提交 b992914b 编写于 作者:  Peijun.zhao's avatar Peijun.zhao

兼容安卓加密接口报错,并记录流水

上级 adcf01fe
流水线 #24684 已失败 于阶段
in 0 second
...@@ -93,7 +93,7 @@ public class LoginController extends AccountBaseController { ...@@ -93,7 +93,7 @@ public class LoginController extends AccountBaseController {
BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class); BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
request.setProductType(super.getProductType()); request.setProductType(super.getProductType());
Integer sourceType = super.getSourceType(); Integer sourceType = super.getSourceType();
request.setSourceType(sourceType); request.setSourceType(sourceType == null ? 0 : sourceType);
request.setLoginIp(super.getIpAddr()); request.setLoginIp(super.getIpAddr());
request.setUserTokenTourist(super.getUserTokenTourist()); request.setUserTokenTourist(super.getUserTokenTourist());
AccountUtils.checkMobilePhone(request.getMobile()); AccountUtils.checkMobilePhone(request.getMobile());
...@@ -141,7 +141,7 @@ public class LoginController extends AccountBaseController { ...@@ -141,7 +141,7 @@ public class LoginController extends AccountBaseController {
BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class); BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
request.setProductType(super.getProductType()); request.setProductType(super.getProductType());
Integer sourceType = super.getSourceType(); Integer sourceType = super.getSourceType();
request.setSourceType(sourceType); request.setSourceType(sourceType == null ? 0 : sourceType);
request.setLoginIp(super.getIpAddr()); request.setLoginIp(super.getIpAddr());
request.setUserTokenTourist(super.getUserTokenTourist()); request.setUserTokenTourist(super.getUserTokenTourist());
LoginResult login = loginService.loginAndRegister(request); LoginResult login = loginService.loginAndRegister(request);
......
...@@ -23,6 +23,8 @@ public class AesAuthCodeReq { ...@@ -23,6 +23,8 @@ public class AesAuthCodeReq {
private String authCode; private String authCode;
private String password;
/** /**
* 加密后的密文 * 加密后的密文
*/ */
...@@ -95,4 +97,12 @@ public class AesAuthCodeReq { ...@@ -95,4 +97,12 @@ public class AesAuthCodeReq {
public void setAuthCode(String authCode) { public void setAuthCode(String authCode) {
this.authCode = authCode; this.authCode = authCode;
} }
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
} }
...@@ -189,6 +189,8 @@ public class RSAUtil { ...@@ -189,6 +189,8 @@ public class RSAUtil {
authCode.setMobile(req.getMobile()); authCode.setMobile(req.getMobile());
authCode.setDevice_token(req.getDevice_token()); authCode.setDevice_token(req.getDevice_token());
authCode.setBizType(req.getBizType()); authCode.setBizType(req.getBizType());
authCode.setPassword(req.getPassword());
authCode.setAuthCode(req.getAuthCode());
String authCodeStr = JSONObject.toJSONString(authCode); String authCodeStr = JSONObject.toJSONString(authCode);
// System.out.println(authCodeStr); // System.out.println(authCodeStr);
String contentResult = null; String contentResult = null;
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册