提交 40a90698 编写于 作者: peijun.zhao's avatar peijun.zhao

add 静默注册亚测接口v3

上级 23fc344d
流水线 #29111 已失败 于阶段
in 0 second
...@@ -34,6 +34,8 @@ import org.apache.commons.lang3.StringUtils; ...@@ -34,6 +34,8 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Date; import java.util.Date;
...@@ -63,6 +65,10 @@ public class AccountController extends AccountBaseController { ...@@ -63,6 +65,10 @@ public class AccountController extends AccountBaseController {
@Autowired @Autowired
private IntactUtil intactUtil; private IntactUtil intactUtil;
@Autowired
@Qualifier("accountThreadPool")
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
@GetMapping("/test") @GetMapping("/test")
public String test() { public String test() {
return "{\"status\":\"UP\"}"; return "{\"status\":\"UP\"}";
...@@ -438,16 +444,16 @@ public class AccountController extends AccountBaseController { ...@@ -438,16 +444,16 @@ public class AccountController extends AccountBaseController {
// 登录 // 登录
PicaResponse response = null; PicaResponse response = null;
try { try {
this.checkMobilePhone(req.getMobilePhone()); // this.checkMobilePhone(req.getMobilePhone());
// logger.info("login:{}", JSONObject.toJSONString(req)); // logger.info("login:{}", JSONObject.toJSONString(req));
//接入新旭事务一致性 //接入新旭事务一致性
// String batchNo1 = IntactUtils.getUUID(); // String batchNo1 = IntactUtils.getUUID();
// intactUtil.sendIntact(batchNo1,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"req:"+ JSON.toJSONString(req)); // intactUtil.sendIntact(batchNo1,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"req:"+ JSON.toJSONString(req));
Account account1 = accountService.getByMobilePhone(req.getMobilePhone()); //获取账号信息 // Account account1 = accountService.getByMobilePhone(req.getMobilePhone()); //获取账号信息
if (account1 == null) { // if (account == null) {
// intactUtil.sendIntact(batchNo1,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"未注册,请验证码登录"); // intactUtil.sendIntact(batchNo1,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"未注册,请验证码登录");
return PicaResponse.toResponse(null, PicaResultCode.RESULE_DATA_NONE.code(), "未注册,请验证码登录"); // return PicaResponse.toResponse(null, PicaResultCode.RESULE_DATA_NONE.code(), "未注册,请验证码登录");
} // }
if (StringUtils.isBlank(req.getPassword())) { if (StringUtils.isBlank(req.getPassword())) {
//验证码登录 //验证码登录
...@@ -460,26 +466,28 @@ public class AccountController extends AccountBaseController { ...@@ -460,26 +466,28 @@ public class AccountController extends AccountBaseController {
String authCodeKey = this.getAuthCodeKey(req.getMobilePhone(), flag); String authCodeKey = this.getAuthCodeKey(req.getMobilePhone(), flag);
redisClient.del(authCodeKey); //清除验证码 redisClient.del(authCodeKey); //清除验证码
} else { //密码登录 } else { //密码登录
if (!StringUtils.equals(req.getPassword(), account1.getPassword())) { if (!StringUtils.equals(req.getPassword(), account.getPassword())) {
// intactUtil.sendIntact(batchNo1,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"请输入正确的密码"); // intactUtil.sendIntact(batchNo1,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"请输入正确的密码");
return PicaResponse.toResponse(null, PicaResultCode.PARAM_IS_INVALID.code(), "请输入正确的密码"); return PicaResponse.toResponse(null, PicaResultCode.PARAM_IS_INVALID.code(), "请输入正确的密码");
} }
} }
//更新最后登录时间 threadPoolTaskExecutor.execute(() -> {
Account update = new Account(); //更新最后登录时间
update.setId(account1.getId()); Account update = new Account();
update.setLastLoginTime(new Date()); update.setId(account.getId());
if (StringUtils.isBlank(account1.getUnionid()) && StringUtils.isNotBlank(req.getUnionid())) { update.setLastLoginTime(new Date());
update.setUnionid(req.getUnionid()); //绑定微信unionid if (StringUtils.isBlank(account.getUnionid()) && StringUtils.isNotBlank(req.getUnionid())) {
update.setModifyId(account1.getId()); update.setUnionid(req.getUnionid()); //绑定微信unionid
update.setModifyTime(new Date()); update.setModifyId(account.getId());
} update.setModifyTime(new Date());
accountService.updateAccountById(update); }
accountService.updateAccountById(update);
});
//登录成功,清除旧token,生成新token //登录成功,清除旧token,生成新token
String deviceType = super.getDeviceInfo("device_type"); //1:pc 2:android 3:ios String deviceType = super.getDeviceInfo("device_type"); //1:pc 2:android 3:ios
String newToken = this.generateTokenWebLive(account1, deviceType); String newToken = this.generateTokenWebLive(account, deviceType);
// intactUtil.sendIntact(batchNo1,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"req:"+ JSON.toJSONString(req)); // intactUtil.sendIntact(batchNo1,"login",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"req:"+ JSON.toJSONString(req));
response = PicaResponse.toResponse(newToken); response = PicaResponse.toResponse(newToken);
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册