Merge remote-tracking branch 'origin/main' into feature/20260713/task-module

# Conflicts:
#	nl-gateway/src/main/resources/application-dev.yaml
#	nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml
#	nl-module-lms/nl-module-lms-server/src/main/resources/application-dev.yaml
#	nl-module-lms/nl-module-lms-server/src/main/resources/application-local.yaml
#	nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml
#	nl-server/src/main/resources/application-dev.yaml
This commit is contained in:
2026-07-15 16:40:23 +08:00
67 changed files with 11830 additions and 15 deletions

View File

@@ -3,7 +3,7 @@
spring:
cloud:
nacos:
server-addr: 192.168.10.2:8848 # Nacos 服务器地址
server-addr: 192.168.81.193:8848 # Nacos 服务器地址
username: # Nacos 账号
password: # Nacos 密码
discovery: # 【配置中心】配置项
@@ -95,9 +95,9 @@ spring:
xxl:
job:
admin:
addresses: http://192.168.10.2:8080/xxl-job-admin # 调度中心部署跟地址
addresses: http://192.168.81.193:8080/xxl-job-admin # 调度中心部署跟地址
executor:
ip: 192.168.10.2
ip: 192.168.81.193
port: 9991
--- #################### 服务保障相关配置 ####################