Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tmerclub-search/src/main/resources/bootstrap.yml
This commit is contained in:
liubozhi 2025-04-18 09:23:54 +08:00
commit fc46f21a27
13 changed files with 39 additions and 53 deletions

View File

@ -27,8 +27,6 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${tmerclub_DUBBO_PORT:11112} port: ${tmerclub_DUBBO_PORT:11112}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13112}
group: dubbo-default

View File

@ -27,7 +27,6 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${TMERCLUB_DUBBO_PORT:11101} port: ${TMERCLUB_DUBBO_PORT:11101}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13101}
group: dubbo-default

View File

@ -28,7 +28,6 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${TMERCLUB_DUBBO_PORT:11118} port: ${TMERCLUB_DUBBO_PORT:11118}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13118}
group: dubbo-default

View File

@ -27,7 +27,6 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${TMERCLUB_DUBBO_PORT:11116} port: ${TMERCLUB_DUBBO_PORT:11116}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13116}
group: dubbo-default

View File

@ -27,7 +27,6 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${tmerclub_DUBBO_PORT:11114} port: ${tmerclub_DUBBO_PORT:11114}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13114}
group: dubbo-default

View File

@ -27,7 +27,6 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${tmerclub_DUBBO_PORT:11120} port: ${tmerclub_DUBBO_PORT:11120}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13120}
group: dubbo-default

View File

@ -27,7 +27,6 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${tmerclub_DUBBO_PORT:11109} port: ${tmerclub_DUBBO_PORT:11109}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13109}
group: dubbo-default

View File

@ -27,7 +27,6 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${tmerclub_DUBBO_PORT:11109} port: ${tmerclub_DUBBO_PORT:11109}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13109}
group: dubbo-default

View File

@ -27,7 +27,6 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${tmerclub_DUBBO_PORT:11106} port: ${tmerclub_DUBBO_PORT:11106}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13106}
group: dubbo-default

View File

@ -27,7 +27,6 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${tmerclub_DUBBO_PORT:11113} port: ${tmerclub_DUBBO_PORT:11113}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13113}
group: dubbo-default

View File

@ -33,7 +33,6 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${tmerclub_DUBBO_PORT:11104} port: ${tmerclub_DUBBO_PORT:11104}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13104}
group: dubbo-default

View File

@ -27,7 +27,6 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${tmerclub_DUBBO_PORT:11115} port: ${tmerclub_DUBBO_PORT:11115}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13115}
group: dubbo-default

View File

@ -34,8 +34,7 @@ logging:
dubbo: dubbo:
protocol: protocol:
port: ${tmerclub_DUBBO_PORT:11105} port: ${tmerclub_DUBBO_PORT:11105}
consumer: host: ${spring.cloud.nacos.discovery.ip}
loadbalance: dev application:
registry: qos-port: ${tmerclub_DUBBOQOS_PORT:13105}
group: dubbo-default