From f6f0c976228d17b0281ba7cf29ed080234065920 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Wed, 17 Sep 2025 19:09:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=BE=BD=E7=A7=9F=E8=B5=81=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E4=BB=93=E5=BA=93=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bootstrap-material_mall_test.yml | 32 +++++++++++++++++++ .../resources/bootstrap-sgzb_bns_local.yml | 14 ++++++-- bonus-auth/src/main/resources/bootstrap.yml | 3 +- .../bootstrap-material_mall_test.yml | 8 ++--- .../resources/bootstrap-sgzb_bns_local.yml | 7 ++-- .../src/main/resources/bootstrap.yml | 3 +- .../resources/bootstrap-sgzb_bns_local.yml | 10 ++++-- .../src/main/resources/bootstrap.yml | 3 +- .../bootstrap-material_mall_test.yml | 31 ++++++++++++++++++ .../resources/bootstrap-sgzb_bns_local.yml | 9 ++++-- .../src/main/resources/bootstrap.yml | 4 ++- 11 files changed, 107 insertions(+), 17 deletions(-) create mode 100644 bonus-auth/src/main/resources/bootstrap-material_mall_test.yml create mode 100644 bonus-modules/bonus-system/src/main/resources/bootstrap-material_mall_test.yml diff --git a/bonus-auth/src/main/resources/bootstrap-material_mall_test.yml b/bonus-auth/src/main/resources/bootstrap-material_mall_test.yml new file mode 100644 index 0000000..e82a002 --- /dev/null +++ b/bonus-auth/src/main/resources/bootstrap-material_mall_test.yml @@ -0,0 +1,32 @@ +# Tomcat +server: + port: 28081 + +# Spring +spring: + cloud: + nacos: + discovery: + # 服务注册地址 +# server-addr: 192.168.1.2:8848 + server-addr: 14.103.246.124:8848 +# namespace: material_mall + namespace: material_mall_shanxi + ip: 192.168.0.69 + config: + # 配置中心地址 +# server-addr: 192.168.1.2:8848 + server-addr: 14.103.246.124:8848 +# namespace: material_mall + namespace: material_mall_shanxi + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + +#加密组件 +jasypt: + encryptor: + password: Encrypt + diff --git a/bonus-auth/src/main/resources/bootstrap-sgzb_bns_local.yml b/bonus-auth/src/main/resources/bootstrap-sgzb_bns_local.yml index 45f3441..02103c3 100644 --- a/bonus-auth/src/main/resources/bootstrap-sgzb_bns_local.yml +++ b/bonus-auth/src/main/resources/bootstrap-sgzb_bns_local.yml @@ -8,11 +8,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 14.103.246.124:8848 namespace: sgzb_bns +# ip: 192.168.0.69 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 14.103.246.124:8848 namespace: sgzb_bns # 配置文件格式 file-extension: yml @@ -25,3 +26,12 @@ jasypt: encryptor: password: Encrypt + +#iws +third-party-login: + iws: + webAppId: 123456 + webUrl: http://127.0.0.1:8080/ + h5AppId: 123456789 + h5Url: http://127.0.0.1:8080/ + diff --git a/bonus-auth/src/main/resources/bootstrap.yml b/bonus-auth/src/main/resources/bootstrap.yml index 7051969..1379e62 100644 --- a/bonus-auth/src/main/resources/bootstrap.yml +++ b/bonus-auth/src/main/resources/bootstrap.yml @@ -5,7 +5,8 @@ spring: name: bonus-auth profiles: # 环境配置 - active: dev + active: material_mall_test +# active: sgzb_bns_local #加密组件 jasypt: diff --git a/bonus-gateway/src/main/resources/bootstrap-material_mall_test.yml b/bonus-gateway/src/main/resources/bootstrap-material_mall_test.yml index 164066c..fc15524 100644 --- a/bonus-gateway/src/main/resources/bootstrap-material_mall_test.yml +++ b/bonus-gateway/src/main/resources/bootstrap-material_mall_test.yml @@ -9,16 +9,16 @@ spring: discovery: # 服务注册地址 server-addr: 14.103.246.124:8848 - namespace: material_mall -# namespace: material_mall_shanxi +# namespace: material_mall + namespace: material_mall_shanxi username: nacos password: nacos123 ip: 192.168.0.69 config: # 配置中心地址 server-addr: 14.103.246.124:8848 - namespace: material_mall -# namespace: material_mall_shanxi +# namespace: material_mall + namespace: material_mall_shanxi username: nacos password: nacos123 # 配置文件格式 diff --git a/bonus-gateway/src/main/resources/bootstrap-sgzb_bns_local.yml b/bonus-gateway/src/main/resources/bootstrap-sgzb_bns_local.yml index 8e18c71..e2b3119 100644 --- a/bonus-gateway/src/main/resources/bootstrap-sgzb_bns_local.yml +++ b/bonus-gateway/src/main/resources/bootstrap-sgzb_bns_local.yml @@ -8,11 +8,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 14.103.246.124:8848 namespace: sgzb_bns +# ip: 192.168.0.69 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 14.103.246.124:8848 namespace: sgzb_bns # 配置文件格式 file-extension: yml @@ -29,7 +30,7 @@ spring: datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: 14.103.246.124:8848 namespace: sgzb_bns dataId: sentinel-bonus-gateway groupId: DEFAULT_GROUP diff --git a/bonus-gateway/src/main/resources/bootstrap.yml b/bonus-gateway/src/main/resources/bootstrap.yml index 1766a04..09a19f9 100644 --- a/bonus-gateway/src/main/resources/bootstrap.yml +++ b/bonus-gateway/src/main/resources/bootstrap.yml @@ -5,7 +5,8 @@ spring: name: bonus-gateway profiles: # 环境配置 - active: dev +# active: sgzb_bns_local + active: material_mall_test #加密组件 jasypt: diff --git a/bonus-modules/bonus-file/src/main/resources/bootstrap-sgzb_bns_local.yml b/bonus-modules/bonus-file/src/main/resources/bootstrap-sgzb_bns_local.yml index 807d698..564c2b9 100644 --- a/bonus-modules/bonus-file/src/main/resources/bootstrap-sgzb_bns_local.yml +++ b/bonus-modules/bonus-file/src/main/resources/bootstrap-sgzb_bns_local.yml @@ -8,14 +8,20 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 14.103.246.124:8848 namespace: sgzb_bns + ip: 192.168.0.69 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 14.103.246.124:8848 namespace: sgzb_bns # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + +file: + path: /home/bonus/file + prefix: / + domain: / diff --git a/bonus-modules/bonus-file/src/main/resources/bootstrap.yml b/bonus-modules/bonus-file/src/main/resources/bootstrap.yml index 371813f..1916f5d 100644 --- a/bonus-modules/bonus-file/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-file/src/main/resources/bootstrap.yml @@ -6,7 +6,8 @@ spring: profiles: # 环境配置 - active: dev +# active: sgzb_bns_local + active: material_mall_test #加密组件 jasypt: diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap-material_mall_test.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap-material_mall_test.yml new file mode 100644 index 0000000..26afc7b --- /dev/null +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap-material_mall_test.yml @@ -0,0 +1,31 @@ +# Tomcat +server: + port: 28082 + +# Spring +spring: + cloud: + nacos: + discovery: + # 服务注册地址 +# server-addr: 192.168.1.2:8848 + server-addr: 14.103.246.124:8848 +# namespace: material_mall + namespace: material_mall_shanxi + ip: 192.168.0.69 + config: + # 配置中心地址 + #server-addr: 192.168.1.2:8848 + server-addr: 14.103.246.124:8848 +# namespace: material_mall + namespace: material_mall_shanxi + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + +#加密组件 +jasypt: + encryptor: + password: Encrypt diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap-sgzb_bns_local.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap-sgzb_bns_local.yml index db2006e..4b45d0b 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap-sgzb_bns_local.yml +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap-sgzb_bns_local.yml @@ -8,11 +8,16 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 +# server-addr: 43.134.4.238:8848 +# namespace: sgzb_bns + server-addr: 14.103.246.124:8848 namespace: sgzb_bns +# ip: 192.168.0.69 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 +# server-addr: 43.134.4.238:8848 +# namespace: sgzb_bns + server-addr: 14.103.246.124:8848 namespace: sgzb_bns # 配置文件格式 file-extension: yml diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml index 790dc0d..087653d 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml @@ -5,7 +5,9 @@ spring: name: bonus-system profiles: # 环境配置 - active: dev +# active: sgzb_bns_local + active: material_mall_test + task: scheduling: pool: