日志记录

2024-04-29 09:59:48 +08:00
parent ecae487993
commit 5ac93618a6
120 changed files with 1180 additions and 738 deletions
--- a/eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java
@@ -72,29 +72,29 @@ public class RedisConfig extends CachingConfigurerSupport {
        lettuceConnectionFactory.setDatabase(redisProperties.getDatabase());
        return lettuceConnectionFactory;
    }
-    @Bean
-    public RedisConnectionFactory redisConnectionFactory5() {
-        LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(redisProperties.getHost(), redisProperties.getPort());
-        lettuceConnectionFactory.setPassword(redisProperties.getPassword());
-        lettuceConnectionFactory.setDatabase(5);
-        return lettuceConnectionFactory;
-    }
+//    @Bean
+//    public RedisConnectionFactory redisConnectionFactory5() {
+//        LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(redisProperties.getHost(), redisProperties.getPort());
+//        lettuceConnectionFactory.setPassword(redisProperties.getPassword());
+//        lettuceConnectionFactory.setDatabase(5);
+//        return lettuceConnectionFactory;
+//    }

-    @Bean(name = "redis5Template")
-    public RedisTemplate<Object, Object> redis5Template(@Qualifier("redisConnectionFactory5") RedisConnectionFactory redisConnectionFactory5) {
-        RedisTemplate<Object, Object> template = new RedisTemplate<>();
-        //序列化
-        FastJsonRedisSerializer<Object> fastJsonRedisSerializer = new FastJsonRedisSerializer<>(Object.class);
-        // value值的序列化采用fastJsonRedisSerializer
-        template.setValueSerializer(fastJsonRedisSerializer);
-        template.setHashValueSerializer(fastJsonRedisSerializer);
-        // key的序列化采用StringRedisSerializer
-        template.setKeySerializer(new StringRedisSerializer());
-        template.setHashKeySerializer(new StringRedisSerializer());
-        template.setConnectionFactory(redisConnectionFactory5);
-        // 配置序列化等信息
-        return template;
-    }
+//    @Bean(name = "redis5Template")
+//    public RedisTemplate<Object, Object> redis5Template(@Qualifier("redisConnectionFactory5") RedisConnectionFactory redisConnectionFactory5) {
+//        RedisTemplate<Object, Object> template = new RedisTemplate<>();
+//        //序列化
+//        FastJsonRedisSerializer<Object> fastJsonRedisSerializer = new FastJsonRedisSerializer<>(Object.class);
+//        // value值的序列化采用fastJsonRedisSerializer
+//        template.setValueSerializer(fastJsonRedisSerializer);
+//        template.setHashValueSerializer(fastJsonRedisSerializer);
+//        // key的序列化采用StringRedisSerializer
+//        template.setKeySerializer(new StringRedisSerializer());
+//        template.setHashKeySerializer(new StringRedisSerializer());
+//        template.setConnectionFactory(redisConnectionFactory5);
+//        // 配置序列化等信息
+//        return template;
+//    }

    /**
     *  设置 redis 数据默认过期时间，默认2小时
--- a/eladmin-common/src/main/java/cn/ysk/cashier/utils/RedisUtils.java
+++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/RedisUtils.java
@@ -41,22 +41,29 @@ import java.util.concurrent.TimeUnit;
 public class RedisUtils {
    private static final Logger log = LoggerFactory.getLogger(RedisUtils.class);
    private RedisTemplate<Object, Object> redisTemplate;
-    private RedisTemplate<Object, Object> redisTemplate5;
+//    private RedisTemplate<Object, Object> redisTemplate5;

    @Value("${jwt.online-key}")
    private String onlineKey;

-    public RedisUtils(RedisTemplate<Object, Object> redisTemplate,@Qualifier("redis5Template")RedisTemplate<Object, Object> redisTemplate5) {
+//    public RedisUtils(RedisTemplate<Object, Object> redisTemplate,@Qualifier("redis5Template")RedisTemplate<Object, Object> redisTemplate5) {
+//        this.redisTemplate = redisTemplate;
+//        this.redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+//        this.redisTemplate.setKeySerializer(new StringRedisSerializer());
+//        this.redisTemplate.setStringSerializer(new StringRedisSerializer());
+//
+//
+//        this.redisTemplate5 = redisTemplate5;
+//        this.redisTemplate5.setHashKeySerializer(new StringRedisSerializer());
+//        this.redisTemplate5.setKeySerializer(new StringRedisSerializer());
+//        this.redisTemplate5.setStringSerializer(new StringRedisSerializer());
+//    }
+
+    public RedisUtils(RedisTemplate<Object, Object> redisTemplate) {
        this.redisTemplate = redisTemplate;
        this.redisTemplate.setHashKeySerializer(new StringRedisSerializer());
        this.redisTemplate.setKeySerializer(new StringRedisSerializer());
        this.redisTemplate.setStringSerializer(new StringRedisSerializer());
-
-
-        this.redisTemplate5 = redisTemplate5;
-        this.redisTemplate5.setHashKeySerializer(new StringRedisSerializer());
-        this.redisTemplate5.setKeySerializer(new StringRedisSerializer());
-        this.redisTemplate5.setStringSerializer(new StringRedisSerializer());
    }

    /**
@@ -774,16 +781,15 @@ public class RedisUtils {
     * @param value 值
     * @return true成功 false失败
     */
-    public boolean set5(String key, Object value) {
-        try {
-            redisTemplate5.opsForValue().set(key, value);
-//            redisTemplate.opsForValue().set(key, value);
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            return false;
-        }
-    }
+//    public boolean set5(String key, Object value) {
+//        try {
+//            redisTemplate5.opsForValue().set(key, value);
+//            return true;
+//        } catch (Exception e) {
+//            log.error(e.getMessage(), e);
+//            return false;
+//        }
+//    }


    /**
@@ -792,26 +798,26 @@ public class RedisUtils {
     *
     * @param key 可以传一个值 或多个
     */
-    public void del5(String... keys) {
-        if (keys != null && keys.length > 0) {
-            if (keys.length == 1) {
-                boolean result = redisTemplate5.delete(keys[0]);
-                log.debug("--------------------------------------------");
-                log.debug(new StringBuilder("删除缓存：").append(keys[0]).append("，结果：").append(result).toString());
-                log.debug("--------------------------------------------");
-            } else {
-                Set<Object> keySet = new HashSet<>();
-                for (String key : keys) {
-                    keySet.addAll(redisTemplate5.keys(key));
-                }
-                long count = redisTemplate5.delete(keySet);
-                log.debug("--------------------------------------------");
-                log.debug("成功删除缓存：" + keySet.toString());
-                log.debug("缓存删除数量：" + count + "个");
-                log.debug("--------------------------------------------");
-            }
-        }
-    }
+//    public void del5(String... keys) {
+//        if (keys != null && keys.length > 0) {
+//            if (keys.length == 1) {
+//                boolean result = redisTemplate5.delete(keys[0]);
+//                log.debug("--------------------------------------------");
+//                log.debug(new StringBuilder("删除缓存：").append(keys[0]).append("，结果：").append(result).toString());
+//                log.debug("--------------------------------------------");
+//            } else {
+//                Set<Object> keySet = new HashSet<>();
+//                for (String key : keys) {
+//                    keySet.addAll(redisTemplate5.keys(key));
+//                }
+//                long count = redisTemplate5.delete(keySet);
+//                log.debug("--------------------------------------------");
+//                log.debug("成功删除缓存：" + keySet.toString());
+//                log.debug("缓存删除数量：" + count + "个");
+//                log.debug("--------------------------------------------");
+//            }
+//        }
+//    }


 }