Merge branch 'pre' into jxl_apply_push_1122

docu/dev_stone.sql

@@ -10,9 +10,12 @@ create table stone_score_logs
     overdue_at  datetime comment '过期时间',
     created_at datetime ,
     updated_at datetime ,
-    comment    text
+    comment    text,
+     KEY `stone_score_logs_uid_index` (`uid`),
+     KEY `stone_score_logs_logsId_index` (`logs_id`)
 ) engine = InnoDB comment '积分日志表';
 
+
 drop table if exists stone_score_items;
 create table stone_score_items
 (
@@ -34,7 +37,10 @@ create table stone_score_items
     end_time datetime NULL  COMMENT '定时下架-时间',
     created_at datetime ,
     updated_at datetime ,
-    comment    text
+    comment    text,
+    KEY `stone_score_items_item_id_index` (`item_id`),
+    KEY `stone_score_items_target_id_index` (`target_id`),
+    KEY `stone_score_items_status_index` (`status`)
 ) engine = InnoDB comment '积分物品表';
 
 drop table if exists stone_score_user;
@@ -46,7 +52,8 @@ create table stone_score_user
     status int default 1 comment '状态[1-正常|2-冻结]',
     created_at datetime ,
     updated_at datetime ,
-    comment    text
+    comment    text,
+    KEY `stone_score_user_uid_index` (`uid`)
 ) engine = InnoDB comment '积分用户表';
 
 drop table if exists stone_score_order;
@@ -74,7 +81,9 @@ create table stone_score_order
     pay_status             tinyint        NOT NULL DEFAULT 0 COMMENT '支付状态[0-未支付|1-已支付|2-支付失败]',
     created_at datetime ,
     updated_at datetime ,
-    comment    text
+    comment    text,
+     KEY `stone_score_order_uid_index` (`uid`),
+     KEY `stone_score_order_status_index` (`status`),
 ) engine = InnoDB comment '积分订单表';
 
 

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-easemob/src/main/java/com/liquidnet/common/third/easemob/util/EasemobUtil.java

