Browse Source

独立登录

lyhzzz 3 năm trước cách đây
mục cha
commit
f2db978ca8

+ 1 - 1
src/main/java/com/fdkankan/fusion/common/util/RedisKeyUtil.java

@@ -3,5 +3,5 @@ package com.fdkankan.fusion.common.util;
 public class RedisKeyUtil {
 
     public static String mergerVideoKey = "fusion:merger:video:";
-    public static String loginToken = "fusion-";
+    public static String loginToken = "fusion:token:";
 }

+ 8 - 10
src/main/java/com/fdkankan/fusion/controller/LoginController.java

@@ -28,9 +28,7 @@ public class LoginController {
         FdkkResponse<FdkkLoginVo> fdkkLoginVo = fdKKClient.fdkkLogin(request);
         if(fdkkLoginVo.getCode() == 0){
             FdkkLoginVo data = fdkkLoginVo.getData();
-//            String fuToken = RedisKeyUtil.loginToken+data.getToken();
-//            redisUtil.set(fuToken,data.getToken());
-//            data.setToken(fuToken);
+            redisUtil.set(RedisKeyUtil.loginToken + data.getToken(),data.getToken(),6*60*60);
             return ResultData.ok(fdkkLoginVo.getData());
         }
         return ResultData.error(fdkkLoginVo.getCode(),fdkkLoginVo.getMsg());
@@ -38,12 +36,12 @@ public class LoginController {
 
     @PostMapping("/fdLogout")
     public ResultData fdLogout(@RequestHeader String token){
-        FdkkResponse<FdkkLoginVo> fdkkLoginVo = fdKKClient.fdkkLogout(token);
-        if(fdkkLoginVo.getCode() == 0){
-            return ResultData.ok(fdkkLoginVo.getData());
-        }
-        return ResultData.error(fdkkLoginVo.getCode(),fdkkLoginVo.getMsg());
-        //redisUtil.del(token);
-       // return ResultData.ok();
+//        FdkkResponse<FdkkLoginVo> fdkkLoginVo = fdKKClient.fdkkLogout(token);
+//        if(fdkkLoginVo.getCode() == 0){
+//            return ResultData.ok(fdkkLoginVo.getData());
+//        }
+//        return ResultData.error(fdkkLoginVo.getCode(),fdkkLoginVo.getMsg());
+        redisUtil.del(token);
+        return ResultData.ok();
     }
 }

+ 7 - 3
src/main/java/com/fdkankan/fusion/interceptor/TokenInterceptor.java

@@ -4,6 +4,7 @@ package com.fdkankan.fusion.interceptor;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.common.util.RedisKeyUtil;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -32,9 +33,12 @@ public class TokenInterceptor implements HandlerInterceptor {
 			return false;
 		}
 		try {
-			String redisKey = String.format(RedisKey.TOKEN_V3,token);
-			if(redisUtil.hasKey(redisKey)){
-				redisUtil.expire(redisKey,2 * 60 * 60);
+			String fuToken = RedisKeyUtil.loginToken + token;
+			if(redisUtil.hasKey(fuToken)){
+				redisUtil.expire(fuToken,6 * 60 * 60);
+
+				String redisKey = String.format(RedisKey.TOKEN_V3,token);
+				redisUtil.expire(redisKey,6 * 60 * 60);
 				return true;
 			}
 		}catch (Exception e){