Merge branch 'dev' into master

# Conflicts:
#	mhd-auth/src/main/resources/bootstrap.yml
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
#	mhd-user-center/src/main/resources/bootstrap.yml
This commit is contained in:
hjx
2026-01-07 15:04:36 +08:00
30 changed files with 726 additions and 39 deletions
+2 -2
View File
@@ -14,7 +14,7 @@ spring:
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.5:6848
username: nacos
@@ -22,7 +22,7 @@ spring:
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.5:6848
username: nacos