@@ -12,6 +12,7 @@ import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.commons.lang.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
@@ -98,21 +99,20 @@ public class EasemobUtil{
 //        ObjectNode objectNode = JsonUtils.OM().createObjectNode();
         try {
             response = HttpUtil.postJson(requestUrl,json.toString(),commonHeader);
-        }
-        catch(HttpClientErrorException e){
+        } catch(HttpClientErrorException e) {
+            log.error("createUser error", e);
             if(e.getRawStatusCode() == 400){
                 JSONObject jsonObject = JsonUtils.fromJson(e.getResponseBodyAsString(), new TypeReference<JSONObject>() {});
-                log.info("createUser error : {}",jsonObject.get("error"));
-                log.info("createUser error_description : {}",jsonObject.get("error_description"));
                 return jsonObject.toJSONString();
             }
-
         }catch (Exception e) {
-            e.printStackTrace();
-            log.error("createUser error : {}",e);
+            log.error("createUser error",e);
         }
         log.info("createUsers--->>> response : {} ",response);
 
+        if (StringUtils.isEmpty(response)) {
+            return response;
+        }
         ObjectNode jsonObject = JsonUtils.fromJson(response,ObjectNode.class);
         ArrayNode arrayNode = (ArrayNode)jsonObject.get("entities");
         response = arrayNode.get(0).toString();

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

@@ -52,15 +52,15 @@ liquidnet:
     adam:
       database: 255
       dbs: 0,256
-      host: r-2ze3sf1ll8er966uuc.redis.rds.aliyuncs.com
+      host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
       port: 6380
-      password: Qwer1234
+      password: PO@B!Iud32
     candy:
       database: 255
       dbs: 0,256
-      host: r-2zem98z0tongsw3fpc.redis.rds.aliyuncs.com
+      host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
       port: 6380
-      password: Qwer1234
+      password: PO@B!Iud32
   mongodb:
     host: 39.107.71.112:27017
     port: 27017

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

@@ -3,7 +3,7 @@ server:
   tomcat:
     uri-encoding: UTF-8
     maxThreads: 2000 #默认200
-    minSpareThreads: 2000 #默认10
+    minSpareThreads: 200 #默认10
     maxConnections: 20000 #默认10000
     acceptCount: 5000  #默认100
     processorCache: 5000  #默认200

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

@@ -58,7 +58,7 @@ info:
     version: '@project.version@'
 # -----------------------------------------------------------
 mybatis-plus:
-  mapper-locations: classpath:com.liquidnet.service.*.mapper/*Mapper.xml,classpath:com.liquidnet.service.kylin.mapper/*Mapper.xml
+  mapper-locations: classpath*:com.liquidnet.service.*.mapper/*Mapper.xml
 # -----------------------------------------------------------
 spring:
   application:

liquidnet-bus-do/liquidnet-service-stone-do/src/main/java/com/liquidnet/service/stone/entity/StoneScoreUser.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.liquidnet.service.stone.dto.StoneScoreListDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,7 +19,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class StoneScoreUser implements Serializable {
+public class StoneScoreUser implements Serializable,Cloneable {
 
     private static final long serialVersionUID = 1L;
 
@@ -46,4 +48,14 @@ public class StoneScoreUser implements Serializable {
     private String comment;
 
 
+    private static final StoneScoreUser obj = new StoneScoreUser();
+    public static StoneScoreUser getNew() {
+        try {
+            return (StoneScoreUser) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new StoneScoreUser();
+    }
+
 }

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

@@ -83,7 +83,7 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
                 JSONObject jsonObject = null;
                 try {
                     // 138cef91a62088bd3ef329fa3a6176cb18a > 138CEF91A62088BD3EF329FA3A6176CB18A > IM@zhengzai
-                    String result = easemobUtil.createUser(existUserInfoVo.getUid(), ppwd, existUserInfoVo.getNickname());
+                    String result = easemobUtil.createUser(existUserInfoVo.getUid(), ppwd, parameter.getNickname());
                     jsonObject = JSONObject.parseObject(result);
                 } catch (Exception e) {
                     log.error("###编辑资料:注册IM异常[uid:{},mobile:{}]", existUserInfoVo.getUid(), existUserInfoVo.getMobile());

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/ServiceNotifyApplication.java

@@ -5,12 +5,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.core.env.Environment;
 
 import java.net.InetAddress;
 import java.util.Arrays;
 
 @Slf4j
+@EnableFeignClients(basePackages = {"com.liquidnet"})
 @SpringBootApplication(scanBasePackages = {"com.liquidnet"})
 public class ServiceNotifyApplication implements CommandLineRunner {
     @Autowired

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/docu/mongo_db.sql

@@ -18,9 +18,9 @@ db.StoneUserVo.createIndex({uid:"hashed"});
 
 #创建分片
 sh.enableSharding("prod_ln_scene");
-sh.shardCollection("prod_ln_scene.StoneOrderListVo",{"orderId":"hashed"});
+sh.shardCollection("prod_ln_scene.StoneOrderListVo",{"uid":"hashed"});
 sh.shardCollection("prod_ln_scene.StoneScoreItems",{"itemId":"hashed"});
-sh.shardCollection("prod_ln_scene.StoneScoreLogs",{"logsId":"hashed"});
+sh.shardCollection("prod_ln_scene.StoneScoreLogs",{"uid":"hashed"});
 sh.shardCollection("prod_ln_scene.StoneUserVo",{"uid":"hashed"});
 
 

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,6 +205,7 @@ public class UserDataServiceImpl {
             for (SweetAppletUser info : sweetAppletUsers) {
                 SweetAppletUsersVo oldInfo = redisUtils.getSweetAppletUsersOfPhone(info.getGetPurePhoneNumber());
                 if (null == oldInfo) {
+                    try {
                         ResponseDto<AdamUserInfoVo> userInfoVo = feignAdamBaseClient.registerByMobile(info.getGetPurePhoneNumber());
                         AdamUserInfoVo userInfoVoData = userInfoVo.getData();
                         String userId = userInfoVoData.getUid();
@@ -237,6 +240,9 @@ public class UserDataServiceImpl {
                         sweetAppletUsersVo.setCountryCode(info.getGetCountryCode());
                         sweetAppletUsersVo.setType(info.getType());
                         redisUtils.setSweetAppletUsers(sweetAppletUsersVo);
+                    } catch (Exception e) {
+                        log.error("feignAdamBaseClientException phone:{}, e:{}", info.getGetPurePhoneNumber(), e);
+                    }
                 }
             }
         }