diff --git a/backend/src/main/java/com/qqchen/deploy/backend/api/TenantApiController.java b/backend/src/main/java/com/qqchen/deploy/backend/api/TenantApiController.java index 453ffe44..95bdbd36 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/api/TenantApiController.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/api/TenantApiController.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.api; -import com.qqchen.deploy.backend.common.api.Response; -import com.qqchen.deploy.backend.common.controller.BaseController; +import com.qqchen.deploy.backend.framework.api.Response; +import com.qqchen.deploy.backend.framework.controller.BaseController; import com.qqchen.deploy.backend.converter.TenantConverter; import com.qqchen.deploy.backend.dto.query.TenantQuery; import com.qqchen.deploy.backend.dto.request.TenantRequest; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/api/UserApiController.java b/backend/src/main/java/com/qqchen/deploy/backend/api/UserApiController.java index bb6f8c2d..3e2bd9be 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/api/UserApiController.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/api/UserApiController.java @@ -1,8 +1,8 @@ package com.qqchen.deploy.backend.api; -import com.qqchen.deploy.backend.common.controller.BaseController; -import com.qqchen.deploy.backend.common.api.Response; -import com.qqchen.deploy.backend.common.enums.ResponseCode; +import com.qqchen.deploy.backend.framework.controller.BaseController; +import com.qqchen.deploy.backend.framework.api.Response; +import com.qqchen.deploy.backend.framework.enums.ResponseCode; import com.qqchen.deploy.backend.converter.UserConverter; import com.qqchen.deploy.backend.dto.request.LoginRequest; import com.qqchen.deploy.backend.dto.response.LoginResponse; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/controller/UserController.java b/backend/src/main/java/com/qqchen/deploy/backend/controller/UserController.java index bf5dfa12..e8af2fe8 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/controller/UserController.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/controller/UserController.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.controller; import com.qqchen.deploy.backend.api.UserApiController; -import com.qqchen.deploy.backend.common.api.Response; +import com.qqchen.deploy.backend.framework.api.Response; import com.qqchen.deploy.backend.converter.UserConverter; import com.qqchen.deploy.backend.service.IUserService; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/converter/TenantConverter.java b/backend/src/main/java/com/qqchen/deploy/backend/converter/TenantConverter.java index eebbd1aa..3b1ca93e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/converter/TenantConverter.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/converter/TenantConverter.java @@ -1,15 +1,10 @@ package com.qqchen.deploy.backend.converter; -import com.qqchen.deploy.backend.common.converter.BaseConverter; +import com.qqchen.deploy.backend.framework.converter.BaseConverter; import com.qqchen.deploy.backend.dto.request.TenantRequest; -import com.qqchen.deploy.backend.dto.request.UserRequest; import com.qqchen.deploy.backend.dto.response.TenantResponse; -import com.qqchen.deploy.backend.dto.response.UserResponse; import com.qqchen.deploy.backend.entity.Tenant; -import com.qqchen.deploy.backend.entity.User; import org.mapstruct.Mapper; -import org.mapstruct.Mapping; -import org.mapstruct.MappingTarget; import org.mapstruct.ReportingPolicy; @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/converter/UserConverter.java b/backend/src/main/java/com/qqchen/deploy/backend/converter/UserConverter.java index 7b3d8478..32ad98c0 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/converter/UserConverter.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/converter/UserConverter.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.converter; -import com.qqchen.deploy.backend.common.converter.BaseConverter; +import com.qqchen.deploy.backend.framework.converter.BaseConverter; import com.qqchen.deploy.backend.entity.User; import com.qqchen.deploy.backend.dto.request.UserRequest; import com.qqchen.deploy.backend.dto.response.UserResponse; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/dto/query/TenantQuery.java b/backend/src/main/java/com/qqchen/deploy/backend/dto/query/TenantQuery.java index aaf24f1b..abceb610 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/dto/query/TenantQuery.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/dto/query/TenantQuery.java @@ -1,10 +1,8 @@ package com.qqchen.deploy.backend.dto.query; -import com.qqchen.deploy.backend.common.annotation.QueryField; -import com.qqchen.deploy.backend.common.enums.QueryType; -import com.qqchen.deploy.backend.common.query.BaseQuery; -import jakarta.persistence.Column; -import jakarta.validation.constraints.NotBlank; +import com.qqchen.deploy.backend.framework.annotation.QueryField; +import com.qqchen.deploy.backend.framework.enums.QueryType; +import com.qqchen.deploy.backend.framework.query.BaseQuery; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/dto/query/UserQuery.java b/backend/src/main/java/com/qqchen/deploy/backend/dto/query/UserQuery.java index c8ae95dd..3def907e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/dto/query/UserQuery.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/dto/query/UserQuery.java @@ -1,8 +1,8 @@ package com.qqchen.deploy.backend.dto.query; -import com.qqchen.deploy.backend.common.annotation.QueryField; -import com.qqchen.deploy.backend.common.query.BaseQuery; -import com.qqchen.deploy.backend.common.enums.QueryType; +import com.qqchen.deploy.backend.framework.annotation.QueryField; +import com.qqchen.deploy.backend.framework.query.BaseQuery; +import com.qqchen.deploy.backend.framework.enums.QueryType; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/dto/request/TenantRequest.java b/backend/src/main/java/com/qqchen/deploy/backend/dto/request/TenantRequest.java index f1cac7db..f306a317 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/dto/request/TenantRequest.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/dto/request/TenantRequest.java @@ -1,10 +1,7 @@ package com.qqchen.deploy.backend.dto.request; -import com.qqchen.deploy.backend.common.dto.BaseRequest; -import jakarta.persistence.Column; -import jakarta.validation.constraints.Email; +import com.qqchen.deploy.backend.framework.dto.BaseRequest; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/dto/request/UserRequest.java b/backend/src/main/java/com/qqchen/deploy/backend/dto/request/UserRequest.java index bf386511..f15fecec 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/dto/request/UserRequest.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/dto/request/UserRequest.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.dto.request; -import com.qqchen.deploy.backend.common.dto.BaseRequest; +import com.qqchen.deploy.backend.framework.dto.BaseRequest; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/dto/response/TenantResponse.java b/backend/src/main/java/com/qqchen/deploy/backend/dto/response/TenantResponse.java index dc3cd106..e7aed94d 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/dto/response/TenantResponse.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/dto/response/TenantResponse.java @@ -1,8 +1,6 @@ package com.qqchen.deploy.backend.dto.response; -import com.qqchen.deploy.backend.common.dto.BaseResponse; -import jakarta.persistence.Column; -import jakarta.validation.constraints.NotBlank; +import com.qqchen.deploy.backend.framework.dto.BaseResponse; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/dto/response/UserResponse.java b/backend/src/main/java/com/qqchen/deploy/backend/dto/response/UserResponse.java index adf5dff6..fadbb83f 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/dto/response/UserResponse.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/dto/response/UserResponse.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.dto.response; -import com.qqchen.deploy.backend.common.dto.BaseResponse; +import com.qqchen.deploy.backend.framework.dto.BaseResponse; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/Department.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/Department.java index a9b14f13..f913ea7b 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/Department.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/Department.java @@ -1,25 +1,12 @@ package com.qqchen.deploy.backend.entity; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; -import jakarta.persistence.CascadeType; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import jakarta.persistence.Transient; import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; @Data @EqualsAndHashCode(callSuper = true) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsBuild.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsBuild.java index 05ca2d59..4e965b92 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsBuild.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsBuild.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.entity; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; import jakarta.persistence.Table; import lombok.Data; @@ -12,7 +12,7 @@ import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) @jakarta.persistence.Entity -@Table(name = "sys_jenkins_build") +@Table(name = "deploy_jenkins_build") @LogicDelete public class JenkinsBuild extends Entity { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsConfig.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsConfig.java index 7645794d..eadbe85c 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsConfig.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsConfig.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.entity; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; import jakarta.persistence.Table; import lombok.Data; @@ -12,7 +12,7 @@ import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) @jakarta.persistence.Entity -@Table(name = "sys_jenkins_config") +@Table(name = "deploy_jenkins_config") @LogicDelete public class JenkinsConfig extends Entity { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsJob.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsJob.java index fb036c95..01b936d4 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsJob.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsJob.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.entity; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; import jakarta.persistence.FetchType; import jakarta.persistence.JoinColumn; @@ -17,7 +17,7 @@ import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) @jakarta.persistence.Entity -@Table(name = "sys_jenkins_job") +@Table(name = "deploy_jenkins_job") @LogicDelete public class JenkinsJob extends Entity { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsSyncHistory.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsSyncHistory.java index 56c49b4f..93d46f4e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsSyncHistory.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsSyncHistory.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.entity; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -14,7 +14,7 @@ import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) @jakarta.persistence.Entity -@Table(name = "sys_jenkins_sync_history") +@Table(name = "deploy_jenkins_sync_history") @LogicDelete public class JenkinsSyncHistory extends Entity { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsView.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsView.java index 188c93be..0eddd3e5 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsView.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsView.java @@ -1,8 +1,8 @@ package com.qqchen.deploy.backend.entity; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; import jakarta.persistence.Table; import lombok.Data; @@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @jakarta.persistence.Entity -@Table(name = "sys_jenkins_view") +@Table(name = "deploy_jenkins_view") @LogicDelete public class JenkinsView extends Entity { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/Menu.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/Menu.java index 70cfbe6e..47b05793 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/Menu.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/Menu.java @@ -1,24 +1,11 @@ package com.qqchen.deploy.backend.entity; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToMany; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import jakarta.persistence.Transient; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; @Data diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryBranch.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryBranch.java index 4f85ed04..0f71352b 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryBranch.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryBranch.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.entity; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; import jakarta.persistence.Table; import lombok.Data; @@ -12,7 +12,7 @@ import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) @jakarta.persistence.Entity -@Table(name = "sys_repository_branch") +@Table(name = "deploy_repository_branch") @LogicDelete public class RepositoryBranch extends Entity { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryConfig.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryConfig.java index 9c9570f4..a0b481f7 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryConfig.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryConfig.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.entity; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -15,7 +15,7 @@ import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) @jakarta.persistence.Entity -@Table(name = "sys_repository_config") +@Table(name = "deploy_repository_config") @LogicDelete public class RepositoryConfig extends Entity { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryGroup.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryGroup.java index 03127333..66f227a9 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryGroup.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryGroup.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.entity; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; import jakarta.persistence.Table; import lombok.Data; @@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @jakarta.persistence.Entity -@Table(name = "sys_repository_group") +@Table(name = "deploy_repository_group") @LogicDelete public class RepositoryGroup extends Entity { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryProject.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryProject.java index 3f17a469..5d73055a 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryProject.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryProject.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.entity; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; import jakarta.persistence.Table; import lombok.Data; @@ -12,7 +12,7 @@ import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) @jakarta.persistence.Entity -@Table(name = "sys_repository_project") +@Table(name = "deploy_repository_project") @LogicDelete public class RepositoryProject extends Entity { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositorySyncHistory.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositorySyncHistory.java index 5bf366ac..594192cb 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositorySyncHistory.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/RepositorySyncHistory.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.entity; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -14,7 +14,7 @@ import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) @jakarta.persistence.Entity -@Table(name = "sys_repository_sync_history") +@Table(name = "deploy_repository_sync_history") @LogicDelete public class RepositorySyncHistory extends Entity { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/Role.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/Role.java index b52395a1..42a8c7b8 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/Role.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/Role.java @@ -1,21 +1,12 @@ package com.qqchen.deploy.backend.entity; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; -import jakarta.persistence.CascadeType; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; -import jakarta.persistence.ManyToMany; -import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; @Data @@ -37,5 +28,5 @@ public class Role extends Entity { @Column(nullable = false) private Integer sort = 0; - + } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/RoleMenu.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/RoleMenu.java index 7f0ffd92..3e54845a 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/RoleMenu.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/RoleMenu.java @@ -1,19 +1,11 @@ package com.qqchen.deploy.backend.entity; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToMany; -import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.util.Set; @Data diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/Tenant.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/Tenant.java index 94953bc8..2d7bb7cd 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/Tenant.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/Tenant.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.entity; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; import jakarta.persistence.Table; import jakarta.validation.constraints.NotBlank; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/User.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/User.java index a1885608..1753e71f 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/User.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/User.java @@ -1,24 +1,11 @@ package com.qqchen.deploy.backend.entity; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.AggregateRoot; -import com.qqchen.deploy.backend.common.domain.Entity; -import com.qqchen.deploy.backend.event.UserRoleChangedEvent; -import jakarta.persistence.CascadeType; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; -import jakarta.persistence.OneToMany; -import jakarta.persistence.OneToOne; import jakarta.persistence.Table; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; @Data @EqualsAndHashCode(callSuper = true) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/UserDepartment.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/UserDepartment.java index 0ddad3a6..f7b40565 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/UserDepartment.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/UserDepartment.java @@ -1,21 +1,11 @@ package com.qqchen.deploy.backend.entity; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; -import jakarta.persistence.CascadeType; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; -import jakarta.persistence.FetchType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.OneToOne; import jakarta.persistence.Table; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.util.Set; @Data @EqualsAndHashCode(callSuper = true) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/entity/UserRole.java b/backend/src/main/java/com/qqchen/deploy/backend/entity/UserRole.java index d03b17a5..e1b408ac 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/entity/UserRole.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/entity/UserRole.java @@ -1,18 +1,11 @@ package com.qqchen.deploy.backend.entity; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; -import jakarta.persistence.FetchType; -import jakarta.persistence.GenerationType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToOne; import jakarta.persistence.Table; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.ToString; @Data @EqualsAndHashCode(callSuper = true) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/event/UserRoleChangedEvent.java b/backend/src/main/java/com/qqchen/deploy/backend/event/UserRoleChangedEvent.java index 94bfff02..77ca38c8 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/event/UserRoleChangedEvent.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/event/UserRoleChangedEvent.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.event; -import com.qqchen.deploy.backend.common.event.DomainEvent; +import com.qqchen.deploy.backend.framework.event.DomainEvent; import lombok.Getter; @Getter diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/annotation/LogicDelete.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/annotation/LogicDelete.java similarity index 89% rename from backend/src/main/java/com/qqchen/deploy/backend/common/annotation/LogicDelete.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/annotation/LogicDelete.java index 107b3e4f..a744b861 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/annotation/LogicDelete.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/annotation/LogicDelete.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.annotation; +package com.qqchen.deploy.backend.framework.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/annotation/QueryField.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/annotation/QueryField.java similarity index 76% rename from backend/src/main/java/com/qqchen/deploy/backend/common/annotation/QueryField.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/annotation/QueryField.java index 47c335b0..b925e9a1 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/annotation/QueryField.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/annotation/QueryField.java @@ -1,6 +1,6 @@ -package com.qqchen.deploy.backend.common.annotation; +package com.qqchen.deploy.backend.framework.annotation; -import com.qqchen.deploy.backend.common.enums.QueryType; +import com.qqchen.deploy.backend.framework.enums.QueryType; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/annotation/TenantFilter.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/annotation/TenantFilter.java similarity index 87% rename from backend/src/main/java/com/qqchen/deploy/backend/common/annotation/TenantFilter.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/annotation/TenantFilter.java index f725e0e7..a027edcb 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/annotation/TenantFilter.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/annotation/TenantFilter.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.annotation; +package com.qqchen.deploy.backend.framework.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/api/Response.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/api/Response.java similarity index 89% rename from backend/src/main/java/com/qqchen/deploy/backend/common/api/Response.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/api/Response.java index d2a51837..77fc411a 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/api/Response.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/api/Response.java @@ -1,7 +1,7 @@ -package com.qqchen.deploy.backend.common.api; +package com.qqchen.deploy.backend.framework.api; -import com.qqchen.deploy.backend.common.enums.ResponseCode; -import com.qqchen.deploy.backend.common.utils.MessageUtils; +import com.qqchen.deploy.backend.framework.enums.ResponseCode; +import com.qqchen.deploy.backend.framework.utils.MessageUtils; import lombok.Data; import java.io.Serializable; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/config/AppConfig.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/config/AppConfig.java similarity index 92% rename from backend/src/main/java/com/qqchen/deploy/backend/common/config/AppConfig.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/config/AppConfig.java index 09fe44da..57ccc063 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/config/AppConfig.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/config/AppConfig.java @@ -1,12 +1,11 @@ -package com.qqchen.deploy.backend.common.config; +package com.qqchen.deploy.backend.framework.config; -import com.qqchen.deploy.backend.common.interceptor.TenantInterceptor; +import com.qqchen.deploy.backend.framework.interceptor.TenantInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/config/JacksonConfig.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/config/JacksonConfig.java similarity index 95% rename from backend/src/main/java/com/qqchen/deploy/backend/common/config/JacksonConfig.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/config/JacksonConfig.java index ea732f76..cfc11319 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/config/JacksonConfig.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/config/JacksonConfig.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.config; +package com.qqchen.deploy.backend.framework.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/config/JpaAuditingConfig.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/config/JpaAuditingConfig.java similarity index 94% rename from backend/src/main/java/com/qqchen/deploy/backend/common/config/JpaAuditingConfig.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/config/JpaAuditingConfig.java index 0e8172a6..aed9e6f0 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/config/JpaAuditingConfig.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/config/JpaAuditingConfig.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.config; +package com.qqchen.deploy.backend.framework.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/config/MessageConfig.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/config/MessageConfig.java similarity index 91% rename from backend/src/main/java/com/qqchen/deploy/backend/common/config/MessageConfig.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/config/MessageConfig.java index 4d2eb0cb..1f8b8ffb 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/config/MessageConfig.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/config/MessageConfig.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.config; +package com.qqchen.deploy.backend.framework.config; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; @@ -7,8 +7,6 @@ import org.springframework.context.support.ResourceBundleMessageSource; import org.springframework.web.servlet.LocaleResolver; import org.springframework.web.servlet.i18n.SessionLocaleResolver; -import java.util.Arrays; -import java.util.List; import java.util.Locale; @Configuration diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/context/TenantContext.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/context/TenantContext.java similarity index 90% rename from backend/src/main/java/com/qqchen/deploy/backend/common/context/TenantContext.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/context/TenantContext.java index 9dd0d62c..c2bdb595 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/context/TenantContext.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/context/TenantContext.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.context; +package com.qqchen.deploy.backend.framework.context; public class TenantContext { private static final ThreadLocal CURRENT_TENANT = new ThreadLocal<>(); diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/controller/BaseController.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/controller/BaseController.java similarity index 81% rename from backend/src/main/java/com/qqchen/deploy/backend/common/controller/BaseController.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/controller/BaseController.java index 6f5f5439..38459e85 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/controller/BaseController.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/controller/BaseController.java @@ -1,12 +1,12 @@ -package com.qqchen.deploy.backend.common.controller; +package com.qqchen.deploy.backend.framework.controller; -import com.qqchen.deploy.backend.common.domain.Entity; -import com.qqchen.deploy.backend.common.converter.BaseConverter; -import com.qqchen.deploy.backend.common.dto.BaseResponse; -import com.qqchen.deploy.backend.common.query.BaseQuery; -import com.qqchen.deploy.backend.common.dto.BaseRequest; -import com.qqchen.deploy.backend.common.api.Response; -import com.qqchen.deploy.backend.common.service.IBaseService; +import com.qqchen.deploy.backend.framework.domain.Entity; +import com.qqchen.deploy.backend.framework.converter.BaseConverter; +import com.qqchen.deploy.backend.framework.dto.BaseResponse; +import com.qqchen.deploy.backend.framework.query.BaseQuery; +import com.qqchen.deploy.backend.framework.dto.BaseRequest; +import com.qqchen.deploy.backend.framework.api.Response; +import com.qqchen.deploy.backend.framework.service.IBaseService; import org.springframework.data.domain.Page; import org.springframework.web.bind.annotation.*; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/converter/BaseConverter.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/converter/BaseConverter.java similarity index 77% rename from backend/src/main/java/com/qqchen/deploy/backend/common/converter/BaseConverter.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/converter/BaseConverter.java index 775dd936..fc73c8f7 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/converter/BaseConverter.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/converter/BaseConverter.java @@ -1,7 +1,7 @@ -package com.qqchen.deploy.backend.common.converter; +package com.qqchen.deploy.backend.framework.converter; -import com.qqchen.deploy.backend.common.domain.Entity; -import com.qqchen.deploy.backend.common.dto.BaseRequest; +import com.qqchen.deploy.backend.framework.domain.Entity; +import com.qqchen.deploy.backend.framework.dto.BaseRequest; import org.mapstruct.MappingTarget; import org.springframework.data.domain.Page; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/domain/AggregateRoot.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/domain/AggregateRoot.java similarity index 92% rename from backend/src/main/java/com/qqchen/deploy/backend/common/domain/AggregateRoot.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/domain/AggregateRoot.java index 8c7309a9..b6a4de1b 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/domain/AggregateRoot.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/domain/AggregateRoot.java @@ -1,13 +1,12 @@ -package com.qqchen.deploy.backend.common.domain; +package com.qqchen.deploy.backend.framework.domain; -import com.qqchen.deploy.backend.common.event.DomainEvent; +import com.qqchen.deploy.backend.framework.event.DomainEvent; import org.springframework.data.domain.AfterDomainEventPublication; import org.springframework.data.domain.DomainEvents; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; public abstract class AggregateRoot extends Entity { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/domain/Entity.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/domain/Entity.java similarity index 96% rename from backend/src/main/java/com/qqchen/deploy/backend/common/domain/Entity.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/domain/Entity.java index b53eec56..4b530107 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/domain/Entity.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/domain/Entity.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.domain; +package com.qqchen.deploy.backend.framework.domain; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/dto/BaseRequest.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/dto/BaseRequest.java similarity index 89% rename from backend/src/main/java/com/qqchen/deploy/backend/common/dto/BaseRequest.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/dto/BaseRequest.java index 748ca356..fc0e7a5b 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/dto/BaseRequest.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/dto/BaseRequest.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.dto; +package com.qqchen.deploy.backend.framework.dto; import lombok.Data; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/dto/BaseResponse.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/dto/BaseResponse.java similarity index 86% rename from backend/src/main/java/com/qqchen/deploy/backend/common/dto/BaseResponse.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/dto/BaseResponse.java index be799ffc..1c217395 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/dto/BaseResponse.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/dto/BaseResponse.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.dto; +package com.qqchen.deploy.backend.framework.dto; import lombok.Data; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/enums/QueryType.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/enums/QueryType.java similarity index 87% rename from backend/src/main/java/com/qqchen/deploy/backend/common/enums/QueryType.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/enums/QueryType.java index b22b8225..2fa5ad5b 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/enums/QueryType.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/enums/QueryType.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.enums; +package com.qqchen.deploy.backend.framework.enums; public enum QueryType { EQUAL, // 等于 diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/enums/ResponseCode.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/enums/ResponseCode.java similarity index 94% rename from backend/src/main/java/com/qqchen/deploy/backend/common/enums/ResponseCode.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/enums/ResponseCode.java index 8e2e8a2d..acd8bdae 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/enums/ResponseCode.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/enums/ResponseCode.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.enums; +package com.qqchen.deploy.backend.framework.enums; import lombok.Getter; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/event/DomainEvent.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/event/DomainEvent.java similarity index 86% rename from backend/src/main/java/com/qqchen/deploy/backend/common/event/DomainEvent.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/event/DomainEvent.java index 843fb688..bdd31e97 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/event/DomainEvent.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/event/DomainEvent.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.event; +package com.qqchen.deploy.backend.framework.event; import lombok.Getter; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/exception/BusinessException.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/exception/BusinessException.java similarity index 72% rename from backend/src/main/java/com/qqchen/deploy/backend/common/exception/BusinessException.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/exception/BusinessException.java index a1621bb1..04b4cd86 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/exception/BusinessException.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/exception/BusinessException.java @@ -1,7 +1,7 @@ -package com.qqchen.deploy.backend.common.exception; +package com.qqchen.deploy.backend.framework.exception; -import com.qqchen.deploy.backend.common.enums.ResponseCode; -import com.qqchen.deploy.backend.common.utils.MessageUtils; +import com.qqchen.deploy.backend.framework.enums.ResponseCode; +import com.qqchen.deploy.backend.framework.utils.MessageUtils; import lombok.Getter; @Getter diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/exception/GlobalExceptionHandler.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/exception/GlobalExceptionHandler.java similarity index 84% rename from backend/src/main/java/com/qqchen/deploy/backend/common/exception/GlobalExceptionHandler.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/exception/GlobalExceptionHandler.java index e0d6b388..2340df54 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/exception/GlobalExceptionHandler.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/exception/GlobalExceptionHandler.java @@ -1,7 +1,7 @@ -package com.qqchen.deploy.backend.common.exception; +package com.qqchen.deploy.backend.framework.exception; -import com.qqchen.deploy.backend.common.api.Response; -import com.qqchen.deploy.backend.common.enums.ResponseCode; +import com.qqchen.deploy.backend.framework.api.Response; +import com.qqchen.deploy.backend.framework.enums.ResponseCode; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/filter/TenantFilter.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/filter/TenantFilter.java similarity index 89% rename from backend/src/main/java/com/qqchen/deploy/backend/common/filter/TenantFilter.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/filter/TenantFilter.java index 787aa8de..fe894d3f 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/filter/TenantFilter.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/filter/TenantFilter.java @@ -1,6 +1,6 @@ -package com.qqchen.deploy.backend.common.filter; +package com.qqchen.deploy.backend.framework.filter; -import com.qqchen.deploy.backend.common.context.TenantContext; +import com.qqchen.deploy.backend.framework.context.TenantContext; import jakarta.servlet.Filter; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/integration/dto/ThirdPartyDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/integration/dto/ThirdPartyDTO.java similarity index 61% rename from backend/src/main/java/com/qqchen/deploy/backend/common/integration/dto/ThirdPartyDTO.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/integration/dto/ThirdPartyDTO.java index b7110614..cacde227 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/integration/dto/ThirdPartyDTO.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/integration/dto/ThirdPartyDTO.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.integration.dto; +package com.qqchen.deploy.backend.framework.integration.dto; public interface ThirdPartyDTO { // 标记接口,表明这是第三方系统的数据结构 diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/interceptor/TenantInterceptor.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/interceptor/TenantInterceptor.java similarity index 86% rename from backend/src/main/java/com/qqchen/deploy/backend/common/interceptor/TenantInterceptor.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/interceptor/TenantInterceptor.java index 8ff80595..b472c1b4 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/interceptor/TenantInterceptor.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/interceptor/TenantInterceptor.java @@ -1,8 +1,8 @@ -package com.qqchen.deploy.backend.common.interceptor; +package com.qqchen.deploy.backend.framework.interceptor; -import com.qqchen.deploy.backend.common.context.TenantContext; -import com.qqchen.deploy.backend.common.enums.ResponseCode; -import com.qqchen.deploy.backend.common.exception.BusinessException; +import com.qqchen.deploy.backend.framework.context.TenantContext; +import com.qqchen.deploy.backend.framework.enums.ResponseCode; +import com.qqchen.deploy.backend.framework.exception.BusinessException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/query/BaseQuery.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/query/BaseQuery.java similarity index 89% rename from backend/src/main/java/com/qqchen/deploy/backend/common/query/BaseQuery.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/query/BaseQuery.java index c97882e1..251f8716 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/query/BaseQuery.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/query/BaseQuery.java @@ -1,7 +1,7 @@ -package com.qqchen.deploy.backend.common.query; +package com.qqchen.deploy.backend.framework.query; -import com.qqchen.deploy.backend.common.annotation.QueryField; -import com.qqchen.deploy.backend.common.enums.QueryType; +import com.qqchen.deploy.backend.framework.annotation.QueryField; +import com.qqchen.deploy.backend.framework.enums.QueryType; import lombok.Data; import java.io.Serializable; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/query/DateRange.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/query/DateRange.java similarity index 95% rename from backend/src/main/java/com/qqchen/deploy/backend/common/query/DateRange.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/query/DateRange.java index f72e8fde..5ec8b346 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/query/DateRange.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/query/DateRange.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.query; +package com.qqchen.deploy.backend.framework.query; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/query/Range.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/query/Range.java similarity index 64% rename from backend/src/main/java/com/qqchen/deploy/backend/common/query/Range.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/query/Range.java index 77355ee9..dfbfac85 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/query/Range.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/query/Range.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.query; +package com.qqchen.deploy.backend.framework.query; import lombok.Data; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/repository/IBaseRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/repository/IBaseRepository.java similarity index 92% rename from backend/src/main/java/com/qqchen/deploy/backend/common/repository/IBaseRepository.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/repository/IBaseRepository.java index 8946a58c..cb334a58 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/repository/IBaseRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/repository/IBaseRepository.java @@ -1,6 +1,6 @@ -package com.qqchen.deploy.backend.common.repository; +package com.qqchen.deploy.backend.framework.repository; -import com.qqchen.deploy.backend.common.domain.Entity; +import com.qqchen.deploy.backend.framework.domain.Entity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.querydsl.QuerydslPredicateExecutor; import org.springframework.data.repository.NoRepositoryBean; @@ -8,17 +8,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import java.io.Serializable; import java.util.List; import java.util.Optional; import java.util.Collection; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; import java.time.LocalDateTime; -import java.util.function.Predicate; -import java.util.Iterator; import java.util.ArrayList; @NoRepositoryBean diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/security/config/SecurityConfig.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/security/config/SecurityConfig.java similarity index 80% rename from backend/src/main/java/com/qqchen/deploy/backend/common/security/config/SecurityConfig.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/security/config/SecurityConfig.java index 2ee8440a..ca1f1c6c 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/security/config/SecurityConfig.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/security/config/SecurityConfig.java @@ -1,8 +1,8 @@ -package com.qqchen.deploy.backend.common.security.config; +package com.qqchen.deploy.backend.framework.security.config; -import com.qqchen.deploy.backend.common.security.filter.JwtAuthenticationFilter; -import com.qqchen.deploy.backend.common.security.handler.CustomAuthenticationEntryPoint; -import com.qqchen.deploy.backend.common.security.util.JwtTokenUtil; +import com.qqchen.deploy.backend.framework.security.filter.JwtAuthenticationFilter; +import com.qqchen.deploy.backend.framework.security.handler.CustomAuthenticationEntryPoint; +import com.qqchen.deploy.backend.framework.security.util.JwtTokenUtil; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -11,19 +11,11 @@ import org.springframework.security.config.annotation.authentication.configurati import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.provisioning.InMemoryUserDetailsManager; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.CorsConfigurationSource; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; - -import java.util.Arrays; @Configuration @EnableWebSecurity diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/security/filter/JwtAuthenticationFilter.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/security/filter/JwtAuthenticationFilter.java similarity index 93% rename from backend/src/main/java/com/qqchen/deploy/backend/common/security/filter/JwtAuthenticationFilter.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/security/filter/JwtAuthenticationFilter.java index 756e1e69..d479943d 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/security/filter/JwtAuthenticationFilter.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/security/filter/JwtAuthenticationFilter.java @@ -1,7 +1,7 @@ -package com.qqchen.deploy.backend.common.security.filter; +package com.qqchen.deploy.backend.framework.security.filter; -import com.qqchen.deploy.backend.common.context.TenantContext; -import com.qqchen.deploy.backend.common.security.util.JwtTokenUtil; +import com.qqchen.deploy.backend.framework.context.TenantContext; +import com.qqchen.deploy.backend.framework.security.util.JwtTokenUtil; import jakarta.servlet.FilterChain; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/security/handler/CustomAuthenticationEntryPoint.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/security/handler/CustomAuthenticationEntryPoint.java similarity index 89% rename from backend/src/main/java/com/qqchen/deploy/backend/common/security/handler/CustomAuthenticationEntryPoint.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/security/handler/CustomAuthenticationEntryPoint.java index a0123c0c..9c162f85 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/security/handler/CustomAuthenticationEntryPoint.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/security/handler/CustomAuthenticationEntryPoint.java @@ -1,9 +1,9 @@ -package com.qqchen.deploy.backend.common.security.handler; +package com.qqchen.deploy.backend.framework.security.handler; import com.fasterxml.jackson.databind.ObjectMapper; -import com.qqchen.deploy.backend.common.api.Response; -import com.qqchen.deploy.backend.common.enums.ResponseCode; -import com.qqchen.deploy.backend.common.utils.MessageUtils; +import com.qqchen.deploy.backend.framework.api.Response; +import com.qqchen.deploy.backend.framework.enums.ResponseCode; +import com.qqchen.deploy.backend.framework.utils.MessageUtils; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/security/util/JwtTokenUtil.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/security/util/JwtTokenUtil.java similarity index 97% rename from backend/src/main/java/com/qqchen/deploy/backend/common/security/util/JwtTokenUtil.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/security/util/JwtTokenUtil.java index ea219bfd..fc343442 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/security/util/JwtTokenUtil.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/security/util/JwtTokenUtil.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.security.util; +package com.qqchen.deploy.backend.framework.security.util; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/service/IBaseService.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/service/IBaseService.java similarity index 70% rename from backend/src/main/java/com/qqchen/deploy/backend/common/service/IBaseService.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/service/IBaseService.java index 34ad1f9e..2f409c1e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/service/IBaseService.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/service/IBaseService.java @@ -1,7 +1,7 @@ -package com.qqchen.deploy.backend.common.service; +package com.qqchen.deploy.backend.framework.service; -import com.qqchen.deploy.backend.common.domain.Entity; -import com.qqchen.deploy.backend.common.query.BaseQuery; +import com.qqchen.deploy.backend.framework.domain.Entity; +import com.qqchen.deploy.backend.framework.query.BaseQuery; import org.springframework.data.domain.Page; import java.io.Serializable; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/service/impl/BaseServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java similarity index 94% rename from backend/src/main/java/com/qqchen/deploy/backend/common/service/impl/BaseServiceImpl.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java index 357e7894..92972191 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/service/impl/BaseServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.service.impl; +package com.qqchen.deploy.backend.framework.service.impl; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -6,16 +6,16 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.qqchen.deploy.backend.common.annotation.LogicDelete; -import com.qqchen.deploy.backend.common.domain.Entity; -import com.qqchen.deploy.backend.common.enums.QueryType; -import com.qqchen.deploy.backend.common.query.BaseQuery; -import com.qqchen.deploy.backend.common.query.DateRange; -import com.qqchen.deploy.backend.common.query.Range; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; -import com.qqchen.deploy.backend.common.annotation.QueryField; -import com.qqchen.deploy.backend.common.service.IBaseService; -import com.qqchen.deploy.backend.common.utils.EntityPathResolver; +import com.qqchen.deploy.backend.framework.annotation.LogicDelete; +import com.qqchen.deploy.backend.framework.domain.Entity; +import com.qqchen.deploy.backend.framework.enums.QueryType; +import com.qqchen.deploy.backend.framework.query.BaseQuery; +import com.qqchen.deploy.backend.framework.query.DateRange; +import com.qqchen.deploy.backend.framework.query.Range; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.annotation.QueryField; +import com.qqchen.deploy.backend.framework.service.IBaseService; +import com.qqchen.deploy.backend.framework.utils.EntityPathResolver; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.types.EntityPath; import com.querydsl.core.types.Path; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/utils/EntityPathResolver.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/utils/EntityPathResolver.java similarity index 97% rename from backend/src/main/java/com/qqchen/deploy/backend/common/utils/EntityPathResolver.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/utils/EntityPathResolver.java index 83e20c40..18c5c1cf 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/utils/EntityPathResolver.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/utils/EntityPathResolver.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.utils; +package com.qqchen.deploy.backend.framework.utils; import com.querydsl.core.types.EntityPath; import com.querydsl.core.types.Path; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/utils/MessageUtils.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/utils/MessageUtils.java similarity index 94% rename from backend/src/main/java/com/qqchen/deploy/backend/common/utils/MessageUtils.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/utils/MessageUtils.java index d208b989..421e15a6 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/utils/MessageUtils.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/utils/MessageUtils.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.utils; +package com.qqchen.deploy.backend.framework.utils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/common/utils/PasswordGenerator.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/utils/PasswordGenerator.java similarity index 92% rename from backend/src/main/java/com/qqchen/deploy/backend/common/utils/PasswordGenerator.java rename to backend/src/main/java/com/qqchen/deploy/backend/framework/utils/PasswordGenerator.java index 11d09779..b0ba18bd 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/common/utils/PasswordGenerator.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/utils/PasswordGenerator.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.common.utils; +package com.qqchen.deploy.backend.framework.utils; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/integration/dto/JenkinsBuildDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/integration/dto/JenkinsBuildDTO.java index 61e0360e..3306c52e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/integration/dto/JenkinsBuildDTO.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/integration/dto/JenkinsBuildDTO.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.integration.dto; -import com.qqchen.deploy.backend.common.integration.dto.ThirdPartyDTO; +import com.qqchen.deploy.backend.framework.integration.dto.ThirdPartyDTO; import lombok.Data; @Data diff --git a/backend/src/main/java/com/qqchen/deploy/backend/integration/dto/JenkinsConnectionDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/integration/dto/JenkinsConnectionDTO.java index 599398ca..246d3e08 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/integration/dto/JenkinsConnectionDTO.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/integration/dto/JenkinsConnectionDTO.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.integration.dto; -import com.qqchen.deploy.backend.common.integration.dto.ThirdPartyDTO; +import com.qqchen.deploy.backend.framework.integration.dto.ThirdPartyDTO; import lombok.Data; @Data diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IDepartmentRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IDepartmentRepository.java index f23dbfee..86dd0d12 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IDepartmentRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IDepartmentRepository.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.Department; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsBuildRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsBuildRepository.java index c178e5eb..e8c4e85a 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsBuildRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsBuildRepository.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.JenkinsBuild; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsConfigRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsConfigRepository.java index da4874de..ad862a51 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsConfigRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsConfigRepository.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.JenkinsConfig; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsJobRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsJobRepository.java index 80392b87..011bb067 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsJobRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsJobRepository.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.JenkinsJob; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsSyncHistoryRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsSyncHistoryRepository.java index 973d8fde..01b3eee2 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsSyncHistoryRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsSyncHistoryRepository.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.JenkinsSyncHistory; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsViewRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsViewRepository.java index 60813f65..a9ccd8d5 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsViewRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsViewRepository.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.JenkinsView; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryBranchRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryBranchRepository.java index b91502d3..edf18fdf 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryBranchRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryBranchRepository.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.RepositoryBranch; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryConfigRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryConfigRepository.java index e1b8985a..4b099c8e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryConfigRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryConfigRepository.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.RepositoryConfig; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryGroupRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryGroupRepository.java index bbd85f80..ca58fc84 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryGroupRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryGroupRepository.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.RepositoryGroup; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryProjectRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryProjectRepository.java index cb7df9f5..670c289d 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryProjectRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryProjectRepository.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.RepositoryProject; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositorySyncHistoryRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositorySyncHistoryRepository.java index de597b55..e6525645 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositorySyncHistoryRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositorySyncHistoryRepository.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.RepositorySyncHistory; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRoleMenuRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRoleMenuRepository.java index 363a20d8..5203b66f 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRoleMenuRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRoleMenuRepository.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.RoleMenu; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRoleRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRoleRepository.java index a1f23817..b2344d8e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IRoleRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IRoleRepository.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.Role; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/ITenantRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/ITenantRepository.java index 444faba3..175471a5 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/ITenantRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/ITenantRepository.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.Tenant; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IUserRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IUserRepository.java index b7e1fa60..725ee28e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IUserRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IUserRepository.java @@ -1,10 +1,9 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.User; import org.springframework.stereotype.Repository; -import java.util.List; import java.util.Optional; @Repository diff --git a/backend/src/main/java/com/qqchen/deploy/backend/repository/IUserRoleRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/repository/IUserRoleRepository.java index 6de868f2..4a0f834a 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/repository/IUserRoleRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/repository/IUserRoleRepository.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.repository; -import com.qqchen.deploy.backend.common.repository.IBaseRepository; +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import com.qqchen.deploy.backend.entity.UserRole; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/service/IDepartmentService.java b/backend/src/main/java/com/qqchen/deploy/backend/service/IDepartmentService.java index 107f7bb5..95f04081 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/service/IDepartmentService.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/service/IDepartmentService.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.service; -import com.qqchen.deploy.backend.common.service.IBaseService; +import com.qqchen.deploy.backend.framework.service.IBaseService; import com.qqchen.deploy.backend.entity.Department; import java.util.List; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/service/IJenkinsService.java b/backend/src/main/java/com/qqchen/deploy/backend/service/IJenkinsService.java index 08f23bd8..cf5a4cc5 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/service/IJenkinsService.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/service/IJenkinsService.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.service; -import com.qqchen.deploy.backend.common.service.IBaseService; +import com.qqchen.deploy.backend.framework.service.IBaseService; import com.qqchen.deploy.backend.entity.JenkinsConfig; public interface IJenkinsService extends IBaseService { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/service/IMenuService.java b/backend/src/main/java/com/qqchen/deploy/backend/service/IMenuService.java index 40e2b0fc..d477ddc8 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/service/IMenuService.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/service/IMenuService.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.service; -import com.qqchen.deploy.backend.common.service.IBaseService; +import com.qqchen.deploy.backend.framework.service.IBaseService; import com.qqchen.deploy.backend.entity.Menu; import java.util.List; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/service/IRepositoryService.java b/backend/src/main/java/com/qqchen/deploy/backend/service/IRepositoryService.java index 8c712643..4531f0ac 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/service/IRepositoryService.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/service/IRepositoryService.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.service; -import com.qqchen.deploy.backend.common.service.IBaseService; +import com.qqchen.deploy.backend.framework.service.IBaseService; import com.qqchen.deploy.backend.entity.RepositoryConfig; import java.util.List; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/service/IRoleService.java b/backend/src/main/java/com/qqchen/deploy/backend/service/IRoleService.java index ff1dd111..592adaed 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/service/IRoleService.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/service/IRoleService.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.service; -import com.qqchen.deploy.backend.common.service.IBaseService; +import com.qqchen.deploy.backend.framework.service.IBaseService; import com.qqchen.deploy.backend.entity.Role; import java.util.List; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/service/ITenantService.java b/backend/src/main/java/com/qqchen/deploy/backend/service/ITenantService.java index 6d8c7dcc..860fbfff 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/service/ITenantService.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/service/ITenantService.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.service; -import com.qqchen.deploy.backend.common.service.IBaseService; +import com.qqchen.deploy.backend.framework.service.IBaseService; import com.qqchen.deploy.backend.entity.Tenant; import java.util.List; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/service/IUserService.java b/backend/src/main/java/com/qqchen/deploy/backend/service/IUserService.java index de608ab9..eb55807b 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/service/IUserService.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/service/IUserService.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.service; -import com.qqchen.deploy.backend.common.service.IBaseService; +import com.qqchen.deploy.backend.framework.service.IBaseService; import com.qqchen.deploy.backend.dto.request.LoginRequest; import com.qqchen.deploy.backend.dto.response.LoginResponse; import com.qqchen.deploy.backend.entity.User; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/service/impl/DepartmentServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/service/impl/DepartmentServiceImpl.java index 3c2f7b93..e8ecf30e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/service/impl/DepartmentServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/service/impl/DepartmentServiceImpl.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.service.impl; -import com.qqchen.deploy.backend.common.service.impl.BaseServiceImpl; +import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl; import com.qqchen.deploy.backend.entity.Department; import com.qqchen.deploy.backend.repository.IDepartmentRepository; import com.qqchen.deploy.backend.service.IDepartmentService; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/service/impl/TenantServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/service/impl/TenantServiceImpl.java index 8ac674ac..08dcd75e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/service/impl/TenantServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/service/impl/TenantServiceImpl.java @@ -1,8 +1,8 @@ package com.qqchen.deploy.backend.service.impl; -import com.qqchen.deploy.backend.common.exception.BusinessException; -import com.qqchen.deploy.backend.common.enums.ResponseCode; -import com.qqchen.deploy.backend.common.service.impl.BaseServiceImpl; +import com.qqchen.deploy.backend.framework.exception.BusinessException; +import com.qqchen.deploy.backend.framework.enums.ResponseCode; +import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl; import com.qqchen.deploy.backend.entity.QTenant; import com.qqchen.deploy.backend.entity.Tenant; import com.qqchen.deploy.backend.repository.ITenantRepository; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserDetailsServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserDetailsServiceImpl.java index 6bd2927c..5e4c8756 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserDetailsServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserDetailsServiceImpl.java @@ -23,7 +23,6 @@ public class UserDetailsServiceImpl implements UserDetailsService { public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { User user = userRepository.findByUsernameAndDeletedFalse(username) .orElseThrow(() -> new UsernameNotFoundException("用户不存在")); - return new org.springframework.security.core.userdetails.User( user.getUsername(), user.getPassword(), diff --git a/backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserServiceImpl.java index 88edd9e1..e1a6db82 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserServiceImpl.java @@ -1,9 +1,9 @@ package com.qqchen.deploy.backend.service.impl; -import com.qqchen.deploy.backend.common.enums.ResponseCode; -import com.qqchen.deploy.backend.common.exception.BusinessException; -import com.qqchen.deploy.backend.common.security.util.JwtTokenUtil; -import com.qqchen.deploy.backend.common.service.impl.BaseServiceImpl; +import com.qqchen.deploy.backend.framework.enums.ResponseCode; +import com.qqchen.deploy.backend.framework.exception.BusinessException; +import com.qqchen.deploy.backend.framework.security.util.JwtTokenUtil; +import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl; import com.qqchen.deploy.backend.dto.request.LoginRequest; import com.qqchen.deploy.backend.dto.response.LoginResponse; import com.qqchen.deploy.backend.entity.User; diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 4dde7958..05dfeb8e 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -38,7 +38,7 @@ logging: org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping: TRACE org.hibernate.type.descriptor.sql.BasicBinder: TRACE org.hibernate.type.descriptor.sql: TRACE - com.qqchen.deploy.backend.common.utils.EntityPathResolver: DEBUG + com.qqchen.deploy.backend.framework.utils.EntityPathResolver: DEBUG com.qqchen.deploy.backend: DEBUG jwt: secret: 'thisIsAVeryVerySecretKeyForJwtTokenGenerationAndValidation123456789'