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 13 username: test
14 14 redis:
15 15 host: 192.168.0.9
  16 + password: fw@test@redis
16 17  
17 18 nacos:
18 19 plugin:
... ... @@ -26,6 +27,7 @@ file:
26 27 jedis:
27 28 pool:
28 29 host: 192.168.0.9
  30 + password: fw@test@redis
29 31 logging:
30 32 file:
31 33 max-history: 15
... ...
fw-hermes-server/src/main/resources/application.yml
  View file @43d9f70
... ... @@ -18,7 +18,7 @@ spring:
18 18 hikari:
19 19 connection-test-query: SELECT 1 FROM DUAL
20 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 22 username: root
23 23 jackson:
24 24 default-property-inclusion: non_null
... ... @@ -30,7 +30,7 @@ spring:
30 30 profiles:
31 31 active: cache,${activatedProfiles}
32 32 redis:
33   - host: 192.168.0.8
  33 + host: 192.168.0.234
34 34 lettuce:
35 35 pool:
36 36 max-active: 20
... ...