From f53fbbf6bbfcf31ebd04e7563a6d57a07de63c41 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 25 三月 2026 08:48:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-common/xp-common-security/src/main/java/com/xiaopeng/common/security/service/TokenService.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/xp-robotaxi-common/xp-common-security/src/main/java/com/xiaopeng/common/security/service/TokenService.java b/xp-robotaxi-common/xp-common-security/src/main/java/com/xiaopeng/common/security/service/TokenService.java
index d5a9294..b220da7 100644
--- a/xp-robotaxi-common/xp-common-security/src/main/java/com/xiaopeng/common/security/service/TokenService.java
+++ b/xp-robotaxi-common/xp-common-security/src/main/java/com/xiaopeng/common/security/service/TokenService.java
@@ -9,6 +9,7 @@
 import com.xiaopeng.common.core.exception.auth.NotLoginException;
 import com.xiaopeng.api.vo.account.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import com.xiaopeng.common.core.constant.CacheConstants;
 import com.xiaopeng.common.core.constant.SecurityConstants;
@@ -29,6 +30,9 @@
 public class TokenService {
 	@Autowired
 	private RedisService redisService;
+
+    @Value("${token.secret}")
+    private String secret;
 	
 	protected static final long MILLIS_SECOND = 1000;
 	
@@ -62,7 +66,7 @@
 		claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);
 		// 接口返回信息
 		Map<String, Object> rspMap = new HashMap<String, Object>();
-		rspMap.put("access_token", JwtUtils.createToken(claimsMap));
+		rspMap.put("access_token", JwtUtils.createToken(claimsMap, secret));
 		rspMap.put("expires_in", expireTime);
 		return rspMap;
 	}
@@ -90,7 +94,7 @@
 		claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);
 		// 接口返回信息
 		Map<String, Object> rspMap = new HashMap<String, Object>();
-		rspMap.put("access_token", JwtUtils.createToken(claimsMap));
+		rspMap.put("access_token", JwtUtils.createToken(claimsMap, secret));
 		rspMap.put("expires_in", expireTime);
 		return rspMap;
 	}
@@ -150,7 +154,7 @@
 		LoginUser user = null;
 		try {
 			if (StringUtils.isNotEmpty(token)) {
-				String userkey = JwtUtils.getUserKey(token);
+				String userkey = JwtUtils.getUserKey(token, secret);
 				user = redisService.getCacheObject(getTokenKey(userkey));
 				return user;
 			}
@@ -167,7 +171,7 @@
 		LoginOperationUser user = null;
 		try {
 			if (StringUtils.isNotEmpty(token)) {
-				String userkey = JwtUtils.getOperationUserKey(token);
+				String userkey = JwtUtils.getOperationUserKey(token, secret);
 				user = redisService.getCacheObject(getTokenKey(userkey));
 				return user;
 			}
@@ -190,7 +194,7 @@
 	 */
 	public void delLoginUser(String token) {
 		if (StringUtils.isNotEmpty(token)) {
-			String userkey = JwtUtils.getUserKey(token);
+			String userkey = JwtUtils.getUserKey(token, secret);
 			redisService.deleteObject(getTokenKey(userkey));
 		}
 	}
@@ -253,4 +257,8 @@
 	private String getUserKey(Long userid) {
 		return ACCESS_TOKEN + userid;
 	}
+
+    public String getSecret() {
+        return secret;
+    }
 }
\ No newline at end of file

--
Gitblit v1.7.1