From 42a196f8759c9b5f64d71f2226909fbfe0fae24a 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: Thu, 30 Dec 2021 23:12:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=A4=9A=E7=8E=AF=E5=A2=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/application-dev.yml | 71 +++---------------- config/application-prod.yml | 48 +++++++++++++ config/application.yml | 62 ++++++++++++++++ .../com/ruoyi/auth/RuoYiAuthApplication.java | 11 +-- ruoyi-auth/src/main/resources/bootstrap.yml | 7 +- .../annotation/EnableCustomConfig.java | 3 +- .../security/config/ApplicationConfig.java | 22 ------ .../gateway/RuoYiGatewayApplication.java | 11 +-- .../src/main/resources/bootstrap.yml | 15 ++-- .../com/ruoyi/file/RuoYiFileApplication.java | 11 +-- .../src/main/resources/bootstrap.yml | 7 +- .../com/ruoyi/gen/RuoYiGenApplication.java | 11 +-- .../src/main/resources/bootstrap.yml | 7 +- .../ruoyi/system/RuoYiSystemApplication.java | 11 +-- .../src/main/resources/bootstrap.yml | 7 +- .../monitor/RuoYiMonitorApplication.java | 11 +-- .../src/main/resources/bootstrap.yml | 7 +- 17 files changed, 146 insertions(+), 176 deletions(-) create mode 100644 config/application-prod.yml create mode 100644 config/application.yml delete mode 100644 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java diff --git a/config/application-dev.yml b/config/application-dev.yml index 055055ab..b9f3dc30 100644 --- a/config/application-dev.yml +++ b/config/application-dev.yml @@ -1,31 +1,19 @@ +# redis 单机配置(单机与集群只能开启一个另一个需要注释掉) spring: - main: - allow-bean-definition-overriding: true - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - - # redis通用配置 子服务可以自行配置进行覆盖 redis: + # 地址 host: localhost + # 端口，默认为6379 port: 6379 - password: + # 数据库索引 database: 0 + # 密码 + password: + # 连接超时时间 timeout: 10s + # 是否开启ssl ssl: false - #jackson配置 - jackson: - # 日期格式化 - date-format: yyyy-MM-dd HH:mm:ss - serialization: - # 格式化输出 - INDENT_OUTPUT: false - # 忽略无法转换的对象 - fail_on_empty_beans: false - deserialization: - # 允许对象忽略json中不存在的属性 - fail_on_unknown_properties: false - # redisson 配置 redisson: # 线程池数量 @@ -58,46 +46,3 @@ redisson: subscriptionsPerConnection: 5 # DNS监测时间间隔，单位：毫秒 dnsMonitoringInterval: 5000 - # redisson 缓存配置 - cacheGroup: - # 用例: @Cacheable(cacheNames="groupId", key="#XXX") 方可使用缓存组配置 - - groupId: redissonCacheMap - # 组过期时间(脚本监控) - ttl: 60000 - # 组最大空闲时间(脚本监控) - maxIdleTime: 60000 - # 组最大长度 - maxSize: 0 - -# 分布式锁 lock4j 全局配置 -lock4j: - # 获取分布式锁超时时间，默认为 3000 毫秒 - acquire-timeout: 3000 - # 分布式锁的超时时间，默认为 30 毫秒 - expire: 30000 - -# feign 配置 -feign: - sentinel: - enabled: true - okhttp: - enabled: true - httpclient: - enabled: false - client: - config: - default: - connectTimeout: 10000 - readTimeout: 10000 - compression: - request: - enabled: true - response: - enabled: true - -# 暴露监控端点 -management: - endpoints: - web: - exposure: - include: '*' diff --git a/config/application-prod.yml b/config/application-prod.yml new file mode 100644 index 00000000..b9f3dc30 --- /dev/null +++ b/config/application-prod.yml @@ -0,0 +1,48 @@ +# redis 单机配置(单机与集群只能开启一个另一个需要注释掉) +spring: + redis: + # 地址 + host: localhost + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: 0 + # 密码 + password: + # 连接超时时间 + timeout: 10s + # 是否开启ssl + ssl: false + +# redisson 配置 +redisson: + # 线程池数量 + threads: 16 + # Netty线程池数量 + nettyThreads: 32 + # 传输模式 + transportMode: "NIO" + # 单节点配置 + singleServerConfig: + # 客户端名称 + clientName: ${ruoyi.name} + # 最小空闲连接数 + connectionMinimumIdleSize: 32 + # 连接池大小 + connectionPoolSize: 64 + # 连接空闲超时，单位：毫秒 + idleConnectionTimeout: 10000 + # 命令等待超时，单位：毫秒 + timeout: 3000 + # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。 + retryAttempts: 3 + # 命令重试发送时间间隔，单位：毫秒 + retryInterval: 1500 + # 发布和订阅连接的最小空闲连接数 + subscriptionConnectionMinimumIdleSize: 1 + # 发布和订阅连接池大小 + subscriptionConnectionPoolSize: 50 + # 单个连接最大订阅数量 + subscriptionsPerConnection: 5 + # DNS监测时间间隔，单位：毫秒 + dnsMonitoringInterval: 5000 diff --git a/config/application.yml b/config/application.yml new file mode 100644 index 00000000..9a3765a0 --- /dev/null +++ b/config/application.yml @@ -0,0 +1,62 @@ +spring: + main: + allow-bean-definition-overriding: true + #jackson配置 + jackson: + # 日期格式化 + date-format: yyyy-MM-dd HH:mm:ss + serialization: + # 格式化输出 + indent_output: false + # 忽略无法转换的对象 + fail_on_empty_beans: false + deserialization: + # 允许对象忽略json中不存在的属性 + fail_on_unknown_properties: false + +# feign 配置 +feign: + sentinel: + enabled: true + okhttp: + enabled: true + httpclient: + enabled: false + client: + config: + default: + connectTimeout: 10000 + readTimeout: 10000 + compression: + request: + enabled: true + response: + enabled: true + +# 暴露监控端点 +management: + endpoints: + web: + exposure: + include: '*' + +# redisson 缓存配置 +redisson: + cacheGroup: + # 用例: @Cacheable(cacheNames="groupId", key="#XXX") 方可使用缓存组配置 + - groupId: redissonCacheMap + # 组过期时间(脚本监控) + ttl: 60000 + # 组最大空闲时间(脚本监控) + maxIdleTime: 60000 + # 组最大长度 + maxSize: 0 + +# 分布式锁 lock4j 全局配置 +lock4j: + # 获取分布式锁超时时间，默认为 3000 毫秒 + acquire-timeout: 3000 + # 分布式锁的超时时间，默认为 30 毫秒 + expire: 30000 + + diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java index 00a499df..00b9cc02 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java @@ -17,15 +17,6 @@ public class RuoYiAuthApplication public static void main(String[] args) { SpringApplication.run(RuoYiAuthApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 认证授权中心启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 认证授权中心启动成功 ლ(´ڡ`ლ)ﾞ "); } } diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index d9e0d195..6fd4fb10 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -15,18 +15,17 @@ spring: spring: cloud: nacos: + # nacos 服务地址 + server-addr: @nacos.server@ discovery: - # 服务注册地址 - server-addr: @nacos.server@ # 注册组 group: @nacos.discovery.group@ config: - # 配置中心地址 - server-addr: @nacos.server@ # 配置组 group: @nacos.config.group@ # 配置文件格式 file-extension: yml # 共享配置 shared-configs: + - application.${spring.cloud.nacos.config.file-extension} - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java index fa2a8b29..55e5636a 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java @@ -10,7 +10,6 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableAsync; -import com.ruoyi.common.security.config.ApplicationConfig; import com.ruoyi.common.security.feign.FeignAutoConfiguration; @Target(ElementType.TYPE) @@ -24,7 +23,7 @@ import com.ruoyi.common.security.feign.FeignAutoConfiguration; // 开启线程异步执行 @EnableAsync // 自动加载类 -@Import({ ApplicationConfig.class, FeignAutoConfiguration.class }) +@Import({ FeignAutoConfiguration.class }) public @interface EnableCustomConfig { diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java deleted file mode 100644 index a7a64c9e..00000000 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.ruoyi.common.security.config; - -import java.util.TimeZone; -import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; -import org.springframework.context.annotation.Bean; - -/** - * 系统配置 - * - * @author ruoyi - */ -public class ApplicationConfig -{ - /** - * 时区配置 - */ - @Bean - public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() - { - return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault()); - } -} diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java index c6f7db68..ddb7ad3f 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java @@ -15,15 +15,6 @@ public class RuoYiGatewayApplication public static void main(String[] args) { SpringApplication.run(RuoYiGatewayApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依网关启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 若依网关启动成功 ლ(´ڡ`ლ)ﾞ "); } } diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 56d7cc3c..07ca52f2 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -10,27 +10,24 @@ spring: profiles: # 环境配置 active: @profiles.active@ - main: - allow-bean-definition-overriding: true --- # nacos 配置 spring: cloud: nacos: + # nacos 服务地址 + server-addr: @nacos.server@ discovery: - # 服务注册地址 - server-addr: @nacos.server@ # 注册组 group: @nacos.discovery.group@ config: - # 配置中心地址 - server-addr: @nacos.server@ # 配置组 group: @nacos.config.group@ # 配置文件格式 file-extension: yml # 共享配置 shared-configs: + - application.${spring.cloud.nacos.config.file-extension} - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} --- # sentinel 配置 @@ -46,8 +43,8 @@ spring: datasource: ds1: nacos: - server-addr: @nacos.server@ - dataId: sentinel-ruoyi-gateway - groupId: @nacos.config.group@ + server-addr: ${spring.cloud.nacos.server-addr} + dataId: sentinel-${spring.application.name} + groupId: ${spring.cloud.nacos.config.group} data-type: json rule-type: flow diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java index 1f320da9..7d368ea6 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java @@ -17,15 +17,6 @@ public class RuoYiFileApplication public static void main(String[] args) { SpringApplication.run(RuoYiFileApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 文件服务模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 文件服务模块启动成功 ლ(´ڡ`ლ)ﾞ "); } } diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index cacc66b2..2579bf12 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -15,18 +15,17 @@ spring: spring: cloud: nacos: + # nacos 服务地址 + server-addr: @nacos.server@ discovery: - # 服务注册地址 - server-addr: @nacos.server@ # 注册组 group: @nacos.discovery.group@ config: - # 配置中心地址 - server-addr: @nacos.server@ # 配置组 group: @nacos.config.group@ # 配置文件格式 file-extension: yml # 共享配置 shared-configs: + - application.${spring.cloud.nacos.config.file-extension} - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java index ebfa433e..de8d209d 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java @@ -20,15 +20,6 @@ public class RuoYiGenApplication public static void main(String[] args) { SpringApplication.run(RuoYiGenApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 代码生成模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 代码生成模块启动成功 ლ(´ڡ`ლ)ﾞ "); } } diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 1e0b28b6..6949e4b2 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -15,18 +15,17 @@ spring: spring: cloud: nacos: + # nacos 服务地址 + server-addr: @nacos.server@ discovery: - # 服务注册地址 - server-addr: @nacos.server@ # 注册组 group: @nacos.discovery.group@ config: - # 配置中心地址 - server-addr: @nacos.server@ # 配置组 group: @nacos.config.group@ # 配置文件格式 file-extension: yml # 共享配置 shared-configs: + - application.${spring.cloud.nacos.config.file-extension} - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java index dfe390fa..a307b760 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java @@ -20,15 +20,6 @@ public class RuoYiSystemApplication public static void main(String[] args) { SpringApplication.run(RuoYiSystemApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 系统模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 系统模块启动成功 ლ(´ڡ`ლ)ﾞ "); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index bba13d65..5d247131 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -15,18 +15,17 @@ spring: spring: cloud: nacos: + # nacos 服务地址 + server-addr: @nacos.server@ discovery: - # 服务注册地址 - server-addr: @nacos.server@ # 注册组 group: @nacos.discovery.group@ config: - # 配置中心地址 - server-addr: @nacos.server@ # 配置组 group: @nacos.config.group@ # 配置文件格式 file-extension: yml # 共享配置 shared-configs: + - application.${spring.cloud.nacos.config.file-extension} - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java index 73628b3b..19bb1209 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java +++ b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java @@ -16,15 +16,6 @@ public class RuoYiMonitorApplication public static void main(String[] args) { SpringApplication.run(RuoYiMonitorApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 监控中心启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ 监控中心启动成功 ლ(´ڡ`ლ)ﾞ "); } } diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index 09260448..03943edc 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -15,18 +15,17 @@ spring: spring: cloud: nacos: + # nacos 服务地址 + server-addr: @nacos.server@ discovery: - # 服务注册地址 - server-addr: @nacos.server@ # 注册组 group: @nacos.discovery.group@ config: - # 配置中心地址 - server-addr: @nacos.server@ # 配置组 group: @nacos.config.group@ # 配置文件格式 file-extension: yml # 共享配置 shared-configs: + - application.${spring.cloud.nacos.config.file-extension} - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}