fix 修复 合并错误

ruoyi-common/pom.xml

@@ -40,6 +40,11 @@
             <artifactId>sa-token-jwt</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-crypto</artifactId>
+        </dependency>
+
         <!-- 自定义验证注解 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java

@@ -114,29 +114,6 @@ public class RedisUtils {
         }
     }
 
-    /**
-     * 缓存基本的对象，保留当前对象 TTL 有效期
-     *
-     * @param key   缓存的键值
-     * @param value 缓存的值
-     * @param isSaveTtl 是否保留TTL有效期(例如: set之前ttl剩余90 set之后还是为90)
-     * @since Redis 6.X 以上使用 setAndKeepTTL 兼容 5.X 方案
-     */
-    public static <T> void setCacheObject(final String key, final T value, final boolean isSaveTtl) {
-        RBucket<Object> bucket = client.getBucket(key);
-        if (isSaveTtl) {
-            try {
-                bucket.setAndKeepTTL(value);
-            } catch (Exception e) {
-                long timeToLive = bucket.remainTimeToLive();
-                bucket.set(value);
-                bucket.expire(timeToLive, TimeUnit.MILLISECONDS);
-            }
-        } else {
-            bucket.set(value);
-        }
-    }
-
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *