From af9f7ad7d711f0562e4394449a117da20f808fc2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 七月 2024 16:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index 226d393..2fd86db 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -367,7 +367,7 @@
// JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ONE);
// String token = JwtTokenUtil.generateToken(payLoad);
// redisTemplate.opsForValue().set(ZTConstants.BUSINESS+"_"+users.getId(),token);
- String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.BUSINESS,users.getId()+"",redisTemplate);
+ String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.BUSINESS,JSONObject.toJSON(users).toString(),redisTemplate);
AccountResponse accountResponse = new AccountResponse();
accountResponse.setToken(token);
accountResponse.setUsers(users);
@@ -393,15 +393,13 @@
if(!Constants.equalsInteger(users.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插垹闄�");
}
- if(!StringUtils.equals(users.getStatus(),Constants.ZERO+"")){
+ if(!StringUtils.equals(users.getStatus(),Constants.ONE+"")){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插仠鐢紝璇疯仈绯荤鐞嗗憳");
}
users.setOpenid(openId);
usersMapper.updateById(users);
//鍒涘缓token
- JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ONE);
- String token = JwtTokenUtil.generateToken(payLoad);
- redisTemplate.opsForValue().set(ZTConstants.BUSINESS+"_"+users.getId(),token);
+ String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.BUSINESS,JSONObject.toJSON(users).toString(),redisTemplate);
accountResponse.setToken(token);
getUsersDetail(users);
accountResponse.setSessionKey(session.getSessionKey());
@@ -412,6 +410,7 @@
}
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
}
+
@Override
public AccountResponse getWxMiniPhoneLogin(WxPhoneRequest wxPhoneRequest){
@@ -426,15 +425,13 @@
Users users = usersMapper.selectOne(new QueryWrapper<Users>().lambda()
.eq(Users::getPhone,phone).last("limit 1"));
AccountResponse accountResponse = new AccountResponse();
- accountResponse.setPhone(phone);
+ accountResponse.setPhone( Constants.desensitizationPhone(phone));
if(Objects.isNull(users)){
return accountResponse;
}
accountResponse.setUsers(users);
- //鍒涘缓token
- JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ZERO);
- String token = JwtTokenUtil.generateToken(payLoad);
- redisTemplate.opsForValue().set(ZTConstants.BUSINESS+"_"+users.getId(),token);
+ String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.BUSINESS,JSONObject.toJSON(users).toString(),redisTemplate);
+ accountResponse.setToken(token);
return accountResponse;
} catch (Exception e) {
e.printStackTrace();
@@ -871,14 +868,10 @@
@Override
- public ZTBaseRequst logOff(Long userId){
+ public ZTBaseRequst logOff(Long userId,String token){
Users users = usersMapper.selectById(userId);
if(Objects.isNull(users)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
- }
- if(StringUtils.isBlank(users.getOpenid())){
- redisTemplate.delete(ZTConstants.BUSINESS+"_"+ users.getId());
- return null;
}
//鏍￠獙鐢ㄦ埛token淇℃伅
MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,users.getId(), ZTConstants.BUSINESS);
@@ -890,9 +883,9 @@
usersMapper.update(new UpdateWrapper<Users>().lambda()
.set(Users::getOpenid,null)
.set(Users::getEditDate,new Date())
- .eq(Users::getId,users.getId())
+ .eq(Users::getOpenid,users.getOpenid())
);
- redisTemplate.delete(ZTConstants.BUSINESS+"_"+ users.getId());
+ redisTemplate.delete(token);
return ztBaseRequst;
}
--
Gitblit v1.9.3