third / fw-hermes

Commit 43d9f702ab89d38db311234ffebf7fbf2df67eff

Authored by 张志伟
2 parents 4919c144 0f0f8680

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

Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
fw-hermes-server/src/main/resources/application-test.yml
  View file @43d9f70
@@ -13,6 +13,7 @@ spring: @@ -13,6 +13,7 @@ spring:
13 username: test 13 username: test
14 redis: 14 redis:
15 host: 192.168.0.9 15 host: 192.168.0.9
  16 + password: fw@test@redis
16 17
17 nacos: 18 nacos:
18 plugin: 19 plugin:
@@ -26,6 +27,7 @@ file: @@ -26,6 +27,7 @@ file:
26 jedis: 27 jedis:
27 pool: 28 pool:
28 host: 192.168.0.9 29 host: 192.168.0.9
  30 + password: fw@test@redis
29 logging: 31 logging:
30 file: 32 file:
31 max-history: 15 33 max-history: 15
fw-hermes-server/src/main/resources/application.yml
  View file @43d9f70
@@ -18,7 +18,7 @@ spring: @@ -18,7 +18,7 @@ spring:
18 hikari: 18 hikari:
19 connection-test-query: SELECT 1 FROM DUAL 19 connection-test-query: SELECT 1 FROM DUAL
20 password: mysql@pwd123 20 password: mysql@pwd123
21 - url: jdbc:mysql://192.168.0.8:3306/fw_hermes?characterEncoding=UTF-8&useSSL=false 21 + url: jdbc:mysql://192.168.0.234:3306/fw_hermes?characterEncoding=UTF-8&useSSL=false
22 username: root 22 username: root
23 jackson: 23 jackson:
24 default-property-inclusion: non_null 24 default-property-inclusion: non_null
@@ -30,7 +30,7 @@ spring: @@ -30,7 +30,7 @@ spring:
30 profiles: 30 profiles:
31 active: cache,${activatedProfiles} 31 active: cache,${activatedProfiles}
32 redis: 32 redis:
33 - host: 192.168.0.8 33 + host: 192.168.0.234
34 lettuce: 34 lettuce:
35 pool: 35 pool:
36 max-active: 20 36 max-active: 20