Merge branch 'pre' into 'master'

Pre

See merge request !120

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/syncRedis/RedisDataController.java

@@ -29,7 +29,7 @@ public class RedisDataController {
      * basicServices
      * @return
      */
-    @PostMapping("basicServices/versions")
+    /*@PostMapping("basicServices/versions")
     @ApiOperation("basicServices版本控制数据迁移-可以通过后台编辑")
     public ResponseDto<Boolean> basicServicesVersions() {
         Boolean result = redisDataService.basicServicesVersions();
@@ -43,10 +43,10 @@ public class RedisDataController {
         return ResponseDto.success(result);
     }
 
-    /**
+    *//**
      * kylin
      * @return
-     */
+     *//*
     @PostMapping("kylin/banner")
     @ApiOperation("kylin-banner数据迁移-可以通过后台编辑")
     public ResponseDto<Boolean> kylinBanner() {
@@ -54,10 +54,10 @@ public class RedisDataController {
         return ResponseDto.success(result);
     }
 
-    /**
+    *//**
      * sweet
      * @return
-     */
+     *//*
     @PostMapping("sweet/accessToken")
     @ApiOperation("sweet-AccessToken数据迁移-可不迁可自动生成")
     public ResponseDto<Boolean> sweetAccessToken() {
@@ -91,7 +91,7 @@ public class RedisDataController {
     public ResponseDto<Boolean> sweetUnionIdStr() {
         Boolean result = redisDataService.sweetUnionIdStr();
         return ResponseDto.success(result);
-    }
+    }*/
 
     @PostMapping("sweet/cityVote3")
     @ApiOperation("sweet-cityVote3数据迁移")

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/syncRedis/RedisDataServiceImpl.java

@@ -12,6 +12,7 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.admin.ZhengzaiAppVersionsVo;
 import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.liquidnet.service.sweet.entity.SweetWechatUser;
+import com.liquidnet.service.sweet.param.SweetCityVoteParam;
 import com.liquidnet.service.sweet.vo.SweetAnswerVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +32,7 @@ public class RedisDataServiceImpl {
     @Autowired
     private RedisUtil redisUtil;
 
-    private static final JedisPool jedisPool;
+    /*private static final JedisPool jedisPool;
     private static final ObjectMapper toObjMapper;
 
     static {
@@ -49,7 +50,7 @@ public class RedisDataServiceImpl {
 
     private Jedis getRedis() {
         Jedis resource = jedisPool.getResource();
-        resource.auth("NBs$%6hW"); // 线上
+        resource.auth("java:1ICjLqCyMPk7"); // 线上
 //        resource.auth("PO@B!Iud32"); // test
         resource.select(15);
         return resource;
@@ -212,24 +213,22 @@ public class RedisDataServiceImpl {
             log.error("kylinBannerError", e);
             return false;
         }
-    }
+    }*/
 
     public Boolean cityVote3() {
         try {
-            Jedis redis = getRedis();
-
             String redisKey = "sweet:cityVote3:cityCode*";
 
-            Set<String> keys = redis.keys(redisKey);
+            Set<String> keys = redisUtil.getRedisTemplateByDb(15).keys(redisKey);
             for (String key : keys) {
-                String value = redis.get(key);
+                Integer value = (Integer) redisUtil.getDB15RedisGet(key);
                 redisUtil.set(key, value);
             }
 
             String redisKey2 = "sweet:cityVote3:user*";
-            Set<String> keys2 = redis.keys(redisKey2);
+            Set<String> keys2 = redisUtil.getRedisTemplateByDb(15).keys(redisKey2);
             for (String key : keys2) {
-                String value = redis.get(key);
+                SweetCityVoteParam value = (SweetCityVoteParam) redisUtil.getDB15RedisGet(key);
                 redisUtil.set(key, value);
             }
 
@@ -242,20 +241,18 @@ public class RedisDataServiceImpl {
 
     public Boolean cityVote4() {
         try {
-            Jedis redis = getRedis();
-
             String redisKey = "sweet:cityVote4:cityCode*";
 
-            Set<String> keys = redis.keys(redisKey);
+            Set<String> keys = redisUtil.getRedisTemplateByDb(15).keys(redisKey);
             for (String key : keys) {
-                String value = redis.get(key);
+                Integer value = (Integer) redisUtil.getDB15RedisGet(key);
                 redisUtil.set(key, value);
             }
 
             String redisKey2 = "sweet:cityVote4:user*";
-            Set<String> keys2 = redis.keys(redisKey2);
+            Set<String> keys2 = redisUtil.getRedisTemplateByDb(15).keys(redisKey2);
             for (String key : keys2) {
-                String value = redis.get(key);
+                SweetCityVoteParam value = (SweetCityVoteParam) redisUtil.getDB15RedisGet(key);
                 redisUtil.set(key, value);
             }
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/syncRedis/UserDataServiceImpl.java

@@ -11,6 +11,8 @@ import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
 import com.liquidnet.service.sweet.config.WechatMpConfigure;
 import com.liquidnet.service.sweet.entity.SweetAppletUser;
+import com.liquidnet.service.sweet.entity.SweetAppletUsers;
+import com.liquidnet.service.sweet.entity.SweetWechatUsers;
 import com.liquidnet.service.sweet.mapper.SweetAppletUserMapper;
 import com.liquidnet.service.sweet.mapper.SweetAppletUsersMapper;
 import com.liquidnet.service.sweet.mapper.SweetWechatUsersMapper;
@@ -203,40 +205,44 @@ public class UserDataServiceImpl {
             for (SweetAppletUser info : sweetAppletUsers) {
                 SweetAppletUsersVo oldInfo = redisUtils.getSweetAppletUsersOfPhone(info.getGetPurePhoneNumber());
                 if (null == oldInfo) {
-                    ResponseDto<AdamUserInfoVo> userInfoVo = feignAdamBaseClient.registerByMobile(info.getGetPurePhoneNumber());
-                    AdamUserInfoVo userInfoVoData = userInfoVo.getData();
-                    String userId = userInfoVoData.getUid();
-
-                    LinkedList<String> sqlsA = CollectionUtil.linkedListString();
-                    LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
-                    sqlsA.add(SqlMapping.get("sweet_applet_users.insert"));
-                    sqlsDataA.add(new Object[]{
-                            info.getUserId(), userId, info.getOpenId(), info.getUnionId(), info.getGetPhoneNumber(), info.getGetPurePhoneNumber(), info.getGetCountryCode(), info.getType()
-                    });
-                    queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_USER_INSERT.getKey(),
-                            SqlMapping.gets(sqlsA, sqlsDataA));
-
-                    /*SweetAppletUsers sweetAppletUsers1 = new SweetAppletUsers();
-                    sweetAppletUsers1.setAppletUserId(info.getUserId());
-                    sweetAppletUsers1.setUserId(userId);
-                    sweetAppletUsers1.setOpenId(info.getOpenId());
-                    sweetAppletUsers1.setUnionId(info.getUnionId());
-                    sweetAppletUsers1.setPhoneNumber(info.getGetPhoneNumber());
-                    sweetAppletUsers1.setPurePhoneNumber(info.getGetPurePhoneNumber());
-                    sweetAppletUsers1.setCountryCode(info.getGetCountryCode());
-                    sweetAppletUsers1.setType(info.getType());
-                    appletUsersMapper.insert(sweetAppletUsers1);*/
-
-                    SweetAppletUsersVo sweetAppletUsersVo = SweetAppletUsersVo.getNew();
-                    sweetAppletUsersVo.setAppletUserId(info.getUserId());
-                    sweetAppletUsersVo.setUserId(userId);
-                    sweetAppletUsersVo.setOpenId(info.getOpenId());
-                    sweetAppletUsersVo.setUnionId(info.getUnionId());
-                    sweetAppletUsersVo.setPhoneNumber(info.getGetPhoneNumber());
-                    sweetAppletUsersVo.setPurePhoneNumber(info.getGetPurePhoneNumber());
-                    sweetAppletUsersVo.setCountryCode(info.getGetCountryCode());
-                    sweetAppletUsersVo.setType(info.getType());
-                    redisUtils.setSweetAppletUsers(sweetAppletUsersVo);
+                    try {
+                        ResponseDto<AdamUserInfoVo> userInfoVo = feignAdamBaseClient.registerByMobile(info.getGetPurePhoneNumber());
+                        AdamUserInfoVo userInfoVoData = userInfoVo.getData();
+                        String userId = userInfoVoData.getUid();
+
+                        LinkedList<String> sqlsA = CollectionUtil.linkedListString();
+                        LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+                        sqlsA.add(SqlMapping.get("sweet_applet_users.insert"));
+                        sqlsDataA.add(new Object[]{
+                                info.getUserId(), userId, info.getOpenId(), info.getUnionId(), info.getGetPhoneNumber(), info.getGetPurePhoneNumber(), info.getGetCountryCode(), info.getType()
+                        });
+                        queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_USER_INSERT.getKey(),
+                                SqlMapping.gets(sqlsA, sqlsDataA));
+
+                        /*SweetAppletUsers sweetAppletUsers1 = new SweetAppletUsers();
+                        sweetAppletUsers1.setAppletUserId(info.getUserId());
+                        sweetAppletUsers1.setUserId(userId);
+                        sweetAppletUsers1.setOpenId(info.getOpenId());
+                        sweetAppletUsers1.setUnionId(info.getUnionId());
+                        sweetAppletUsers1.setPhoneNumber(info.getGetPhoneNumber());
+                        sweetAppletUsers1.setPurePhoneNumber(info.getGetPurePhoneNumber());
+                        sweetAppletUsers1.setCountryCode(info.getGetCountryCode());
+                        sweetAppletUsers1.setType(info.getType());
+                        appletUsersMapper.insert(sweetAppletUsers1);*/
+
+                        SweetAppletUsersVo sweetAppletUsersVo = SweetAppletUsersVo.getNew();
+                        sweetAppletUsersVo.setAppletUserId(info.getUserId());
+                        sweetAppletUsersVo.setUserId(userId);
+                        sweetAppletUsersVo.setOpenId(info.getOpenId());
+                        sweetAppletUsersVo.setUnionId(info.getUnionId());
+                        sweetAppletUsersVo.setPhoneNumber(info.getGetPhoneNumber());
+                        sweetAppletUsersVo.setPurePhoneNumber(info.getGetPurePhoneNumber());
+                        sweetAppletUsersVo.setCountryCode(info.getGetCountryCode());
+                        sweetAppletUsersVo.setType(info.getType());
+                        redisUtils.setSweetAppletUsers(sweetAppletUsersVo);
+                    } catch (Exception e) {
+                        log.error("feignAdamBaseClientException phone:{}, e:{}", info.getGetPurePhoneNumber(), e);
+                    }
                 }
             }
         }