From 2175a9fb40866b7484b9899e7eae608f323bdb0f Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Wed, 2 Jul 2025 23:43:01 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=89=88=E6=9C=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 2 ++ docker-compose.yml | 2 ++ .../configuration/OrionRedisAutoConfiguration.java | 12 ++++++++++++ .../additional-spring-configuration-metadata.json | 6 ++++++ .../src/main/resources/application-dev.yaml | 2 ++ .../src/main/resources/application-prod.yaml | 2 ++ 6 files changed, 26 insertions(+) diff --git a/.env.example b/.env.example index 5979522a..886ce7a2 100644 --- a/.env.example +++ b/.env.example @@ -15,6 +15,8 @@ MYSQL_ROOT_PASSWORD=Data@123456 REDIS_HOST=redis REDIS_PASSWORD=Data@123456 +REDIS_DATABASE=0 +REDIS_DATA_VERSION=1 GUACD_HOST=guacd GUACD_PORT=4822 diff --git a/docker-compose.yml b/docker-compose.yml index a1f6fd61..24736576 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,8 @@ services: MYSQL_PASSWORD: ${MYSQL_PASSWORD:-Data@123456} REDIS_HOST: ${REDIS_HOST:-redis} REDIS_PASSWORD: ${REDIS_PASSWORD:-Data@123456} + REDIS_DATABASE: ${REDIS_DATABASE:-0} + REDIS_DATA_VERSION: ${REDIS_DATA_VERSION:-1} GUACD_HOST: ${GUACD_HOST:-guacd} GUACD_PORT: ${GUACD_PORT:-4822} GUACD_DRIVE_PATH: ${GUACD_DRIVE_PATH:-/drive} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java index 96652341..55ca9b83 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java @@ -22,6 +22,7 @@ */ package org.dromara.visor.framework.redis.configuration; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.dromara.visor.common.interfaces.Locker; import org.dromara.visor.common.utils.LockerUtils; @@ -31,6 +32,7 @@ import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.redisson.api.RedissonClient; import org.redisson.config.SingleServerConfig; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -101,5 +103,15 @@ public class OrionRedisAutoConfiguration { return redisLocker; } + /** + * 设置 redis 数据版本 + * + * @param dataVersion dataVersion + */ + @Value("${spring.redis.data-version}") + public void setDataVersion(String dataVersion) { + CacheKeyDefine.setGlobalPrefix("v" + dataVersion + ":"); + } + } 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 51558866..6164f65c 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 @@ -25,6 +25,12 @@ "description": "最小空闲连接数.", "defaultValue": "16" }, + { + "name": "spring.redis.data-version", + "type": "java.lang.String", + "description": "redis 数据版本.", + "defaultValue": "1" + }, { "name": "no.redis", "type": "java.lang.Boolean", diff --git a/orion-visor-launch/src/main/resources/application-dev.yaml b/orion-visor-launch/src/main/resources/application-dev.yaml index 1d3509f1..84d61baa 100644 --- a/orion-visor-launch/src/main/resources/application-dev.yaml +++ b/orion-visor-launch/src/main/resources/application-dev.yaml @@ -13,6 +13,8 @@ spring: host: ${REDIS_HOST:127.0.0.1} port: ${REDIS_PORT:6379} password: ${REDIS_PASSWORD:Data@123456} + database: ${REDIS_DATABASE:10} + data-version: ${REDIS_DATA_VERSION:1} redisson: threads: 2 netty-threads: 2 diff --git a/orion-visor-launch/src/main/resources/application-prod.yaml b/orion-visor-launch/src/main/resources/application-prod.yaml index 244f939c..c86b4f11 100644 --- a/orion-visor-launch/src/main/resources/application-prod.yaml +++ b/orion-visor-launch/src/main/resources/application-prod.yaml @@ -24,6 +24,8 @@ spring: host: ${REDIS_HOST:127.0.0.1} port: ${REDIS_PORT:6379} password: ${REDIS_PASSWORD:Data@123456} + database: ${REDIS_DATABASE:0} + data-version: ${REDIS_DATA_VERSION:1} redisson: threads: 4 netty-threads: 4