valhalla / fw-shirasawa

Commit 30a3f35e5911e95db96776d4bb12f2be561daa34

Authored by 张志伟
2 parents 4706d7d6 9d2ff1cb

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

Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
fw-shirasawa-server/src/main/resources/application-test.yml
  View file @30a3f35
@@ -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:
fw-shirasawa-server/src/main/resources/application.yml
  View file @30a3f35
@@ -23,7 +23,7 @@ spring: @@ -23,7 +23,7 @@ spring:
23 hikari: 23 hikari:
24 connection-test-query: SELECT 1 FROM DUAL 24 connection-test-query: SELECT 1 FROM DUAL
25 password: mysql@pwd123 25 password: mysql@pwd123
26 - url: jdbc:mysql://192.168.0.8:3306/fw_shirasawa?characterEncoding=UTF-8&useSSL=false 26 + url: jdbc:mysql://192.168.0.234:3306/fw_shirasawa?characterEncoding=UTF-8&useSSL=false
27 username: root 27 username: root
28 jackson: 28 jackson:
29 default-property-inclusion: non_null 29 default-property-inclusion: non_null
@@ -35,7 +35,7 @@ spring: @@ -35,7 +35,7 @@ spring:
35 profiles: 35 profiles:
36 active: cache,${activatedProfiles} 36 active: cache,${activatedProfiles}
37 redis: 37 redis:
38 - host: 192.168.0.8 38 + host: 192.168.0.234
39 lettuce: 39 lettuce:
40 pool: 40 pool:
41 max-active: 20 41 max-active: 20