Commit 30a3f35e5911e95db96776d4bb12f2be561daa34
Merge remote-tracking branch 'origin/dev' into test
Showing
2 changed files
with
3 additions
and
2 deletions
fw-shirasawa-server/src/main/resources/application-test.yml
fw-shirasawa-server/src/main/resources/application.yml
... | ... | @@ -23,7 +23,7 @@ spring: |
23 | 23 | hikari: |
24 | 24 | connection-test-query: SELECT 1 FROM DUAL |
25 | 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 | 27 | username: root |
28 | 28 | jackson: |
29 | 29 | default-property-inclusion: non_null |
... | ... | @@ -35,7 +35,7 @@ spring: |
35 | 35 | profiles: |
36 | 36 | active: cache,${activatedProfiles} |
37 | 37 | redis: |
38 | - host: 192.168.0.8 | |
38 | + host: 192.168.0.234 | |
39 | 39 | lettuce: |
40 | 40 | pool: |
41 | 41 | max-active: 20 | ... | ... |