From 8a21555621e8328b3e2a9534e030298a21b094a3 Mon Sep 17 00:00:00 2001
From: yang_shj <yang_shj@hisuntech.com>
Date: Mon, 7 Mar 2022 11:23:25 +0800
Subject: [PATCH] =?UTF-8?q?feat=200=20=E6=94=AF=E4=BB=98=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/springcloud/service/UserService.java |  7 +-----
 .../service/imp/UserServiceImp.java           | 22 -------------------
 .../com/base/springcloud/util/TokenUtils.java | 22 ++++++++++++++++++-
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/UserService.java b/payment-base-app/src/main/java/com/base/springcloud/service/UserService.java
index 8c4ef06..8279bb5 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/service/UserService.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/service/UserService.java
@@ -6,14 +6,9 @@ public interface UserService {
 
 	/**
 	 * 获取用户信息
+	 *
 	 * @param userName
 	 */
 	User getUser(String userName);
 
-	/**
-	 * TOKEN有效期校验
-	 * @param token
-	 * @param user
-	 */
-	void TokenValidity(String token, User user);
 }
diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/UserServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/UserServiceImp.java
index f7add23..9b8f01a 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/UserServiceImp.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/UserServiceImp.java
@@ -24,9 +24,6 @@ public class UserServiceImp implements UserService {
 	@Autowired
 	private UserMapper userMapper;
 
-	@Autowired
-	private RedisUtil redisService;
-
 	/**
 	 * 获取用户信息
 	 * @param userName
@@ -45,23 +42,4 @@ public class UserServiceImp implements UserService {
 		}
 		return user;
 	}
-
-	/**
-	 * TOKEN有效期校验
-	 * @param token
-	 * @param user
-	 */
-	@Override
-	public void TokenValidity(String token, User user) {
-		String redisToken = String.valueOf(redisService.get(PaymentConstant.TOKEN_PREFIX + token));
-		if(StringUtils.isBlank(redisToken))
-			throw new BusinessException(ErrorConstant.TOKEN_EXPIRATION_DATE);
-		if(!JwtUtil.verify(redisToken, user.getUserName(), user.getPassword()))
-			throw new BusinessException(ErrorConstant.ILLEGAL_TOKEN);
-		String newAuthorization = JwtUtil.sign(user.getUserName(),  user.getPassword());
-		// 设置Toekn缓存有效时间
-		redisService.set(PaymentConstant.TOKEN_PREFIX + token, newAuthorization);
-		redisService.expire(PaymentConstant.TOKEN_PREFIX + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
-
-	}
 }
diff --git a/payment-base-app/src/main/java/com/base/springcloud/util/TokenUtils.java b/payment-base-app/src/main/java/com/base/springcloud/util/TokenUtils.java
index 74c6c5e..1564597 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/util/TokenUtils.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/util/TokenUtils.java
@@ -23,9 +23,12 @@ public class TokenUtils {
 
 	private static UserService service;
 
+	private static RedisUtil redisService;
+
 	@PostConstruct
 	public void init() {
 		service= this.userService;
+		redisService = this.redisUtil;
 	}
 
 	/**
@@ -52,9 +55,26 @@ public class TokenUtils {
 		User user = service.getUser(username);
 
 		// 校验token是否超时失效 & 或者账号密码是否错误
-		//TokenValidity(token,user);
+		TokenValidity(token,user,redisService);
 	}
 
+	/**
+	 * TOKEN有效期校验
+	 * @param token
+	 * @param user
+	 */
+	public static void TokenValidity(String token, User user,RedisUtil redisService) {
+		String redisToken = String.valueOf(redisService.get(PaymentConstant.TOKEN_PREFIX + token));
+		if(StringUtils.isBlank(redisToken))
+			throw new BusinessException(ErrorConstant.TOKEN_EXPIRATION_DATE);
+		if(!JwtUtil.verify(redisToken, user.getUserName(), user.getPassword()))
+			throw new BusinessException(ErrorConstant.ILLEGAL_TOKEN);
+		String newAuthorization = JwtUtil.sign(user.getUserName(),  user.getPassword());
+		// 设置Toekn缓存有效时间
+		redisService.set(PaymentConstant.TOKEN_PREFIX + token, newAuthorization);
+		redisService.expire(PaymentConstant.TOKEN_PREFIX + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
+
+	}
 
 
 	public static void departmentInfo(HttpServletRequest request) {