Merge branch 'dev' into test

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

@@ -19,14 +19,11 @@ import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
@@ -190,7 +187,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+//    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void bindTpa(String uid, AdamThirdPartParam param) {
         LocalDateTime now = LocalDateTime.now();
 
@@ -223,7 +220,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+//    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void bindTpaForce(String bindUid, String unBindUid, AdamThirdPartParam param) {
         this.unBindTpaProcess(unBindUid, param.getPlatform());
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetActionCallbackController.java → liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatActionCallbackController.java

@@ -13,7 +13,7 @@ import java.io.PrintWriter;
 @RestController
 @RequestMapping("/actionCallback")
 @Slf4j
-public class SweetActionCallbackController {
+public class SweetWechatActionCallbackController {
 
     @GetMapping("record")
     @ApiOperation("get")

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetLoginController.java → liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatLoginController.java

@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "小程序登陆")
 @RestController
-@RequestMapping("/sweet-login")
-public class SweetLoginController {
+@RequestMapping("/wechatLogin")
+public class SweetWechatLoginController {
 
     @Autowired
     private SweetLoginServiceImpl sweetLoginService;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetTemplateController.java → liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatTemplateController.java

@@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "公众号模版消息")
 @RestController
-@RequestMapping("/sweet-template")
-public class SweetTemplateController {
+@RequestMapping("/wechatTemplate")
+public class SweetWechatTemplateController {
 
     @Autowired
     private SweetTemplateServiceImpl sweetTemplateService;

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

@@ -3,7 +3,6 @@ package com.liquidnet.service.sweet.service.impl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
-//import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
@@ -21,7 +20,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.List;
 import java.util.Set;
 
 /**

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
-//import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.SweetManualAppletDto;