fix 修复 dubbo 自动配置优先级高于 nacos 导致配置不生效 循环依赖报错
parent
d728617890
commit
384a52e3e9
|
|
@ -48,7 +48,6 @@ dubbo:
|
||||||
|
|
||||||
spring:
|
spring:
|
||||||
main:
|
main:
|
||||||
allow-circular-references: true
|
|
||||||
allow-bean-definition-overriding: true
|
allow-bean-definition-overriding: true
|
||||||
mvc:
|
mvc:
|
||||||
pathmatch:
|
pathmatch:
|
||||||
|
|
@ -90,9 +89,9 @@ spring:
|
||||||
# redisson 配置
|
# redisson 配置
|
||||||
redisson:
|
redisson:
|
||||||
# 线程池数量
|
# 线程池数量
|
||||||
threads: 16
|
threads: 4
|
||||||
# Netty线程池数量
|
# Netty线程池数量
|
||||||
nettyThreads: 32
|
nettyThreads: 8
|
||||||
# 传输模式
|
# 传输模式
|
||||||
transportMode: "NIO"
|
transportMode: "NIO"
|
||||||
# 单节点配置
|
# 单节点配置
|
||||||
|
|
@ -100,9 +99,9 @@ redisson:
|
||||||
# 客户端名称
|
# 客户端名称
|
||||||
clientName: ${spring.application.name}
|
clientName: ${spring.application.name}
|
||||||
# 最小空闲连接数
|
# 最小空闲连接数
|
||||||
connectionMinimumIdleSize: 32
|
connectionMinimumIdleSize: 8
|
||||||
# 连接池大小
|
# 连接池大小
|
||||||
connectionPoolSize: 64
|
connectionPoolSize: 32
|
||||||
# 连接空闲超时,单位:毫秒
|
# 连接空闲超时,单位:毫秒
|
||||||
idleConnectionTimeout: 10000
|
idleConnectionTimeout: 10000
|
||||||
# 命令等待超时,单位:毫秒
|
# 命令等待超时,单位:毫秒
|
||||||
|
|
|
||||||
|
|
@ -1,33 +1,36 @@
|
||||||
# Tomcat
|
# Tomcat
|
||||||
server:
|
server:
|
||||||
port: 9200
|
port: 9200
|
||||||
|
|
||||||
# Spring
|
# Spring
|
||||||
spring:
|
spring:
|
||||||
application:
|
main:
|
||||||
# 应用名称
|
# 此配置禁止放入 nacos 优先级不够
|
||||||
name: ruoyi-auth
|
allow-circular-references: true
|
||||||
profiles:
|
application:
|
||||||
# 环境配置
|
# 应用名称
|
||||||
active: @profiles.active@
|
name: ruoyi-auth
|
||||||
|
profiles:
|
||||||
--- # nacos 配置
|
# 环境配置
|
||||||
spring:
|
active: @profiles.active@
|
||||||
cloud:
|
|
||||||
nacos:
|
--- # nacos 配置
|
||||||
# nacos 服务地址
|
spring:
|
||||||
server-addr: @nacos.server@
|
cloud:
|
||||||
discovery:
|
nacos:
|
||||||
# 注册组
|
# nacos 服务地址
|
||||||
group: @nacos.discovery.group@
|
server-addr: @nacos.server@
|
||||||
namespace: ${spring.profiles.active}
|
discovery:
|
||||||
config:
|
# 注册组
|
||||||
# 配置组
|
group: @nacos.discovery.group@
|
||||||
group: @nacos.config.group@
|
namespace: ${spring.profiles.active}
|
||||||
namespace: ${spring.profiles.active}
|
config:
|
||||||
# 配置文件格式
|
# 配置组
|
||||||
file-extension: yml
|
group: @nacos.config.group@
|
||||||
# 共享配置
|
namespace: ${spring.profiles.active}
|
||||||
shared-configs:
|
# 配置文件格式
|
||||||
- data-id: application.${spring.cloud.nacos.config.file-extension}
|
file-extension: yml
|
||||||
refresh: true
|
# 共享配置
|
||||||
|
shared-configs:
|
||||||
|
- data-id: application.${spring.cloud.nacos.config.file-extension}
|
||||||
|
refresh: true
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,9 @@ server:
|
||||||
|
|
||||||
# Spring
|
# Spring
|
||||||
spring:
|
spring:
|
||||||
|
main:
|
||||||
|
# 此配置禁止放入 nacos 优先级不够
|
||||||
|
allow-circular-references: true
|
||||||
application:
|
application:
|
||||||
# 应用名称
|
# 应用名称
|
||||||
name: ruoyi-gateway
|
name: ruoyi-gateway
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,9 @@ server:
|
||||||
|
|
||||||
# Spring
|
# Spring
|
||||||
spring:
|
spring:
|
||||||
|
main:
|
||||||
|
# 此配置禁止放入 nacos 优先级不够
|
||||||
|
allow-circular-references: true
|
||||||
application:
|
application:
|
||||||
# 应用名称
|
# 应用名称
|
||||||
name: ruoyi-file
|
name: ruoyi-file
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,9 @@ server:
|
||||||
|
|
||||||
# Spring
|
# Spring
|
||||||
spring:
|
spring:
|
||||||
|
main:
|
||||||
|
# 此配置禁止放入 nacos 优先级不够
|
||||||
|
allow-circular-references: true
|
||||||
application:
|
application:
|
||||||
# 应用名称
|
# 应用名称
|
||||||
name: ruoyi-gen
|
name: ruoyi-gen
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,9 @@ server:
|
||||||
|
|
||||||
# Spring
|
# Spring
|
||||||
spring:
|
spring:
|
||||||
|
main:
|
||||||
|
# 此配置禁止放入 nacos 优先级不够
|
||||||
|
allow-circular-references: true
|
||||||
application:
|
application:
|
||||||
# 应用名称
|
# 应用名称
|
||||||
name: ruoyi-system
|
name: ruoyi-system
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,9 @@ server:
|
||||||
|
|
||||||
# Spring
|
# Spring
|
||||||
spring:
|
spring:
|
||||||
|
main:
|
||||||
|
# 此配置禁止放入 nacos 优先级不够
|
||||||
|
allow-circular-references: true
|
||||||
application:
|
application:
|
||||||
# 应用名称
|
# 应用名称
|
||||||
name: ruoyi-doc
|
name: ruoyi-doc
|
||||||
|
|
|
||||||
|
|
@ -1,33 +1,36 @@
|
||||||
# Tomcat
|
# Tomcat
|
||||||
server:
|
server:
|
||||||
port: 9100
|
port: 9100
|
||||||
|
|
||||||
# Spring
|
# Spring
|
||||||
spring:
|
spring:
|
||||||
application:
|
main:
|
||||||
# 应用名称
|
# 此配置禁止放入 nacos 优先级不够
|
||||||
name: ruoyi-monitor
|
allow-circular-references: true
|
||||||
profiles:
|
application:
|
||||||
# 环境配置
|
# 应用名称
|
||||||
active: @profiles.active@
|
name: ruoyi-monitor
|
||||||
|
profiles:
|
||||||
--- # nacos 配置
|
# 环境配置
|
||||||
spring:
|
active: @profiles.active@
|
||||||
cloud:
|
|
||||||
nacos:
|
--- # nacos 配置
|
||||||
# nacos 服务地址
|
spring:
|
||||||
server-addr: @nacos.server@
|
cloud:
|
||||||
discovery:
|
nacos:
|
||||||
# 注册组
|
# nacos 服务地址
|
||||||
group: @nacos.discovery.group@
|
server-addr: @nacos.server@
|
||||||
namespace: ${spring.profiles.active}
|
discovery:
|
||||||
config:
|
# 注册组
|
||||||
# 配置组
|
group: @nacos.discovery.group@
|
||||||
group: @nacos.config.group@
|
namespace: ${spring.profiles.active}
|
||||||
namespace: ${spring.profiles.active}
|
config:
|
||||||
# 配置文件格式
|
# 配置组
|
||||||
file-extension: yml
|
group: @nacos.config.group@
|
||||||
# 共享配置
|
namespace: ${spring.profiles.active}
|
||||||
shared-configs:
|
# 配置文件格式
|
||||||
- data-id: application.${spring.cloud.nacos.config.file-extension}
|
file-extension: yml
|
||||||
refresh: true
|
# 共享配置
|
||||||
|
shared-configs:
|
||||||
|
- data-id: application.${spring.cloud.nacos.config.file-extension}
|
||||||
|
refresh: true
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,10 @@ server:
|
||||||
port: 9900
|
port: 9900
|
||||||
|
|
||||||
# Spring
|
# Spring
|
||||||
spring:
|
spring:
|
||||||
|
main:
|
||||||
|
# 此配置禁止放入 nacos 优先级不够
|
||||||
|
allow-circular-references: true
|
||||||
application:
|
application:
|
||||||
# 应用名称
|
# 应用名称
|
||||||
name: ruoyi-xxl-job-admin
|
name: ruoyi-xxl-job-admin
|
||||||
|
|
@ -46,4 +49,4 @@ spring:
|
||||||
- data-id: application.${spring.cloud.nacos.config.file-extension}
|
- data-id: application.${spring.cloud.nacos.config.file-extension}
|
||||||
refresh: true
|
refresh: true
|
||||||
- data-id: datasource.${spring.cloud.nacos.config.file-extension}
|
- data-id: datasource.${spring.cloud.nacos.config.file-extension}
|
||||||
refresh: true
|
refresh: true
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue