diff --git a/fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatPullRecord.java b/fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatPullRecord.java index bd72773..859b60d 100644 --- a/fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatPullRecord.java +++ b/fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatPullRecord.java @@ -1,19 +1,15 @@ package cn.fw.hermes.domain.db; import cn.fw.common.data.entity.BaseEntity; -import cn.fw.data.base.db.annotation.DbTable; import lombok.Data; import java.util.Date; /** - * - * * @Author: liwei * @Date: 2018/12/10 19:51 */ @Data -@DbTable("chat_pull_record") public class ChatPullRecord extends BaseEntity { /** diff --git a/fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatRecord.java b/fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatRecord.java index dd1e2e5..1d3e07e 100644 --- a/fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatRecord.java +++ b/fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatRecord.java @@ -1,23 +1,20 @@ package cn.fw.hermes.domain.db; import cn.fw.common.data.entity.BaseEntity; -import cn.fw.data.base.db.annotation.DbTable; import lombok.Data; import java.util.Date; /** - * * 聊天记录 * * @Author: liwei * @Date: 2018/12/10 16:05 */ @Data -@DbTable("chat_record") public class ChatRecord extends BaseEntity { /** - *消息发送者 + * 消息发送者 */ private String fromAccount; diff --git a/fw-hermes-server/src/main/resources/application-test.yml b/fw-hermes-server/src/main/resources/application-test.yml index 66b6a3b..8454eb5 100644 --- a/fw-hermes-server/src/main/resources/application-test.yml +++ b/fw-hermes-server/src/main/resources/application-test.yml @@ -2,6 +2,7 @@ spring: cloud: nacos: discovery: + server-addr: 172.26.154.169:8848 metadata: group: discovery-test-group region: test @@ -9,24 +10,27 @@ spring: namespace: 0ba6d5d6-2a49-4086-b6c3-dbeec01c61a4 datasource: password: mysql@pwd123 - url: jdbc:mysql://192.168.0.9:3306/fw_hermes?characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://172.26.154.169:3301/fw_hermes?characterEncoding=UTF-8&useSSL=false username: test redis: - host: 192.168.0.9 + host: 172.26.154.169 + port: 6378 password: fw@test@redis nacos: + server-addr: 172.26.154.169:8848 plugin: namespace: 0ba6d5d6-2a49-4086-b6b3-dbeec01c61a4 rocketmq: - name-server: 192.168.0.230:9876 + name-server: 172.26.154.169:9876 file: prefix: https://testimg.feewee.cn/ jedis: pool: - host: 192.168.0.9 + host: 172.26.154.169 + port: 6378 password: fw@test@redis logging: file: diff --git a/fw-hermes-server/src/main/resources/application.yml b/fw-hermes-server/src/main/resources/application.yml index 7ba2a20..0f39386 100644 --- a/fw-hermes-server/src/main/resources/application.yml +++ b/fw-hermes-server/src/main/resources/application.yml @@ -110,6 +110,23 @@ server: undertow: worker-threads: 50 +management: + endpoints: + web: + exposure: + include: '*' + # 监控路径前缀 + base-path: /actuator + endpoint: + # 开启允许远程shutdown,通过post请求。 + shutdown: + enabled: true + health: + show-details: always + metrics: + tags: + application: ${spring.application.name} + task: switch: 'on' diff --git a/fw-hermes-server/src/main/resources/logfile.xml b/fw-hermes-server/src/main/resources/logfile.xml index 357a891..75975ba 100644 --- a/fw-hermes-server/src/main/resources/logfile.xml +++ b/fw-hermes-server/src/main/resources/logfile.xml @@ -15,7 +15,7 @@ ${logTotalSizeCap} - [%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%c] - %m%n + [%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{X-APP}/%X{X-IP}/%X{X-TRACE-ID}] [%t] [%c] - %m%n ${charSet} @@ -41,7 +41,7 @@ ${logTotalSizeCap} - [%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%c] - %m%n + [%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{X-APP}/%X{X-IP}/%X{X-TRACE-ID}] [%t] [%c] - %m%n ${charSet} @@ -55,7 +55,7 @@ - %highlight([%-1p]) %highlight(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %boldMagenta(%logger) %cyan(%msg%n) + %highlight([%-1p]) %highlight(%d{yyyy-MM-dd HH:mm:ss} [%X{X-APP}/%X{X-IP}/%X{X-TRACE-ID}]) %green([%thread]) %boldMagenta(%logger) %cyan(%msg%n) ${charSet} diff --git a/pom.xml b/pom.xml index b0f6d46..0208b9e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ cn.fw fw-common-dependencies - 3.2.5 + 3.3.0