Merge remote-tracking branch 'refs/remotes/origin/dev' into dev_user0622

# Conflicts:
#	mhd-user-center/src/main/resources/bootstrap.yml
This commit is contained in:
王奎兴
2026-06-29 18:24:48 +08:00
19 changed files with 247 additions and 53 deletions
@@ -14,18 +14,18 @@ spring:
nacos:
discovery:
# server-addr: 127.0.0.1:8848
# server-addr: 10.33.0.129:6010
server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
server-addr: 10.102.192.30:6848
# server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
config:
# server-addr: 127.0.0.1:8848
# server-addr: 10.33.0.129:6010
server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
server-addr: 10.102.192.30:6848
# server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境