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

Skip to content

L
liquidnet-bus-v1
Commit ad11db0d authored by 张国柄's avatar 张国柄
Browse files
Options

fix:sensitize;

parent e6245d17
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 62 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamLoginInfoVo.java
View file @ ad11db0d
...@@ -42,9 +42,6 @@ public class AdamLoginInfoVo implements Serializable, Cloneable { ...@@ -42,9 +42,6 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
public void setUserInfo(AdamUserInfoVo userInfo) { public void setUserInfo(AdamUserInfoVo userInfo) {
this.userInfo = userInfo; this.userInfo = userInfo;
this.userInfo.setPasswd(null);
// this.userInfo.setPayCode(null);
this.userInfo.setMobile(SensitizeUtil.custom(userInfo.getMobile(), 3, 4));
} }
public AdamRealInfoVo getRealNameInfo() { public AdamRealInfoVo getRealNameInfo() {
...@@ -101,8 +98,14 @@ public class AdamLoginInfoVo implements Serializable, Cloneable { ...@@ -101,8 +98,14 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
try { try {
return (AdamLoginInfoVo) obj.clone(); return (AdamLoginInfoVo) obj.clone();
} catch (CloneNotSupportedException e) { } catch (CloneNotSupportedException e) {
e.printStackTrace(); return new AdamLoginInfoVo();
} }
return new AdamLoginInfoVo(); }
public AdamLoginInfoVo desensitize() {
this.userInfo.setPasswd(null);
// this.userInfo.setPayCode(null);
this.userInfo.setMobile(SensitizeUtil.custom(userInfo.getMobile(), 3, 4));
return this;
} }
} }
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java
View file @ ad11db0d
...@@ -132,11 +132,12 @@ public class AdamLoginController { ...@@ -132,11 +132,12 @@ public class AdamLoginController {
} }
AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew(); AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
loginInfoVo.setUserInfo(userInfoVo);
loginInfoVo.setToken(this.ssoProcess(userInfoVo)); loginInfoVo.setToken(this.ssoProcess(userInfoVo));
loginInfoVo.setUserInfo(userInfoVo);
loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
log.info(UserPathDto.setData("登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo)); log.info(UserPathDto.setData("登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
return ResponseDto.success(loginInfoVo); return ResponseDto.success(loginInfoVo.desensitize());
} }
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
...@@ -158,15 +159,7 @@ public class AdamLoginController { ...@@ -158,15 +159,7 @@ public class AdamLoginController {
String uid = adamRdmService.getUidByMobile(mobile); String uid = adamRdmService.getUidByMobile(mobile);
boolean toRegister = StringUtils.isEmpty(uid); boolean toRegister = StringUtils.isEmpty(uid);
AdamUserInfoVo userInfoVo; AdamUserInfoVo userInfoVo = toRegister ? adamUserService.register(mobile) : adamRdmService.getUserInfoVoByUid(uid);
if (toRegister) {
userInfoVo = adamUserService.register(mobile);
if (null == userInfoVo) {
return ResponseDto.failure(ErrorMapping.get("10000"));
}
} else {
userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
}
if (0 == userInfoVo.getIsComplete() && null != skip && 1 == skip) { if (0 == userInfoVo.getIsComplete() && null != skip && 1 == skip) {
// 根据skip值，设置IsComplete（考虑到已存在用户未完善信息的情况，这里只对返回数据单独设置IsComplete） // 根据skip值，设置IsComplete（考虑到已存在用户未完善信息的情况，这里只对返回数据单独设置IsComplete）
...@@ -174,17 +167,14 @@ public class AdamLoginController { ...@@ -174,17 +167,14 @@ public class AdamLoginController {
} }
AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew(); AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
loginInfoVo.setToken(this.ssoProcess(userInfoVo));
loginInfoVo.setUserInfo(userInfoVo);
if (!toRegister) { if (!toRegister) {
// loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(userInfoVo.getUid()));
// loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid())); loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
} }
// loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
loginInfoVo.setUserInfo(userInfoVo);
loginInfoVo.setToken(this.ssoProcess(userInfoVo));
// loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo)); log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
return ResponseDto.success(loginInfoVo); return ResponseDto.success(loginInfoVo.desensitize());
} }
@ApiOperationSupport(order = 4) @ApiOperationSupport(order = 4)
...@@ -201,28 +191,17 @@ public class AdamLoginController { ...@@ -201,28 +191,17 @@ public class AdamLoginController {
String uid = adamRdmService.getUidByMobile(mobile); String uid = adamRdmService.getUidByMobile(mobile);
boolean toRegister = StringUtils.isEmpty(uid); boolean toRegister = StringUtils.isEmpty(uid);
AdamUserInfoVo userInfoVo; AdamUserInfoVo userInfoVo = toRegister ? adamUserService.register(mobile) : adamRdmService.getUserInfoVoByUid(uid);
if (toRegister) {
userInfoVo = adamUserService.register(mobile);
if (null == userInfoVo) {
return ResponseDto.failure(ErrorMapping.get("10000"));
}
} else {
userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
}
AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew(); AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
loginInfoVo.setToken(this.ssoProcess(userInfoVo));
loginInfoVo.setUserInfo(userInfoVo);
if (!toRegister) { if (!toRegister) {
// loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(userInfoVo.getUid()));
// loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid())); loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
} }
// loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
loginInfoVo.setUserInfo(userInfoVo);
loginInfoVo.setToken(this.ssoProcess(userInfoVo));
// loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo)); log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
return ResponseDto.success(loginInfoVo); return ResponseDto.success(loginInfoVo.desensitize());
} }
@ApiOperationSupport(order = 5) @ApiOperationSupport(order = 5)
...@@ -258,33 +237,22 @@ public class AdamLoginController { ...@@ -258,33 +237,22 @@ public class AdamLoginController {
String uid = adamRdmService.getUidByMobile(wechatMobile); String uid = adamRdmService.getUidByMobile(wechatMobile);
boolean toRegister = StringUtils.isEmpty(uid); boolean toRegister = StringUtils.isEmpty(uid);
AdamUserInfoVo userInfoVo; AdamUserInfoVo userInfoVo = toRegister ? adamUserService.register(wechatMobile) : adamRdmService.getUserInfoVoByUid(uid);
if (toRegister) {
userInfoVo = adamUserService.register(wechatMobile);
if (null == userInfoVo) {
return ResponseDto.failure(ErrorMapping.get("10000"));
}
} else {
userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
}
// 根据skip值，设置IsComplete（考虑到已存在用户未完善信息的情况，这里只对返回数据单独设置IsComplete） // 根据skip值，设置IsComplete（考虑到已存在用户未完善信息的情况，这里只对返回数据单独设置IsComplete）
userInfoVo.setIsComplete(1); userInfoVo.setIsComplete(1);
AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew(); AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
loginInfoVo.setToken(this.ssoProcess(userInfoVo));
loginInfoVo.setUserInfo(userInfoVo);
if (!toRegister) { if (!toRegister) {
// loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(userInfoVo.getUid()));
// loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid())); loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
} }
// loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
loginInfoVo.setUserInfo(userInfoVo);
loginInfoVo.setToken(this.ssoProcess(userInfoVo));
// loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
loginInfoVo.setWechatOpenid(wechatOpenid); loginInfoVo.setWechatOpenid(wechatOpenid);
loginInfoVo.setWechatUnionid(wechatUnionid); loginInfoVo.setWechatUnionid(wechatUnionid);
log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo)); log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
return ResponseDto.success(loginInfoVo); return ResponseDto.success(loginInfoVo.desensitize());
} }
@ApiOperationSupport(order = 6) @ApiOperationSupport(order = 6)
...@@ -299,10 +267,7 @@ public class AdamLoginController { ...@@ -299,10 +267,7 @@ public class AdamLoginController {
if (StringUtils.isEmpty(uid)) return ResponseDto.failure(ErrorMapping.get("10006")); if (StringUtils.isEmpty(uid)) return ResponseDto.failure(ErrorMapping.get("10006"));
loginInfoVo.setUserInfo(adamRdmService.getUserInfoVoByUid(uid)); loginInfoVo.setUserInfo(adamRdmService.getUserInfoVoByUid(uid));
// loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(uid));
// loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(uid));
loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(uid)); loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(uid));
// loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
} else {// 新账号注册 } else {// 新账号注册
ResponseDto<AdamLoginInfoVo> checkSmsCodeDto = this.checkSmsCode(parameter.getMobile(), parameter.getCode()); ResponseDto<AdamLoginInfoVo> checkSmsCodeDto = this.checkSmsCode(parameter.getMobile(), parameter.getCode());
if (!checkSmsCodeDto.isSuccess()) { if (!checkSmsCodeDto.isSuccess()) {
...@@ -315,14 +280,13 @@ public class AdamLoginController { ...@@ -315,14 +280,13 @@ public class AdamLoginController {
AdamUserInfoVo registerUserInfo = registerRespDto.getData(); AdamUserInfoVo registerUserInfo = registerRespDto.getData();
loginInfoVo.setUserInfo(registerUserInfo); loginInfoVo.setUserInfo(registerUserInfo);
loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid())); loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
// loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
} }
toRegister = true; toRegister = true;
} }
loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo())); loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo()));
// loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(loginInfoVo.getUserInfo().getMobile(), 3, 4));
log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo)); log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
return ResponseDto.success(loginInfoVo); return ResponseDto.success(loginInfoVo.desensitize());
} }
@ApiOperationSupport(order = 7) @ApiOperationSupport(order = 7)
......
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