调整项目结构

src/main/java/com/qyft/gd/system/common/utils/SecurityUtils.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.qyft.gd.system.common.constant.SecurityConstants;
 import com.qyft.gd.system.common.constant.SystemConstants;
-import com.qyft.gd.system.model.SysUserDetails;
+import com.qyft.gd.system.security.model.SysUserDetails;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.core.Authentication;

src/main/java/com/qyft/gd/system/controller/AuthController.java

@@ -1,7 +1,7 @@
 package com.qyft.gd.system.controller;
 
 import com.qyft.gd.system.common.result.Result;
-import com.qyft.gd.system.model.AuthenticationToken;
+import com.qyft.gd.system.security.model.AuthenticationToken;
 import com.qyft.gd.system.service.AuthService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

src/main/java/com/qyft/gd/system/model/dto/UserAuthInfo.java

@@ -6,9 +6,6 @@ import java.util.Set;
 
 /**
  * 用户认证信息
- *
- * @author Ray.Hao
- * @since 2022/10/22
  */
 @Data
 public class UserAuthInfo {

src/main/java/com/qyft/gd/system/model/form/RoleForm.java

@@ -1,23 +1,22 @@
 package com.qyft.gd.system.model.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 @Schema(description = "角色表单对象")
 @Data
 public class RoleForm {
 
-    @Schema(description="角色ID")
+    @Schema(description = "角色ID")
     private Long id;
 
-    @Schema(description="角色名称")
+    @Schema(description = "角色名称")
     private String name;
 
-    @Schema(description="角色编码")
+    @Schema(description = "角色编码")
     private String code;
 
-    @Schema(description="角色状态(1-正常；0-停用)")
+    @Schema(description = "角色状态(1-正常；0-停用)")
     private Integer status;
 
 }

src/main/java/com/qyft/gd/system/model/form/UserForm.java

@@ -1,8 +1,6 @@
 package com.qyft.gd.system.model.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 import java.util.List;
@@ -14,25 +12,25 @@ import java.util.List;
 @Data
 public class UserForm {
 
-    @Schema(description="用户ID")
+    @Schema(description = "用户ID")
     private Long id;
 
-    @Schema(description="用户名")
+    @Schema(description = "用户名")
     private String username;
 
-    @Schema(description="昵称")
+    @Schema(description = "昵称")
     private String nickname;
 
-    @Schema(description="性别")
+    @Schema(description = "性别")
     private Integer gender;
 
-    @Schema(description="用户头像")
+    @Schema(description = "用户头像")
     private String avatar;
 
-    @Schema(description="用户状态(1:正常;0:禁用)")
+    @Schema(description = "用户状态(1:正常;0:禁用)")
     private Integer status;
 
-    @Schema(description="角色ID集合")
+    @Schema(description = "角色ID集合")
     private List<Long> roleIds;
 
 }

src/main/java/com/qyft/gd/system/security/JwtTokenManager.java

@@ -11,8 +11,8 @@ import com.qyft.gd.system.common.constant.JwtClaimConstants;
 import com.qyft.gd.system.common.exception.BusinessException;
 import com.qyft.gd.system.common.result.ResultCode;
 import com.qyft.gd.system.config.SecurityProperties;
-import com.qyft.gd.system.model.AuthenticationToken;
-import com.qyft.gd.system.model.SysUserDetails;
+import com.qyft.gd.system.security.model.AuthenticationToken;
+import com.qyft.gd.system.security.model.SysUserDetails;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;

src/main/java/com/qyft/gd/system/security/SysUserDetailsService.java

@@ -1,6 +1,6 @@
 package com.qyft.gd.system.security;
 
-import com.qyft.gd.system.model.SysUserDetails;
+import com.qyft.gd.system.security.model.SysUserDetails;
 import com.qyft.gd.system.model.dto.UserAuthInfo;
 import com.qyft.gd.system.service.UserService;
 import lombok.RequiredArgsConstructor;
@@ -12,9 +12,6 @@ import org.springframework.stereotype.Service;
 
 /**
  * 系统用户认证 DetailsService
- *
- * @author Ray.Hao
- * @since 2021/10/19
  */
 @Service
 @RequiredArgsConstructor

src/main/java/com/qyft/gd/system/security/TokenManager.java

@@ -1,7 +1,7 @@
 package com.qyft.gd.system.security;
 
 
-import com.qyft.gd.system.model.AuthenticationToken;
+import com.qyft.gd.system.security.model.AuthenticationToken;
 import org.springframework.security.core.Authentication;
 
 /**

src/main/java/com/qyft/gd/system/model/AuthenticationToken.java → src/main/java/com/qyft/gd/system/security/model/AuthenticationToken.java

@@ -1,4 +1,4 @@
-package com.qyft.gd.system.model;
+package com.qyft.gd.system.security.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;

src/main/java/com/qyft/gd/system/model/SysUserDetails.java → src/main/java/com/qyft/gd/system/security/model/SysUserDetails.java

@@ -1,4 +1,4 @@
-package com.qyft.gd.system.model;
+package com.qyft.gd.system.security.model;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;

src/main/java/com/qyft/gd/system/service/AuthService.java

@@ -1,13 +1,10 @@
 package com.qyft.gd.system.service;
 
 
-import com.qyft.gd.system.model.AuthenticationToken;
+import com.qyft.gd.system.security.model.AuthenticationToken;
 
 /**
  * 认证服务接口
- *
- * @author Ray.Hao
- * @since 2.4.0
  */
 public interface AuthService {
 

src/main/java/com/qyft/gd/system/service/impl/AuthServiceImpl.java

@@ -5,7 +5,7 @@ import com.qyft.gd.system.common.constant.SecurityConstants;
 import com.qyft.gd.system.common.exception.BusinessException;
 import com.qyft.gd.system.common.result.ResultCode;
 import com.qyft.gd.system.common.utils.SecurityUtils;
-import com.qyft.gd.system.model.AuthenticationToken;
+import com.qyft.gd.system.security.model.AuthenticationToken;
 import com.qyft.gd.system.security.TokenManager;
 import com.qyft.gd.system.service.AuthService;
 import lombok.RequiredArgsConstructor;

src/main/resources/application.yml

@@ -28,7 +28,7 @@ logging:
 
 # 安全配置
 security:
-  enabled: false
+  enabled: true
   session:
     # 会话方式，支持 jwt、redis-token
     type: jwt