From 68d9aa8a89bf5e6ce6b315c99594ff598a61e03c Mon Sep 17 00:00:00 2001
From: "wei.zhang2" <wei.zhang2@baidao.com>
Date: Fri, 29 Dec 2017 15:08:46 +0800
Subject: [PATCH] 1

---
 .../service/impl/TokenServiceDbImpl.java       | 18 +++++++++---------
 .../service/impl/TokenServiceJWTImpl.java      | 16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/boot/security/server/service/impl/TokenServiceDbImpl.java b/src/main/java/com/boot/security/server/service/impl/TokenServiceDbImpl.java
index 35347b8..757c8bf 100644
--- a/src/main/java/com/boot/security/server/service/impl/TokenServiceDbImpl.java
+++ b/src/main/java/com/boot/security/server/service/impl/TokenServiceDbImpl.java
@@ -108,10 +108,10 @@ public class TokenServiceDbImpl implements TokenService {
 	}
 
 	@Override
-	public LoginUser getLoginUser(String token) {
-		String string = getUUIDFromJWT(token);
-		if (string != null) {
-			TokenModel model = tokenDao.getById(string);
+	public LoginUser getLoginUser(String jwtToken) {
+		String uuid = getUUIDFromJWT(jwtToken);
+		if (uuid != null) {
+			TokenModel model = tokenDao.getById(uuid);
 			return toLoginUser(model);
 		}
 
@@ -119,13 +119,13 @@ public class TokenServiceDbImpl implements TokenService {
 	}
 
 	@Override
-	public boolean deleteToken(String token) {
-		String string = getUUIDFromJWT(token);
-		if (string != null) {
-			TokenModel model = tokenDao.getById(string);
+	public boolean deleteToken(String jwtToken) {
+		String uuid = getUUIDFromJWT(jwtToken);
+		if (uuid != null) {
+			TokenModel model = tokenDao.getById(uuid);
 			LoginUser loginUser = toLoginUser(model);
 			if (loginUser != null) {
-				tokenDao.delete(token);
+				tokenDao.delete(uuid);
 				logService.save(loginUser.getId(), "退出", true, null);
 
 				return true;
diff --git a/src/main/java/com/boot/security/server/service/impl/TokenServiceJWTImpl.java b/src/main/java/com/boot/security/server/service/impl/TokenServiceJWTImpl.java
index eff1fab..84717a9 100644
--- a/src/main/java/com/boot/security/server/service/impl/TokenServiceJWTImpl.java
+++ b/src/main/java/com/boot/security/server/service/impl/TokenServiceJWTImpl.java
@@ -103,9 +103,9 @@ public class TokenServiceJWTImpl implements TokenService {
 
 	@Override
 	public LoginUser getLoginUser(String jwtToken) {
-		String string = getUUIDFromJWT(jwtToken);
-		if (string != null) {
-			return redisTemplate.boundValueOps(getTokenKey(string)).get();
+		String uuid = getUUIDFromJWT(jwtToken);
+		if (uuid != null) {
+			return redisTemplate.boundValueOps(getTokenKey(uuid)).get();
 		}
 
 		return null;
@@ -113,9 +113,9 @@ public class TokenServiceJWTImpl implements TokenService {
 
 	@Override
 	public boolean deleteToken(String jwtToken) {
-		String string = getUUIDFromJWT(jwtToken);
-		if (string != null) {
-			String key = getTokenKey(string);
+		String uuid = getUUIDFromJWT(jwtToken);
+		if (uuid != null) {
+			String key = getTokenKey(uuid);
 			LoginUser loginUser = redisTemplate.opsForValue().get(key);
 			if (loginUser != null) {
 				redisTemplate.delete(key);
@@ -129,8 +129,8 @@ public class TokenServiceJWTImpl implements TokenService {
 		return false;
 	}
 
-	private String getTokenKey(String token) {
-		return "tokens:" + token;
+	private String getTokenKey(String uuid) {
+		return "tokens:" + uuid;
 	}
 
 	private Key getKeyInstance() {