redis多数据源

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberCodeAdminController.java

@@ -12,7 +12,7 @@ import com.liquidnet.client.admin.zhengzai.adam.dto.AdamMemberCodeExcelDto;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberCodeAdminService;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberCodeBatchAdminService;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberPriceAdminService;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.adam.dto.admin.AdamMemberCodeGenParam;
 import com.liquidnet.service.adam.dto.admin.AdamMemberCodeListParam;
 import com.liquidnet.service.adam.entity.AdamMemberCode;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamUserMemberAdminController.java

@@ -2,7 +2,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.adam;
 
 import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.enums.BusinessType;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyCouponCodeAdminController.java

@@ -13,7 +13,7 @@ import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
 import com.liquidnet.client.admin.zhengzai.candy.dto.CandyCouponCodeExcelDto;
 import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponCodeAdminService;
 import com.liquidnet.client.admin.zhengzai.candy.service.ICandyUserCouponAdminService;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.candy.constant.CandyRedisConst;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml

@@ -45,11 +45,6 @@
             <artifactId>liquidnet-common-cache-redis</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-cache-redisson</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberCodeAdminServiceImpl.java

@@ -3,7 +3,7 @@ package com.liquidnet.client.admin.zhengzai.adam.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberCodeAdminService;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java

@@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.utils.ShiroUtils;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberOrderAdminService;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.MemberOrderDto;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberPriceAdminServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberPriceAdminService;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.admin.AdamMemberPriceBuildParam;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberRightsAdminServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.common.utils.ShiroUtils;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberRightsAdminService;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.admin.AdamMemberRightsBuildParam;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/AdminUpushServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.enums.UpushTargetType;
@@ -9,7 +10,7 @@ import com.liquidnet.client.admin.zhengzai.kylin.utils.upush.AndroidNotification
 import com.liquidnet.client.admin.zhengzai.kylin.utils.upush.PushClient;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.upush.android.AndroidBroadcast;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.upush.ios.IOSBroadcast;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.vo.admin.AdminUpushVo;
@@ -19,7 +20,6 @@ import com.liquidnet.service.kylin.dto.param.admin.UpushParam;
 import com.liquidnet.service.kylin.dto.param.admin.UpushSearchParam;
 import com.liquidnet.service.kylin.entity.AdminUpush;
 import com.liquidnet.service.kylin.mapper.AdminUpushMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.service.kylin.service.admin.IAdminUpushService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java

@@ -10,7 +10,7 @@ import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberPriceAdminSer
 import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponAdminService;
 import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponRuleAdminService;
 import com.liquidnet.client.admin.zhengzai.candy.service.ICandyMgtCouponAdminService;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
@@ -31,7 +31,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinBannersServiceImpl.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.enums.BannersTargetType;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
+import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
 import com.liquidnet.service.kylin.dto.param.BannersParam;
@@ -22,7 +24,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinDamaiServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.common.utils.DateUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.TaobaoTicketUtils;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.OrderPushDamaiDto;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundExecuteServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam;
-import com.liquidnet.service.kylin.entity.*;
+import com.liquidnet.service.kylin.entity.KylinOrderRefundBatches;
+import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
+import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import com.liquidnet.service.kylin.mapper.KylinOrderRefundBatchesMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderRefundsMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
@@ -15,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundPerformancesAdminServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.utils.ShiroUtils;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ResponseDto;
@@ -24,7 +24,6 @@ import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinZhengzaiAppVersionsServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java

 package com.liquidnet.client.admin.zhengzai.kylin.utils;
 
-import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress;
-import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
@@ -20,7 +19,6 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.ArrayList;
 import java.util.List;
 
 @Component

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java

 package com.liquidnet.client.admin.zhengzai.kylin.utils;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -3,7 +3,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.utils;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/QueueUtils.java

 package com.liquidnet.client.admin.zhengzai.kylin.utils;
 
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.stream.StreamRecords;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
@@ -12,7 +12,7 @@ import java.util.HashMap;
 public class QueueUtils {
 
     @Autowired
-    StringRedisTemplate stringRedisTemplate;
+    RedisDataSourceUtil redisDataSourceUtil;
 
     /**
      * 发送消息 - REDIS
@@ -23,6 +23,6 @@ public class QueueUtils {
     public void sendMsgByRedis(String streamKey, String jsonMsg) {
         HashMap<String, String> map = CollectionUtil.mapStringString();
         map.put("message", jsonMsg);
-        stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
+        redisDataSourceUtil.getRedisKylinUtil().getStringRedisTemplate().opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
     }
 }

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml

@@ -111,10 +111,10 @@ spring:
   redis:
     kylin:
       database: 15
-      dbs: ${liquidnet.redis.dbs}
-      port: ${liquidnet.redis.port}
-      host: ${liquidnet.redis.host}
-      password: ${liquidnet.redis.password}
+      dbs: ${liquidnet.redis.kylin.dbs}
+      port: ${liquidnet.redis.kylin.port}
+      host: ${liquidnet.redis.kylin.host}
+      password: ${liquidnet.redis.kylin.password}
       lettuce:
         pool:
           max-active: 8

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/pom.xml

@@ -23,17 +23,10 @@
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-common-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-cache-redisson</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
-
-
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-service-kylin-api</artifactId>

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

 package com.liquidnet.service.platform.utils;
 
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.stream.StreamRecords;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
@@ -14,7 +14,7 @@ public class QueueUtils {
 //    @Autowired
 //    private RabbitTemplate rabbitTemplate;
     @Autowired
-    StringRedisTemplate stringRedisTemplate;
+    RedisDataSourceUtil redisDataSourceUtil;
 
     /**
      * 发送 SqlMapping Json 字符串
@@ -37,6 +37,6 @@ public class QueueUtils {
     public void sendMsgByRedis(String streamKey, String jsonMsg) {
         HashMap<String, String> map = CollectionUtil.mapStringString();
         map.put("message", jsonMsg);
-        stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
+        redisDataSourceUtil.getRedisKylinUtil().getStringRedisTemplate().opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
     }
 }