Merge remote-tracking branch 'origin/test'

张志伟
2 parents 695728fb fde690df
Showing 6 changed files with 30 additions and 16 deletions
fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatPullRecord.java
fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatRecord.java
fw-hermes-server/src/main/resources/application-test.yml
fw-hermes-server/src/main/resources/application.yml
fw-hermes-server/src/main/resources/logfile.xml
pom.xml
 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<ChatPullRecord, Long> {
  
     /**
 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<ChatRecord, Long> {
     /**
-     *消息发送者
+     * 消息发送者
      */
     private String fromAccount;
  
@@ -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:
@@ -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'
  
@@ -15,7 +15,7 @@
             <totalSizeCap>${logTotalSizeCap}</totalSizeCap>
         </rollingPolicy>
         <encoder>
-            <pattern>[%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%c] - %m%n</pattern>
+            <pattern>[%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{X-APP}/%X{X-IP}/%X{X-TRACE-ID}] [%t] [%c] - %m%n</pattern>
             <charset>${charSet}</charset>
         </encoder>
     </appender>
@@ -41,7 +41,7 @@
             <totalSizeCap>${logTotalSizeCap}</totalSizeCap>
         </rollingPolicy>
         <encoder>
-            <pattern>[%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%c] - %m%n</pattern>
+            <pattern>[%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{X-APP}/%X{X-IP}/%X{X-TRACE-ID}] [%t] [%c] - %m%n</pattern>
             <charset>${charSet}</charset>
         </encoder>
     </appender>
@@ -55,7 +55,7 @@
  
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%highlight([%-1p]) %highlight(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %boldMagenta(%logger) %cyan(%msg%n)</pattern>
+            <pattern>%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)</pattern>
             <charset>${charSet}</charset>
         </encoder>
     </appender>
@@ -12,7 +12,7 @@
     <parent>
         <groupId>cn.fw</groupId>
         <artifactId>fw-common-dependencies</artifactId>
-        <version>3.2.5</version>
+        <version>3.3.0</version>
     </parent>
  
     <modules>