From 3518728553452a2a03cdcc22366297f3d0058cb8 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 28 Mar 2025 16:34:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/bootstrap-yn-img-tool.yml | 19 ++++---- bonus-auth/src/main/resources/bootstrap.yml | 2 +- .../bootstrap-material_mall_local.yml | 43 ------------------- .../resources/bootstrap-sgzb_bns_local.yml | 43 ------------------- .../bootstrap-smart_canteen_local.yml | 43 ------------------- .../resources/bootstrap-smart_site_local.yml | 43 ------------------- .../main/resources/bootstrap-yn-img-tool.yml | 19 ++++---- .../src/main/resources/bootstrap.yml | 2 +- .../bootstrap-smart_canteen_local.yml | 26 ----------- ...ns_local.yml => bootstrap-yn-img-tool.yml} | 19 ++++---- .../src/main/resources/bootstrap.yml | 2 +- 11 files changed, 30 insertions(+), 231 deletions(-) rename bonus-modules/bonus-system/src/main/resources/bootstrap-material_mall_local.yml => bonus-auth/src/main/resources/bootstrap-yn-img-tool.yml (58%) delete mode 100644 bonus-gateway/src/main/resources/bootstrap-material_mall_local.yml delete mode 100644 bonus-gateway/src/main/resources/bootstrap-sgzb_bns_local.yml delete mode 100644 bonus-gateway/src/main/resources/bootstrap-smart_canteen_local.yml delete mode 100644 bonus-gateway/src/main/resources/bootstrap-smart_site_local.yml rename bonus-modules/bonus-system/src/main/resources/bootstrap-smart_site_local.yml => bonus-gateway/src/main/resources/bootstrap-yn-img-tool.yml (58%) delete mode 100644 bonus-modules/bonus-system/src/main/resources/bootstrap-smart_canteen_local.yml rename bonus-modules/bonus-system/src/main/resources/{bootstrap-sgzb_bns_local.yml => bootstrap-yn-img-tool.yml} (58%) diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap-material_mall_local.yml b/bonus-auth/src/main/resources/bootstrap-yn-img-tool.yml similarity index 58% rename from bonus-modules/bonus-system/src/main/resources/bootstrap-material_mall_local.yml rename to bonus-auth/src/main/resources/bootstrap-yn-img-tool.yml index 4711197..b5f868a 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap-material_mall_local.yml +++ b/bonus-auth/src/main/resources/bootstrap-yn-img-tool.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 28082 + port: 18081 # Spring spring: @@ -8,19 +8,18 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: material_mall + server-addr: 192.168.0.16:18848 + namespace: bonus-ai + username: nacos + password: nacos config: # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: material_mall + server-addr: 192.168.0.16:18848 + namespace: bonus-ai + username: nacos + password: nacos # 配置文件格式 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.yml b/bonus-auth/src/main/resources/bootstrap.yml index 7051969..746681b 100644 --- a/bonus-auth/src/main/resources/bootstrap.yml +++ b/bonus-auth/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: bonus-auth profiles: # 环境配置 - active: dev + active: yn-img-tool #加密组件 jasypt: diff --git a/bonus-gateway/src/main/resources/bootstrap-material_mall_local.yml b/bonus-gateway/src/main/resources/bootstrap-material_mall_local.yml deleted file mode 100644 index 4238b7b..0000000 --- a/bonus-gateway/src/main/resources/bootstrap-material_mall_local.yml +++ /dev/null @@ -1,43 +0,0 @@ -# Tomcat -server: - port: 28080 - -# Spring -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: material_mall - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: material_mall - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - sentinel: - # 取消控制台懒加载 - eager: true - transport: - # 控制台地址 - dashboard: 127.0.0.1:18858 - # nacos配置持久化 - datasource: - ds1: - nacos: - server-addr: 127.0.0.1:8848 - namespace: sgzb_bns - dataId: sentinel-bonus-gateway - groupId: DEFAULT_GROUP - data-type: json - rule-type: gw-flow - -#加密组件 -jasypt: - encryptor: - password: Encrypt - diff --git a/bonus-gateway/src/main/resources/bootstrap-sgzb_bns_local.yml b/bonus-gateway/src/main/resources/bootstrap-sgzb_bns_local.yml deleted file mode 100644 index 8e18c71..0000000 --- a/bonus-gateway/src/main/resources/bootstrap-sgzb_bns_local.yml +++ /dev/null @@ -1,43 +0,0 @@ -# Tomcat -server: - port: 18080 - -# Spring -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: sgzb_bns - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: sgzb_bns - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - sentinel: - # 取消控制台懒加载 - eager: true - transport: - # 控制台地址 - dashboard: 127.0.0.1:18858 - # nacos配置持久化 - datasource: - ds1: - nacos: - server-addr: 127.0.0.1:8848 - namespace: sgzb_bns - dataId: sentinel-bonus-gateway - groupId: DEFAULT_GROUP - data-type: json - rule-type: gw-flow - -#加密组件 -jasypt: - encryptor: - password: Encrypt - diff --git a/bonus-gateway/src/main/resources/bootstrap-smart_canteen_local.yml b/bonus-gateway/src/main/resources/bootstrap-smart_canteen_local.yml deleted file mode 100644 index 07b1c43..0000000 --- a/bonus-gateway/src/main/resources/bootstrap-smart_canteen_local.yml +++ /dev/null @@ -1,43 +0,0 @@ -# Tomcat -server: - port: 58080 - -# Spring -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: smart_canteen - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: smart_canteen - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - sentinel: - # 取消控制台懒加载 - eager: true - transport: - # 控制台地址 - dashboard: 127.0.0.1:18858 - # nacos配置持久化 - datasource: - ds1: - nacos: - server-addr: 127.0.0.1:8848 - namespace: sgzb_bns - dataId: sentinel-bonus-gateway - groupId: DEFAULT_GROUP - data-type: json - rule-type: gw-flow - -#加密组件 -jasypt: - encryptor: - password: Encrypt - diff --git a/bonus-gateway/src/main/resources/bootstrap-smart_site_local.yml b/bonus-gateway/src/main/resources/bootstrap-smart_site_local.yml deleted file mode 100644 index e89f050..0000000 --- a/bonus-gateway/src/main/resources/bootstrap-smart_site_local.yml +++ /dev/null @@ -1,43 +0,0 @@ -# Tomcat -server: - port: 38080 - -# Spring -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: smart_site - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: smart_site - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - sentinel: - # 取消控制台懒加载 - eager: true - transport: - # 控制台地址 - dashboard: 127.0.0.1:18858 - # nacos配置持久化 - datasource: - ds1: - nacos: - server-addr: 127.0.0.1:8848 - namespace: sgzb_bns - dataId: sentinel-bonus-gateway - groupId: DEFAULT_GROUP - data-type: json - rule-type: gw-flow - -#加密组件 -jasypt: - encryptor: - password: Encrypt - diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap-smart_site_local.yml b/bonus-gateway/src/main/resources/bootstrap-yn-img-tool.yml similarity index 58% rename from bonus-modules/bonus-system/src/main/resources/bootstrap-smart_site_local.yml rename to bonus-gateway/src/main/resources/bootstrap-yn-img-tool.yml index 44a0b1b..b5f868a 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap-smart_site_local.yml +++ b/bonus-gateway/src/main/resources/bootstrap-yn-img-tool.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 38082 + port: 18081 # Spring spring: @@ -8,19 +8,18 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: smart_site + server-addr: 192.168.0.16:18848 + namespace: bonus-ai + username: nacos + password: nacos config: # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: smart_site + server-addr: 192.168.0.16:18848 + namespace: bonus-ai + username: nacos + password: nacos # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - -#加密组件 -jasypt: - encryptor: - password: Encrypt diff --git a/bonus-gateway/src/main/resources/bootstrap.yml b/bonus-gateway/src/main/resources/bootstrap.yml index 1766a04..d64dfbf 100644 --- a/bonus-gateway/src/main/resources/bootstrap.yml +++ b/bonus-gateway/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: bonus-gateway profiles: # 环境配置 - active: dev + active: yn-img-tool #加密组件 jasypt: diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap-smart_canteen_local.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap-smart_canteen_local.yml deleted file mode 100644 index a57d174..0000000 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap-smart_canteen_local.yml +++ /dev/null @@ -1,26 +0,0 @@ -# Tomcat -server: - port: 58082 - -# Spring -spring: - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: smart_canteen - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: smart_canteen - # 配置文件格式 - 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-yn-img-tool.yml similarity index 58% rename from bonus-modules/bonus-system/src/main/resources/bootstrap-sgzb_bns_local.yml rename to bonus-modules/bonus-system/src/main/resources/bootstrap-yn-img-tool.yml index db2006e..b5f868a 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap-sgzb_bns_local.yml +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap-yn-img-tool.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 18082 + port: 18081 # Spring spring: @@ -8,19 +8,18 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: sgzb_bns + server-addr: 192.168.0.16:18848 + namespace: bonus-ai + username: nacos + password: nacos config: # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: sgzb_bns + server-addr: 192.168.0.16:18848 + namespace: bonus-ai + username: nacos + password: nacos # 配置文件格式 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.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml index 790dc0d..e558c8c 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: bonus-system profiles: # 环境配置 - active: dev + active: yn-img-tool task: scheduling: pool: