From 4fc49f3f06e9bb6275045d32245469816b451a4c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 23 七月 2024 09:57:26 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index ef73633..b4d1738 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -2,6 +2,7 @@
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -275,7 +276,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
}
// String openId = code;
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId).isNotNull("phone"));
Users users = new Users();
if(StringUtils.isBlank(iamId)){
users = usersMapper.selectOne(new QueryWrapper<Users>().lambda()
@@ -313,10 +314,7 @@
this.saveCustomerUser(users,member.getId());
member = this.getMemberInfo(member.getId());
}
- //鍒涘缓token
- JwtPayLoad payLoad = new JwtPayLoad(member.getId(),Constants.ZERO);
- String token = JwtTokenUtil.generateToken(payLoad);
- redisTemplate.opsForValue().set(ZTConstants.CUSTOMER+"_"+member.getId(),token);
+ String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.CUSTOMER, JSONObject.toJSON(member).toString(),redisTemplate);
AccountResponse accountResponse = new AccountResponse();
accountResponse.setToken(token);
accountResponse.setSessionKey(session.getSessionKey());
@@ -494,8 +492,6 @@
// .set(Member::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
.eq(Member::getId,member.getId()));
ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
- }else{
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
ztBaseInfoResponse.setToken(member.getToken());
@@ -508,11 +504,6 @@
ztBaseInfoResponse.setUserType(ZTConstants.BUSINESS);
ztBaseInfoResponse.setOpenId(users.getOpenid());
if(Objects.isNull(users.getTokenDate()) || users.getTokenDate().getTime()<=System.currentTimeMillis() ){
- ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
- //鏌ヨAPPID
- String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
- param.setAppId(appId);
- param.setOpenId(users.getOpenid());
ZTSysuserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getSysuserToken(users.getPhone());
if(Objects.nonNull(ztUserGetTokenResponse)){
users.setToken(ztUserGetTokenResponse.getToken());
@@ -522,29 +513,22 @@
.eq(Users::getId,users.getId()));
ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
return ztBaseInfoResponse;
- }else{
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
ztBaseInfoResponse.setToken(users.getToken());
-// return ztBaseInfoResponse;
- }else{
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒");
}
return ztBaseInfoResponse;
}
-
-
@Override
- public ZTBaseRequst logOff(Long memberId){
+ public ZTBaseRequst logOff(Long memberId,String token){
Member member = memberMapper.selectById(memberId);
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(StringUtils.isBlank(member.getPhone())){
- redisTemplate.delete(ZTConstants.CUSTOMER+"_"+ member.getId());
+ redisTemplate.delete(token);
return null;
}
//鏍￠獙鐢ㄦ埛token淇℃伅
@@ -555,6 +539,7 @@
ztBaseRequst.setOpenId(member.getOpenid());
ztBaseRequst.setToken(member.getToken());
memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .set(Member::getOpenid,null)
.set(Member::getPhone,null)
.set(Member::getEditDate,new Date())
.eq(Member::getId,member.getId())
--
Gitblit v1.9.3