fix 修复 dubbo 自动配置优先级高于 nacos 导致配置不生效 循环依赖报错
parent
d728617890
commit
384a52e3e9
|
|
@ -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
|
||||
# 命令等待超时,单位:毫秒
|
||||
|
|
|
|||
|
|
@ -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
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@ server:
|
|||
|
||||
# Spring
|
||||
spring:
|
||||
main:
|
||||
# 此配置禁止放入 nacos 优先级不够
|
||||
allow-circular-references: true
|
||||
application:
|
||||
# 应用名称
|
||||
name: ruoyi-gateway
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@ server:
|
|||
|
||||
# Spring
|
||||
spring:
|
||||
main:
|
||||
# 此配置禁止放入 nacos 优先级不够
|
||||
allow-circular-references: true
|
||||
application:
|
||||
# 应用名称
|
||||
name: ruoyi-file
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@ server:
|
|||
|
||||
# Spring
|
||||
spring:
|
||||
main:
|
||||
# 此配置禁止放入 nacos 优先级不够
|
||||
allow-circular-references: true
|
||||
application:
|
||||
# 应用名称
|
||||
name: ruoyi-gen
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@ server:
|
|||
|
||||
# Spring
|
||||
spring:
|
||||
main:
|
||||
# 此配置禁止放入 nacos 优先级不够
|
||||
allow-circular-references: true
|
||||
application:
|
||||
# 应用名称
|
||||
name: ruoyi-system
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@ server:
|
|||
|
||||
# Spring
|
||||
spring:
|
||||
main:
|
||||
# 此配置禁止放入 nacos 优先级不够
|
||||
allow-circular-references: true
|
||||
application:
|
||||
# 应用名称
|
||||
name: ruoyi-doc
|
||||
|
|
|
|||
|
|
@ -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
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
refresh: true
|
||||
|
|
|
|||
Loading…
Reference in New Issue