提交chime社交相关-屏蔽redis调用

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/config/AbstractRedisConfig.java

@@ -7,7 +7,6 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
@@ -51,6 +50,7 @@ public abstract class AbstractRedisConfig {
 
     @PostConstruct
     public void initRedisTemp() throws Exception {
+        log.info("############################################################");
         log.info("###### START 初始化 Redis "+this.getClass().getSimpleName()+"连接池 START ######");
         if(StringUtils.isEmpty(getHost())||getHost().equalsIgnoreCase("null")){
             log.info("无配置，不需要初始化！");
@@ -111,23 +111,26 @@ public abstract class AbstractRedisConfig {
         return redisTemplateMap.get(db);
     }
 
-    @Bean
-    public RedisTemplate redisTemplate() {
-        LettuceConnectionFactory factory = null;
-        if(totalDbs==1){
-            factory = getDbFactory(defaultDb);
-        }else{
-            factory = getDbFactory(totalDbs-1);
+//    @Bean
+//    public RedisTemplate redisTemplate() {
+//        LettuceConnectionFactory factory = null;
+//        if(totalDbs==1){
+//            factory = getDbFactory(defaultDb);
+//        }else{
+//            factory = getDbFactory(totalDbs-1);
+//        }
+//        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+//        redisTemplate.setConnectionFactory(factory);
+//        setSerializer(redisTemplate);
+//        redisTemplate.afterPropertiesSet();
+//        return redisTemplate;
+//    }
+
+    public StringRedisTemplate getStringRedisTemplate(){
+        if(StringUtils.isEmpty(getHost())||getHost().equalsIgnoreCase("null")){
+            log.info("无配置，不需要初始化！");
+            return null;
         }
-        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-        redisTemplate.setConnectionFactory(factory);
-        setSerializer(redisTemplate);
-        redisTemplate.afterPropertiesSet();
-        return redisTemplate;
-    }
-
-    @Bean
-    public StringRedisTemplate stringRedisTemplate() {
         LettuceConnectionFactory factory = null;
         if(totalDbs==1){
             factory = getDbFactory(defaultDb);
@@ -136,6 +139,7 @@ public abstract class AbstractRedisConfig {
         }
         StringRedisTemplate redisTemplate = new StringRedisTemplate();
         redisTemplate.setConnectionFactory(factory);
+        redisTemplate.afterPropertiesSet();
         return redisTemplate;
     }
 

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/config/RedisConfig.java

@@ -2,7 +2,9 @@ package com.liquidnet.common.cache.redis.config;//package com.liquidnet.common.c
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.StringRedisTemplate;
 
 import java.util.List;
 
@@ -38,6 +40,11 @@ public class RedisConfig extends AbstractRedisConfig{
     @Value("${spring.redis.dbs:${spring.redis.database:-1}}")
     private List<Integer> dbs;
 
+    @Bean
+    public StringRedisTemplate stringRedisTemplate() {
+        return this.getStringRedisTemplate();
+    }
+
     String getHost(){
         return this.host;
     }

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -37,11 +37,11 @@ liquidnet:
     port: 6379
     password: 3Xa%8p
     dragon:
-      dbs: 0,16
-      database: 15
-      host: 39.106.122.201
-      port: 6379
-      password: 3Xa%8p
+      database: 255
+      dbs: 0,256
+      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+      port: 6380
+      password: PO@B!Iud32
     sweet:
       dbs: 0,16
       database: 15

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform.yml

@@ -99,42 +99,42 @@ spring:
           max-wait: -1
           max-idle: 8
           min-idle: 0
-    sweet:
-      database: 15
-      dbs: ${liquidnet.redis.sweet.dbs}
-      port: ${liquidnet.redis.sweet.port}
-      host: ${liquidnet.redis.sweet.host}
-      password: ${liquidnet.redis.sweet.password}
-      lettuce:
-        pool:
-          max-active: 8
-          max-wait: -1
-          max-idle: 8
-          min-idle: 0
-    adam:
-      database: 15
-      dbs: ${liquidnet.redis.adam.dbs}
-      port: ${liquidnet.redis.adam.port}
-      host: ${liquidnet.redis.adam.host}
-      password: ${liquidnet.redis.adam.password}
-      lettuce:
-        pool:
-          max-active: 8
-          max-wait: -1
-          max-idle: 8
-          min-idle: 0
-    candy:
-      database: 15
-      dbs: ${liquidnet.redis.candy.dbs}
-      port: ${liquidnet.redis.candy.port}
-      host: ${liquidnet.redis.candy.host}
-      password: ${liquidnet.redis.candy.password}
-      lettuce:
-        pool:
-          max-active: 8
-          max-wait: -1
-          max-idle: 8
-          min-idle: 0
+#    sweet:
+#      database: 15
+#      dbs: ${liquidnet.redis.sweet.dbs}
+#      port: ${liquidnet.redis.sweet.port}
+#      host: ${liquidnet.redis.sweet.host}
+#      password: ${liquidnet.redis.sweet.password}
+#      lettuce:
+#        pool:
+#          max-active: 8
+#          max-wait: -1
+#          max-idle: 8
+#          min-idle: 0
+#    adam:
+#      database: 15
+#      dbs: ${liquidnet.redis.adam.dbs}
+#      port: ${liquidnet.redis.adam.port}
+#      host: ${liquidnet.redis.adam.host}
+#      password: ${liquidnet.redis.adam.password}
+#      lettuce:
+#        pool:
+#          max-active: 8
+#          max-wait: -1
+#          max-idle: 8
+#          min-idle: 0
+#    candy:
+#      database: 15
+#      dbs: ${liquidnet.redis.candy.dbs}
+#      port: ${liquidnet.redis.candy.port}
+#      host: ${liquidnet.redis.candy.host}
+#      password: ${liquidnet.redis.candy.password}
+#      lettuce:
+#        pool:
+#          max-active: 8
+#          max-wait: -1
+#          max-idle: 8
+#          min-idle: 0
 
     redisson:
       singleServerConfig:

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/DataUtils.java

@@ -2,32 +2,27 @@ package com.liquidnet.service.platform.utils;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressRouteVo;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
-import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
-import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
-import com.liquidnet.service.kylin.dto.vo.mongo.*;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.entity.KylinBuyNotice;
 import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
 import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.regex.Pattern;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 
 @Component
 public class DataUtils {
@@ -40,8 +35,6 @@ public class DataUtils {
     private RedisUtil redisUtil;
     @Autowired
     private MongoVoUtils mongoVoUtils;
-    @Autowired
-    private RedisTemplate redisTemplate;
 
     /**
      * 根据 购票须知 id 获取 购票须知文案

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/test/java/com/liquidnet/service/platform/test/TestRedis.java

@@ -33,17 +33,30 @@ public class TestRedis {
     @Autowired
     private RedisDataSourceUtil redisDataSourceUtil;
 
+    @Test
+    public void getRedisQueueList(){
+
+    }
     @Test
     public void pringRedisInitInfo(){
 //        log.info("redisConfig.defaultDb===",redisConfig.defaultDb);
 //        log.info("redisConfig.totalDbs===",redisConfig.totalDbs);
 //        redisConfig.getRedisTemplateByDb(MathUtil.getIndex("1",redisConfig.defaultDb,redisConfig.totalDbs));
 //
-        System.out.println("RedisConfig.totalDbs==="+ redisDataSourceUtil.getRedisDb1Util().getDbs());
-        System.out.println("RedisDb2Config.totalDbs==="+ redisDataSourceUtil.getRedisDb2Util().getDbs());
-        System.out.println("RedisDb3Config.totalDbs==="+ redisDataSourceUtil.getRedisDb3Util().getDbs());
-        System.out.println("RedisDb4Config.totalDbs==="+ redisDataSourceUtil.getRedisDb4Util().getDbs());
-        System.out.println("RedisDb5Config.totalDbs==="+ redisDataSourceUtil.getRedisDb5Util().getDbs());
+        System.out.println("getRedisKylinUtil.totalDbs==="+ redisDataSourceUtil.getRedisKylinUtil().getDbs());
+        System.out.println("getRedisDragonUtil.totalDbs==="+ redisDataSourceUtil.getRedisDragonUtil().getDbs());
+        System.out.println("getRedisSweetUtil.totalDbs==="+ redisDataSourceUtil.getRedisSweetUtil().getDbs());
+        System.out.println("getRedisAdamUtil.totalDbs==="+ redisDataSourceUtil.getRedisAdamUtil().getDbs());
+        System.out.println("getRedisCandyUtil.totalDbs==="+ redisDataSourceUtil.getRedisCandyUtil().getDbs());
+    }
+
+    @Test
+    public void getRedisQueue(){
+        log.info("getRedisKylinUtil.stream===",redisDataSourceUtil.getRedisKylinUtil().getStringRedisTemplate().opsForStream().size("dragon:stream:dragon-pay"));
+        log.info("getRedisDragonUtil.stream===",redisDataSourceUtil.getRedisDragonUtil().getStringRedisTemplate().opsForStream().size("dragon:stream:dragon-pay"));
+//        log.info("getRedisSweetUtil.stream===",redisDataSourceUtil.getRedisSweetUtil().getStringRedisTemplate().opsForStream().size("abc"));
+//        log.info("getRedisAdamUtil.stream===",redisDataSourceUtil.getRedisAdamUtil().getStringRedisTemplate().opsForStream().size("abc"));
+//        log.info("getRedisCandyUtil.stream===",redisDataSourceUtil.getRedisCandyUtil().getStringRedisTemplate().opsForStream().size("abc"));
     }
 
     @Test
@@ -83,49 +96,6 @@ public class TestRedis {
 //        }
     }
 
-    @Test
-    public void getRefundList(){
-//        List<Object> payCodeList = this.getPrefixKeyValue("dragon:pay:code:*");
-//        for(Object payCode:payCodeList){
-//            System.out.println("object=== "+ JsonUtils.toJson(payCode));
-//        }
-        //设置新的redis
-        List<String> keys = getPrefixKeys("dragon:refund:refundCode:dragon:refund:refundCode:*");
-        String url = "";
-        log.info("总共迁移数据条数==="+keys.size());
-        for(String key:keys){
-            Object obj = redisUtil.getRedisTemplateByDb(0).opsForValue().get(key);
-            if(obj!=null){
-                url =  (String) obj;
-            }
-            key = key.substring(25,key.length());
-            redisUtil.set(key,url);
-        }
-//        System.out.println(redisUtil.sGet("kylin:agent:info"));
-//        System.out.println(redisUtil.sHasKey("kylin:agent:info",14));
-
-//        System.out.println(redisUtil.getRedisTemplateByDb(0).opsForValue().get("dragon:pay:code:PAY20210810193315191566757"));
-//
-//        List<Object> values = null;
-//        // 获取所有的key
-//        Set<String> keys = redisUtil.getRedisTemplateByDb(0).keys("dragon:pay:code:*");
-//        if (null != keys){
-//            for(String ss:keys){
-//                System.out.println("ss====="+ss);
-//            }
-//            // 批量获取数据
-//            values = redisUtil.getRedisTemplateByDb(0).opsForValue().multiGet(keys);
-//        }
-//        for(Object payCode:values){
-//            System.out.println("object=== "+ JsonUtils.toJson(payCode));
-//        }
-    }
-
-    @Test
-    public void deleteDataFromDb(){
-
-    }
-
     /**
      * 获取指定前缀的值
      * @param prefix key前缀