diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java index 5e04fcca..eda2a328 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.data.redis.cache.RedisCacheManager; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnectionFactory; +import java.nio.charset.StandardCharsets; import java.util.Collection; import java.util.List; import java.util.Set; @@ -53,7 +54,7 @@ public class RedisCacheServiceImpl implements CacheService { if (keys != null) { return keys.stream().map(key -> { - String redisKey = StrUtil.str(key, "utf-8"); + String redisKey = StrUtil.str(key, StandardCharsets.UTF_8); // 从 Redis 键中提取出最后一个冒号后面的字符串作为真正的键 return redisKey.substring(redisKey.lastIndexOf(":") + 1); }).collect(Collectors.toList()); diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/manager/CustomRedisCacheManager.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/manager/CustomRedisCacheManager.java new file mode 100644 index 00000000..ce959263 --- /dev/null +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/manager/CustomRedisCacheManager.java @@ -0,0 +1,144 @@ +package net.lab1024.sa.base.module.support.cache.manager; + +import cn.hutool.core.util.StrUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.convert.DurationStyle; +import org.springframework.data.redis.cache.*; + +import java.time.Duration; + +import static net.lab1024.sa.base.common.constant.StringConst.COLON; + +/** + * 自定义 RedisCacheManager,支持在 cacheName 中通过 '#' 指定 TTL(过期时间)。 + * @Author CoderKK + * @Date 2025-08-15 13:01:01 + *

+ * 支持格式:{@code cacheName#ttl},其中 ttl 支持 Spring 的 Duration 格式。 + * 特殊值:{@code -1} 表示永久缓存(永不过期)。 + *

+ * + *

使用示例:

+ *
+ * // 10 秒后过期
+ * @Cacheable(value = "user#10s", key = "#id")
+ * // 2 小时后过期
+ * @Cacheable(value = "report#2h", key = "#date")
+ * // 30 分钟后过期
+ * @Cacheable(value = "session#30m", key = "#token")
+ * // 永不过期(永久缓存),适用于极少变化的配置数据
+ * @Cacheable(value = "appConfig#-1", key = "'globalSettings'")
+ * // 无 TTL,使用全局默认过期时间(如 7 天)
+ * @Cacheable(value = "product", key = "#productId")
+ * 
+ * + *

生成的 Redis Key 格式:

+ *
+ * cache:cacheName:key
+ * 例如:cache:user:123
+ *      cache:appConfig:globalSettings
+ * 
+ * + *

支持的 TTL 单位:

+ * + * + *

注意事项:

+ * + */ +@Slf4j +public class CustomRedisCacheManager extends RedisCacheManager { + + /** + * 缓存全局前缀 + */ + private static final String CACHE_PREFIX = "cache"; + + /** + * 自定义 TTL 分隔符,用于在 cacheName 后附加过期时间 + */ + private static final String CUSTOM_TTL_SEPARATOR = "#"; + + /** + * 默认缓存过期时间:7 天 + */ + private static final Duration DEFAULT_TTL = Duration.ofDays(7); + + public CustomRedisCacheManager(RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration) { + super(cacheWriter, defaultCacheConfiguration); + } + + /** + * 创建 RedisCache 实例,支持从 cacheName 解析 TTL + * + * @param name 缓存名称(支持 name#ttl 格式) + * @param cacheConfig 默认缓存配置 + * @return RedisCache + */ + @Override + protected RedisCache createRedisCache(String name, RedisCacheConfiguration cacheConfig) { + Duration ttl = parseTtlFromCacheName(name); + if (ttl == null) { + ttl = DEFAULT_TTL; + } + + CacheKeyPrefix keyPrefix = cacheName -> { + if (StrUtil.isBlank(cacheName)) { + return CACHE_PREFIX + COLON; + } + String[] parts = cacheName.split(CUSTOM_TTL_SEPARATOR, 2); + String cleanName = StrUtil.trim(parts[0]); + return CACHE_PREFIX + COLON + cleanName + COLON; + }; + + // 构建最终缓存配置:设置 key 前缀 + TTL + RedisCacheConfiguration config = cacheConfig.computePrefixWith(keyPrefix).entryTtl(ttl); + + return super.createRedisCache(name, config); + } + + /** + * 从 cacheName 中解析 TTL + * + * @param name 缓存名称,格式如:users#10m, products#2h, config#-1(永久) + * @return 解析出的 Duration若无效则返回 null;若为 -1,则返回 Duration.ofMillis(-1) 表示永久缓存 + */ + private Duration parseTtlFromCacheName(String name) { + if (StrUtil.isBlank(name)) { + return null; + } + + String[] parts = name.split(CUSTOM_TTL_SEPARATOR, 2); + if (parts.length < 2) { + return null; // 无 TTL 部分 + } + + String ttlStr = StrUtil.trim(parts[1]); + if (StrUtil.isBlank(ttlStr)) { + return null; + } + + // 特殊处理:-1 表示永久缓存 + if ("-1".equals(ttlStr)) { + return Duration.ofMillis(-1); // Spring Redis 中负数 Duration 表示永不过期 + } + + try { + Duration ttl = DurationStyle.detectAndParse(ttlStr); + return ttl.toSeconds() > 0 ? ttl : null; + } catch (IllegalArgumentException e) { + log.debug("解析缓存 TTL 失败,cacheName='{}', ttl='{}', 错误: {}", name, ttlStr, e.getMessage()); + return null; + } + } +} \ No newline at end of file diff --git a/smart-admin-web-javascript/src/views/system/home/index.vue b/smart-admin-web-javascript/src/views/system/home/index.vue index 34626731..bca396d4 100644 --- a/smart-admin-web-javascript/src/views/system/home/index.vue +++ b/smart-admin-web-javascript/src/views/system/home/index.vue @@ -54,11 +54,11 @@ - + - + diff --git a/sql/smart_admin_v3.sql b/sql/smart_admin_v3.sql index 5838fda9..61abaa46 100644 --- a/sql/smart_admin_v3.sql +++ b/sql/smart_admin_v3.sql @@ -924,7 +924,7 @@ CREATE TABLE `t_operate_log` ( `url` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '请求路径', `method` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '请求方法', `param` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '请求参数', - `response` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '请求参数', + `response` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '返回值', `ip` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '请求ip', `ip_region` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '请求ip地区', `user_agent` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '请求user-agent',