From 1456f24fc354f2ff4b0fbd650ab2d5e5b94a4f6d Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Sun, 27 Apr 2025 19:05:59 +0800 Subject: [PATCH] =?UTF-8?q?##=20bd=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bd-business-bonus/src/main/resources/bootstrap.yml | 2 ++ .../bd-business-member/src/main/resources/bootstrap.yml | 2 ++ .../bd-business-report/src/main/resources/bootstrap.yml | 2 ++ bd-business/bd-business-sale/src/main/resources/bootstrap.yml | 2 ++ bd-business/bd-business-scm/src/main/resources/bootstrap.yml | 2 ++ .../bd-business-system/src/main/resources/bootstrap.yml | 2 ++ bd-gateway/src/main/resources/bootstrap.yml | 2 ++ bd-third/src/main/resources/application-test.properties | 2 +- bd-third/src/main/resources/application.properties | 2 +- bd-third/src/main/resources/bootstrap.yml | 2 ++ pom.xml | 4 ++-- 11 files changed, 20 insertions(+), 4 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml b/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml index 7acdf43a..ca4c2bdf 100644 --- a/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml @@ -27,11 +27,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-business/bd-business-member/src/main/resources/bootstrap.yml b/bd-business/bd-business-member/src/main/resources/bootstrap.yml index 7b3b38ad..c8e643b8 100644 --- a/bd-business/bd-business-member/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-member/src/main/resources/bootstrap.yml @@ -27,11 +27,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-business/bd-business-report/src/main/resources/bootstrap.yml b/bd-business/bd-business-report/src/main/resources/bootstrap.yml index 956e8a56..8dbbbdcc 100644 --- a/bd-business/bd-business-report/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-report/src/main/resources/bootstrap.yml @@ -20,11 +20,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-business/bd-business-sale/src/main/resources/bootstrap.yml b/bd-business/bd-business-sale/src/main/resources/bootstrap.yml index f64cc978..44d6be61 100644 --- a/bd-business/bd-business-sale/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-sale/src/main/resources/bootstrap.yml @@ -21,11 +21,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-business/bd-business-scm/src/main/resources/bootstrap.yml b/bd-business/bd-business-scm/src/main/resources/bootstrap.yml index 052af1d5..53017dc6 100644 --- a/bd-business/bd-business-scm/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-scm/src/main/resources/bootstrap.yml @@ -27,11 +27,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-business/bd-business-system/src/main/resources/bootstrap.yml b/bd-business/bd-business-system/src/main/resources/bootstrap.yml index a7fa8ba2..93002c63 100644 --- a/bd-business/bd-business-system/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-system/src/main/resources/bootstrap.yml @@ -27,11 +27,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-gateway/src/main/resources/bootstrap.yml b/bd-gateway/src/main/resources/bootstrap.yml index 3f4e66c3..d33cb9fe 100644 --- a/bd-gateway/src/main/resources/bootstrap.yml +++ b/bd-gateway/src/main/resources/bootstrap.yml @@ -22,11 +22,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-third/src/main/resources/application-test.properties b/bd-third/src/main/resources/application-test.properties index 11aff9ba..3c4d00e6 100644 --- a/bd-third/src/main/resources/application-test.properties +++ b/bd-third/src/main/resources/application-test.properties @@ -10,7 +10,7 @@ logging.config=classpath:logback.xml ### 执行器通讯TOKEN [选填]：非空时启用； xxl.job.accessToken=base_token ### 执行器AppName [选填]：执行器心跳注册分组依据；为空则关闭自动注册 -xxl.job.executor.appname=xxl-job-base +xxl.job.executor.appname=xxl-job-bd ### 执行器注册 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。 xxl.job.executor.address= ### 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"； diff --git a/bd-third/src/main/resources/application.properties b/bd-third/src/main/resources/application.properties index 6a5dab01..9897fe85 100644 --- a/bd-third/src/main/resources/application.properties +++ b/bd-third/src/main/resources/application.properties @@ -10,7 +10,7 @@ logging.config=classpath:logback.xml ### 执行器通讯TOKEN [选填]：非空时启用； xxl.job.accessToken=base_token ### 执行器AppName [选填]：执行器心跳注册分组依据；为空则关闭自动注册 -xxl.job.executor.appname=xxl-job-base +xxl.job.executor.appname=xxl-job-bd ### 执行器注册 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。 xxl.job.executor.address= ### 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"； diff --git a/bd-third/src/main/resources/bootstrap.yml b/bd-third/src/main/resources/bootstrap.yml index b1398736..0de24f81 100644 --- a/bd-third/src/main/resources/bootstrap.yml +++ b/bd-third/src/main/resources/bootstrap.yml @@ -20,11 +20,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/pom.xml b/pom.xml index e05264e2..736e7060 100644 --- a/pom.xml +++ b/pom.xml @@ -524,7 +524,7 @@ 127.0.0.1:8848 - + 333dba4b-9c8c-4f16-a5eb-b49f1fdd7b68 DEFAULT_GROUP @@ -544,7 +544,7 @@ 172.26.201.166:8848 - + bd DEFAULT_GROUP