redis多数据源

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

@@ -76,6 +76,7 @@ spring:
     virtual-host: ${liquidnet.rabbitmq.virtual-host}
     connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
   redis:
+    kylin:
       database: 15
       dbs: ${liquidnet.redis.kylin.dbs}
       port: ${liquidnet.redis.kylin.port}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/ZhengzaiAppVersionsController.java

 package com.liquidnet.service.platform.controller.basicServices;
 
-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.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.admin.ZhengzaiAppVersionsVo;
@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class ZhengzaiAppVersionsController {
 
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
 
     @PostMapping("/last")
     @ApiOperation("获取最新版本信息")
@@ -42,15 +42,15 @@ public class ZhengzaiAppVersionsController {
         ZhengzaiAppVersionsVo info = null;
         if (1 == appType) {
             if (1 == type) {
-                info = (ZhengzaiAppVersionsVo) redisUtil.get(KylinRedisConst.ZHENGZAI_APP_VERSIONS_IOS);
+                info = (ZhengzaiAppVersionsVo) redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ZHENGZAI_APP_VERSIONS_IOS);
             } else if (2 == type) {
-                info = (ZhengzaiAppVersionsVo) redisUtil.get(KylinRedisConst.ZHENGZAI_APP_VERSIONS_ANDROID);
+                info = (ZhengzaiAppVersionsVo) redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ZHENGZAI_APP_VERSIONS_ANDROID);
             }
         } else if (2 == appType) {
             if (1 == type) {
-                info = (ZhengzaiAppVersionsVo) redisUtil.get(KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_IOS);
+                info = (ZhengzaiAppVersionsVo) redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_IOS);
             } else if (2 == type) {
-                info = (ZhengzaiAppVersionsVo) redisUtil.get(KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_ANDROID);
+                info = (ZhengzaiAppVersionsVo) redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_ANDROID);
             }
         }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/candy/task/CandyCouponDueTaskController.java

@@ -2,7 +2,7 @@ package com.liquidnet.service.platform.controller.candy.task;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-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.base.ResponseDto;
 import com.liquidnet.service.candy.constant.CandyRedisConst;
