From 5ac9c7dc710889c186d52b462ee085ddb6772420 Mon Sep 17 00:00:00 2001
From: x ronger <ronger-x@outlook.com>
Date: Sun, 24 Nov 2019 15:59:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vertical/jwt/service/RedisTokenManager.java   | 15 ++++++++-------
 .../rymcu/vertical/jwt/service/TokenManager.java  |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/rymcu/vertical/jwt/service/RedisTokenManager.java b/src/main/java/com/rymcu/vertical/jwt/service/RedisTokenManager.java
index b3c2659..fbb3232 100644
--- a/src/main/java/com/rymcu/vertical/jwt/service/RedisTokenManager.java
+++ b/src/main/java/com/rymcu/vertical/jwt/service/RedisTokenManager.java
@@ -1,7 +1,6 @@
 package com.rymcu.vertical.jwt.service;
 
 
-import com.rymcu.vertical.core.service.redis.RedisService;
 import com.rymcu.vertical.jwt.def.JwtConstants;
 import com.rymcu.vertical.jwt.model.TokenModel;
 import io.jsonwebtoken.Jwts;
@@ -22,12 +21,11 @@ import java.util.concurrent.TimeUnit;
 public class RedisTokenManager implements TokenManager {
     @Autowired
     private StringRedisTemplate redisTemplate;
-    @Autowired
-    private RedisService redisService;
 
     /**
      * 生成TOKEN
      */
+    @Override
     public String createToken(String id) {
         //使用uuid作为源token
         String token = Jwts.builder().setId(id).setSubject(id).setIssuedAt(new Date()).signWith(SignatureAlgorithm.HS256, JwtConstants.JWT_SECRET).compact();
@@ -36,10 +34,12 @@ public class RedisTokenManager implements TokenManager {
         return token;
     }
 
-    public TokenModel getToken(String token, String userid) {
-        return new TokenModel(userid, token);
+    @Override
+    public TokenModel getToken(String token, String account) {
+        return new TokenModel(account, token);
     }
 
+    @Override
     public boolean checkToken(TokenModel model) {
         if (model == null) {
             return false;
@@ -53,7 +53,8 @@ public class RedisTokenManager implements TokenManager {
         return true;
     }
 
-    public void deleteToken(String username) {
-        redisTemplate.delete(username);
+    @Override
+    public void deleteToken(String account) {
+        redisTemplate.delete(account);
     }
 }
diff --git a/src/main/java/com/rymcu/vertical/jwt/service/TokenManager.java b/src/main/java/com/rymcu/vertical/jwt/service/TokenManager.java
index 3ab7b2e..577c37a 100644
--- a/src/main/java/com/rymcu/vertical/jwt/service/TokenManager.java
+++ b/src/main/java/com/rymcu/vertical/jwt/service/TokenManager.java
@@ -27,12 +27,12 @@ public interface TokenManager {
      * 从字符串中解析token
      * @return
      */
-    public TokenModel getToken(String token, String userid);
+    public TokenModel getToken(String token, String account);
 
     /**
      * 清除token
-     * @param username 登录用户账号
+     * @param account 登录用户账号
      */
-    public void deleteToken(String username);
+    public void deleteToken(String account);
 
 }