Commit e5a50cecfe3fde3e2d7f12ff4c53fc1f3d7a3af4
Merge remote-tracking branch 'origin/test'
Showing
6 changed files
with
30 additions
and
16 deletions
fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatPullRecord.java
1 | package cn.fw.hermes.domain.db; | 1 | package cn.fw.hermes.domain.db; |
2 | 2 | ||
3 | import cn.fw.common.data.entity.BaseEntity; | 3 | import cn.fw.common.data.entity.BaseEntity; |
4 | -import cn.fw.data.base.db.annotation.DbTable; | ||
5 | import lombok.Data; | 4 | import lombok.Data; |
6 | 5 | ||
7 | import java.util.Date; | 6 | import java.util.Date; |
8 | 7 | ||
9 | /** | 8 | /** |
10 | - * | ||
11 | - * | ||
12 | * @Author: liwei | 9 | * @Author: liwei |
13 | * @Date: 2018/12/10 19:51 | 10 | * @Date: 2018/12/10 19:51 |
14 | */ | 11 | */ |
15 | @Data | 12 | @Data |
16 | -@DbTable("chat_pull_record") | ||
17 | public class ChatPullRecord extends BaseEntity<ChatPullRecord, Long> { | 13 | public class ChatPullRecord extends BaseEntity<ChatPullRecord, Long> { |
18 | 14 | ||
19 | /** | 15 | /** |
fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/ChatRecord.java
1 | package cn.fw.hermes.domain.db; | 1 | package cn.fw.hermes.domain.db; |
2 | 2 | ||
3 | import cn.fw.common.data.entity.BaseEntity; | 3 | import cn.fw.common.data.entity.BaseEntity; |
4 | -import cn.fw.data.base.db.annotation.DbTable; | ||
5 | import lombok.Data; | 4 | import lombok.Data; |
6 | 5 | ||
7 | import java.util.Date; | 6 | import java.util.Date; |
8 | 7 | ||
9 | /** | 8 | /** |
10 | - * | ||
11 | * 聊天记录 | 9 | * 聊天记录 |
12 | * | 10 | * |
13 | * @Author: liwei | 11 | * @Author: liwei |
14 | * @Date: 2018/12/10 16:05 | 12 | * @Date: 2018/12/10 16:05 |
15 | */ | 13 | */ |
16 | @Data | 14 | @Data |
17 | -@DbTable("chat_record") | ||
18 | public class ChatRecord extends BaseEntity<ChatRecord, Long> { | 15 | public class ChatRecord extends BaseEntity<ChatRecord, Long> { |
19 | /** | 16 | /** |
20 | - *消息发送者 | 17 | + * 消息发送者 |
21 | */ | 18 | */ |
22 | private String fromAccount; | 19 | private String fromAccount; |
23 | 20 |
fw-hermes-server/src/main/resources/application-test.yml
@@ -2,6 +2,7 @@ spring: | @@ -2,6 +2,7 @@ spring: | ||
2 | cloud: | 2 | cloud: |
3 | nacos: | 3 | nacos: |
4 | discovery: | 4 | discovery: |
5 | + server-addr: 172.26.154.169:8848 | ||
5 | metadata: | 6 | metadata: |
6 | group: discovery-test-group | 7 | group: discovery-test-group |
7 | region: test | 8 | region: test |
@@ -9,24 +10,27 @@ spring: | @@ -9,24 +10,27 @@ spring: | ||
9 | namespace: 0ba6d5d6-2a49-4086-b6c3-dbeec01c61a4 | 10 | namespace: 0ba6d5d6-2a49-4086-b6c3-dbeec01c61a4 |
10 | datasource: | 11 | datasource: |
11 | password: mysql@pwd123 | 12 | password: mysql@pwd123 |
12 | - url: jdbc:mysql://192.168.0.9:3306/fw_hermes?characterEncoding=UTF-8&useSSL=false | 13 | + url: jdbc:mysql://172.26.154.169:3301/fw_hermes?characterEncoding=UTF-8&useSSL=false |
13 | username: test | 14 | username: test |
14 | redis: | 15 | redis: |
15 | - host: 192.168.0.9 | 16 | + host: 172.26.154.169 |
17 | + port: 6378 | ||
16 | password: fw@test@redis | 18 | password: fw@test@redis |
17 | 19 | ||
18 | nacos: | 20 | nacos: |
21 | + server-addr: 172.26.154.169:8848 | ||
19 | plugin: | 22 | plugin: |
20 | namespace: 0ba6d5d6-2a49-4086-b6b3-dbeec01c61a4 | 23 | namespace: 0ba6d5d6-2a49-4086-b6b3-dbeec01c61a4 |
21 | 24 | ||
22 | rocketmq: | 25 | rocketmq: |
23 | - name-server: 192.168.0.230:9876 | 26 | + name-server: 172.26.154.169:9876 |
24 | 27 | ||
25 | file: | 28 | file: |
26 | prefix: https://testimg.feewee.cn/ | 29 | prefix: https://testimg.feewee.cn/ |
27 | jedis: | 30 | jedis: |
28 | pool: | 31 | pool: |
29 | - host: 192.168.0.9 | 32 | + host: 172.26.154.169 |
33 | + port: 6378 | ||
30 | password: fw@test@redis | 34 | password: fw@test@redis |
31 | logging: | 35 | logging: |
32 | file: | 36 | file: |
fw-hermes-server/src/main/resources/application.yml
@@ -110,6 +110,23 @@ server: | @@ -110,6 +110,23 @@ server: | ||
110 | undertow: | 110 | undertow: |
111 | worker-threads: 50 | 111 | worker-threads: 50 |
112 | 112 | ||
113 | +management: | ||
114 | + endpoints: | ||
115 | + web: | ||
116 | + exposure: | ||
117 | + include: '*' | ||
118 | + # 监控路径前缀 | ||
119 | + base-path: /actuator | ||
120 | + endpoint: | ||
121 | + # 开启允许远程shutdown,通过post请求。 | ||
122 | + shutdown: | ||
123 | + enabled: true | ||
124 | + health: | ||
125 | + show-details: always | ||
126 | + metrics: | ||
127 | + tags: | ||
128 | + application: ${spring.application.name} | ||
129 | + | ||
113 | task: | 130 | task: |
114 | switch: 'on' | 131 | switch: 'on' |
115 | 132 |
fw-hermes-server/src/main/resources/logfile.xml
@@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
15 | <totalSizeCap>${logTotalSizeCap}</totalSizeCap> | 15 | <totalSizeCap>${logTotalSizeCap}</totalSizeCap> |
16 | </rollingPolicy> | 16 | </rollingPolicy> |
17 | <encoder> | 17 | <encoder> |
18 | - <pattern>[%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%c] - %m%n</pattern> | 18 | + <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> |
19 | <charset>${charSet}</charset> | 19 | <charset>${charSet}</charset> |
20 | </encoder> | 20 | </encoder> |
21 | </appender> | 21 | </appender> |
@@ -41,7 +41,7 @@ | @@ -41,7 +41,7 @@ | ||
41 | <totalSizeCap>${logTotalSizeCap}</totalSizeCap> | 41 | <totalSizeCap>${logTotalSizeCap}</totalSizeCap> |
42 | </rollingPolicy> | 42 | </rollingPolicy> |
43 | <encoder> | 43 | <encoder> |
44 | - <pattern>[%-5p] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] [%c] - %m%n</pattern> | 44 | + <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> |
45 | <charset>${charSet}</charset> | 45 | <charset>${charSet}</charset> |
46 | </encoder> | 46 | </encoder> |
47 | </appender> | 47 | </appender> |
@@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
55 | 55 | ||
56 | <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> | 56 | <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> |
57 | <encoder> | 57 | <encoder> |
58 | - <pattern>%highlight([%-1p]) %highlight(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %boldMagenta(%logger) %cyan(%msg%n)</pattern> | 58 | + <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> |
59 | <charset>${charSet}</charset> | 59 | <charset>${charSet}</charset> |
60 | </encoder> | 60 | </encoder> |
61 | </appender> | 61 | </appender> |
pom.xml
@@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
12 | <parent> | 12 | <parent> |
13 | <groupId>cn.fw</groupId> | 13 | <groupId>cn.fw</groupId> |
14 | <artifactId>fw-common-dependencies</artifactId> | 14 | <artifactId>fw-common-dependencies</artifactId> |
15 | - <version>3.2.5</version> | 15 | + <version>3.3.0</version> |
16 | </parent> | 16 | </parent> |
17 | 17 | ||
18 | <modules> | 18 | <modules> |