feat: 完善 plugin cache

cadecode · cadecode · commit 377446495a4b · 2023-06-08T21:18:31.000+08:00
diff --git a/common/core/pom.xml b/common/core/pom.xml
@@ -38,31 +38,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
         </dependency>
-        <!--SpringBoot Cache-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
-        </dependency>
-        <!--RedisTemplate-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <!--commons-pool2（RedisTemplate 依赖）-->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
         <!--spring retry-->
         <dependency>
             <groupId>org.springframework.retry</groupId>
             <artifactId>spring-retry</artifactId>
         </dependency>
-        <!--caffeine-->
-        <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>caffeine</artifactId>
-        </dependency>
         <!--ttl-->
         <dependency>
             <groupId>com.alibaba</groupId>
diff --git a/common/plugin/cache/pom.xml b/common/plugin/cache/pom.xml
@@ -11,4 +11,31 @@
 
     <artifactId>uni-boot-common-plugin-cache</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>top.cadecode</groupId>
+            <artifactId>uni-boot-common-core</artifactId>
+        </dependency>
+        <!--SpringBoot Cache-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+        <!--RedisTemplate-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <!--commons-pool2（RedisTemplate 依赖）-->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+        <!--caffeine-->
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
+    </dependencies>
+
 </project>
diff --git a/common/plugin/cache/src/main/java/top/cadecode/uniboot/common/plugin/cache/config/CacheConfig.java b/common/plugin/cache/src/main/java/top/cadecode/uniboot/common/plugin/cache/config/CacheConfig.java
@@ -1,4 +1,4 @@
-package top.cadecode.uniboot.framework.config;
+package top.cadecode.uniboot.common.plugin.cache.config;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import lombok.RequiredArgsConstructor;
diff --git a/common/plugin/cache/src/main/java/top/cadecode/uniboot/common/plugin/cache/config/RedisConfig.java b/common/plugin/cache/src/main/java/top/cadecode/uniboot/common/plugin/cache/config/RedisConfig.java
@@ -1,4 +1,4 @@
-package top.cadecode.uniboot.framework.config;
+package top.cadecode.uniboot.common.plugin.cache.config;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
diff --git a/common/plugin/cache/src/main/java/top/cadecode/uniboot/common/plugin/cache/util/CacheKeyGenerator.java b/common/plugin/cache/src/main/java/top/cadecode/uniboot/common/plugin/cache/util/CacheKeyGenerator.java
@@ -1,4 +1,4 @@
-package top.cadecode.uniboot.common.core.datasource;
+package top.cadecode.uniboot.common.plugin.cache.util;
 
 /**
  * Redis key 命名生成器
@@ -23,4 +23,8 @@ public static String key(String prefix, String... extra) {
         return prefixBuilder.toString();
     }
 
+    public static String lockKey(String... extra) {
+        return key("lock", extra);
+    }
+
 }
diff --git a/common/plugin/cache/src/main/java/top/cadecode/uniboot/common/plugin/cache/util/RedisLock.java b/common/plugin/cache/src/main/java/top/cadecode/uniboot/common/plugin/cache/util/RedisLock.java
@@ -1,4 +1,4 @@
-package top.cadecode.uniboot.common.core.util;
+package top.cadecode.uniboot.common.plugin.cache.util;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/common/plugin/cache/src/main/java/top/cadecode/uniboot/common/plugin/cache/util/RedisUtil.java b/common/plugin/cache/src/main/java/top/cadecode/uniboot/common/plugin/cache/util/RedisUtil.java
@@ -1,10 +1,11 @@
-package top.cadecode.uniboot.common.core.util;
+package top.cadecode.uniboot.common.plugin.cache.util;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
+import top.cadecode.uniboot.common.core.util.JacksonUtil;
 
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
diff --git a/framework/pom.xml b/framework/pom.xml
@@ -33,5 +33,9 @@
             <groupId>top.cadecode</groupId>
             <artifactId>uni-boot-common-plugin-datasource</artifactId>
         </dependency>
+        <dependency>
+            <groupId>top.cadecode</groupId>
+            <artifactId>uni-boot-common-plugin-cache</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/framework/src/main/java/top/cadecode/uniboot/framework/security/filter/RedisTokenAuthFilter.java b/framework/src/main/java/top/cadecode/uniboot/framework/security/filter/RedisTokenAuthFilter.java
@@ -5,10 +5,10 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 import top.cadecode.uniboot.common.core.consts.CacheKeyPrefix;
-import top.cadecode.uniboot.common.core.datasource.CacheKeyGenerator;
 import top.cadecode.uniboot.common.core.enums.AuthModelEnum;
 import top.cadecode.uniboot.common.core.enums.error.AuthErrorEnum;
-import top.cadecode.uniboot.common.core.util.RedisUtil;
+import top.cadecode.uniboot.common.plugin.cache.util.CacheKeyGenerator;
+import top.cadecode.uniboot.common.plugin.cache.util.RedisUtil;
 import top.cadecode.uniboot.framework.bean.dto.SysUserDto;
 import top.cadecode.uniboot.framework.bean.dto.SysUserDto.SysUserDetailsDto;
 import top.cadecode.uniboot.framework.security.TokenAuthFilter;
diff --git a/framework/src/main/java/top/cadecode/uniboot/framework/security/handler/RedisLoginSuccessHandler.java b/framework/src/main/java/top/cadecode/uniboot/framework/security/handler/RedisLoginSuccessHandler.java
@@ -4,10 +4,10 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 import top.cadecode.uniboot.common.core.consts.CacheKeyPrefix;
-import top.cadecode.uniboot.common.core.datasource.CacheKeyGenerator;
 import top.cadecode.uniboot.common.core.enums.AuthModelEnum;
 import top.cadecode.uniboot.common.core.response.ApiResult;
-import top.cadecode.uniboot.common.core.util.RedisUtil;
+import top.cadecode.uniboot.common.plugin.cache.util.CacheKeyGenerator;
+import top.cadecode.uniboot.common.plugin.cache.util.RedisUtil;
 import top.cadecode.uniboot.framework.bean.dto.SysUserDto;
 import top.cadecode.uniboot.framework.bean.dto.SysUserDto.SysUserDetailsDto;
 import top.cadecode.uniboot.framework.config.SecurityConfig;
diff --git a/framework/src/main/java/top/cadecode/uniboot/framework/security/handler/SignOutSuccessHandler.java b/framework/src/main/java/top/cadecode/uniboot/framework/security/handler/SignOutSuccessHandler.java
@@ -9,11 +9,11 @@
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
 import org.springframework.stereotype.Component;
 import top.cadecode.uniboot.common.core.consts.CacheKeyPrefix;
-import top.cadecode.uniboot.common.core.datasource.CacheKeyGenerator;
 import top.cadecode.uniboot.common.core.enums.error.AuthErrorEnum;
 import top.cadecode.uniboot.common.core.response.ApiResult;
 import top.cadecode.uniboot.common.core.util.JacksonUtil;
-import top.cadecode.uniboot.common.core.util.RedisUtil;
+import top.cadecode.uniboot.common.plugin.cache.util.CacheKeyGenerator;
+import top.cadecode.uniboot.common.plugin.cache.util.RedisUtil;
 import top.cadecode.uniboot.framework.config.SecurityConfig;
 import top.cadecode.uniboot.framework.security.TokenAuthFilter;
 import top.cadecode.uniboot.framework.security.TokenAuthHolder;
diff --git a/framework/src/main/java/top/cadecode/uniboot/framework/serviceimpl/SysApiServiceImpl.java b/framework/src/main/java/top/cadecode/uniboot/framework/serviceimpl/SysApiServiceImpl.java
@@ -9,7 +9,7 @@
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import top.cadecode.uniboot.common.core.consts.CacheKeyPrefix;
-import top.cadecode.uniboot.common.core.util.RedisUtil;
+import top.cadecode.uniboot.common.plugin.cache.util.RedisUtil;
 import top.cadecode.uniboot.framework.bean.po.SysApi;
 import top.cadecode.uniboot.framework.bean.vo.SysApiVo.SysApiRolesVo;
 import top.cadecode.uniboot.framework.mapper.SysApiMapper;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package top.cadecode.uniboot.framework.config;`
	`1`	`+package top.cadecode.uniboot.common.plugin.cache.config;`
`2`	`2`
`3`	`3`	`import com.github.benmanes.caffeine.cache.Caffeine;`
`4`	`4`	`import lombok.RequiredArgsConstructor;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package top.cadecode.uniboot.common.core.datasource;`
	`1`	`+package top.cadecode.uniboot.common.plugin.cache.util;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Redis key 命名生成器`
`@@ -23,4 +23,8 @@ public static String key(String prefix, String... extra) {`
`23`	`23`	`return prefixBuilder.toString();`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ public static String lockKey(String... extra) {`
	`27`	`+ return key("lock", extra);`
	`28`	`+ }`
	`29`	`+`
`26`	`30`	`}`