From 76fd061d08beeb99591aa2f535e21809a0547543 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 03 四月 2024 10:03:40 +0800
Subject: [PATCH] zjh 2024/04/03-1

---
 ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java       |   51 +++++++++++++------------
 ltkj-admin/src/main/resources/application.yml                                 |    4 +-
 ltkj-framework/src/main/java/com/ltkj/framework/web/service/TokenService.java |    6 +-
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 45d1eb1..57257f7 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -215,8 +215,8 @@
 
 #绉湪鎶ヨ〃璁块棶鍦板潃
 jimu:
-  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
-#  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
+#  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
+  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
 #  path: http://192.168.0.5:5000/ltkj-admin
 #   path: http://10.168.0.9:5011
 #   path: http://192.168.0.105:5011
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
index 9f66f0b..c2ba0eb 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
@@ -24,16 +24,37 @@
 @EnableCaching
 @Slf4j
 public class RedisConfig extends CachingConfigurerSupport {
+
+    @Bean
+    @SuppressWarnings(value = {"unchecked", "rawtypes"})
+    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
+        RedisTemplate<Object, Object> template = new RedisTemplate<>();
+        template.setConnectionFactory(connectionFactory);
+
+        FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
+
+        // 浣跨敤StringRedisSerializer鏉ュ簭鍒楀寲鍜屽弽搴忓垪鍖杛edis鐨刱ey鍊�
+        template.setKeySerializer(new StringRedisSerializer());
+        template.setValueSerializer(serializer);
+
+        // Hash鐨刱ey涔熼噰鐢⊿tringRedisSerializer鐨勫簭鍒楀寲鏂瑰紡
+        template.setHashKeySerializer(new StringRedisSerializer());
+        template.setHashValueSerializer(serializer);
+
+        template.afterPropertiesSet();
+        return template;
+    }
+
     @Bean
     public JedisPoolConfig jedisPoolConfig() {
         JedisPoolConfig config = new JedisPoolConfig();
         // 璁剧疆JedisPoolConfig鐨勭浉鍏冲弬鏁帮紝渚嬪鏈�澶ц繛鎺ユ暟銆佹渶澶х┖闂叉椂闂寸瓑
-        config.setMinIdle(0);
-        config.setMaxIdle(8);
-        config.setMaxTotal(8);
-        config.setMaxWaitMillis(-1);
-        config.setTestOnBorrow(true);
-        config.setTestOnReturn(true);
+//        config.setMinIdle(0);
+//        config.setMaxIdle(8);
+//        config.setMaxTotal(8);
+//        config.setMaxWaitMillis(-1);
+//        config.setTestOnBorrow(true);
+//        config.setTestOnReturn(true);
         return config;
     }
     @Bean
@@ -91,25 +112,7 @@
         }
         return factory;
     }
-    @Bean
-    @SuppressWarnings(value = {"unchecked", "rawtypes"})
-    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
-        RedisTemplate<Object, Object> template = new RedisTemplate<>();
-        template.setConnectionFactory(connectionFactory);
 
-        FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
-
-        // 浣跨敤StringRedisSerializer鏉ュ簭鍒楀寲鍜屽弽搴忓垪鍖杛edis鐨刱ey鍊�
-        template.setKeySerializer(new StringRedisSerializer());
-        template.setValueSerializer(serializer);
-
-        // Hash鐨刱ey涔熼噰鐢⊿tringRedisSerializer鐨勫簭鍒楀寲鏂瑰紡
-        template.setHashKeySerializer(new StringRedisSerializer());
-        template.setHashValueSerializer(serializer);
-
-        template.afterPropertiesSet();
-        return template;
-    }
 
     @Bean
     public DefaultRedisScript<Long> limitScript() {
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/TokenService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/TokenService.java
index 4f4d338..3c021cd 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/TokenService.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/TokenService.java
@@ -47,7 +47,7 @@
 
     private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L;
 
-    private static final Long MILLIS_DAY = 60 * MILLIS_SECOND * 60 * 24;
+    private static final long MILLIS_DAY = 60 * MILLIS_SECOND * 60 * 24;
 
     @Autowired
     private RedisCache redisCache;
@@ -141,11 +141,11 @@
         loginUser.setExpireTime(loginUser.getLoginTime() + MILLIS_DAY);
         // 鏍规嵁uuid灏唋oginUser缂撳瓨
         String userKey = getTokenKey(loginUser.getToken());
-        redisCache.setCacheObject(userKey, loginUser, Math.toIntExact(MILLIS_DAY), TimeUnit.MINUTES);
+        redisCache.setCacheObject(userKey, loginUser,1, TimeUnit.DAYS);
         if (!soloLogin) {
             // 缂撳瓨鐢ㄦ埛鍞竴鏍囪瘑锛岄槻姝㈠悓涓�甯愬彿锛屽悓鏃剁櫥褰�
             String userIdKey = getUserIdKey(loginUser.getUser().getUserId());
-            redisCache.setCacheObject(userIdKey, userKey, Math.toIntExact(MILLIS_DAY), TimeUnit.MINUTES);
+            redisCache.setCacheObject(userIdKey, userKey, 1, TimeUnit.DAYS);
         }
     }
 

--
Gitblit v1.8.0