caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 优化扫描登录相关代码

Browse Source
This commit is contained in:
paulGao 2022-09-19 09:23:56 +08:00
parent 3786c53cad
commit 3549b216b0
2 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
View File

@ -3,7 +3,6 @@ package cn.lili.controller.passport;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.dos.Member;
@ -58,9 +57,9 @@ public class MemberBuyerController {
}
/**
* 长轮询：参考nacos
*
* @param token
* @param beforeSessionStatus 上次记录的session状态
* @return
@ -69,10 +68,10 @@ public class MemberBuyerController {
@PostMapping(value = "/session_login/{token}", produces = "application/json;charset=UTF-8")
public Object loginWithSession(@PathVariable("token") String token, Integer beforeSessionStatus) {
log.info("receive login with session key {}", token);
ResponseEntity<ResultMessage> timeoutResponseEntity =
ResponseEntity<ResultMessage<Object>> timeoutResponseEntity =
new ResponseEntity<>(ResultUtil.error(ResultCode.ERROR), HttpStatus.OK);
int timeoutSecond = 20;
DeferredResult<ResponseEntity> deferredResult = new DeferredResult<>(timeoutSecond * 1000L, timeoutResponseEntity);
DeferredResult<ResponseEntity<Object>> deferredResult = new DeferredResult<>(timeoutSecond * 1000L, timeoutResponseEntity);
CompletableFuture.runAsync(() -> {
try {
int i = 0;
@ -92,7 +91,8 @@ public class MemberBuyerController {
}
} catch (Exception e) {
log.error("获取登录状态异常，", e);
deferredResult.setResult(new ResponseEntity(ResultUtil.error(ResultCode.ERROR), HttpStatus.OK));
deferredResult.setResult(new ResponseEntity<>(ResultUtil.error(ResultCode.ERROR), HttpStatus.OK));
Thread.currentThread().interrupt();
}
}, Executors.newCachedThreadPool());
return deferredResult;

19
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
View File

@ -17,7 +17,10 @@ import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.security.token.Token;
import cn.lili.common.sensitive.SensitiveWordsFilter;
import cn.lili.common.utils.*;
import cn.lili.common.utils.BeanUtil;
import cn.lili.common.utils.CookieUtil;
import cn.lili.common.utils.SnowFlake;
import cn.lili.common.utils.UuidUtils;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.connect.config.ConnectAuthEnum;
import cn.lili.modules.connect.entity.Connect;
@ -30,8 +33,8 @@ import cn.lili.modules.member.entity.enums.PointTypeEnum;
import cn.lili.modules.member.entity.enums.QRCodeLoginSessionStatusEnum;
import cn.lili.modules.member.entity.vo.MemberSearchVO;
import cn.lili.modules.member.entity.vo.MemberVO;
import cn.lili.modules.member.entity.vo.QRLoginResultVo;
import cn.lili.modules.member.entity.vo.QRCodeLoginSessionVo;
import cn.lili.modules.member.entity.vo.QRLoginResultVo;
import cn.lili.modules.member.mapper.MemberMapper;
import cn.lili.modules.member.service.MemberService;
import cn.lili.modules.member.token.MemberTokenGenerate;
@ -53,7 +56,10 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
/**
@ -210,6 +216,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
}
@Override
@Transactional
public Token autoRegister() {
ConnectAuthUser connectAuthUser = this.checkConnectUser();
return this.autoRegister(connectAuthUser);
@ -404,11 +411,11 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
@Override
public Member updateMember(ManagerMemberEditDTO managerMemberEditDTO) {
//过滤会员昵称敏感词
if (StringUtils.isNotBlank(managerMemberEditDTO.getNickName())) {
if (CharSequenceUtil.isNotBlank(managerMemberEditDTO.getNickName())) {
managerMemberEditDTO.setNickName(SensitiveWordsFilter.filter(managerMemberEditDTO.getNickName()));
}
//如果密码不为空则加密密码
if (StringUtils.isNotBlank(managerMemberEditDTO.getPassword())) {
if (CharSequenceUtil.isNotBlank(managerMemberEditDTO.getPassword())) {
managerMemberEditDTO.setPassword(new BCryptPasswordEncoder().encode(managerMemberEditDTO.getPassword()));
}
//查询会员信息
@ -712,7 +719,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
if (code == 1) {
//同意
session.setStatus(QRCodeLoginSessionStatusEnum.VERIFIED.getCode());
session.setUserId(Long.valueOf(tokenUser.getId()));
session.setUserId(Long.parseLong(tokenUser.getId()));
} else {
//拒绝
session.setStatus(QRCodeLoginSessionStatusEnum.CANCELED.getCode());