记得上下班打卡 | git大法好,push需谨慎

Commit 267ae36f authored by 姜秀龙's avatar 姜秀龙

doudou 静默登录记录来源

parent 8077bd58
...@@ -32,6 +32,16 @@ public interface IAdamUserService { ...@@ -32,6 +32,16 @@ public interface IAdamUserService {
*/ */
AdamUserInfoVo register(String mobile, int isComplete); 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);
/** /**
* 第三方账号注册 * 第三方账号注册
* *
......
...@@ -3,4 +3,7 @@ package com.liquidnet.service.adam.constant; ...@@ -3,4 +3,7 @@ package com.liquidnet.service.adam.constant;
public class AdamConst { 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_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"; 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";
} }
...@@ -13,6 +13,7 @@ import com.liquidnet.common.sms.processor.SmsProcessor; ...@@ -13,6 +13,7 @@ import com.liquidnet.common.sms.processor.SmsProcessor;
import com.liquidnet.commons.lang.constant.LnsEnum; import com.liquidnet.commons.lang.constant.LnsEnum;
import com.liquidnet.commons.lang.core.JwtValidator; import com.liquidnet.commons.lang.core.JwtValidator;
import com.liquidnet.commons.lang.util.*; 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.AdamThirdPartParam;
import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo; import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo; import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
...@@ -351,7 +352,7 @@ public class AdamLoginController { ...@@ -351,7 +352,7 @@ public class AdamLoginController {
log.error("login by silent for mobile:{},{}/{},{}-{}", mobile, otp, otpDecrypt, l, reql); log.error("login by silent for mobile:{},{}/{},{}-{}", mobile, otp, otpDecrypt, l, reql);
return ResponseDto.failure(ErrorMapping.get("10005")); return ResponseDto.failure(ErrorMapping.get("10005"));
} }
return this.silentMobileLoginSuccess(mobile); return this.silentMobileLoginSuccess(mobile, null);
} }
@ApiOperationSupport(order = 7) @ApiOperationSupport(order = 7)
...@@ -371,14 +372,16 @@ public class AdamLoginController { ...@@ -371,14 +372,16 @@ public class AdamLoginController {
log.error("login by silent v2 otp invalid, mobile:{}", mobile); log.error("login by silent v2 otp invalid, mobile:{}", mobile);
return ResponseDto.failure(ErrorMapping.get("10005")); 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); String uid = adamRdmService.getUidByMobile(mobile);
boolean toRegister = StringUtils.isEmpty(uid); 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)) { if (!toRegister && (null == userInfoVo || userInfoVo.getState() == 2)) {
log.warn("Cancelled mobile:{}", mobile); log.warn("Cancelled mobile:{}", mobile);
......
...@@ -61,6 +61,11 @@ public class AdamUserServiceImpl implements IAdamUserService { ...@@ -61,6 +61,11 @@ public class AdamUserServiceImpl implements IAdamUserService {
@Override @Override
public AdamUserInfoVo register(String mobile, int isComplete) { 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(); LocalDateTime now = LocalDateTime.now();
AdamUserInfoVo userInfoVo = AdamUserInfoVo.getNew(); AdamUserInfoVo userInfoVo = AdamUserInfoVo.getNew();
...@@ -82,12 +87,12 @@ public class AdamUserServiceImpl implements IAdamUserService { ...@@ -82,12 +87,12 @@ public class AdamUserServiceImpl implements IAdamUserService {
String[] mobileLocateArr = adamRdmService.getMobileLocateArr(mobile); String[] mobileLocateArr = adamRdmService.getMobileLocateArr(mobile);
toMqSqls.add(SqlMapping.get("adam_user_mobile_locate.add")); toMqSqls.add(SqlMapping.get("adam_user_mobile_locate.add"));
String cliIpAddr = CurrentUtil.getCliIpAddr(); String cliIpAddr = CurrentUtil.getCliIpAddr();
String headerCliSource = CurrentUtil.getHeaderCliSource(); String cliSource = StringUtils.isNotBlank(registSource) ? registSource : CurrentUtil.getHeaderCliSource();
if (null != mobileLocateArr && mobileLocateArr.length > 0) { if (null != mobileLocateArr && mobileLocateArr.length > 0) {
initUserMobileLocateObjs.add(new Object[]{ initUserMobileLocateObjs.add(new Object[]{
userInfoVo.getUid(), mobile, 1, userInfoVo.getUid(), mobile, 1,
mobileLocateArr[0], mobileLocateArr[1], mobileLocateArr[2], mobileLocateArr[3], mobileLocateArr[4], 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.setProvince(mobileLocateArr[0]);
userInfoVo.setCity(mobileLocateArr[1]); userInfoVo.setCity(mobileLocateArr[1]);
...@@ -95,7 +100,7 @@ public class AdamUserServiceImpl implements IAdamUserService { ...@@ -95,7 +100,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
initUserMobileLocateObjs.add(new Object[]{ initUserMobileLocateObjs.add(new Object[]{
userInfoVo.getUid(), mobile, 1, userInfoVo.getUid(), mobile, 1,
null, null, null, null, null, null, null, null, null, null,
mobile, cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now mobile, cliIpAddr, cliSource, now, cliIpAddr, cliSource, now, now
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment