From 576e3a18ac17035a2b001e84e6ea3210f00a100a Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 22 Apr 2025 19:30:02 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E9=83=A8=E5=88=86=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=8F=90=E5=8F=96=E5=88=B0nacos=EF=BC=9B=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 14 -------------- .../src/main/resources/bootstrap.yml | 13 ------------- .../src/main/resources/bootstrap.yml | 5 ----- .../src/main/resources/bootstrap.yml | 15 --------------- .../src/main/resources/bootstrap.yml | 5 ----- .../src/main/resources/bootstrap.yml | 5 ----- .../main/resources/application-online.properties | 6 ++---- hzs-third/src/main/resources/bootstrap.yml | 5 ----- pom.xml | 5 ++--- 9 files changed, 4 insertions(+), 69 deletions(-) diff --git a/hzs-business/hzs-business-bonus/src/main/resources/bootstrap.yml b/hzs-business/hzs-business-bonus/src/main/resources/bootstrap.yml index 0451b49a..507bdbd8 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/bootstrap.yml +++ b/hzs-business/hzs-business-bonus/src/main/resources/bootstrap.yml @@ -1,17 +1,3 @@ -# 项目配置 -hzs: - # 当前环境(测试=test,生产=online) - env: test - # PC地址 - pc: - # 公众号地址 - gzh: - # IOS地址 - ios: - # android地址 - android: - - # Tomcat server: port: 8098 diff --git a/hzs-business/hzs-business-member/src/main/resources/bootstrap.yml b/hzs-business/hzs-business-member/src/main/resources/bootstrap.yml index 2afbadd9..c5841936 100644 --- a/hzs-business/hzs-business-member/src/main/resources/bootstrap.yml +++ b/hzs-business/hzs-business-member/src/main/resources/bootstrap.yml @@ -1,16 +1,3 @@ -# 项目配置 -hzs: - # 当前环境(测试=test,生产=online) - env: test - # PC地址 - pc: - # 公众号地址 - gzh: - # IOS地址 - ios: - # android地址 - android: - # Tomcat server: port: 8092 diff --git a/hzs-business/hzs-business-report/src/main/resources/bootstrap.yml b/hzs-business/hzs-business-report/src/main/resources/bootstrap.yml index 9aa4753b..8114dada 100644 --- a/hzs-business/hzs-business-report/src/main/resources/bootstrap.yml +++ b/hzs-business/hzs-business-report/src/main/resources/bootstrap.yml @@ -1,8 +1,3 @@ -# 项目配置 -hzs: - # 当前环境(测试=test,生产=online) - env: test - # Tomcat server: port: 8097 diff --git a/hzs-business/hzs-business-sale/src/main/resources/bootstrap.yml b/hzs-business/hzs-business-sale/src/main/resources/bootstrap.yml index d267a255..a0535160 100644 --- a/hzs-business/hzs-business-sale/src/main/resources/bootstrap.yml +++ b/hzs-business/hzs-business-sale/src/main/resources/bootstrap.yml @@ -1,18 +1,3 @@ -# 项目配置 -hzs: - # 当前环境(测试=test,生产=online) - env: test - # PC地址 - pc: http://t-app.beida413.com/ - # 公众号地址 - gzh: - # IOS地址 - ios: - # android地址 - android: - # 当前环境(0=启用 1=禁用) - enable: 1 - # Tomcat server: port: 8093 diff --git a/hzs-business/hzs-business-scm/src/main/resources/bootstrap.yml b/hzs-business/hzs-business-scm/src/main/resources/bootstrap.yml index 81de9f10..2f21be64 100644 --- a/hzs-business/hzs-business-scm/src/main/resources/bootstrap.yml +++ b/hzs-business/hzs-business-scm/src/main/resources/bootstrap.yml @@ -1,8 +1,3 @@ -# 项目配置 -hzs: - # 当前环境(测试=test,生产=online) - env: test - # Tomcat server: port: 8099 diff --git a/hzs-business/hzs-business-system/src/main/resources/bootstrap.yml b/hzs-business/hzs-business-system/src/main/resources/bootstrap.yml index 758437ed..0cbc2ec5 100644 --- a/hzs-business/hzs-business-system/src/main/resources/bootstrap.yml +++ b/hzs-business/hzs-business-system/src/main/resources/bootstrap.yml @@ -1,8 +1,3 @@ -# 项目配置 -hzs: - # 当前环境(测试=test,生产=online) - env: test - # Tomcat server: port: 8091 diff --git a/hzs-third/src/main/resources/application-online.properties b/hzs-third/src/main/resources/application-online.properties index 11aff9ba..25de8405 100644 --- a/hzs-third/src/main/resources/application-online.properties +++ b/hzs-third/src/main/resources/application-online.properties @@ -1,14 +1,12 @@ ### 调度中心部署跟地址 [选填]:如调度中心集群部署存在多个地址则用逗号分隔。执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调";为空则关闭自动注册; -xxl.job.admin.addresses=http://172.26.201.166:8181/xxl-job-admin -## 本地 -##xxl.job.admin.addresses=http://192.168.31.139:8880/xxl-job-admin +xxl.job.admin.addresses=http://172.26.201.172:8181/xxl-admin # log config logging.config=classpath:logback.xml ### 执行器通讯TOKEN [选填]:非空时启用; -xxl.job.accessToken=base_token +xxl.job.accessToken=base_token_online ### 执行器AppName [选填]:执行器心跳注册分组依据;为空则关闭自动注册 xxl.job.executor.appname=xxl-job-base ### 执行器注册 [选填]:优先使用该配置作为注册地址,为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。 diff --git a/hzs-third/src/main/resources/bootstrap.yml b/hzs-third/src/main/resources/bootstrap.yml index 84afe786..95fba9b8 100644 --- a/hzs-third/src/main/resources/bootstrap.yml +++ b/hzs-third/src/main/resources/bootstrap.yml @@ -1,8 +1,3 @@ -# 项目配置 -hzs: - # 当前环境(测试=test,生产=online) - env: test - # Tomcat server: port: 8085 diff --git a/pom.xml b/pom.xml index 00cf26f2..8a877c80 100644 --- a/pom.xml +++ b/pom.xml @@ -561,8 +561,7 @@ online - - 172.26.201.166:8848 + 172.26.201.172:8847 @@ -570,7 +569,7 @@ nacos - bd!Nacos@wsx + lxOnline_nacos#211