From b24a6dc809d87c07e0b36f91c2e6e28ac2273c53 Mon Sep 17 00:00:00 2001 From: siujamo Date: Wed, 31 Dec 2025 11:14:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E5=8C=85?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/onixbyte/helix/controller/AssetController.java | 2 +- .../domain/database/query/wrapper/QueryRoleWrapper.java | 2 +- .../domain/database/query/wrapper/QueryUserWrapper.java | 2 +- .../java/com/onixbyte/helix/domain/entity/Authority.java | 3 +-- .../java/com/onixbyte/helix/domain/entity/Department.java | 2 +- src/main/java/com/onixbyte/helix/domain/entity/Menu.java | 2 +- .../java/com/onixbyte/helix/domain/entity/Position.java | 2 +- src/main/java/com/onixbyte/helix/domain/entity/Role.java | 2 +- .../java/com/onixbyte/helix/domain/entity/Setting.java | 2 +- src/main/java/com/onixbyte/helix/domain/entity/User.java | 2 +- .../com/onixbyte/helix/domain/entity/UserIdentity.java | 2 +- .../helix/domain/entity/embeddable/UserIdentityId.java | 3 +-- .../com/onixbyte/helix/domain/view/AuthorityView.java | 2 +- .../com/onixbyte/helix/domain/view/DepartmentView.java | 2 +- .../java/com/onixbyte/helix/domain/view/PositionView.java | 2 +- .../java/com/onixbyte/helix/domain/view/RoleView.java | 2 +- .../com/onixbyte/helix/domain/view/UserIdentityView.java | 2 +- .../java/com/onixbyte/helix/domain/view/UserView.java | 2 +- .../onixbyte/helix/domain/web/request/AddUserRequest.java | 2 +- .../helix/domain/web/request/UpdateUserRequest.java | 4 +--- .../helix/domain/web/response/UserDetailResponse.java | 2 +- .../helix/{constant => enumeration}/ExternalHost.java | 2 +- .../helix/{constant => enumeration}/IdentityProvider.java | 2 +- .../helix/{constant => enumeration}/SettingType.java | 2 +- .../onixbyte/helix/{constant => enumeration}/Status.java | 2 +- .../helix/{constant => enumeration}/UserStatus.java | 2 +- .../onixbyte/helix/filter/TokenAuthenticationFilter.java | 8 ++++---- .../java/com/onixbyte/helix/manager/AssetManager.java | 2 +- .../java/com/onixbyte/helix/manager/AuthorityManager.java | 2 +- .../java/com/onixbyte/helix/manager/CaptchaManager.java | 6 ------ src/main/java/com/onixbyte/helix/manager/UserManager.java | 2 +- src/main/java/com/onixbyte/helix/service/AuthService.java | 2 +- .../java/com/onixbyte/helix/service/CaptchaService.java | 4 ++-- src/main/java/com/onixbyte/helix/service/RoleService.java | 3 +-- src/main/java/com/onixbyte/helix/service/UserService.java | 2 +- .../onixbyte/helix/{constant => shared}/AssetPrefix.java | 2 +- .../onixbyte/helix/{constant => shared}/CacheName.java | 2 +- .../com/onixbyte/helix/{constant => shared}/FileType.java | 2 +- .../onixbyte/helix/{constant => shared}/SettingName.java | 2 +- .../SecurityConstant.java => shared/TokenConstant.java} | 4 ++-- 40 files changed, 44 insertions(+), 55 deletions(-) rename src/main/java/com/onixbyte/helix/{constant => enumeration}/ExternalHost.java (95%) rename src/main/java/com/onixbyte/helix/{constant => enumeration}/IdentityProvider.java (97%) rename src/main/java/com/onixbyte/helix/{constant => enumeration}/SettingType.java (63%) rename src/main/java/com/onixbyte/helix/{constant => enumeration}/Status.java (97%) rename src/main/java/com/onixbyte/helix/{constant => enumeration}/UserStatus.java (98%) rename src/main/java/com/onixbyte/helix/{constant => shared}/AssetPrefix.java (83%) rename src/main/java/com/onixbyte/helix/{constant => shared}/CacheName.java (92%) rename src/main/java/com/onixbyte/helix/{constant => shared}/FileType.java (91%) rename src/main/java/com/onixbyte/helix/{constant => shared}/SettingName.java (82%) rename src/main/java/com/onixbyte/helix/{constant/SecurityConstant.java => shared/TokenConstant.java} (74%) diff --git a/src/main/java/com/onixbyte/helix/controller/AssetController.java b/src/main/java/com/onixbyte/helix/controller/AssetController.java index c545530..3ef06d7 100644 --- a/src/main/java/com/onixbyte/helix/controller/AssetController.java +++ b/src/main/java/com/onixbyte/helix/controller/AssetController.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.controller; -import com.onixbyte.helix.constant.AssetPrefix; +import com.onixbyte.helix.shared.AssetPrefix; import com.onixbyte.helix.domain.web.response.FileUploadResponse; import com.onixbyte.helix.exception.BizException; import com.onixbyte.helix.service.AssetService; diff --git a/src/main/java/com/onixbyte/helix/domain/database/query/wrapper/QueryRoleWrapper.java b/src/main/java/com/onixbyte/helix/domain/database/query/wrapper/QueryRoleWrapper.java index 29a2a8d..51366b4 100644 --- a/src/main/java/com/onixbyte/helix/domain/database/query/wrapper/QueryRoleWrapper.java +++ b/src/main/java/com/onixbyte/helix/domain/database/query/wrapper/QueryRoleWrapper.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.database.query.wrapper; -import com.onixbyte.helix.constant.Status; +import com.onixbyte.helix.enumeration.Status; public class QueryRoleWrapper { private String name; diff --git a/src/main/java/com/onixbyte/helix/domain/database/query/wrapper/QueryUserWrapper.java b/src/main/java/com/onixbyte/helix/domain/database/query/wrapper/QueryUserWrapper.java index 1ee80ae..695a704 100644 --- a/src/main/java/com/onixbyte/helix/domain/database/query/wrapper/QueryUserWrapper.java +++ b/src/main/java/com/onixbyte/helix/domain/database/query/wrapper/QueryUserWrapper.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.database.query.wrapper; -import com.onixbyte.helix.constant.UserStatus; +import com.onixbyte.helix.enumeration.UserStatus; import java.time.LocalDateTime; diff --git a/src/main/java/com/onixbyte/helix/domain/entity/Authority.java b/src/main/java/com/onixbyte/helix/domain/entity/Authority.java index 1851591..eab02f1 100644 --- a/src/main/java/com/onixbyte/helix/domain/entity/Authority.java +++ b/src/main/java/com/onixbyte/helix/domain/entity/Authority.java @@ -1,9 +1,8 @@ package com.onixbyte.helix.domain.entity; -import com.onixbyte.helix.constant.Status; +import com.onixbyte.helix.enumeration.Status; import jakarta.persistence.*; import org.hibernate.annotations.JdbcType; -import org.hibernate.annotations.Type; import org.hibernate.dialect.PostgreSQLEnumJdbcType; import org.springframework.security.core.GrantedAuthority; import java.time.LocalDateTime; diff --git a/src/main/java/com/onixbyte/helix/domain/entity/Department.java b/src/main/java/com/onixbyte/helix/domain/entity/Department.java index d4f0d40..1a68320 100644 --- a/src/main/java/com/onixbyte/helix/domain/entity/Department.java +++ b/src/main/java/com/onixbyte/helix/domain/entity/Department.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.entity; -import com.onixbyte.helix.constant.Status; +import com.onixbyte.helix.enumeration.Status; import com.onixbyte.helix.domain.common.Treeable; import jakarta.persistence.*; import org.hibernate.annotations.JdbcType; diff --git a/src/main/java/com/onixbyte/helix/domain/entity/Menu.java b/src/main/java/com/onixbyte/helix/domain/entity/Menu.java index c45dd3b..5702892 100644 --- a/src/main/java/com/onixbyte/helix/domain/entity/Menu.java +++ b/src/main/java/com/onixbyte/helix/domain/entity/Menu.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.entity; -import com.onixbyte.helix.constant.Status; +import com.onixbyte.helix.enumeration.Status; import com.onixbyte.helix.domain.common.Treeable; import jakarta.persistence.*; import org.hibernate.annotations.JdbcType; diff --git a/src/main/java/com/onixbyte/helix/domain/entity/Position.java b/src/main/java/com/onixbyte/helix/domain/entity/Position.java index fc0733a..65db827 100644 --- a/src/main/java/com/onixbyte/helix/domain/entity/Position.java +++ b/src/main/java/com/onixbyte/helix/domain/entity/Position.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.entity; -import com.onixbyte.helix.constant.Status; +import com.onixbyte.helix.enumeration.Status; import jakarta.persistence.*; import org.hibernate.annotations.JdbcType; import org.hibernate.dialect.PostgreSQLEnumJdbcType; diff --git a/src/main/java/com/onixbyte/helix/domain/entity/Role.java b/src/main/java/com/onixbyte/helix/domain/entity/Role.java index 5633d13..5fa4176 100644 --- a/src/main/java/com/onixbyte/helix/domain/entity/Role.java +++ b/src/main/java/com/onixbyte/helix/domain/entity/Role.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.entity; -import com.onixbyte.helix.constant.Status; +import com.onixbyte.helix.enumeration.Status; import jakarta.persistence.*; import org.hibernate.annotations.JdbcType; import org.hibernate.dialect.PostgreSQLEnumJdbcType; diff --git a/src/main/java/com/onixbyte/helix/domain/entity/Setting.java b/src/main/java/com/onixbyte/helix/domain/entity/Setting.java index 6bb6ce6..69f5046 100644 --- a/src/main/java/com/onixbyte/helix/domain/entity/Setting.java +++ b/src/main/java/com/onixbyte/helix/domain/entity/Setting.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.entity; -import com.onixbyte.helix.constant.SettingType; +import com.onixbyte.helix.enumeration.SettingType; import jakarta.persistence.*; import org.hibernate.annotations.JdbcType; import org.hibernate.dialect.PostgreSQLEnumJdbcType; diff --git a/src/main/java/com/onixbyte/helix/domain/entity/User.java b/src/main/java/com/onixbyte/helix/domain/entity/User.java index eae7198..5d48206 100644 --- a/src/main/java/com/onixbyte/helix/domain/entity/User.java +++ b/src/main/java/com/onixbyte/helix/domain/entity/User.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.entity; -import com.onixbyte.helix.constant.UserStatus; +import com.onixbyte.helix.enumeration.UserStatus; import jakarta.persistence.*; // 导入 Jakarta Persistence API import org.hibernate.annotations.JdbcType; import org.hibernate.dialect.PostgreSQLEnumJdbcType; diff --git a/src/main/java/com/onixbyte/helix/domain/entity/UserIdentity.java b/src/main/java/com/onixbyte/helix/domain/entity/UserIdentity.java index caf8d02..87d3e45 100644 --- a/src/main/java/com/onixbyte/helix/domain/entity/UserIdentity.java +++ b/src/main/java/com/onixbyte/helix/domain/entity/UserIdentity.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.entity; -import com.onixbyte.helix.constant.IdentityProvider; +import com.onixbyte.helix.enumeration.IdentityProvider; import com.onixbyte.helix.domain.entity.embeddable.UserIdentityId; import jakarta.persistence.*; // 导入 Jakarta Persistence API import java.time.LocalDateTime; diff --git a/src/main/java/com/onixbyte/helix/domain/entity/embeddable/UserIdentityId.java b/src/main/java/com/onixbyte/helix/domain/entity/embeddable/UserIdentityId.java index f400040..3ec828f 100644 --- a/src/main/java/com/onixbyte/helix/domain/entity/embeddable/UserIdentityId.java +++ b/src/main/java/com/onixbyte/helix/domain/entity/embeddable/UserIdentityId.java @@ -1,9 +1,8 @@ package com.onixbyte.helix.domain.entity.embeddable; -import com.onixbyte.helix.constant.IdentityProvider; +import com.onixbyte.helix.enumeration.IdentityProvider; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; -import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import org.hibernate.annotations.JdbcType; import org.hibernate.dialect.PostgreSQLEnumJdbcType; diff --git a/src/main/java/com/onixbyte/helix/domain/view/AuthorityView.java b/src/main/java/com/onixbyte/helix/domain/view/AuthorityView.java index 1db4664..c5562c4 100644 --- a/src/main/java/com/onixbyte/helix/domain/view/AuthorityView.java +++ b/src/main/java/com/onixbyte/helix/domain/view/AuthorityView.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.view; -import com.onixbyte.helix.constant.Status; +import com.onixbyte.helix.enumeration.Status; import com.onixbyte.helix.domain.entity.Authority; import java.time.LocalDateTime; diff --git a/src/main/java/com/onixbyte/helix/domain/view/DepartmentView.java b/src/main/java/com/onixbyte/helix/domain/view/DepartmentView.java index a72c58b..4edf143 100644 --- a/src/main/java/com/onixbyte/helix/domain/view/DepartmentView.java +++ b/src/main/java/com/onixbyte/helix/domain/view/DepartmentView.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.view; -import com.onixbyte.helix.constant.Status; +import com.onixbyte.helix.enumeration.Status; import com.onixbyte.helix.domain.entity.Department; import java.time.LocalDateTime; diff --git a/src/main/java/com/onixbyte/helix/domain/view/PositionView.java b/src/main/java/com/onixbyte/helix/domain/view/PositionView.java index 8989f2b..8b9d3a6 100644 --- a/src/main/java/com/onixbyte/helix/domain/view/PositionView.java +++ b/src/main/java/com/onixbyte/helix/domain/view/PositionView.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.view; -import com.onixbyte.helix.constant.Status; +import com.onixbyte.helix.enumeration.Status; import com.onixbyte.helix.domain.entity.Position; import java.time.LocalDateTime; diff --git a/src/main/java/com/onixbyte/helix/domain/view/RoleView.java b/src/main/java/com/onixbyte/helix/domain/view/RoleView.java index dc0bc79..ee00803 100644 --- a/src/main/java/com/onixbyte/helix/domain/view/RoleView.java +++ b/src/main/java/com/onixbyte/helix/domain/view/RoleView.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.view; -import com.onixbyte.helix.constant.Status; +import com.onixbyte.helix.enumeration.Status; import com.onixbyte.helix.domain.entity.Role; import java.time.LocalDateTime; diff --git a/src/main/java/com/onixbyte/helix/domain/view/UserIdentityView.java b/src/main/java/com/onixbyte/helix/domain/view/UserIdentityView.java index d261996..aeab9d4 100644 --- a/src/main/java/com/onixbyte/helix/domain/view/UserIdentityView.java +++ b/src/main/java/com/onixbyte/helix/domain/view/UserIdentityView.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.view; -import com.onixbyte.helix.constant.IdentityProvider; +import com.onixbyte.helix.enumeration.IdentityProvider; import com.onixbyte.helix.domain.entity.UserIdentity; import java.time.LocalDateTime; diff --git a/src/main/java/com/onixbyte/helix/domain/view/UserView.java b/src/main/java/com/onixbyte/helix/domain/view/UserView.java index df86f39..dc1b439 100644 --- a/src/main/java/com/onixbyte/helix/domain/view/UserView.java +++ b/src/main/java/com/onixbyte/helix/domain/view/UserView.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.view; -import com.onixbyte.helix.constant.UserStatus; +import com.onixbyte.helix.enumeration.UserStatus; import com.onixbyte.helix.domain.entity.User; import java.time.LocalDateTime; diff --git a/src/main/java/com/onixbyte/helix/domain/web/request/AddUserRequest.java b/src/main/java/com/onixbyte/helix/domain/web/request/AddUserRequest.java index 9162a5c..df7fca0 100644 --- a/src/main/java/com/onixbyte/helix/domain/web/request/AddUserRequest.java +++ b/src/main/java/com/onixbyte/helix/domain/web/request/AddUserRequest.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.web.request; -import com.onixbyte.helix.constant.UserStatus; +import com.onixbyte.helix.enumeration.UserStatus; import jakarta.validation.constraints.NotBlank; import java.util.List; diff --git a/src/main/java/com/onixbyte/helix/domain/web/request/UpdateUserRequest.java b/src/main/java/com/onixbyte/helix/domain/web/request/UpdateUserRequest.java index 4c53655..55bfb05 100644 --- a/src/main/java/com/onixbyte/helix/domain/web/request/UpdateUserRequest.java +++ b/src/main/java/com/onixbyte/helix/domain/web/request/UpdateUserRequest.java @@ -1,11 +1,9 @@ package com.onixbyte.helix.domain.web.request; -import com.onixbyte.helix.constant.UserStatus; +import com.onixbyte.helix.enumeration.UserStatus; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Positive; -import java.util.List; - public record UpdateUserRequest( @NotNull(message = "User ID cannot be null") @Positive(message = "User ID must be positive") diff --git a/src/main/java/com/onixbyte/helix/domain/web/response/UserDetailResponse.java b/src/main/java/com/onixbyte/helix/domain/web/response/UserDetailResponse.java index 7c50647..a709218 100644 --- a/src/main/java/com/onixbyte/helix/domain/web/response/UserDetailResponse.java +++ b/src/main/java/com/onixbyte/helix/domain/web/response/UserDetailResponse.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.domain.web.response; -import com.onixbyte.helix.constant.UserStatus; +import com.onixbyte.helix.enumeration.UserStatus; import java.time.LocalDateTime; diff --git a/src/main/java/com/onixbyte/helix/constant/ExternalHost.java b/src/main/java/com/onixbyte/helix/enumeration/ExternalHost.java similarity index 95% rename from src/main/java/com/onixbyte/helix/constant/ExternalHost.java rename to src/main/java/com/onixbyte/helix/enumeration/ExternalHost.java index 5512434..af7ebd9 100644 --- a/src/main/java/com/onixbyte/helix/constant/ExternalHost.java +++ b/src/main/java/com/onixbyte/helix/enumeration/ExternalHost.java @@ -1,4 +1,4 @@ -package com.onixbyte.helix.constant; +package com.onixbyte.helix.enumeration; /** * Constants for external host configurations and endpoints. diff --git a/src/main/java/com/onixbyte/helix/constant/IdentityProvider.java b/src/main/java/com/onixbyte/helix/enumeration/IdentityProvider.java similarity index 97% rename from src/main/java/com/onixbyte/helix/constant/IdentityProvider.java rename to src/main/java/com/onixbyte/helix/enumeration/IdentityProvider.java index 9e06844..068ee13 100644 --- a/src/main/java/com/onixbyte/helix/constant/IdentityProvider.java +++ b/src/main/java/com/onixbyte/helix/enumeration/IdentityProvider.java @@ -1,4 +1,4 @@ -package com.onixbyte.helix.constant; +package com.onixbyte.helix.enumeration; import com.onixbyte.helix.config.AuthenticationConfig; diff --git a/src/main/java/com/onixbyte/helix/constant/SettingType.java b/src/main/java/com/onixbyte/helix/enumeration/SettingType.java similarity index 63% rename from src/main/java/com/onixbyte/helix/constant/SettingType.java rename to src/main/java/com/onixbyte/helix/enumeration/SettingType.java index a4dfdd3..47facf9 100644 --- a/src/main/java/com/onixbyte/helix/constant/SettingType.java +++ b/src/main/java/com/onixbyte/helix/enumeration/SettingType.java @@ -1,4 +1,4 @@ -package com.onixbyte.helix.constant; +package com.onixbyte.helix.enumeration; public enum SettingType { diff --git a/src/main/java/com/onixbyte/helix/constant/Status.java b/src/main/java/com/onixbyte/helix/enumeration/Status.java similarity index 97% rename from src/main/java/com/onixbyte/helix/constant/Status.java rename to src/main/java/com/onixbyte/helix/enumeration/Status.java index 5b2a80d..eb078c8 100644 --- a/src/main/java/com/onixbyte/helix/constant/Status.java +++ b/src/main/java/com/onixbyte/helix/enumeration/Status.java @@ -1,4 +1,4 @@ -package com.onixbyte.helix.constant; +package com.onixbyte.helix.enumeration; /** * Enumeration representing general status states for system entities. diff --git a/src/main/java/com/onixbyte/helix/constant/UserStatus.java b/src/main/java/com/onixbyte/helix/enumeration/UserStatus.java similarity index 98% rename from src/main/java/com/onixbyte/helix/constant/UserStatus.java rename to src/main/java/com/onixbyte/helix/enumeration/UserStatus.java index bbc05a3..957f8ba 100644 --- a/src/main/java/com/onixbyte/helix/constant/UserStatus.java +++ b/src/main/java/com/onixbyte/helix/enumeration/UserStatus.java @@ -1,4 +1,4 @@ -package com.onixbyte.helix.constant; +package com.onixbyte.helix.enumeration; /** * Enumeration representing the various states of user accounts within the system. diff --git a/src/main/java/com/onixbyte/helix/filter/TokenAuthenticationFilter.java b/src/main/java/com/onixbyte/helix/filter/TokenAuthenticationFilter.java index 63990d1..63b3c2b 100644 --- a/src/main/java/com/onixbyte/helix/filter/TokenAuthenticationFilter.java +++ b/src/main/java/com/onixbyte/helix/filter/TokenAuthenticationFilter.java @@ -2,10 +2,10 @@ package com.onixbyte.helix.filter; import com.auth0.jwt.exceptions.JWTVerificationException; import com.onixbyte.helix.client.TokenClient; -import com.onixbyte.helix.constant.SecurityConstant; import com.onixbyte.helix.manager.AuthorityManager; import com.onixbyte.helix.manager.UserManager; import com.onixbyte.helix.security.authentication.UsernamePasswordAuthentication; +import com.onixbyte.helix.shared.TokenConstant; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -46,18 +46,18 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter { @NonNull HttpServletResponse response, @NonNull FilterChain filterChain ) throws ServletException, IOException { - var token = request.getHeader(SecurityConstant.TOKEN_HEADER_NAME); + var token = request.getHeader(TokenConstant.TOKEN_HEADER_NAME); if (Objects.isNull(token) || token.isBlank()) { filterChain.doFilter(request, response); return; } - if (!token.startsWith(SecurityConstant.TOKEN_PREFIX)) { + if (!token.startsWith(TokenConstant.TOKEN_PREFIX)) { filterChain.doFilter(request, response); return; } - token = token.substring(SecurityConstant.TOKEN_PREFIX_LENGTH); + token = token.substring(TokenConstant.TOKEN_PREFIX_LENGTH); try { var decodedToken = tokenClient.verifyToken(token); var username = decodedToken.getSubject(); diff --git a/src/main/java/com/onixbyte/helix/manager/AssetManager.java b/src/main/java/com/onixbyte/helix/manager/AssetManager.java index b9f1d59..d899fd8 100644 --- a/src/main/java/com/onixbyte/helix/manager/AssetManager.java +++ b/src/main/java/com/onixbyte/helix/manager/AssetManager.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.manager; -import com.onixbyte.helix.constant.CacheName; +import com.onixbyte.helix.shared.CacheName; import com.onixbyte.helix.domain.entity.Asset; import com.onixbyte.helix.mapper.AssetMapper; import com.onixbyte.helix.repository.AssetRepository; diff --git a/src/main/java/com/onixbyte/helix/manager/AuthorityManager.java b/src/main/java/com/onixbyte/helix/manager/AuthorityManager.java index 7d76d3d..55cc481 100644 --- a/src/main/java/com/onixbyte/helix/manager/AuthorityManager.java +++ b/src/main/java/com/onixbyte/helix/manager/AuthorityManager.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.manager; -import com.onixbyte.helix.constant.CacheName; +import com.onixbyte.helix.shared.CacheName; import com.onixbyte.helix.domain.entity.Authority; import com.onixbyte.helix.mapper.AuthorityMapper; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/onixbyte/helix/manager/CaptchaManager.java b/src/main/java/com/onixbyte/helix/manager/CaptchaManager.java index 605918a..2f8ad32 100644 --- a/src/main/java/com/onixbyte/helix/manager/CaptchaManager.java +++ b/src/main/java/com/onixbyte/helix/manager/CaptchaManager.java @@ -1,16 +1,10 @@ package com.onixbyte.helix.manager; import com.onixbyte.helix.client.RedisClient; -import com.onixbyte.helix.constant.CacheName; -import com.onixbyte.helix.properties.CaptchaProperties; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.Cache; -import org.springframework.data.redis.cache.RedisCacheManager; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import java.time.Duration; -import java.util.Objects; @Component public class CaptchaManager { diff --git a/src/main/java/com/onixbyte/helix/manager/UserManager.java b/src/main/java/com/onixbyte/helix/manager/UserManager.java index 942fb11..2bf0e72 100644 --- a/src/main/java/com/onixbyte/helix/manager/UserManager.java +++ b/src/main/java/com/onixbyte/helix/manager/UserManager.java @@ -1,7 +1,7 @@ package com.onixbyte.helix.manager; import com.onixbyte.helix.common.regex.Patterns; -import com.onixbyte.helix.constant.CacheName; +import com.onixbyte.helix.shared.CacheName; import com.onixbyte.helix.domain.database.query.wrapper.QueryUserWrapper; import com.onixbyte.helix.domain.entity.User; import com.onixbyte.helix.domain.web.response.UserDetailResponse; diff --git a/src/main/java/com/onixbyte/helix/service/AuthService.java b/src/main/java/com/onixbyte/helix/service/AuthService.java index 1103f5e..d272cec 100644 --- a/src/main/java/com/onixbyte/helix/service/AuthService.java +++ b/src/main/java/com/onixbyte/helix/service/AuthService.java @@ -1,7 +1,7 @@ package com.onixbyte.helix.service; import com.onixbyte.helix.client.TokenClient; -import com.onixbyte.helix.constant.SettingName; +import com.onixbyte.helix.shared.SettingName; import com.onixbyte.helix.domain.entity.Setting; import com.onixbyte.helix.domain.web.request.UsernamePasswordLoginRequest; import com.onixbyte.helix.domain.web.response.LoginSuccessResponse; diff --git a/src/main/java/com/onixbyte/helix/service/CaptchaService.java b/src/main/java/com/onixbyte/helix/service/CaptchaService.java index 866d1a9..cda2d08 100644 --- a/src/main/java/com/onixbyte/helix/service/CaptchaService.java +++ b/src/main/java/com/onixbyte/helix/service/CaptchaService.java @@ -1,8 +1,8 @@ package com.onixbyte.helix.service; import com.onixbyte.captcha.Producer; -import com.onixbyte.helix.constant.FileType; -import com.onixbyte.helix.constant.SettingName; +import com.onixbyte.helix.shared.FileType; +import com.onixbyte.helix.shared.SettingName; import com.onixbyte.helix.domain.entity.Setting; import com.onixbyte.helix.domain.web.response.CaptchaResponse; import com.onixbyte.helix.exception.BizException; diff --git a/src/main/java/com/onixbyte/helix/service/RoleService.java b/src/main/java/com/onixbyte/helix/service/RoleService.java index f09ad05..8deedd0 100644 --- a/src/main/java/com/onixbyte/helix/service/RoleService.java +++ b/src/main/java/com/onixbyte/helix/service/RoleService.java @@ -1,6 +1,6 @@ package com.onixbyte.helix.service; -import com.onixbyte.helix.constant.Status; +import com.onixbyte.helix.enumeration.Status; import com.onixbyte.helix.domain.database.query.wrapper.QueryRoleWrapper; import com.onixbyte.helix.domain.entity.Role; import com.onixbyte.helix.domain.web.request.AddRoleRequest; @@ -9,7 +9,6 @@ import com.onixbyte.helix.domain.web.request.QueryRoleRequest; import com.onixbyte.helix.manager.RoleAuthorityManager; import com.onixbyte.helix.manager.RoleManager; import com.onixbyte.helix.manager.UserRoleManager; -import com.onixbyte.helix.repository.UserRoleRepository; import jakarta.transaction.Transactional; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/onixbyte/helix/service/UserService.java b/src/main/java/com/onixbyte/helix/service/UserService.java index f565764..8667811 100644 --- a/src/main/java/com/onixbyte/helix/service/UserService.java +++ b/src/main/java/com/onixbyte/helix/service/UserService.java @@ -1,7 +1,7 @@ package com.onixbyte.helix.service; import com.onixbyte.common.util.HashUtil; -import com.onixbyte.helix.constant.UserStatus; +import com.onixbyte.helix.enumeration.UserStatus; import com.onixbyte.helix.domain.database.query.wrapper.QueryUserWrapper; import com.onixbyte.helix.domain.entity.Role; import com.onixbyte.helix.domain.entity.User; diff --git a/src/main/java/com/onixbyte/helix/constant/AssetPrefix.java b/src/main/java/com/onixbyte/helix/shared/AssetPrefix.java similarity index 83% rename from src/main/java/com/onixbyte/helix/constant/AssetPrefix.java rename to src/main/java/com/onixbyte/helix/shared/AssetPrefix.java index 09c9612..2591d2e 100644 --- a/src/main/java/com/onixbyte/helix/constant/AssetPrefix.java +++ b/src/main/java/com/onixbyte/helix/shared/AssetPrefix.java @@ -1,4 +1,4 @@ -package com.onixbyte.helix.constant; +package com.onixbyte.helix.shared; public class AssetPrefix { diff --git a/src/main/java/com/onixbyte/helix/constant/CacheName.java b/src/main/java/com/onixbyte/helix/shared/CacheName.java similarity index 92% rename from src/main/java/com/onixbyte/helix/constant/CacheName.java rename to src/main/java/com/onixbyte/helix/shared/CacheName.java index 8c60a6e..607d6d7 100644 --- a/src/main/java/com/onixbyte/helix/constant/CacheName.java +++ b/src/main/java/com/onixbyte/helix/shared/CacheName.java @@ -1,4 +1,4 @@ -package com.onixbyte.helix.constant; +package com.onixbyte.helix.shared; public class CacheName { diff --git a/src/main/java/com/onixbyte/helix/constant/FileType.java b/src/main/java/com/onixbyte/helix/shared/FileType.java similarity index 91% rename from src/main/java/com/onixbyte/helix/constant/FileType.java rename to src/main/java/com/onixbyte/helix/shared/FileType.java index 45f55a4..1f9267d 100644 --- a/src/main/java/com/onixbyte/helix/constant/FileType.java +++ b/src/main/java/com/onixbyte/helix/shared/FileType.java @@ -1,4 +1,4 @@ -package com.onixbyte.helix.constant; +package com.onixbyte.helix.shared; public interface FileType { diff --git a/src/main/java/com/onixbyte/helix/constant/SettingName.java b/src/main/java/com/onixbyte/helix/shared/SettingName.java similarity index 82% rename from src/main/java/com/onixbyte/helix/constant/SettingName.java rename to src/main/java/com/onixbyte/helix/shared/SettingName.java index b539d96..9d92b64 100644 --- a/src/main/java/com/onixbyte/helix/constant/SettingName.java +++ b/src/main/java/com/onixbyte/helix/shared/SettingName.java @@ -1,4 +1,4 @@ -package com.onixbyte.helix.constant; +package com.onixbyte.helix.shared; public class SettingName { diff --git a/src/main/java/com/onixbyte/helix/constant/SecurityConstant.java b/src/main/java/com/onixbyte/helix/shared/TokenConstant.java similarity index 74% rename from src/main/java/com/onixbyte/helix/constant/SecurityConstant.java rename to src/main/java/com/onixbyte/helix/shared/TokenConstant.java index 08c3bb5..7dbd3e8 100644 --- a/src/main/java/com/onixbyte/helix/constant/SecurityConstant.java +++ b/src/main/java/com/onixbyte/helix/shared/TokenConstant.java @@ -1,6 +1,6 @@ -package com.onixbyte.helix.constant; +package com.onixbyte.helix.shared; -public class SecurityConstant { +public class TokenConstant { public static final String TOKEN_HEADER_NAME = "Authorization";