refactor: 调整包结构

This commit is contained in:
siujamo
2025-12-31 11:14:10 +08:00
parent d2d0ccef1c
commit b24a6dc809
40 changed files with 44 additions and 55 deletions
@@ -1,6 +1,6 @@
package com.onixbyte.helix.controller; 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.domain.web.response.FileUploadResponse;
import com.onixbyte.helix.exception.BizException; import com.onixbyte.helix.exception.BizException;
import com.onixbyte.helix.service.AssetService; import com.onixbyte.helix.service.AssetService;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.database.query.wrapper; package com.onixbyte.helix.domain.database.query.wrapper;
import com.onixbyte.helix.constant.Status; import com.onixbyte.helix.enumeration.Status;
public class QueryRoleWrapper { public class QueryRoleWrapper {
private String name; private String name;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.database.query.wrapper; package com.onixbyte.helix.domain.database.query.wrapper;
import com.onixbyte.helix.constant.UserStatus; import com.onixbyte.helix.enumeration.UserStatus;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,9 +1,8 @@
package com.onixbyte.helix.domain.entity; package com.onixbyte.helix.domain.entity;
import com.onixbyte.helix.constant.Status; import com.onixbyte.helix.enumeration.Status;
import jakarta.persistence.*; import jakarta.persistence.*;
import org.hibernate.annotations.JdbcType; import org.hibernate.annotations.JdbcType;
import org.hibernate.annotations.Type;
import org.hibernate.dialect.PostgreSQLEnumJdbcType; import org.hibernate.dialect.PostgreSQLEnumJdbcType;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.entity; 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 com.onixbyte.helix.domain.common.Treeable;
import jakarta.persistence.*; import jakarta.persistence.*;
import org.hibernate.annotations.JdbcType; import org.hibernate.annotations.JdbcType;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.entity; 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 com.onixbyte.helix.domain.common.Treeable;
import jakarta.persistence.*; import jakarta.persistence.*;
import org.hibernate.annotations.JdbcType; import org.hibernate.annotations.JdbcType;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.entity; package com.onixbyte.helix.domain.entity;
import com.onixbyte.helix.constant.Status; import com.onixbyte.helix.enumeration.Status;
import jakarta.persistence.*; import jakarta.persistence.*;
import org.hibernate.annotations.JdbcType; import org.hibernate.annotations.JdbcType;
import org.hibernate.dialect.PostgreSQLEnumJdbcType; import org.hibernate.dialect.PostgreSQLEnumJdbcType;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.entity; package com.onixbyte.helix.domain.entity;
import com.onixbyte.helix.constant.Status; import com.onixbyte.helix.enumeration.Status;
import jakarta.persistence.*; import jakarta.persistence.*;
import org.hibernate.annotations.JdbcType; import org.hibernate.annotations.JdbcType;
import org.hibernate.dialect.PostgreSQLEnumJdbcType; import org.hibernate.dialect.PostgreSQLEnumJdbcType;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.entity; package com.onixbyte.helix.domain.entity;
import com.onixbyte.helix.constant.SettingType; import com.onixbyte.helix.enumeration.SettingType;
import jakarta.persistence.*; import jakarta.persistence.*;
import org.hibernate.annotations.JdbcType; import org.hibernate.annotations.JdbcType;
import org.hibernate.dialect.PostgreSQLEnumJdbcType; import org.hibernate.dialect.PostgreSQLEnumJdbcType;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.entity; 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 jakarta.persistence.*; // 导入 Jakarta Persistence API
import org.hibernate.annotations.JdbcType; import org.hibernate.annotations.JdbcType;
import org.hibernate.dialect.PostgreSQLEnumJdbcType; import org.hibernate.dialect.PostgreSQLEnumJdbcType;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.entity; 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 com.onixbyte.helix.domain.entity.embeddable.UserIdentityId;
import jakarta.persistence.*; // 导入 Jakarta Persistence API import jakarta.persistence.*; // 导入 Jakarta Persistence API
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,9 +1,8 @@
package com.onixbyte.helix.domain.entity.embeddable; 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.Column;
import jakarta.persistence.Embeddable; import jakarta.persistence.Embeddable;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated; import jakarta.persistence.Enumerated;
import org.hibernate.annotations.JdbcType; import org.hibernate.annotations.JdbcType;
import org.hibernate.dialect.PostgreSQLEnumJdbcType; import org.hibernate.dialect.PostgreSQLEnumJdbcType;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.view; 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 com.onixbyte.helix.domain.entity.Authority;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.view; 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 com.onixbyte.helix.domain.entity.Department;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.view; 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 com.onixbyte.helix.domain.entity.Position;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.view; 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 com.onixbyte.helix.domain.entity.Role;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.view; 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 com.onixbyte.helix.domain.entity.UserIdentity;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.view; 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 com.onixbyte.helix.domain.entity.User;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.web.request; 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 jakarta.validation.constraints.NotBlank;
import java.util.List; import java.util.List;
@@ -1,11 +1,9 @@
package com.onixbyte.helix.domain.web.request; 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.NotNull;
import jakarta.validation.constraints.Positive; import jakarta.validation.constraints.Positive;
import java.util.List;
public record UpdateUserRequest( public record UpdateUserRequest(
@NotNull(message = "User ID cannot be null") @NotNull(message = "User ID cannot be null")
@Positive(message = "User ID must be positive") @Positive(message = "User ID must be positive")
@@ -1,6 +1,6 @@
package com.onixbyte.helix.domain.web.response; package com.onixbyte.helix.domain.web.response;
import com.onixbyte.helix.constant.UserStatus; import com.onixbyte.helix.enumeration.UserStatus;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -1,4 +1,4 @@
package com.onixbyte.helix.constant; package com.onixbyte.helix.enumeration;
/** /**
* Constants for external host configurations and endpoints. * Constants for external host configurations and endpoints.
@@ -1,4 +1,4 @@
package com.onixbyte.helix.constant; package com.onixbyte.helix.enumeration;
import com.onixbyte.helix.config.AuthenticationConfig; import com.onixbyte.helix.config.AuthenticationConfig;
@@ -1,4 +1,4 @@
package com.onixbyte.helix.constant; package com.onixbyte.helix.enumeration;
public enum SettingType { public enum SettingType {
@@ -1,4 +1,4 @@
package com.onixbyte.helix.constant; package com.onixbyte.helix.enumeration;
/** /**
* Enumeration representing general status states for system entities. * Enumeration representing general status states for system entities.
@@ -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. * Enumeration representing the various states of user accounts within the system.
@@ -2,10 +2,10 @@ package com.onixbyte.helix.filter;
import com.auth0.jwt.exceptions.JWTVerificationException; import com.auth0.jwt.exceptions.JWTVerificationException;
import com.onixbyte.helix.client.TokenClient; import com.onixbyte.helix.client.TokenClient;
import com.onixbyte.helix.constant.SecurityConstant;
import com.onixbyte.helix.manager.AuthorityManager; import com.onixbyte.helix.manager.AuthorityManager;
import com.onixbyte.helix.manager.UserManager; import com.onixbyte.helix.manager.UserManager;
import com.onixbyte.helix.security.authentication.UsernamePasswordAuthentication; import com.onixbyte.helix.security.authentication.UsernamePasswordAuthentication;
import com.onixbyte.helix.shared.TokenConstant;
import jakarta.servlet.FilterChain; import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException; import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
@@ -46,18 +46,18 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
@NonNull HttpServletResponse response, @NonNull HttpServletResponse response,
@NonNull FilterChain filterChain @NonNull FilterChain filterChain
) throws ServletException, IOException { ) 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()) { if (Objects.isNull(token) || token.isBlank()) {
filterChain.doFilter(request, response); filterChain.doFilter(request, response);
return; return;
} }
if (!token.startsWith(SecurityConstant.TOKEN_PREFIX)) { if (!token.startsWith(TokenConstant.TOKEN_PREFIX)) {
filterChain.doFilter(request, response); filterChain.doFilter(request, response);
return; return;
} }
token = token.substring(SecurityConstant.TOKEN_PREFIX_LENGTH); token = token.substring(TokenConstant.TOKEN_PREFIX_LENGTH);
try { try {
var decodedToken = tokenClient.verifyToken(token); var decodedToken = tokenClient.verifyToken(token);
var username = decodedToken.getSubject(); var username = decodedToken.getSubject();
@@ -1,6 +1,6 @@
package com.onixbyte.helix.manager; 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.domain.entity.Asset;
import com.onixbyte.helix.mapper.AssetMapper; import com.onixbyte.helix.mapper.AssetMapper;
import com.onixbyte.helix.repository.AssetRepository; import com.onixbyte.helix.repository.AssetRepository;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.manager; 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.domain.entity.Authority;
import com.onixbyte.helix.mapper.AuthorityMapper; import com.onixbyte.helix.mapper.AuthorityMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -1,16 +1,10 @@
package com.onixbyte.helix.manager; package com.onixbyte.helix.manager;
import com.onixbyte.helix.client.RedisClient; 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.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 org.springframework.stereotype.Component;
import java.time.Duration; import java.time.Duration;
import java.util.Objects;
@Component @Component
public class CaptchaManager { public class CaptchaManager {
@@ -1,7 +1,7 @@
package com.onixbyte.helix.manager; package com.onixbyte.helix.manager;
import com.onixbyte.helix.common.regex.Patterns; 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.database.query.wrapper.QueryUserWrapper;
import com.onixbyte.helix.domain.entity.User; import com.onixbyte.helix.domain.entity.User;
import com.onixbyte.helix.domain.web.response.UserDetailResponse; import com.onixbyte.helix.domain.web.response.UserDetailResponse;
@@ -1,7 +1,7 @@
package com.onixbyte.helix.service; package com.onixbyte.helix.service;
import com.onixbyte.helix.client.TokenClient; 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.entity.Setting;
import com.onixbyte.helix.domain.web.request.UsernamePasswordLoginRequest; import com.onixbyte.helix.domain.web.request.UsernamePasswordLoginRequest;
import com.onixbyte.helix.domain.web.response.LoginSuccessResponse; import com.onixbyte.helix.domain.web.response.LoginSuccessResponse;
@@ -1,8 +1,8 @@
package com.onixbyte.helix.service; package com.onixbyte.helix.service;
import com.onixbyte.captcha.Producer; import com.onixbyte.captcha.Producer;
import com.onixbyte.helix.constant.FileType; import com.onixbyte.helix.shared.FileType;
import com.onixbyte.helix.constant.SettingName; import com.onixbyte.helix.shared.SettingName;
import com.onixbyte.helix.domain.entity.Setting; import com.onixbyte.helix.domain.entity.Setting;
import com.onixbyte.helix.domain.web.response.CaptchaResponse; import com.onixbyte.helix.domain.web.response.CaptchaResponse;
import com.onixbyte.helix.exception.BizException; import com.onixbyte.helix.exception.BizException;
@@ -1,6 +1,6 @@
package com.onixbyte.helix.service; 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.database.query.wrapper.QueryRoleWrapper;
import com.onixbyte.helix.domain.entity.Role; import com.onixbyte.helix.domain.entity.Role;
import com.onixbyte.helix.domain.web.request.AddRoleRequest; 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.RoleAuthorityManager;
import com.onixbyte.helix.manager.RoleManager; import com.onixbyte.helix.manager.RoleManager;
import com.onixbyte.helix.manager.UserRoleManager; import com.onixbyte.helix.manager.UserRoleManager;
import com.onixbyte.helix.repository.UserRoleRepository;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -1,7 +1,7 @@
package com.onixbyte.helix.service; package com.onixbyte.helix.service;
import com.onixbyte.common.util.HashUtil; 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.database.query.wrapper.QueryUserWrapper;
import com.onixbyte.helix.domain.entity.Role; import com.onixbyte.helix.domain.entity.Role;
import com.onixbyte.helix.domain.entity.User; import com.onixbyte.helix.domain.entity.User;
@@ -1,4 +1,4 @@
package com.onixbyte.helix.constant; package com.onixbyte.helix.shared;
public class AssetPrefix { public class AssetPrefix {
@@ -1,4 +1,4 @@
package com.onixbyte.helix.constant; package com.onixbyte.helix.shared;
public class CacheName { public class CacheName {
@@ -1,4 +1,4 @@
package com.onixbyte.helix.constant; package com.onixbyte.helix.shared;
public interface FileType { public interface FileType {
@@ -1,4 +1,4 @@
package com.onixbyte.helix.constant; package com.onixbyte.helix.shared;
public class SettingName { public class SettingName {
@@ -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"; public static final String TOKEN_HEADER_NAME = "Authorization";