Merge branch 'refs/heads/jxl-adam-adddoudou' into test-ecs

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamUserService.java

@@ -32,6 +32,16 @@ public interface IAdamUserService {
      */
     AdamUserInfoVo register(String mobile, int isComplete);
 
+    /**
+     * 手机号注册（指定注册来源，写入 adam_user_mobile_locate.regist_source）
+     *
+     * @param mobile
+     * @param isComplete   是否标记为已完善状态[0-未完善｜1-已完善]
+     * @param registSource 注册来源；为空时回退到请求头 source
+     * @return AdamUserInfoVo
+     */
+    AdamUserInfoVo register(String mobile, int isComplete, String registSource);
+
     /**
      * 第三方账号注册
      *

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

@@ -3,4 +3,7 @@ package com.liquidnet.service.adam.constant;
 public class AdamConst {
     public static final String DEF_URL_AVATAR = "https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png";
     public static final String DEF_URL_BACKGROUND = "https://img.zhengzai.tv/other/2021/07/27/150eeb0e20af4fc88e8a1ec57c46c362.png";
+
+    /** silent_mobile_v2 静默注册来源：DouDou */
+    public static final String REGIST_SOURCE_DOUDOU = "doudou";
 }

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

@@ -13,6 +13,7 @@ import com.liquidnet.common.sms.processor.SmsProcessor;
 import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.core.JwtValidator;
 import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.service.adam.constant.AdamConst;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
@@ -351,7 +352,7 @@ public class AdamLoginController {
             log.error("login by silent for mobile:{},{}/{},{}-{}", mobile, otp, otpDecrypt, l, reql);
             return ResponseDto.failure(ErrorMapping.get("10005"));
         }
-        return this.silentMobileLoginSuccess(mobile);
+        return this.silentMobileLoginSuccess(mobile, null);
     }
 
     @ApiOperationSupport(order = 7)
@@ -371,14 +372,16 @@ public class AdamLoginController {
             log.error("login by silent v2 otp invalid, mobile:{}", mobile);
             return ResponseDto.failure(ErrorMapping.get("10005"));
         }
-        return this.silentMobileLoginSuccess(mobile);
+        return this.silentMobileLoginSuccess(mobile, AdamConst.REGIST_SOURCE_DOUDOU);
     }
 
-    private ResponseDto<AdamLoginInfoVo> silentMobileLoginSuccess(String mobile) {
+    private ResponseDto<AdamLoginInfoVo> silentMobileLoginSuccess(String mobile, String registSource) {
         String uid = adamRdmService.getUidByMobile(mobile);
         boolean toRegister = StringUtils.isEmpty(uid);
 
-        AdamUserInfoVo userInfoVo = toRegister ? adamUserService.register(mobile) : adamRdmService.getUserInfoVoByUid(uid);
+        AdamUserInfoVo userInfoVo = toRegister
+                ? adamUserService.register(mobile, 0, registSource)
+                : adamRdmService.getUserInfoVoByUid(uid);
 
         if (!toRegister && (null == userInfoVo || userInfoVo.getState() == 2)) {
             log.warn("Cancelled mobile:{}", mobile);

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

@@ -61,6 +61,11 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
     @Override
     public AdamUserInfoVo register(String mobile, int isComplete) {
+        return this.register(mobile, isComplete, null);
+    }
+
+    @Override
+    public AdamUserInfoVo register(String mobile, int isComplete, String registSource) {
         LocalDateTime now = LocalDateTime.now();
 
         AdamUserInfoVo userInfoVo = AdamUserInfoVo.getNew();
@@ -82,12 +87,12 @@ public class AdamUserServiceImpl implements IAdamUserService {
         String[] mobileLocateArr = adamRdmService.getMobileLocateArr(mobile);
         toMqSqls.add(SqlMapping.get("adam_user_mobile_locate.add"));
         String cliIpAddr = CurrentUtil.getCliIpAddr();
-        String headerCliSource = CurrentUtil.getHeaderCliSource();
+        String cliSource = StringUtils.isNotBlank(registSource) ? registSource : CurrentUtil.getHeaderCliSource();
         if (null != mobileLocateArr && mobileLocateArr.length > 0) {
             initUserMobileLocateObjs.add(new Object[]{
                     userInfoVo.getUid(), mobile, 1,
                     mobileLocateArr[0], mobileLocateArr[1], mobileLocateArr[2], mobileLocateArr[3], mobileLocateArr[4],
-                    mobile, cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now
+                    mobile, cliIpAddr, cliSource, now, cliIpAddr, cliSource, now, now
             });
             userInfoVo.setProvince(mobileLocateArr[0]);
             userInfoVo.setCity(mobileLocateArr[1]);
@@ -95,7 +100,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
             initUserMobileLocateObjs.add(new Object[]{
                     userInfoVo.getUid(), mobile, 1,
                     null, null, null, null, null,
-                    mobile, cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now
+                    mobile, cliIpAddr, cliSource, now, cliIpAddr, cliSource, now, now
             });
         }