Commit ff0c2c89fcdcb8fc174ccce6d9a77e4ff2d71c9e

Authored by 张志伟
2 parents 61d9397a b4d7e881

Merge remote-tracking branch 'origin/dev' into test

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: