From e45908130c40289fd4d9db975931542cb3613ad2 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Wed, 27 Mar 2024 15:30:03 +0800 Subject: [PATCH] =?UTF-8?q?:wrench:=20=E4=BF=AE=E6=94=B9=20redisson=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/OrionRedisAutoConfiguration.java | 16 +++++++++++ .../redis/core/config/RedissonConfig.java | 27 +++++++++++++++++++ .../spring-configuration-metadata.json | 21 +++++++++++++++ .../spring-configuration-metadata.json | 5 ++++ .../src/main/resources/application-dev.yaml | 5 +++- .../src/main/resources/application-prod.yaml | 3 +++ .../src/main/resources/application.yaml | 1 + .../orion-ops-module-asset-service/pom.xml | 6 +++++ 8 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/config/RedissonConfig.java create mode 100644 orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/config/OrionRedisAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/config/OrionRedisAutoConfiguration.java index 8cae088e..be769da5 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/config/OrionRedisAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/config/OrionRedisAutoConfiguration.java @@ -1,9 +1,12 @@ package com.orion.ops.framework.redis.config; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; +import com.orion.ops.framework.redis.core.config.RedissonConfig; import com.orion.ops.framework.redis.core.utils.RedisUtils; +import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.connection.RedisConnectionFactory; @@ -20,6 +23,7 @@ import org.springframework.data.redis.serializer.RedisSerializer; @Lazy(value = false) @AutoConfiguration @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_REDIS) +@EnableConfigurationProperties(RedissonConfig.class) public class OrionRedisAutoConfiguration { /** @@ -40,5 +44,17 @@ public class OrionRedisAutoConfiguration { return redisTemplate; } + /** + * @param redissonConfig config + * @return redisson 自定义配置 + */ + @Bean + public RedissonAutoConfigurationCustomizer redissonConfigurationCustomizer(RedissonConfig redissonConfig) { + return config -> { + config.setThreads(redissonConfig.getThreads()); + config.setNettyThreads(redissonConfig.getNettyThreads()); + }; + } + } diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/config/RedissonConfig.java b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/config/RedissonConfig.java new file mode 100644 index 00000000..8bedc04f --- /dev/null +++ b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/java/com/orion/ops/framework/redis/core/config/RedissonConfig.java @@ -0,0 +1,27 @@ +package com.orion.ops.framework.redis.core.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * redisson 配置 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2024/3/27 15:17 + */ +@Data +@ConfigurationProperties("spring.redisson") +public class RedissonConfig { + + /** + * 任务线程数 + */ + private Integer threads; + + /** + * netty 线程数 + */ + private Integer nettyThreads; + +} diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json new file mode 100644 index 00000000..7865b9f7 --- /dev/null +++ b/orion-ops-framework/orion-ops-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json @@ -0,0 +1,21 @@ +{ + "groups": [ + { + "name": "spring.redisson", + "type": "com.orion.ops.framework.redis.core.config.RedissonConfig", + "sourceType": "com.orion.ops.framework.redis.core.config.RedissonConfig" + } + ], + "properties": [ + { + "name": "spring.redisson.threads", + "type": "java.lang.Integer", + "description": "任务线程数." + }, + { + "name": "spring.redisson.netty-threads", + "type": "java.lang.Integer", + "description": "netty 线程数." + } + ] +} \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json index 4795f857..176656d4 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json @@ -17,6 +17,11 @@ "type": "java.lang.String", "description": "swagger 项目描述." }, + { + "name": "orion.swagger.author", + "type": "java.lang.String", + "description": "swagger 项目作者." + }, { "name": "orion.swagger.version", "type": "java.lang.String", diff --git a/orion-ops-launch/src/main/resources/application-dev.yaml b/orion-ops-launch/src/main/resources/application-dev.yaml index 0faecfed..359696ea 100644 --- a/orion-ops-launch/src/main/resources/application-dev.yaml +++ b/orion-ops-launch/src/main/resources/application-dev.yaml @@ -10,7 +10,10 @@ spring: redis: host: 127.0.0.1 port: 6379 - password: lijiahang + password: Data@123456 + redisson: + threads: 2 + netty-threads: 2 mybatis-plus: configuration: diff --git a/orion-ops-launch/src/main/resources/application-prod.yaml b/orion-ops-launch/src/main/resources/application-prod.yaml index d68980ed..f871e138 100644 --- a/orion-ops-launch/src/main/resources/application-prod.yaml +++ b/orion-ops-launch/src/main/resources/application-prod.yaml @@ -21,6 +21,9 @@ spring: host: ${REDIS_HOST:127.0.0.1} port: ${REDIS_PORT:6379} password: ${REDIS_PASSWORD:Data@123456} + redisson: + threads: 4 + netty-threads: 4 springdoc: api-docs: diff --git a/orion-ops-launch/src/main/resources/application.yaml b/orion-ops-launch/src/main/resources/application.yaml index ca047f0d..5cadb72f 100644 --- a/orion-ops-launch/src/main/resources/application.yaml +++ b/orion-ops-launch/src/main/resources/application.yaml @@ -91,6 +91,7 @@ spring: class: org.quartz.simpl.SimpleThreadPool threadCount: 10 threadPriority: 5 + threadNamePrefix: quartz- threadsInheritContextClassLoaderOfInitializingThread: true boot: admin: diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/pom.xml b/orion-ops-module-asset/orion-ops-module-asset-service/pom.xml index b5c5ab34..4c261f3b 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/pom.xml +++ b/orion-ops-module-asset/orion-ops-module-asset-service/pom.xml @@ -88,6 +88,12 @@ com.orion.ops orion-ops-spring-boot-starter-storage + + + + com.orion.ops + orion-ops-spring-boot-starter-job + \ No newline at end of file