Merge remote-tracking branch 'origin/master'
# Conflicts: # tmerclub-search/src/main/resources/bootstrap.yml
This commit is contained in:
commit
fc46f21a27
@ -27,8 +27,6 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${tmerclub_DUBBO_PORT:11112}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13112}
|
||||
|
@ -27,7 +27,6 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${TMERCLUB_DUBBO_PORT:11101}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13101}
|
||||
|
@ -28,7 +28,6 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${TMERCLUB_DUBBO_PORT:11118}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13118}
|
||||
|
@ -27,7 +27,6 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${TMERCLUB_DUBBO_PORT:11116}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13116}
|
||||
|
@ -27,7 +27,6 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${tmerclub_DUBBO_PORT:11114}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13114}
|
||||
|
@ -27,7 +27,6 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${tmerclub_DUBBO_PORT:11120}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13120}
|
||||
|
@ -27,7 +27,6 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${tmerclub_DUBBO_PORT:11109}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13109}
|
||||
|
@ -27,7 +27,6 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${tmerclub_DUBBO_PORT:11109}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13109}
|
||||
|
@ -27,7 +27,6 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${tmerclub_DUBBO_PORT:11106}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13106}
|
||||
|
@ -27,7 +27,6 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${tmerclub_DUBBO_PORT:11113}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13113}
|
||||
|
@ -33,7 +33,6 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${tmerclub_DUBBO_PORT:11104}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13104}
|
||||
|
@ -27,7 +27,6 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${tmerclub_DUBBO_PORT:11115}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13115}
|
||||
|
@ -34,8 +34,7 @@ logging:
|
||||
dubbo:
|
||||
protocol:
|
||||
port: ${tmerclub_DUBBO_PORT:11105}
|
||||
consumer:
|
||||
loadbalance: dev
|
||||
registry:
|
||||
group: dubbo-default
|
||||
host: ${spring.cloud.nacos.discovery.ip}
|
||||
application:
|
||||
qos-port: ${tmerclub_DUBBOQOS_PORT:13105}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user