@@ -51,7 +51,7 @@ import java.util.stream.IntStream;
 @RequestMapping("ccoupon/task/due")
 public class CandyCouponDueTaskController {
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
     @Autowired
     private PlatformCandyCouponService platformCandyCouponService;
     @Autowired
@@ -113,11 +113,11 @@ public class CandyCouponDueTaskController {
                     updateCouponCodeList.forEach(r -> {
                         String ccKey = CandyRedisConst.BASIC_COUPON_CODE.concat(r.getCcode());
 
-                        CandyCouponCodeDto dto = (CandyCouponCodeDto) redisUtil.get(ccKey);
+                        CandyCouponCodeDto dto = (CandyCouponCodeDto) redisDataSourceUtil.getRedisKylinUtil().get(ccKey);
 
                         if (null != dto) {
                             dto.setState(3);
-                            redisUtil.set(ccKey, dto);
+                            redisDataSourceUtil.getRedisKylinUtil().set(ccKey, dto);
                         }
                         pl.getAndIncrement();
                     });
@@ -197,7 +197,7 @@ public class CandyCouponDueTaskController {
             if (!CollectionUtils.isEmpty(updateCommonCouponList)) {
                 if (platformCandyCommonCouponService.updateBatchById(updateCommonCouponList, updateCommonCouponList.size())) {
                     String ccKey = CandyRedisConst.BASIC_COMMON_COUPON;
-                    List<CandyCommonCouponBasicDto> vos = (List<CandyCommonCouponBasicDto>) redisUtil.get(ccKey);
+                    List<CandyCommonCouponBasicDto> vos = (List<CandyCommonCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(ccKey);
 
                     if (!CollectionUtils.isEmpty(vos)) {
                         Map<String, CandyCommonCouponBasicDto> vosMap = vos.stream().collect(Collectors.toMap(CandyCommonCouponBasicDto::getCcouponId, t -> t));
@@ -209,7 +209,7 @@ public class CandyCouponDueTaskController {
                             vos.add(commonCouponBasicDto);
                         });
 
-                        redisUtil.set(ccKey, vos);
+                        redisDataSourceUtil.getRedisKylinUtil().set(ccKey, vos);
                     }
                 } else {
                     throw new LiquidnetServiceException("-1", String.format("券到期处理失败[updateCommonCouponList.size=%s]", updateCommonCouponList.size()));
@@ -272,7 +272,7 @@ public class CandyCouponDueTaskController {
 
                     userCouponListByUidMap.forEach((uid, updateUserCouponListByUid) -> {
                         String uckey = CandyRedisConst.BASIC_USER_COUPON.concat(uid);
-                        List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisUtil.get(uckey);
+                        List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(uckey);
 
                         if (!CollectionUtils.isEmpty(vos)) {
                             updateUserCouponListByUid.forEach(r -> {
@@ -286,7 +286,7 @@ public class CandyCouponDueTaskController {
                                 }
                                 pl.getAndIncrement();
                             });
-                            redisUtil.set(uckey, vos);
+                            redisDataSourceUtil.getRedisKylinUtil().set(uckey, vos);
                         }
                     });
                 } else {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/basicServices/AdminUpushServiceImpl.java

@@ -2,7 +2,7 @@ package com.liquidnet.service.platform.service.basicServices;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.adam.dto.vo.admin.AdminUpushVo;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.entity.AdminUpush;
@@ -34,7 +34,7 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
     MongoTemplate mongoTemplate;
 
     @Autowired
-    RedisUtil redisUtil;
+    RedisDataSourceUtil redisDataSourceUtil;
 
     public PageInfo<AdminUpushVo> lists(HttpServletRequest request, Integer page, Integer size) {
         String source = request.getHeader("source");
@@ -42,9 +42,9 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
         Object adminUpushVo = null;
         if (null != source) {
             if (source.equals("IOS")) {
-                adminUpushVo = redisUtil.get(KylinRedisConst.ADMIN_UPUSH_LIST_IOS);
+                adminUpushVo = redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ADMIN_UPUSH_LIST_IOS);
             } else if (source.equals("Android")) {
-                adminUpushVo = redisUtil.get(KylinRedisConst.ADMIN_UPUSH_LIST_ANDROID);
+                adminUpushVo = redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ADMIN_UPUSH_LIST_ANDROID);
             }
         }
         if (null == adminUpushVo || page > 1) { // 不分页了 大于第一页返回空

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/PlatformMemberRefundService.java

@@ -3,7 +3,7 @@ package com.liquidnet.service.platform.service.impl.adam;
 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.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
@@ -41,7 +41,7 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
     private CandyUserCouponMapper candyUserCouponMapper;
 
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
 
     public boolean refundProcessing(HttpServletRequest request) {
         String refundNo = request.getParameter("orderRefundCode");
@@ -101,21 +101,21 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
         {// 同步用户端信息
             // 同步更新REDIS会员订单信息
             String moKey = AdamRedisConst.INFO_MEMBER_ORDER + memberOrder.getUid();
-            ArrayList<AdamMemberOrderVo> vos = (ArrayList<AdamMemberOrderVo>) redisUtil.get(moKey);
+            ArrayList<AdamMemberOrderVo> vos = (ArrayList<AdamMemberOrderVo>) redisDataSourceUtil.getRedisKylinUtil().get(moKey);
             int idx = IntStream.range(0, vos.size()).filter(i -> vos.get(i).getOrderNo().equals(memberOrder.getOrderNo())).findFirst().orElse(-1);
             AdamMemberOrderVo vo = vos.get(idx);
             vo.setState(5);
             vo.setUpdatedAt(now);
             vos.set(idx, vo);
-            boolean syncVo = redisUtil.set(moKey, vos);
+            boolean syncVo = redisDataSourceUtil.getRedisKylinUtil().set(moKey, vos);
             log.info("###会员退款回调处理成功:更新REDIS会员订单信息{}[orderNo:{},uid:{}]", syncVo ? "成功" : "失败", orderNo, memberOrder.getUid());
 
             String umKey = AdamRedisConst.INFO_USER_MEMBER.concat(memberOrder.getUid());
-            AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisUtil.get(umKey);
+            AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisDataSourceUtil.getRedisKylinUtil().get(umKey);
 
             // 用户会员权益券信息
             String uckey = CandyRedisConst.BASIC_USER_COUPON.concat(memberOrder.getUid());
-            List<CandyUserCouponBasicDto> userCouponBasicDtoList = (List<CandyUserCouponBasicDto>) redisUtil.get(uckey);
+            List<CandyUserCouponBasicDto> userCouponBasicDtoList = (List<CandyUserCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(uckey);
 
             // 同步更新REDIS会员信息
             if (userMemberVo.getState() == 1) {// 非拉黑用户，则更新到期时间为减去订单标记的会员有效期的日期
@@ -131,7 +131,7 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
                 userMemberVo.setExpiryAt(newExpiryAt);
                 userMemberVo.setUpdatedAt(now);
 
-                syncVo = redisUtil.set(umKey, userMemberVo);
+                syncVo = redisDataSourceUtil.getRedisKylinUtil().set(umKey, userMemberVo);
                 log.info("###会员退款回调处理成功:更新REDIS会员信息{}[orderNo:{},uid:{}]", syncVo ? "成功" : "失败", orderNo, memberOrder.getUid());
 
                 // 同步更新MYSQL会员信息
@@ -160,7 +160,7 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
             if (!CollectionUtils.isEmpty(removeUcouponIdList)) {
                 List<String> finalRemoveUcouponIdList = removeUcouponIdList;
                 userCouponBasicDtoList.removeIf(r -> finalRemoveUcouponIdList.contains(r.getUcouponId()));
-                redisUtil.set(uckey, userCouponBasicDtoList);
+                redisDataSourceUtil.getRedisKylinUtil().set(uckey, userCouponBasicDtoList);
 
                 // 同步更新MYSQL用户会员权益券信息
                 LambdaUpdateWrapper<CandyUserCoupon> candyUserCouponLambdaUpdateWrapper = Wrappers.lambdaUpdate(CandyUserCoupon.class);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyCouponService.java

@@ -3,7 +3,7 @@ package com.liquidnet.service.platform.service.impl.candy;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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;
@@ -42,7 +42,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
     @Autowired
     private PlatformAdamUserMemberService platformAdamUserMemberService;
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
 
     private void issueCouponProcessing(final CandyMgtCoupon mgtCoupon, final CandyCoupon coupon) {
         List<CandyCouponRuleDto> couponRuleDtoList = platformCandyCouponRuleService.listForCouponRuleDto(coupon.getCouponId());
@@ -52,7 +52,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
         couponInfoDto.setUseRules(couponRuleDtoList);
 
         String couponInfoDtoKey = CandyRedisConst.BASIC_COUPON_INFO.concat(couponInfoDto.getCouponId());
-        redisUtil.set(couponInfoDtoKey, couponInfoDto);
+        redisDataSourceUtil.getRedisKylinUtil().set(couponInfoDtoKey, couponInfoDto);
 
         switch (coupon.getBindType()) {// 领取方式[0-用户输入兑换｜1-发放至用户]
             case 0:
@@ -111,7 +111,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
         if (!initCouponCodeList.isEmpty()) {
             if (platformCandyCouponCodeService.saveBatch(initCouponCodeList)) {
                 initCouponCodeList.forEach(r -> {
-                    redisUtil.set(CandyRedisConst.BASIC_COUPON_CODE.concat(r.getCcode()), CandyCouponCodeDto.getNew().copy(r));
+                    redisDataSourceUtil.getRedisKylinUtil().set(CandyRedisConst.BASIC_COUPON_CODE.concat(r.getCcode()), CandyCouponCodeDto.getNew().copy(r));
                 });
 
                 initCouponCodeList.clear();
@@ -155,13 +155,13 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
                 initCommonCouponList.forEach(r -> {
                     String ccKey = CandyRedisConst.BASIC_COMMON_COUPON;
 
-                    List<CandyCommonCouponBasicDto> vos = (List<CandyCommonCouponBasicDto>) redisUtil.get(ccKey);
+                    List<CandyCommonCouponBasicDto> vos = (List<CandyCommonCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(ccKey);
                     if (CollectionUtils.isEmpty(vos)) {
                         vos = new ArrayList<>();
                     }
                     vos.add(CandyCommonCouponBasicDto.getNew().copy(r, coupon, couponRuleDtoList));
 
-                    redisUtil.set(ccKey, vos);
+                    redisDataSourceUtil.getRedisKylinUtil().set(ccKey, vos);
                 });
             } else {
                 throw new LiquidnetServiceException("-1", String.format("券发放失败[mcouponId=%s]", mgtCoupon.getMcouponId()));
@@ -223,14 +223,14 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
                     initUserCouponList.forEach(r -> {
                         String uckey = CandyRedisConst.BASIC_USER_COUPON.concat(r.getUid());
 
-                        List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisUtil.get(uckey);
+                        List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(uckey);
 
                         if (CollectionUtils.isEmpty(vos)) {
                             vos = new ArrayList<>();
                         }
                         vos.add(CandyUserCouponBasicDto.getNew().copy(r, coupon, couponRuleDtoList));
 
-                        redisUtil.set(uckey, vos);
+                        redisDataSourceUtil.getRedisKylinUtil().set(uckey, vos);
                     });
                 } else {
                     throw new LiquidnetServiceException("-1", "券发放失败");
@@ -265,7 +265,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
         boolean isMemberRightsCoupon = coupon.getExclusive() == 1;
         for (int i = 0; i < eventAmt; i++) {
             for (String r : eventLimitArr) {
-                String uid = (String) redisUtil.get(AdamRedisConst.IDENTITY_MOBILE.concat(r));
+                String uid = (String) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.IDENTITY_MOBILE.concat(r));
 
                 if (StringUtils.isNotEmpty(uid)) {
                     CandyUserCoupon userCoupon = new CandyUserCoupon();
@@ -277,7 +277,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
 
                     userCoupon.setBindAt(coupon.getEffectAt());
                     if (isMemberRightsCoupon) {
-                        AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
+                        AdamUserMemberVo vo = (AdamUserMemberVo) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
                         userCoupon.setDuedAt(vo.getExpiryAt());
                     } else {
                         userCoupon.setDuedAt(coupon.getExpireAt());
@@ -296,14 +296,14 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
                 initUserCouponList.forEach(r -> {
                     String uckey = CandyRedisConst.BASIC_USER_COUPON.concat(r.getUid());
 
-                    List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisUtil.get(uckey);
+                    List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(uckey);
 
                     if (CollectionUtils.isEmpty(vos)) {
                         vos = new ArrayList<>();
                     }
                     vos.add(CandyUserCouponBasicDto.getNew().copy(r, coupon, couponRuleDtoList));
 
-                    redisUtil.set(uckey, vos);
+                    redisDataSourceUtil.getRedisKylinUtil().set(uckey, vos);
                 });
             } else {
                 throw new LiquidnetServiceException("-1", String.format("券发放失败[mcouponId=%s]", mgtCoupon.getMcouponId()));

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyUserCouponService.java

@@ -2,7 +2,7 @@ package com.liquidnet.service.platform.service.impl.candy;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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.OrderCloseMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -39,7 +39,7 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
     @Autowired
     private QueueUtils queueUtils;
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
 
     /**
      * @param uCouponUidList 内容 uCouponId,uid List
@@ -70,7 +70,7 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
     }
 
     public List<CandyUserCouponBasicDto> ucouponBasicDtoByUidProcessing(String uid) {
-        if (null == redisUtil.get(AdamRedisConst.INFO_USER.concat(uid))) return null;
+        if (null == redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.INFO_USER.concat(uid))) return null;
 
         List<CandyUserCouponBasicDto> basicDtoList = candyUserCouponMapper.selectMultiForUserCouponBasicDto(uid);
         if (!CollectionUtils.isEmpty(basicDtoList)) {
@@ -86,7 +86,7 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
                 dto.setUseRules(couponRuleDtoListMap.get(dto.getCouponId()));
             });
 
-            redisUtil.set(CandyRedisConst.BASIC_USER_COUPON.concat(uid), basicDtoList);
+            redisDataSourceUtil.getRedisKylinUtil().set(CandyRedisConst.BASIC_USER_COUPON.concat(uid), basicDtoList);
         }
         return basicDtoList;
     }
@@ -104,7 +104,7 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
                 dto.setUseRules(couponRuleDtoListMap.get(dto.getCouponId()));
             });
 
-            redisUtil.set(CandyRedisConst.BASIC_COMMON_COUPON, basicDtoList);
+            redisDataSourceUtil.getRedisKylinUtil().set(CandyRedisConst.BASIC_COMMON_COUPON, basicDtoList);
         }
         return basicDtoList;
     }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
@@ -84,7 +85,7 @@ public class DataImpl {
     @Autowired
     private DataUtils dataUtils;
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
 
     public boolean performance() {
         try {
@@ -155,7 +156,7 @@ public class DataImpl {
                         performances.setDescribes(resultData.getString("describe"));
                         performances.setDetails(resultData.getString("detail"));
                         performances.setCityId(Integer.parseInt(resultData.getString("city_id")));
-                        performances.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + resultData.getInt("field_id"), "city_name"));
+                        performances.setCityName((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + resultData.getInt("field_id"), "city_name"));
                         performances.setNoticeImage("[{\"id\":1,\"sort\":1,\"message\":\"因演出票品非普通商品，其背后承载的文化服务具有时效性、稀缺性等特征，故不适用7天无理由退货政策。因“不可抗力”导致的演出取消或延期除外。\",\"title\":\"门票退换\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c45722882a13.png\"},{\"id\":7,\"sort\":2,\"message\":\"凭订单二维码或手机号兑票入场，二维码或手机号请勿泄露，以免影响入场。个人原因导致的信息泄露，主办方/平台方不承担任何责任。\",\"title\":\"电子票\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456d9482fb9.png\"},{\"id\":3,\"sort\":3,\"message\":\"本场演出不设座位，均为站席观演。\",\"title\":\"仅设站席\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456e93db0b9.png\"},{\"id\":12,\"sort\":4,\"message\":\"每场现场票数量由场地方决定，具体请到现场询问。\",\"title\":\"现场票\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/06/17/5d07647eaa55f.png\"}]");
                         performances.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("time_start").toString()));
                         performances.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("time_end").toString()));
@@ -208,7 +209,7 @@ public class DataImpl {
                         performancePartnerVo.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(performances.getTimeStart()));
                         performancePartnerVo.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmss.format(performances.getTimeEnd()));
                         performancePartnerVo.setFieldId(performanceRelations.getFieldId());
-                        performancePartnerVo.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "name"));
+                        performancePartnerVo.setFieldName((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "name"));
                         performancePartnerVo.setNotice(performances.getNotice());
                         performancePartnerVo.setSponsorId(performances.getSponsorId());
                         performancePartnerVo.setSponsorType(performances.getSponsorType());
@@ -677,7 +678,7 @@ public class DataImpl {
                     orderTicketVo.setNoticeImage("[{\"id\":1,\"sort\":1,\"message\":\"因演出票品非普通商品，其背后承载的文化服务具有时效性、稀缺性等特征，故不适用7天无理由退货政策。因“不可抗力”导致的演出取消或延期除外。\",\"title\":\"门票退换\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c45722882a13.png\"},{\"id\":7,\"sort\":2,\"message\":\"凭订单二维码或手机号兑票入场，二维码或手机号请勿泄露，以免影响入场。个人原因导致的信息泄露，主办方/平台方不承担任何责任。\",\"title\":\"电子票\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456d9482fb9.png\"},{\"id\":3,\"sort\":3,\"message\":\"本场演出不设座位，均为站席观演。\",\"title\":\"仅设站席\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456e93db0b9.png\"},{\"id\":12,\"sort\":4,\"message\":\"每场现场票数量由场地方决定，具体请到现场询问。\",\"title\":\"现场票\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/06/17/5d07647eaa55f.png\"}]");
                     orderTicketVo.setNotice(notice);
                     orderTicketVo.setTicketType(ticketType);
-                    orderTicketVo.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + orderTicketRelations.getPerformanceId(), "name"));
+                    orderTicketVo.setFieldName((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + orderTicketRelations.getPerformanceId(), "name"));
 
                     //入场人
                     String enterSql = "select * from order_ticket_entities where order_id = " + orderTickets.getOrderTicketsId(); //设置的预编译语句格式

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

@@ -4,7 +4,7 @@ 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.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;
@@ -64,7 +64,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     private MongoConverter mongoConverter;
 
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
 
     @Autowired
     private DataUtils dataUtils;
@@ -142,7 +142,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             performancePartnerVo.setRoadShowId("0");
             performancePartnerVo.setProjectId("0");
             performancePartnerVo.setIsShow(1);
-            performancePartnerVo.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performancePartnerVo.getFieldId(), "name"));
+            performancePartnerVo.setFieldName((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performancePartnerVo.getFieldId(), "name"));
             performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
 
             mongoTemplate.insert(
@@ -176,7 +176,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             performancePartnerVo.setIsSubmit(0);
             performancePartnerVo.setStatus(0);
             performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
-            performancePartnerVo.setFieldName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performancePartnerVo.getFieldId(), "name"));
+            performancePartnerVo.setFieldName((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performancePartnerVo.getFieldId(), "name"));
             performancePartnerVo.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
             if (data != null) { // 有修改记录
                 performancePartnerVo.setIsTrueName(data.getIsTrueName());
@@ -395,7 +395,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         List<KylinTicketPartnerVo> ticketList = timesItem.getTicket();
                         for (KylinTicketPartnerVo ticketItem : ticketList) {
                             //修改 redis库存
-                            if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId() + ":" + KylinRedisConst.SURPLUS_GENERAL)) {
+                            if (redisDataSourceUtil.getRedisKylinUtil().hasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId() + ":" + KylinRedisConst.SURPLUS_GENERAL)) {
                                 KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, ticketItem.getTicketsId()));
                                 int changeGeneral = ticketItem.getTotalGeneral() - ticketStatus.getTotalGeneral();
                                 int changeExchange = ticketItem.getTotalExchange() - ticketStatus.getTotalExchange();

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

 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.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;
@@ -39,7 +39,7 @@ public class MongoVoUtils {
     @Autowired
     private KylinTicketRelationsMapper ticketRelationsMapper;
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
     @Autowired
     private DataUtils dataUtils;
 
@@ -53,12 +53,12 @@ public class MongoVoUtils {
             KylinPerformanceRelations p3 = performanceRelationsMapper.selectOne(new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performancesId));
             //场地相关数据
             KylinFields fields = new KylinFields();
-            String cityName = (String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name");
-            fields.setCityId(Integer.parseInt((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_id")));
-            fields.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "latitude"));
-            fields.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "longitude"));
-            fields.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name"));
-            fields.setName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "name"));
+            String cityName = (String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name");
+            fields.setCityId(Integer.parseInt((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_id")));
+            fields.setLatitude((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "latitude"));
+            fields.setLongitude((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "longitude"));
+            fields.setCityName((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name"));
+            fields.setName((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "name"));
 
             //相关状态时间初始变量
             LocalDateTime stopSellTime = null;

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

 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.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;
@@ -52,7 +52,7 @@ public class PerformanceVoTask {
     @Autowired
     private DataUtils dataUtils;
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
     @Autowired
     private MongoVoUtils mongoVoUtils;
 
@@ -258,8 +258,8 @@ public class PerformanceVoTask {
             performances.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(kylinPerformanceMisVo.getCreatedAt())));
             performances.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(kylinPerformanceMisVo.getTimeStart())));
             performances.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(kylinPerformanceMisVo.getTimeEnd())));
-            performances.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_name"));
-            performances.setCityId(Integer.parseInt((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_id")));
+            performances.setCityName((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_name"));
+            performances.setCityId(Integer.parseInt((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_id")));
             performances.setUpdatedAt(updatedAt);
 
             performanceStatus.setPerformanceId(performances.getPerformancesId());

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

 package com.liquidnet.service.platform.test;
 
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.dragon.dto.DragonOrdersDto;
 import lombok.extern.slf4j.Slf4j;
@@ -31,8 +30,6 @@ import java.util.Set;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
 public class TestRedis {
-    @Autowired
-    private RedisUtil redisUtil;
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
@@ -68,8 +65,8 @@ public class TestRedis {
      */
     @Test
     public void oldPringRedisInitInfo(){
-        redisUtil.set("testoldRedis","12345");
-        System.out.println("getRedisKylinUtil.get==="+ redisUtil.get("testoldRedis"));
+        redisDataSourceUtil.getRedisKylinUtil().set("testoldRedis","12345");
+        System.out.println("getRedisKylinUtil.get==="+ redisDataSourceUtil.getRedisKylinUtil().get("testoldRedis"));
         System.out.println("getRedisDragonUtil.totalDbs==="+ redisDataSourceUtil.getRedisDragonUtil().getDbs());
     }
 
@@ -108,26 +105,26 @@ public class TestRedis {
         log.info("总共迁移数据条数==="+keys.size());
         DragonOrdersDto dragonOrdersDto = DragonOrdersDto.getNew();
         for(String key:keys){
-            Object obj = redisUtil.getRedisTemplateByDb(0).opsForValue().get(key);
+            Object obj = redisDataSourceUtil.getRedisKylinUtil().getRedisTemplateByDb(0).opsForValue().get(key);
             if(obj!=null){
                 dragonOrdersDto =  (DragonOrdersDto) obj;
             }
-//            redisUtil.set(key,dragonOrdersDto);
+//            redisDataSourceUtil.getRedisKylinUtil().set(key,dragonOrdersDto);
         }
-//        System.out.println(redisUtil.sGet("kylin:agent:info"));
-//        System.out.println(redisUtil.sHasKey("kylin:agent:info",14));
+//        System.out.println(redisDataSourceUtil.getRedisKylinUtil().sGet("kylin:agent:info"));
+//        System.out.println(redisDataSourceUtil.getRedisKylinUtil().sHasKey("kylin:agent:info",14));
 
-//        System.out.println(redisUtil.getRedisTemplateByDb(0).opsForValue().get("dragon:pay:code:PAY20210810193315191566757"));
+//        System.out.println(redisDataSourceUtil.getRedisKylinUtil().getRedisTemplateByDb(0).opsForValue().get("dragon:pay:code:PAY20210810193315191566757"));
 //
 //        List<Object> values = null;
 //        // 获取所有的key
-//        Set<String> keys = redisUtil.getRedisTemplateByDb(0).keys("dragon:pay:code:*");
+//        Set<String> keys = redisDataSourceUtil.getRedisKylinUtil().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);
+//            values = redisDataSourceUtil.getRedisKylinUtil().getRedisTemplateByDb(0).opsForValue().multiGet(keys);
 //        }
 //        for(Object payCode:values){
 //            System.out.println("object=== "+ JsonUtils.toJson(payCode));
@@ -142,13 +139,13 @@ public class TestRedis {
     public List<Object> getPrefixKeyValue(String prefix) {
         List<Object> values = null;
         // 获取所有的key
-        Set<String> keys = redisUtil.getRedisTemplateByDb(0).keys(prefix);
+        Set<String> keys = redisDataSourceUtil.getRedisKylinUtil().getRedisTemplateByDb(0).keys(prefix);
         if (null != keys){
             for(String ss:keys){
                 System.out.println("ss====="+ss);
             }
             // 批量获取数据
-            values = redisUtil.getRedisTemplateByDb(0).opsForValue().multiGet(keys);
+            values = redisDataSourceUtil.getRedisKylinUtil().getRedisTemplateByDb(0).opsForValue().multiGet(keys);
         }
         return values;
     }
@@ -161,7 +158,7 @@ public class TestRedis {
     public List<String> getPrefixKeys(String prefix) {
         List<String> keysList = new ArrayList<>();
         // 获取所有的key
-        Set<String> keys = redisUtil.getRedisTemplateByDb(0).keys(prefix);
+        Set<String> keys = redisDataSourceUtil.getRedisKylinUtil().getRedisTemplateByDb(0).keys(prefix);
         if (null != keys){
             for(String ss:keys){
                 keysList.add(ss);