lyhzzz 3 роки тому
батько
коміт
5715c5af99

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

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

+ 16 - 5
src/main/java/com/fdkankan/fusion/controller/LoginController.java

@@ -2,10 +2,13 @@ package com.fdkankan.fusion.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.common.util.RedisKeyUtil;
 import com.fdkankan.fusion.httpClient.client.FdKKClient;
 import com.fdkankan.fusion.httpClient.request.FdkkLoginRequest;
 import com.fdkankan.fusion.httpClient.response.FdkkLoginVo;
 import com.fdkankan.fusion.httpClient.response.FdkkResponse;
+import com.fdkankan.redis.util.RedisUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -17,11 +20,17 @@ public class LoginController {
 
     @Resource
     FdKKClient fdKKClient;
+    @Autowired
+    RedisUtil redisUtil;
 
     @PostMapping("/fdLogin")
     public ResultData fdLogin(@RequestBody FdkkLoginRequest request){
         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);
             return ResultData.ok(fdkkLoginVo.getData());
         }
         return ResultData.error(fdkkLoginVo.getCode(),fdkkLoginVo.getMsg());
@@ -29,10 +38,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());
+//        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();
     }
 }

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

@@ -32,8 +32,9 @@ public class TokenInterceptor implements HandlerInterceptor {
 			return false;
 		}
 		try {
-			String redisKey = String.format(RedisKey.TOKEN_V3,token);
-			if(redisUtil.hasKey(redisKey)){
+			if(redisUtil.hasKey(token)){
+				redisUtil.expire(token,2 * 60 * 60);
+				String redisKey = String.format(RedisKey.TOKEN_V3,redisUtil.get(token));
 				redisUtil.expire(redisKey,2 * 60 * 60);
 				return true;
 			}