From 0b4e42ee89387babd507b07a9242c2f463272f05 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Wed, 2 Jul 2025 23:50:27 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E4=BF=AE=E6=94=B9=E6=97=A0=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E9=85=8D=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orion-visor-spring-boot-starter-redis/pom.xml | 2 +- ...figuration.java => OrionMockRedisAutoConfiguration.java} | 6 +++--- .../META-INF/additional-spring-configuration-metadata.json | 4 ++-- ...ngframework.boot.autoconfigure.AutoConfiguration.imports | 2 +- orion-visor-launch/src/main/resources/application-dev.yaml | 4 +--- 5 files changed, 8 insertions(+), 10 deletions(-) rename orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/{OrionNoRedisAutoConfiguration.java => OrionMockRedisAutoConfiguration.java} (95%) diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml index a33a408a..10fa2ffc 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml @@ -37,7 +37,7 @@ netty-all - + com.github.fppt jedis-mock diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionNoRedisAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionMockRedisAutoConfiguration.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionNoRedisAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionMockRedisAutoConfiguration.java index c5d2303b..be3188ec 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionNoRedisAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionMockRedisAutoConfiguration.java @@ -38,17 +38,17 @@ import java.net.InetAddress; import java.util.function.Supplier; /** - * noRedis 配置 + * MockRedis * 仅用于本地调试无 redis 的情况 * * @author Jiahang Li * @version 1.0.0 * @since 2024/12/26 10:02 */ -@ConditionalOnProperty(value = "no.redis", havingValue = "true") +@ConditionalOnProperty(value = "spring.redis.mock", havingValue = "true") @AutoConfiguration @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_REDIS - 10) -public class OrionNoRedisAutoConfiguration { +public class OrionMockRedisAutoConfiguration { /** * @return mocked redis server diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 6164f65c..c4acc2b4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -32,9 +32,9 @@ "defaultValue": "1" }, { - "name": "no.redis", + "name": "spring.redis.mock", "type": "java.lang.Boolean", - "description": "是否无 redis.", + "description": "是否使用 mock redis, 一般用于无 redis 调试时使用.", "defaultValue": false } ] diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index cccc4c8f..62154a02 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,3 @@ -org.dromara.visor.framework.redis.configuration.OrionNoRedisAutoConfiguration +org.dromara.visor.framework.redis.configuration.OrionMockRedisAutoConfiguration org.dromara.visor.framework.redis.configuration.OrionRedisAutoConfiguration org.dromara.visor.framework.redis.configuration.OrionCacheAutoConfiguration \ No newline at end of file diff --git a/orion-visor-launch/src/main/resources/application-dev.yaml b/orion-visor-launch/src/main/resources/application-dev.yaml index 84d61baa..2c59d903 100644 --- a/orion-visor-launch/src/main/resources/application-dev.yaml +++ b/orion-visor-launch/src/main/resources/application-dev.yaml @@ -15,6 +15,7 @@ spring: password: ${REDIS_PASSWORD:Data@123456} database: ${REDIS_DATABASE:10} data-version: ${REDIS_DATA_VERSION:1} + mock: false redisson: threads: 2 netty-threads: 2 @@ -42,6 +43,3 @@ mybatis-plus: configuration: # 日志打印 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - -no: - redis: false