From 0e8e56a24a303b803a3d305311b30eaec675d732 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Sun, 18 Dec 2022 12:50:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=AE=A4=E8=AF=81=E9=89=B4?=
 =?UTF-8?q?=E6=9D=83=E4=BC=98=E5=8C=96=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=8B=A6?=
 =?UTF-8?q?=E6=88=AA=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../youlai/system/pojo/dto/TokenResult.java   | 16 +++++++++++++++
 .../security/{jwt => }/JwtTokenManager.java   | 20 ++-----------------
 .../filter/JwtAuthenticationFilter.java       |  4 ++--
 .../security/service/PermissionService.java   |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/com/youlai/system/pojo/dto/TokenResult.java
 rename src/main/java/com/youlai/system/security/{jwt => }/JwtTokenManager.java (84%)

diff --git a/src/main/java/com/youlai/system/pojo/dto/TokenResult.java b/src/main/java/com/youlai/system/pojo/dto/TokenResult.java
new file mode 100644
index 00000000..771553cc
--- /dev/null
+++ b/src/main/java/com/youlai/system/pojo/dto/TokenResult.java
@@ -0,0 +1,16 @@
+package com.youlai.system.pojo.dto;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class TokenResult {
+
+    private String accessToken;
+
+    private String refreshToken;
+
+    private Long expires;
+
+}
diff --git a/src/main/java/com/youlai/system/security/jwt/JwtTokenManager.java b/src/main/java/com/youlai/system/security/JwtTokenManager.java
similarity index 84%
rename from src/main/java/com/youlai/system/security/jwt/JwtTokenManager.java
rename to src/main/java/com/youlai/system/security/JwtTokenManager.java
index 963e43e1..f859a255 100644
--- a/src/main/java/com/youlai/system/security/jwt/JwtTokenManager.java
+++ b/src/main/java/com/youlai/system/security/JwtTokenManager.java
@@ -1,20 +1,4 @@
-/*
- * Copyright 1999-2021 Alibaba Group Holding Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.youlai.system.security.jwt;
+package com.youlai.system.security;
 
 import cn.hutool.core.convert.Convert;
 import com.youlai.system.security.userdetails.SysUserDetails;
@@ -103,7 +87,7 @@ public class JwtTokenManager {
         redisTemplate.opsForValue().set("USER_PERMS:" + userDetails.getUserId(), perms);
 
         return Jwts.builder().setClaims(claims).setExpiration(validity)
-                .signWith(SignatureAlgorithm.HS256, Keys.hmacShaKeyFor(this.getSecretKeyBytes())).compact();
+                .signWith( Keys.hmacShaKeyFor(this.getSecretKeyBytes()),SignatureAlgorithm.HS256).compact();
     }
 
     /**
diff --git a/src/main/java/com/youlai/system/security/filter/JwtAuthenticationFilter.java b/src/main/java/com/youlai/system/security/filter/JwtAuthenticationFilter.java
index dfdb8687..0d14ad0a 100644
--- a/src/main/java/com/youlai/system/security/filter/JwtAuthenticationFilter.java
+++ b/src/main/java/com/youlai/system/security/filter/JwtAuthenticationFilter.java
@@ -2,8 +2,8 @@ package com.youlai.system.security.filter;
 
 import cn.hutool.core.util.StrUtil;
 import com.youlai.system.common.result.ResultCode;
-import com.youlai.system.security.jwt.JwtTokenManager;
-import com.youlai.system.util.ResponseUtils;
+import com.youlai.system.security.JwtTokenManager;
+import com.youlai.system.common.util.ResponseUtils;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/src/main/java/com/youlai/system/security/service/PermissionService.java b/src/main/java/com/youlai/system/security/service/PermissionService.java
index 579ba1c3..1e35fc55 100644
--- a/src/main/java/com/youlai/system/security/service/PermissionService.java
+++ b/src/main/java/com/youlai/system/security/service/PermissionService.java
@@ -2,7 +2,7 @@ package com.youlai.system.security.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
-import com.youlai.system.util.SecurityUtils;
+import com.youlai.system.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;