diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
index 434e4eca..63830284 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
@@ -153,8 +153,19 @@ public class LoginManager {
}
- @CacheEvict(value = {AdminCacheConst.Login.USER_PERMISSION, AdminCacheConst.Login.REQUEST_EMPLOYEE}, allEntries = true)
- public void clear(){
+ /**
+ * 清除用户权限
+ */
+ @CacheEvict(value = AdminCacheConst.Login.USER_PERMISSION)
+ public void clearUserPermission(Long employeeId) {
+
+ }
+
+ /**
+ * 清除用户登录信息
+ */
+ @CacheEvict(value = AdminCacheConst.Login.REQUEST_EMPLOYEE)
+ public void clearUserLoginInfo(Long employeeId) {
}
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
index 7b18f257..2e3b7c8f 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
@@ -317,8 +317,8 @@ public class LoginService implements StpInterface {
// sa token 登出
StpUtil.logout();
- // 清空登录信息缓存
- loginManager.clear();
+ // 清除用户登录信息缓存和权限信息
+ this.clearLoginEmployeeCache(requestUser.getUserId());
//保存登出日志
LoginLogEntity loginEntity = LoginLogEntity.builder()
@@ -474,6 +474,7 @@ public class LoginService implements StpInterface {
}
public void clearLoginEmployeeCache(Long employeeId) {
- loginManager.clear();
+ loginManager.clearUserPermission(employeeId);
+ loginManager.clearUserLoginInfo(employeeId);
}
}
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
index 902d5cf0..bccb2de9 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
@@ -5,18 +5,19 @@ import jakarta.annotation.Resource;
import net.lab1024.sa.base.module.support.cache.CacheService;
import net.lab1024.sa.base.module.support.cache.CaffeineCacheServiceImpl;
import net.lab1024.sa.base.module.support.cache.RedisCacheServiceImpl;
+import net.lab1024.sa.base.module.support.redis.CustomRedisCacheManager;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cache.CacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheWriter;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.serializer.RedisSerializationContext;
/**
* 缓存配置
*
- * @author zhoumingfa
- * @date 2025/03/28
*/
@Configuration
public class CacheConfig {
@@ -26,27 +27,44 @@ public class CacheConfig {
@Resource
- private RedisConnectionFactory factory;
+ private RedisConnectionFactory redisConnectionFactory;
+ /**
+ * 创建自定义Redis缓存管理器Bean 整合spring-cache
+ * Redis连接工厂，用于建立与Redis服务器的连接
+ *
+ * @return CacheManager Redis缓存管理器实例
+ */
@Bean
@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)
- public RedisCacheConfiguration redisCacheConfiguration() {
- return RedisCacheConfiguration.defaultCacheConfig()
+ public CacheManager cacheManager() {
+ // 使用非阻塞模式的缓存写入器，适用于大多数高并发场景
+ RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(redisConnectionFactory);
+
+ // 构建默认缓存配置
+ RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
+ // 禁止缓存 null 值，避免缓存穿透
.disableCachingNullValues()
.computePrefixWith(name -> "cache:" + name + ":")
- .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericFastJsonRedisSerializer()));
+ // 使用 FastJSON 序列化缓存值，支持复杂对象
+ .serializeValuesWith(RedisSerializationContext.SerializationPair
+ .fromSerializer(new GenericFastJsonRedisSerializer()));
+
+ // 返回自定义缓存管理器，支持 cacheName#ttl 格式与永久缓存（#-1）
+ return new CustomRedisCacheManager(redisCacheWriter, defaultCacheConfig);
}
- @Bean
- @ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)
- public CacheService redisCacheService() {
- return new RedisCacheServiceImpl();
- }
- @Bean
- @ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = CAFFEINE_CACHE)
- public CacheService caffeineCacheService() {
- return new CaffeineCacheServiceImpl();
- }
+@Bean
+@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)
+public CacheService redisCacheService() {
+ return new RedisCacheServiceImpl();
+}
+
+@Bean
+@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = CAFFEINE_CACHE)
+public CacheService caffeineCacheService() {
+ return new CaffeineCacheServiceImpl();
+}
}
\ No newline at end of file
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java
index 1fdd6fb5..761799a2 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java
@@ -30,7 +30,7 @@ public class DictDataVO implements Serializable {
private String dictName;
@Schema(description = "字典禁用状态")
- private Integer dictDisabledFlag;
+ private Boolean dictDisabledFlag;
@Schema(description = "字典项值")
private String dataValue;
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictVO.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictVO.java
index 1625ce40..4a9131c4 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictVO.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictVO.java
@@ -30,7 +30,7 @@ public class DictVO {
private String remark;
@Schema(description = "禁用状态")
- private Integer disabledFlag;
+ private Boolean disabledFlag;
@Schema(description = "创建时间")
private LocalDateTime createTime;
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/CustomRedisCacheManager.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/CustomRedisCacheManager.java
new file mode 100644
index 00000000..4ff66aab
--- /dev/null
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/CustomRedisCacheManager.java
@@ -0,0 +1,145 @@
+package net.lab1024.sa.base.module.support.redis;
+
+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 单位：
+ *
+ * - {@code ms} / {@code millis} / {@code milliseconds} - 毫秒
+ * - {@code s} / {@code secs} / {@code seconds} - 秒
+ * - {@code m} / {@code mins} / {@code minutes} - 分钟
+ * - {@code h} / {@code hrs} / {@code hours} - 小时
+ * - {@code d} / {@code days} - 天
+ *
+ *
+ * 注意事项：
+ *
+ * - 不写单位默认为毫秒
+ * - 永久缓存（#-1）不会自动过期，请配合 @CacheEvict 手动清理。
+ * - 避免对频繁更新的数据使用永久缓存，防止数据陈旧。
+ * - cacheName 中的 '#' 只解析第一个，后续字符将作为 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.getSeconds() > 0 ? ttl : null;
+ } catch (IllegalArgumentException e) {
+ log.error("解析缓存 TTL 失败，cacheName='{}', ttl='{}', 错误: {}", name, ttlStr, e);
+ return null;
+ }
+ }
+}
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
index 7dd41272..8b5ac130 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
@@ -153,8 +153,19 @@ public class LoginManager {
}
- @CacheEvict(value = {AdminCacheConst.Login.USER_PERMISSION, AdminCacheConst.Login.REQUEST_EMPLOYEE}, allEntries = true)
- public void clear(){
+ /**
+ * 清除用户权限
+ */
+ @CacheEvict(value = AdminCacheConst.Login.USER_PERMISSION)
+ public void clearUserPermission(Long employeeId) {
+
+ }
+
+ /**
+ * 清除用户登录信息
+ */
+ @CacheEvict(value = AdminCacheConst.Login.REQUEST_EMPLOYEE)
+ public void clearUserLoginInfo(Long employeeId) {
}
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
index 29d4778a..39124053 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
@@ -319,8 +319,8 @@ public class LoginService implements StpInterface {
// sa token 登出
StpUtil.logout();
- // 清空登录信息缓存
- loginManager.clear();
+ // 清除用户登录信息缓存和权限信息
+ this.clearLoginEmployeeCache(requestUser.getUserId());
//保存登出日志
LoginLogEntity loginEntity = LoginLogEntity.builder()
@@ -476,6 +476,7 @@ public class LoginService implements StpInterface {
}
public void clearLoginEmployeeCache(Long employeeId) {
- loginManager.clear();
+ loginManager.clearUserPermission(employeeId);
+ loginManager.clearUserLoginInfo(employeeId);
}
}
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
index 5beb7413..665a23ff 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
@@ -4,10 +4,13 @@ import com.alibaba.fastjson.support.spring.GenericFastJsonRedisSerializer;
import net.lab1024.sa.base.module.support.cache.CacheService;
import net.lab1024.sa.base.module.support.cache.CaffeineCacheServiceImpl;
import net.lab1024.sa.base.module.support.cache.RedisCacheServiceImpl;
+import net.lab1024.sa.base.module.support.redis.CustomRedisCacheManager;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cache.CacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheWriter;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.serializer.RedisSerializationContext;
@@ -16,8 +19,6 @@ import javax.annotation.Resource;
/**
* 缓存配置
*
- * @author zhoumingfa
- * @date 2025/03/28
*/
@Configuration
public class CacheConfig {
@@ -27,27 +28,44 @@ public class CacheConfig {
@Resource
- private RedisConnectionFactory factory;
+ private RedisConnectionFactory redisConnectionFactory;
+ /**
+ * 创建自定义Redis缓存管理器Bean 整合spring-cache
+ * Redis连接工厂，用于建立与Redis服务器的连接
+ *
+ * @return CacheManager Redis缓存管理器实例
+ */
@Bean
@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)
- public RedisCacheConfiguration redisCacheConfiguration() {
- return RedisCacheConfiguration.defaultCacheConfig()
+ public CacheManager cacheManager() {
+ // 使用非阻塞模式的缓存写入器，适用于大多数高并发场景
+ RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(redisConnectionFactory);
+
+ // 构建默认缓存配置
+ RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig()
+ // 禁止缓存 null 值，避免缓存穿透
.disableCachingNullValues()
.computePrefixWith(name -> "cache:" + name + ":")
- .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericFastJsonRedisSerializer()));
+ // 使用 FastJSON 序列化缓存值，支持复杂对象
+ .serializeValuesWith(RedisSerializationContext.SerializationPair
+ .fromSerializer(new GenericFastJsonRedisSerializer()));
+
+ // 返回自定义缓存管理器，支持 cacheName#ttl 格式与永久缓存（#-1）
+ return new CustomRedisCacheManager(redisCacheWriter, defaultCacheConfig);
}
- @Bean
- @ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)
- public CacheService redisCacheService() {
- return new RedisCacheServiceImpl();
- }
- @Bean
- @ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = CAFFEINE_CACHE)
- public CacheService caffeineCacheService() {
- return new CaffeineCacheServiceImpl();
- }
+@Bean
+@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)
+public CacheService redisCacheService() {
+ return new RedisCacheServiceImpl();
+}
+
+@Bean
+@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = CAFFEINE_CACHE)
+public CacheService caffeineCacheService() {
+ return new CaffeineCacheServiceImpl();
+}
}
\ No newline at end of file
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java
index 1fdd6fb5..761799a2 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictDataVO.java
@@ -30,7 +30,7 @@ public class DictDataVO implements Serializable {
private String dictName;
@Schema(description = "字典禁用状态")
- private Integer dictDisabledFlag;
+ private Boolean dictDisabledFlag;
@Schema(description = "字典项值")
private String dataValue;
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictVO.java
index 1625ce40..4a9131c4 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictVO.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictVO.java
@@ -30,7 +30,7 @@ public class DictVO {
private String remark;
@Schema(description = "禁用状态")
- private Integer disabledFlag;
+ private Boolean disabledFlag;
@Schema(description = "创建时间")
private LocalDateTime createTime;
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/CustomRedisCacheManager.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/CustomRedisCacheManager.java
new file mode 100644
index 00000000..4ff66aab
--- /dev/null
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/CustomRedisCacheManager.java
@@ -0,0 +1,145 @@
+package net.lab1024.sa.base.module.support.redis;
+
+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 单位：
+ *
+ * - {@code ms} / {@code millis} / {@code milliseconds} - 毫秒
+ * - {@code s} / {@code secs} / {@code seconds} - 秒
+ * - {@code m} / {@code mins} / {@code minutes} - 分钟
+ * - {@code h} / {@code hrs} / {@code hours} - 小时
+ * - {@code d} / {@code days} - 天
+ *
+ *
+ * 注意事项：
+ *
+ * - 不写单位默认为毫秒
+ * - 永久缓存（#-1）不会自动过期，请配合 @CacheEvict 手动清理。
+ * - 避免对频繁更新的数据使用永久缓存，防止数据陈旧。
+ * - cacheName 中的 '#' 只解析第一个，后续字符将作为 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.getSeconds() > 0 ? ttl : null;
+ } catch (IllegalArgumentException e) {
+ log.error("解析缓存 TTL 失败，cacheName='{}', ttl='{}', 错误: {}", name, ttlStr, e);
+ return null;
+ }
+ }
+}
diff --git a/smart-admin-web-javascript/src/views/support/code-generator/code-generator-util.js b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-util.js
index a9429027..7961bbe1 100644
--- a/smart-admin-web-javascript/src/views/support/code-generator/code-generator-util.js
+++ b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-util.js
@@ -3,12 +3,16 @@ import { convertUpperCamel } from '/@/utils/str-util';
// -------------------------------- java 类型 --------------------------------
export const JavaTypeMap = new Map();
JavaTypeMap.set('bit', 'Boolean');
+JavaTypeMap.set('bool', 'Boolean');
JavaTypeMap.set('int', 'Integer');
+JavaTypeMap.set('int2', 'Integer');
+JavaTypeMap.set('int4', 'Integer');
JavaTypeMap.set('tinyint', 'Integer');
JavaTypeMap.set('smallint', 'Integer');
JavaTypeMap.set('integer', 'Integer');
JavaTypeMap.set('year', 'Integer');
JavaTypeMap.set('bigint', 'Long');
+JavaTypeMap.set('int8', 'Long');
JavaTypeMap.set('float', 'BigDecimal');
JavaTypeMap.set('double', 'BigDecimal');
JavaTypeMap.set('decimal', 'BigDecimal');
@@ -20,6 +24,7 @@ JavaTypeMap.set('longtext', 'String');
JavaTypeMap.set('blob', 'String');
JavaTypeMap.set('date', 'LocalDate');
JavaTypeMap.set('datetime', 'LocalDateTime');
+JavaTypeMap.set('timestamp', 'LocalDateTime');
export const JavaTypeList = [
'Boolean', //
@@ -39,7 +44,11 @@ export function getJavaType(dataType) {
// -------------------------------- js 类型 --------------------------------
export const JsTypeMap = new Map();
JsTypeMap.set('bit', 'Boolean');
+JsTypeMap.set('bool', 'Boolean');
JsTypeMap.set('int', 'Number');
+JsTypeMap.set('int2', 'Number');
+JsTypeMap.set('int4', 'Number');
+JsTypeMap.set('int8', 'Number');
JsTypeMap.set('tinyint', 'Number');
JsTypeMap.set('smallint', 'Number');
JsTypeMap.set('integer', 'Number');
@@ -50,12 +59,14 @@ JsTypeMap.set('double', 'Number');
JsTypeMap.set('decimal', 'Number');
JsTypeMap.set('char', 'String');
JsTypeMap.set('varchar', 'String');
+JsTypeMap.set('character', 'String');
JsTypeMap.set('tinytext', 'String');
JsTypeMap.set('text', 'String');
JsTypeMap.set('longtext', 'String');
JsTypeMap.set('blob', 'String');
JsTypeMap.set('date', 'Date');
JsTypeMap.set('datetime', 'Date');
+JsTypeMap.set('timestamp', 'Date');
export const JsTypeList = [
'Boolean', //
@@ -72,17 +83,23 @@ export function getJsType(dataType) {
export const FrontComponentMap = new Map();
FrontComponentMap.set('bit', 'BooleanSelect');
+FrontComponentMap.set('bool', 'BooleanSelect');
FrontComponentMap.set('int', 'InputNumber');
+FrontComponentMap.set('int2', 'InputNumber');
+FrontComponentMap.set('int4', 'InputNumber');
+FrontComponentMap.set('int8', 'InputNumber');
FrontComponentMap.set('tinyint', 'InputNumber');
FrontComponentMap.set('smallint', 'InputNumber');
FrontComponentMap.set('integer', 'InputNumber');
FrontComponentMap.set('year', 'Date');
+FrontComponentMap.set('timestamp', 'Date');
FrontComponentMap.set('bigint', 'InputNumber');
FrontComponentMap.set('float', 'InputNumber');
FrontComponentMap.set('double', 'InputNumber');
FrontComponentMap.set('decimal', 'InputNumber');
FrontComponentMap.set('char', 'Input');
FrontComponentMap.set('varchar', 'Input');
+FrontComponentMap.set('character', 'Input');
FrontComponentMap.set('tinytext', 'Input');
FrontComponentMap.set('text', 'Textarea');
FrontComponentMap.set('longtext', 'Textarea');
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 9847a1b4..34626731 100644
--- a/smart-admin-web-javascript/src/views/system/home/index.vue
+++ b/smart-admin-web-javascript/src/views/system/home/index.vue
@@ -52,11 +52,11 @@
-
+
-
+
diff --git a/smart-admin-web-typescript/src/views/support/code-generator/code-generator-util.ts b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-util.ts
index a9429027..7961bbe1 100644
--- a/smart-admin-web-typescript/src/views/support/code-generator/code-generator-util.ts
+++ b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-util.ts
@@ -3,12 +3,16 @@ import { convertUpperCamel } from '/@/utils/str-util';
// -------------------------------- java 类型 --------------------------------
export const JavaTypeMap = new Map();
JavaTypeMap.set('bit', 'Boolean');
+JavaTypeMap.set('bool', 'Boolean');
JavaTypeMap.set('int', 'Integer');
+JavaTypeMap.set('int2', 'Integer');
+JavaTypeMap.set('int4', 'Integer');
JavaTypeMap.set('tinyint', 'Integer');
JavaTypeMap.set('smallint', 'Integer');
JavaTypeMap.set('integer', 'Integer');
JavaTypeMap.set('year', 'Integer');
JavaTypeMap.set('bigint', 'Long');
+JavaTypeMap.set('int8', 'Long');
JavaTypeMap.set('float', 'BigDecimal');
JavaTypeMap.set('double', 'BigDecimal');
JavaTypeMap.set('decimal', 'BigDecimal');
@@ -20,6 +24,7 @@ JavaTypeMap.set('longtext', 'String');
JavaTypeMap.set('blob', 'String');
JavaTypeMap.set('date', 'LocalDate');
JavaTypeMap.set('datetime', 'LocalDateTime');
+JavaTypeMap.set('timestamp', 'LocalDateTime');
export const JavaTypeList = [
'Boolean', //
@@ -39,7 +44,11 @@ export function getJavaType(dataType) {
// -------------------------------- js 类型 --------------------------------
export const JsTypeMap = new Map();
JsTypeMap.set('bit', 'Boolean');
+JsTypeMap.set('bool', 'Boolean');
JsTypeMap.set('int', 'Number');
+JsTypeMap.set('int2', 'Number');
+JsTypeMap.set('int4', 'Number');
+JsTypeMap.set('int8', 'Number');
JsTypeMap.set('tinyint', 'Number');
JsTypeMap.set('smallint', 'Number');
JsTypeMap.set('integer', 'Number');
@@ -50,12 +59,14 @@ JsTypeMap.set('double', 'Number');
JsTypeMap.set('decimal', 'Number');
JsTypeMap.set('char', 'String');
JsTypeMap.set('varchar', 'String');
+JsTypeMap.set('character', 'String');
JsTypeMap.set('tinytext', 'String');
JsTypeMap.set('text', 'String');
JsTypeMap.set('longtext', 'String');
JsTypeMap.set('blob', 'String');
JsTypeMap.set('date', 'Date');
JsTypeMap.set('datetime', 'Date');
+JsTypeMap.set('timestamp', 'Date');
export const JsTypeList = [
'Boolean', //
@@ -72,17 +83,23 @@ export function getJsType(dataType) {
export const FrontComponentMap = new Map();
FrontComponentMap.set('bit', 'BooleanSelect');
+FrontComponentMap.set('bool', 'BooleanSelect');
FrontComponentMap.set('int', 'InputNumber');
+FrontComponentMap.set('int2', 'InputNumber');
+FrontComponentMap.set('int4', 'InputNumber');
+FrontComponentMap.set('int8', 'InputNumber');
FrontComponentMap.set('tinyint', 'InputNumber');
FrontComponentMap.set('smallint', 'InputNumber');
FrontComponentMap.set('integer', 'InputNumber');
FrontComponentMap.set('year', 'Date');
+FrontComponentMap.set('timestamp', 'Date');
FrontComponentMap.set('bigint', 'InputNumber');
FrontComponentMap.set('float', 'InputNumber');
FrontComponentMap.set('double', 'InputNumber');
FrontComponentMap.set('decimal', 'InputNumber');
FrontComponentMap.set('char', 'Input');
FrontComponentMap.set('varchar', 'Input');
+FrontComponentMap.set('character', 'Input');
FrontComponentMap.set('tinytext', 'Input');
FrontComponentMap.set('text', 'Textarea');
FrontComponentMap.set('longtext', 'Textarea');