From cbfb113b7a56972564fc3d7a3bf9462b66dc3da5 Mon Sep 17 00:00:00 2001 From: yangjiewei <1658539101@qq.com> Date: Wed, 30 Apr 2025 20:01:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86nacos=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=90=84=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BB=8Enacos=E5=AF=BC=E5=85=A5=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 3 - .../src/main/resources/bootstrap.yml | 45 +++++----- .../src/main/resources/application.yml | 3 - .../src/main/resources/bootstrap.yml | 83 +++++++------------ 4 files changed, 55 insertions(+), 79 deletions(-) delete mode 100644 demo/demo-service/src/main/resources/application.yml delete mode 100644 facade-service/src/main/resources/application.yml diff --git a/demo/demo-service/src/main/resources/application.yml b/demo/demo-service/src/main/resources/application.yml deleted file mode 100644 index caf4dfc..0000000 --- a/demo/demo-service/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev \ No newline at end of file diff --git a/demo/demo-service/src/main/resources/bootstrap.yml b/demo/demo-service/src/main/resources/bootstrap.yml index e61f86d..7b2df20 100644 --- a/demo/demo-service/src/main/resources/bootstrap.yml +++ b/demo/demo-service/src/main/resources/bootstrap.yml @@ -1,23 +1,11 @@ -server: - port: 9001 - spring: application: name: demo-service main: allow-bean-definition-overriding: true -# autoconfigure: -# #自动化配置 例外处理 -# exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure cloud: nacos: #nacos监控 - discovery: - server-addr: 10.0.252.1:8848 - namespace: ITC-MS - group: DNE - username: nacos - password: ABcd1234@ config: server-addr: 10.0.252.1:8848 # nacos 配置中心地址 namespace: ITC-MS @@ -26,25 +14,38 @@ spring: password: ABcd1234@ file-extension: yml # 默认配置 ${spring.application.name}-${spring.profiles.active}.${file-extension} extension-configs: - - data-id: global-config.yml + - data-id: global.yml refresh: true group: DNE - - data-id: sa-token-client-config.yml + + - data-id: discovery.yml refresh: true group: DNE - - data-id: redis-config.yml + + - data-id: datasource.yml refresh: true group: DNE - - data-id: datasource-config.yml + + - data-id: seata.yml refresh: true group: DNE - - data-id: camunda-config.yml + + - data-id: redis.yml refresh: true group: DNE - - data-id: demo-config.yml + + - data-id: magic-api.yml + refresh: true + group: DNE + + - data-id: sa-token.yml + refresh: true + group: DNE + + - data-id: camunda.yml + refresh: true + group: DNE + + - data-id: sentinel.yml refresh: true group: DNE - sentinel: - transport: - dashboard: localhost:8080 #sentinel dashboard 地址 - port: 8719 #默认端口， 如果 被占用，会一直+1 直到未被占用为止 diff --git a/facade-service/src/main/resources/application.yml b/facade-service/src/main/resources/application.yml deleted file mode 100644 index caf4dfc..0000000 --- a/facade-service/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev \ No newline at end of file diff --git a/facade-service/src/main/resources/bootstrap.yml b/facade-service/src/main/resources/bootstrap.yml index a5af43f..8822b07 100644 --- a/facade-service/src/main/resources/bootstrap.yml +++ b/facade-service/src/main/resources/bootstrap.yml @@ -1,23 +1,11 @@ -server: - port: 8094 - spring: application: name: facade-service main: allow-bean-definition-overriding: true -# autoconfigure: -# #自动化配置 例外处理 -# exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure cloud: nacos: #nacos监控 - discovery: - server-addr: 10.0.252.1:8848 - namespace: ITC-MS - group: DNE - username: nacos - password: ABcd1234@ config: server-addr: 10.0.252.1:8848 # nacos 配置中心地址 namespace: ITC-MS @@ -26,45 +14,38 @@ spring: password: ABcd1234@ file-extension: yml # 默认配置 ${spring.application.name}-${spring.profiles.active}.${file-extension} extension-configs: - - data-id: magicapi-config.yml + - data-id: global.yml refresh: true group: DNE - - data-id: global-config.yml - refresh: true - group: DNE - - data-id: sa-token-client-config.yml - refresh: true - group: DNE - - data-id: redis-config.yml - refresh: true - group: DNE - - data-id: datasource-config.yml - refresh: true - group: DNE - - data-id: seata-config.yml - refresh: true - group: DNE - - data-id: camunda-config.yml - refresh: true - group: DNE - - data-id: system-config.yml - refresh: true - group: DNE - sentinel: - transport: - dashboard: localhost:8080 #sentinel dashboard 地址 - port: 8719 #默认端口， 如果 被占用，会一直+1 直到未被占用为止 -#springdoc: -# swagger-ui: -# path: /swagger-ui.html -# tags-sorter: alpha -# operations-sorter: alpha -# show-extensions: true -# api-docs: -# path: /system/v3/api-docs -# group-configs: -# - group: 'default' -# paths-to-match: '/system/**' -# packages-to-scan: com.xjrsoft.system -# default-flat-param-object: false \ No newline at end of file + - data-id: discovery.yml + refresh: true + group: DNE + + - data-id: datasource.yml + refresh: true + group: DNE + + - data-id: seata.yml + refresh: true + group: DNE + + - data-id: redis.yml + refresh: true + group: DNE + + - data-id: magic-api.yml + refresh: true + group: DNE + + - data-id: sa-token.yml + refresh: true + group: DNE + + - data-id: camunda.yml + refresh: true + group: DNE + + - data-id: sentinel.yml + refresh: true + group: DNE \ No newline at end of file