From 384a52e3e99e8c7029b7973bf8e73ace2c04c04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Mon, 17 Jan 2022 15:06:10 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20dubbo=20=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=85=8D=E7=BD=AE=E4=BC=98=E5=85=88=E7=BA=A7=E9=AB=98?= =?UTF-8?q?=E4=BA=8E=20nacos=20=E5=AF=BC=E8=87=B4=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=20=E5=BE=AA=E7=8E=AF=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/dev/application.yml | 9 ++- ruoyi-auth/src/main/resources/bootstrap.yml | 69 ++++++++++--------- .../src/main/resources/bootstrap.yml | 3 + .../src/main/resources/bootstrap.yml | 3 + .../src/main/resources/bootstrap.yml | 3 + .../src/main/resources/bootstrap.yml | 3 + .../src/main/resources/bootstrap.yml | 3 + .../src/main/resources/bootstrap.yml | 69 ++++++++++--------- .../src/main/resources/bootstrap.yml | 7 +- 9 files changed, 96 insertions(+), 73 deletions(-) diff --git a/config/dev/application.yml b/config/dev/application.yml index def48e77..0f8d4a0c 100644 --- a/config/dev/application.yml +++ b/config/dev/application.yml @@ -48,7 +48,6 @@ dubbo: spring: main: - allow-circular-references: true allow-bean-definition-overriding: true mvc: pathmatch: @@ -90,9 +89,9 @@ spring: # redisson 配置 redisson: # 线程池数量 - threads: 16 + threads: 4 # Netty线程池数量 - nettyThreads: 32 + nettyThreads: 8 # 传输模式 transportMode: "NIO" # 单节点配置 @@ -100,9 +99,9 @@ redisson: # 客户端名称 clientName: ${spring.application.name} # 最小空闲连接数 - connectionMinimumIdleSize: 32 + connectionMinimumIdleSize: 8 # 连接池大小 - connectionPoolSize: 64 + connectionPoolSize: 32 # 连接空闲超时，单位：毫秒 idleConnectionTimeout: 10000 # 命令等待超时，单位：毫秒 diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index e8611116..3263cb61 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -1,33 +1,36 @@ -# Tomcat -server: - port: 9200 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-auth - profiles: - # 环境配置 - active: @profiles.active@ - ---- # nacos 配置 -spring: - cloud: - nacos: - # nacos 服务地址 - server-addr: @nacos.server@ - discovery: - # 注册组 - group: @nacos.discovery.group@ - namespace: ${spring.profiles.active} - config: - # 配置组 - group: @nacos.config.group@ - namespace: ${spring.profiles.active} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - data-id: application.${spring.cloud.nacos.config.file-extension} - refresh: true \ No newline at end of file +# Tomcat +server: + port: 9200 + +# Spring +spring: + main: + # 此配置禁止放入 nacos 优先级不够 + allow-circular-references: true + application: + # 应用名称 + name: ruoyi-auth + profiles: + # 环境配置 + active: @profiles.active@ + +--- # nacos 配置 +spring: + cloud: + nacos: + # nacos 服务地址 + server-addr: @nacos.server@ + discovery: + # 注册组 + group: @nacos.discovery.group@ + namespace: ${spring.profiles.active} + config: + # 配置组 + group: @nacos.config.group@ + namespace: ${spring.profiles.active} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - data-id: application.${spring.cloud.nacos.config.file-extension} + refresh: true diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 77cf6666..2b40912f 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -4,6 +4,9 @@ server: # Spring spring: + main: + # 此配置禁止放入 nacos 优先级不够 + allow-circular-references: true application: # 应用名称 name: ruoyi-gateway diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 2df52b7e..8d57473b 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -4,6 +4,9 @@ server: # Spring spring: + main: + # 此配置禁止放入 nacos 优先级不够 + allow-circular-references: true application: # 应用名称 name: ruoyi-file diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 378eaa91..8f2ef66e 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -4,6 +4,9 @@ server: # Spring spring: + main: + # 此配置禁止放入 nacos 优先级不够 + allow-circular-references: true application: # 应用名称 name: ruoyi-gen diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 3cd20f4c..9d85dc95 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -4,6 +4,9 @@ server: # Spring spring: + main: + # 此配置禁止放入 nacos 优先级不够 + allow-circular-references: true application: # 应用名称 name: ruoyi-system diff --git a/ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml index 2f88da81..ce6cdb71 100644 --- a/ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml @@ -4,6 +4,9 @@ server: # Spring spring: + main: + # 此配置禁止放入 nacos 优先级不够 + allow-circular-references: true application: # 应用名称 name: ruoyi-doc diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index 10198f98..2434814a 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -1,33 +1,36 @@ -# Tomcat -server: - port: 9100 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-monitor - profiles: - # 环境配置 - active: @profiles.active@ - ---- # nacos 配置 -spring: - cloud: - nacos: - # nacos 服务地址 - server-addr: @nacos.server@ - discovery: - # 注册组 - group: @nacos.discovery.group@ - namespace: ${spring.profiles.active} - config: - # 配置组 - group: @nacos.config.group@ - namespace: ${spring.profiles.active} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - data-id: application.${spring.cloud.nacos.config.file-extension} - refresh: true \ No newline at end of file +# Tomcat +server: + port: 9100 + +# Spring +spring: + main: + # 此配置禁止放入 nacos 优先级不够 + allow-circular-references: true + application: + # 应用名称 + name: ruoyi-monitor + profiles: + # 环境配置 + active: @profiles.active@ + +--- # nacos 配置 +spring: + cloud: + nacos: + # nacos 服务地址 + server-addr: @nacos.server@ + discovery: + # 注册组 + group: @nacos.discovery.group@ + namespace: ${spring.profiles.active} + config: + # 配置组 + group: @nacos.config.group@ + namespace: ${spring.profiles.active} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - data-id: application.${spring.cloud.nacos.config.file-extension} + refresh: true diff --git a/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/bootstrap.yml index d6be4c2d..8c6c97eb 100644 --- a/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/bootstrap.yml @@ -3,7 +3,10 @@ server: port: 9900 # Spring -spring: +spring: + main: + # 此配置禁止放入 nacos 优先级不够 + allow-circular-references: true application: # 应用名称 name: ruoyi-xxl-job-admin @@ -46,4 +49,4 @@ spring: - data-id: application.${spring.cloud.nacos.config.file-extension} refresh: true - data-id: datasource.${spring.cloud.nacos.config.file-extension} - refresh: true \ No newline at end of file + refresh: true