From e6e520abd96702db6b29459a66440801f58bc89d Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 30 一月 2026 14:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dianjiang
---
server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java b/server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
index c065f29..9c0b262 100644
--- a/server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
+++ b/server/services/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.core.constants.Constants;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.vo.WebLoginUserVO;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import lombok.extern.slf4j.Slf4j;
@@ -34,23 +35,21 @@
/**
* 鐢熸垚token浠ょ墝
*
- * @param member 浠ょ墝涓惡甯︾殑闄勫姞淇℃伅
+ * @param webLoginUser 浠ょ墝涓惡甯︾殑闄勫姞淇℃伅
* @return 浠oken鐗�
*/
- public String generateToken(Member member) {
- if(member == null){
+ public String generateToken(WebLoginUserVO webLoginUser) {
+ if(webLoginUser == null){
return null;
}
- Map<String,Object> map = new HashMap<>();
- map.put("id",member.getId());
- return generateTokenDo(member);
+ return generateTokenDo(webLoginUser);
}
- public Member getUserInfoByToken(String token) {
+ public WebLoginUserVO getUserInfoByToken(String token) {
try {
- Member member = getClaimsFromToken(token);
- return member;
+ WebLoginUserVO userVO = getClaimsFromToken(token);
+ return userVO;
} catch (Exception e) {
e.printStackTrace();
}
@@ -97,17 +96,15 @@
*
* @return 浠ょ墝
*/
- private String generateTokenDo(Member member) {
+ private String generateTokenDo(WebLoginUserVO webLoginUser) {
Map<String, Object> claims = new HashMap<>();
- claims.put("id",member.getId());
+ claims.put("id",webLoginUser.getId());
Date expirationDate = new Date(System.currentTimeMillis() + jwtProperties.getExpiration());
String token = Jwts.builder().setClaims(claims)
.setExpiration(expirationDate)
.signWith(SignatureAlgorithm.HS512, jwtProperties.getSecret())
.compact();
- redisTemplate.opsForValue().set(Constants.REDIS_TOKEN_KEY+token,JSONObject.toJSONString(member)
-// , jwtProperties.getExpiration(), TimeUnit.MILLISECONDS
- );
+ redisTemplate.opsForValue().set(Constants.REDIS_TOKEN_KEY+token,JSONObject.toJSONString(webLoginUser));
return token;
}
@@ -118,11 +115,11 @@
* @param token 浠ょ墝
* @return 鏁版嵁澹版槑
*/
- private Member getClaimsFromToken(String token) {
- Member claims;
+ private WebLoginUserVO getClaimsFromToken(String token) {
+ WebLoginUserVO claims;
try {
String userInfo = (String) redisTemplate.opsForValue().get(Constants.REDIS_TOKEN_KEY+token);
- claims = JSONObject.toJavaObject(JSONObject.parseObject(userInfo),Member.class);
+ claims = JSONObject.toJavaObject(JSONObject.parseObject(userInfo),WebLoginUserVO.class);
} catch (Exception e) {
claims = null;
}
--
Gitblit v1.9.3