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

# Conflicts:
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
This commit is contained in:
王奎兴
2026-01-14 16:40:52 +08:00
136 changed files with 5275 additions and 861 deletions
+8 -4
View File
@@ -14,15 +14,19 @@ 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.105:6848
server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
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.105:6848
server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置