Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redisson/src/main/java/com/liquidnet/common/cache/redisson/handle/RedisDistributedLocker.java

@@ -56,11 +56,15 @@ public class RedisDistributedLocker implements DistributedLocker {
     @Override
     public void unlock(String lockKey) {
         RLock lock = redissonClient.getLock(lockKey);
-        lock.unlock();
+        if (lock.isHeldByCurrentThread()) {
+            lock.unlock();
+        }
     }
 
     @Override
     public void unlock(RLock lock) {
-        lock.unlock();
+        if (lock.isHeldByCurrentThread()) {
+            lock.unlock();
+        }
     }
 }

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

 package com.liquidnet.service.adam.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.common.mq.constant.MQConst;
@@ -13,8 +12,6 @@ import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.entity.AdamRealName;
-import com.liquidnet.service.adam.entity.AdamUser;
-import com.liquidnet.service.adam.mapper.AdamUserMapper;
 import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamEntersService;
 import com.liquidnet.service.adam.service.IAdamRealNameService;
@@ -82,7 +79,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
         LocalDateTime now = LocalDateTime.now();
         AdamUserInfoVo userInfoVo = null;
 
-        if (RedisLockUtil.tryLock(LOCK_KEY_UREGISTER + mobile, 1, 3)) {
+        if (RedisLockUtil.tryLock(LOCK_KEY_UREGISTER + mobile, 1, 5)) {
             String uid = adamRdmService.getUidByMobile(mobile);
             if (StringUtils.isEmpty(uid)) {
                 userInfoVo = AdamUserInfoVo.getNew();
@@ -97,6 +94,10 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 mongoTemplate.insert(userInfoVo, AdamUserInfoVo.class.getSimpleName());
                 log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
 
+                s = System.currentTimeMillis();
+                adamRdmService.setUidByMobile(mobile, userInfoVo.getUid());
+                log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
+
                 LinkedList<String> toMqSqls = new LinkedList<>();
                 LinkedList<Object[]> initUserObjs = new LinkedList<>(), initUserInfoObjs = new LinkedList<>();
 
@@ -110,10 +111,6 @@ public class AdamUserServiceImpl implements IAdamUserService {
                         SqlMapping.gets(toMqSqls, initUserObjs, initUserInfoObjs)
                 );
                 log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
-
-                s = System.currentTimeMillis();
-                adamRdmService.setUidByMobile(mobile, userInfoVo.getUid());
-                log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
             } else {
                 userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
             }