Merge remote-tracking branch 'origin/master'
# Conflicts: # tmerclub-search/src/main/resources/bootstrap.yml
This commit is contained in:
commit
fcd917c201
@ -27,6 +27,6 @@ logging:
|
|||||||
dubbo:
|
dubbo:
|
||||||
protocol:
|
protocol:
|
||||||
port: ${tmerclub_DUBBO_PORT:11114}
|
port: ${tmerclub_DUBBO_PORT:11114}
|
||||||
host: ${spring.cloud.nacos.discovery.ip}
|
host: 172.23.112.124
|
||||||
application:
|
application:
|
||||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13114}
|
qos-port: ${tmerclub_DUBBOQOS_PORT:13114}
|
||||||
|
@ -27,7 +27,6 @@ logging:
|
|||||||
dubbo:
|
dubbo:
|
||||||
protocol:
|
protocol:
|
||||||
port: ${tmerclub_DUBBO_PORT:11108}
|
port: ${tmerclub_DUBBO_PORT:11108}
|
||||||
consumer:
|
host: 172.23.112.124
|
||||||
loadbalance: dev
|
application:
|
||||||
registry:
|
qos-port: ${tmerclub_DUBBOQOS_PORT:13108}
|
||||||
group: dubbo-default
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user