lyhzzz 3 years ago
parent
commit
ebbefa3841

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

@@ -28,9 +28,9 @@ 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);
+//            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());
@@ -38,12 +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());
-        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();
     }
 }

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

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