Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tmerclub-search/src/main/resources/bootstrap.yml
This commit is contained in:
liubozhi 2025-04-18 10:01:58 +08:00
commit fcd917c201
2 changed files with 4 additions and 5 deletions

View File

@ -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}

View File

@ -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