Commit 45a33fbb authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/develop' into develop

parents b8b0aefa c14fe266
...@@ -63,7 +63,8 @@ spring: ...@@ -63,7 +63,8 @@ spring:
pathmatch: pathmatch:
matching-strategy: ant_path_matcher matching-strategy: ant_path_matcher
redis: redis:
host: 127.0.0.1 host: 192.168.1.65
port: 22379
password: '@yf_2017' password: '@yf_2017'
cloud: cloud:
sentinel: sentinel:
...@@ -104,8 +105,7 @@ spring: ...@@ -104,8 +105,7 @@ spring:
pathmatch: pathmatch:
matching-strategy: ant_path_matcher matching-strategy: ant_path_matcher
redis: redis:
host: 192.168.1.65 host: 127.0.0.1
port: 22379
password: '@yf_2017' password: '@yf_2017'
cloud: cloud:
sentinel: sentinel:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment