ai-coding/deploy-ease-platform
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

迁移到framework

Browse Source
This commit is contained in:
dengqichen 2024-11-28 17:04:51 +08:00
parent 06dc11c39b
commit 2597946ef8
96 changed files with 181 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/com/qqchen/deploy/backend/api/TenantApiController.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.api; package com.qqchen.deploy.backend.api;
import com.qqchen.deploy.backend.common.api.Response; import com.qqchen.deploy.backend.framework.api.Response;
import com.qqchen.deploy.backend.common.controller.BaseController; import com.qqchen.deploy.backend.framework.controller.BaseController;
import com.qqchen.deploy.backend.converter.TenantConverter; import com.qqchen.deploy.backend.converter.TenantConverter;
import com.qqchen.deploy.backend.dto.query.TenantQuery; import com.qqchen.deploy.backend.dto.query.TenantQuery;
import com.qqchen.deploy.backend.dto.request.TenantRequest; import com.qqchen.deploy.backend.dto.request.TenantRequest;

6
backend/src/main/java/com/qqchen/deploy/backend/api/UserApiController.java
View File

@ -1,8 +1,8 @@
package com.qqchen.deploy.backend.api; package com.qqchen.deploy.backend.api;
import com.qqchen.deploy.backend.common.controller.BaseController; import com.qqchen.deploy.backend.framework.controller.BaseController;
import com.qqchen.deploy.backend.common.api.Response; import com.qqchen.deploy.backend.framework.api.Response;
import com.qqchen.deploy.backend.common.enums.ResponseCode; import com.qqchen.deploy.backend.framework.enums.ResponseCode;
import com.qqchen.deploy.backend.converter.UserConverter; import com.qqchen.deploy.backend.converter.UserConverter;
import com.qqchen.deploy.backend.dto.request.LoginRequest; import com.qqchen.deploy.backend.dto.request.LoginRequest;
import com.qqchen.deploy.backend.dto.response.LoginResponse; import com.qqchen.deploy.backend.dto.response.LoginResponse;

2
backend/src/main/java/com/qqchen/deploy/backend/controller/UserController.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.controller; package com.qqchen.deploy.backend.controller;
import com.qqchen.deploy.backend.api.UserApiController; 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.converter.UserConverter;
import com.qqchen.deploy.backend.service.IUserService; import com.qqchen.deploy.backend.service.IUserService;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

7
backend/src/main/java/com/qqchen/deploy/backend/converter/TenantConverter.java
View File

@ -1,15 +1,10 @@
package com.qqchen.deploy.backend.converter; 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.TenantRequest;
import com.qqchen.deploy.backend.dto.request.UserRequest;
import com.qqchen.deploy.backend.dto.response.TenantResponse; 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.Tenant;
import com.qqchen.deploy.backend.entity.User;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.MappingTarget;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)

2
backend/src/main/java/com/qqchen/deploy/backend/converter/UserConverter.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.converter; 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.entity.User;
import com.qqchen.deploy.backend.dto.request.UserRequest; import com.qqchen.deploy.backend.dto.request.UserRequest;
import com.qqchen.deploy.backend.dto.response.UserResponse; import com.qqchen.deploy.backend.dto.response.UserResponse;

8
backend/src/main/java/com/qqchen/deploy/backend/dto/query/TenantQuery.java
View File

@ -1,10 +1,8 @@
package com.qqchen.deploy.backend.dto.query; package com.qqchen.deploy.backend.dto.query;
import com.qqchen.deploy.backend.common.annotation.QueryField; import com.qqchen.deploy.backend.framework.annotation.QueryField;
import com.qqchen.deploy.backend.common.enums.QueryType; import com.qqchen.deploy.backend.framework.enums.QueryType;
import com.qqchen.deploy.backend.common.query.BaseQuery; import com.qqchen.deploy.backend.framework.query.BaseQuery;
import jakarta.persistence.Column;
import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

6
backend/src/main/java/com/qqchen/deploy/backend/dto/query/UserQuery.java
View File

@ -1,8 +1,8 @@
package com.qqchen.deploy.backend.dto.query; package com.qqchen.deploy.backend.dto.query;
import com.qqchen.deploy.backend.common.annotation.QueryField; import com.qqchen.deploy.backend.framework.annotation.QueryField;
import com.qqchen.deploy.backend.common.query.BaseQuery; import com.qqchen.deploy.backend.framework.query.BaseQuery;
import com.qqchen.deploy.backend.common.enums.QueryType; import com.qqchen.deploy.backend.framework.enums.QueryType;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

5
backend/src/main/java/com/qqchen/deploy/backend/dto/request/TenantRequest.java
View File

@ -1,10 +1,7 @@
package com.qqchen.deploy.backend.dto.request; 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.persistence.Column;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

2
backend/src/main/java/com/qqchen/deploy/backend/dto/request/UserRequest.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.dto.request; 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.Email;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;

4
backend/src/main/java/com/qqchen/deploy/backend/dto/response/TenantResponse.java
View File

@ -1,8 +1,6 @@
package com.qqchen.deploy.backend.dto.response; package com.qqchen.deploy.backend.dto.response;
import com.qqchen.deploy.backend.common.dto.BaseResponse; import com.qqchen.deploy.backend.framework.dto.BaseResponse;
import jakarta.persistence.Column;
import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

2
backend/src/main/java/com/qqchen/deploy/backend/dto/response/UserResponse.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.dto.response; 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.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

17
backend/src/main/java/com/qqchen/deploy/backend/entity/Department.java
View File

@ -1,25 +1,12 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity;
import com.qqchen.deploy.backend.common.domain.Entity;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column; 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.Table;
import jakarta.persistence.Transient;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

6
backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsBuild.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import lombok.Data; import lombok.Data;
@ -12,7 +12,7 @@ import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@jakarta.persistence.Entity @jakarta.persistence.Entity
@Table(name = "sys_jenkins_build") @Table(name = "deploy_jenkins_build")
@LogicDelete @LogicDelete
public class JenkinsBuild extends Entity<Long> { public class JenkinsBuild extends Entity<Long> {

6
backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsConfig.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import lombok.Data; import lombok.Data;
@ -12,7 +12,7 @@ import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@jakarta.persistence.Entity @jakarta.persistence.Entity
@Table(name = "sys_jenkins_config") @Table(name = "deploy_jenkins_config")
@LogicDelete @LogicDelete
public class JenkinsConfig extends Entity<Long> { public class JenkinsConfig extends Entity<Long> {

6
backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsJob.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.FetchType; import jakarta.persistence.FetchType;
import jakarta.persistence.JoinColumn; import jakarta.persistence.JoinColumn;
@ -17,7 +17,7 @@ import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@jakarta.persistence.Entity @jakarta.persistence.Entity
@Table(name = "sys_jenkins_job") @Table(name = "deploy_jenkins_job")
@LogicDelete @LogicDelete
public class JenkinsJob extends Entity<Long> { public class JenkinsJob extends Entity<Long> {

6
backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsSyncHistory.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.EnumType; import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated; import jakarta.persistence.Enumerated;
@ -14,7 +14,7 @@ import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@jakarta.persistence.Entity @jakarta.persistence.Entity
@Table(name = "sys_jenkins_sync_history") @Table(name = "deploy_jenkins_sync_history")
@LogicDelete @LogicDelete
public class JenkinsSyncHistory extends Entity<Long> { public class JenkinsSyncHistory extends Entity<Long> {

6
backend/src/main/java/com/qqchen/deploy/backend/entity/JenkinsView.java
View File

@ -1,8 +1,8 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import lombok.Data; import lombok.Data;
@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@jakarta.persistence.Entity @jakarta.persistence.Entity
@Table(name = "sys_jenkins_view") @Table(name = "deploy_jenkins_view")
@LogicDelete @LogicDelete
public class JenkinsView extends Entity<Long> { public class JenkinsView extends Entity<Long> {

17
backend/src/main/java/com/qqchen/deploy/backend/entity/Menu.java
View File

@ -1,24 +1,11 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity;
import com.qqchen.deploy.backend.common.domain.Entity;
import jakarta.persistence.Column; 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.Table;
import jakarta.persistence.Transient;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@Data @Data

6
backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryBranch.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import lombok.Data; import lombok.Data;
@ -12,7 +12,7 @@ import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@jakarta.persistence.Entity @jakarta.persistence.Entity
@Table(name = "sys_repository_branch") @Table(name = "deploy_repository_branch")
@LogicDelete @LogicDelete
public class RepositoryBranch extends Entity<Long> { public class RepositoryBranch extends Entity<Long> {

6
backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryConfig.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.EnumType; import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated; import jakarta.persistence.Enumerated;
@ -15,7 +15,7 @@ import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@jakarta.persistence.Entity @jakarta.persistence.Entity
@Table(name = "sys_repository_config") @Table(name = "deploy_repository_config")
@LogicDelete @LogicDelete
public class RepositoryConfig extends Entity<Long> { public class RepositoryConfig extends Entity<Long> {

6
backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryGroup.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import lombok.Data; import lombok.Data;
@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@jakarta.persistence.Entity @jakarta.persistence.Entity
@Table(name = "sys_repository_group") @Table(name = "deploy_repository_group")
@LogicDelete @LogicDelete
public class RepositoryGroup extends Entity<Long> { public class RepositoryGroup extends Entity<Long> {

6
backend/src/main/java/com/qqchen/deploy/backend/entity/RepositoryProject.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import lombok.Data; import lombok.Data;
@ -12,7 +12,7 @@ import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@jakarta.persistence.Entity @jakarta.persistence.Entity
@Table(name = "sys_repository_project") @Table(name = "deploy_repository_project")
@LogicDelete @LogicDelete
public class RepositoryProject extends Entity<Long> { public class RepositoryProject extends Entity<Long> {

6
backend/src/main/java/com/qqchen/deploy/backend/entity/RepositorySyncHistory.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.EnumType; import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated; import jakarta.persistence.Enumerated;
@ -14,7 +14,7 @@ import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@jakarta.persistence.Entity @jakarta.persistence.Entity
@Table(name = "sys_repository_sync_history") @Table(name = "deploy_repository_sync_history")
@LogicDelete @LogicDelete
public class RepositorySyncHistory extends Entity<Long> { public class RepositorySyncHistory extends Entity<Long> {

15
backend/src/main/java/com/qqchen/deploy/backend/entity/Role.java
View File

@ -1,21 +1,12 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity;
import com.qqchen.deploy.backend.common.domain.Entity;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@Data @Data
@ -37,5 +28,5 @@ public class Role extends Entity<Long> {
@Column(nullable = false) @Column(nullable = false)
private Integer sort = 0; private Integer sort = 0;
} }

12
backend/src/main/java/com/qqchen/deploy/backend/entity/RoleMenu.java
View File

@ -1,19 +1,11 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity;
import com.qqchen.deploy.backend.common.domain.Entity;
import jakarta.persistence.Column; 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 jakarta.persistence.Table;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.Set;
@Data @Data

4
backend/src/main/java/com/qqchen/deploy/backend/entity/Tenant.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;

17
backend/src/main/java/com/qqchen/deploy/backend/entity/User.java
View File

@ -1,24 +1,11 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity;
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 jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; 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 @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

14
backend/src/main/java/com/qqchen/deploy/backend/entity/UserDepartment.java
View File

@ -1,21 +1,11 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity;
import com.qqchen.deploy.backend.common.domain.Entity;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column; 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 jakarta.persistence.Table;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.Set;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

11
backend/src/main/java/com/qqchen/deploy/backend/entity/UserRole.java
View File

@ -1,18 +1,11 @@
package com.qqchen.deploy.backend.entity; package com.qqchen.deploy.backend.entity;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity;
import com.qqchen.deploy.backend.common.domain.Entity;
import jakarta.persistence.Column; 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 jakarta.persistence.Table;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)

2
backend/src/main/java/com/qqchen/deploy/backend/event/UserRoleChangedEvent.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.event; 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; import lombok.Getter;
@Getter @Getter

2
backend/src/main/java/com/qqchen/deploy/backend/common/annotation/LogicDelete.java → backend/src/main/java/com/qqchen/deploy/backend/framework/annotation/LogicDelete.java
View File

@ -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.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

4
backend/src/main/java/com/qqchen/deploy/backend/common/annotation/QueryField.java → backend/src/main/java/com/qqchen/deploy/backend/framework/annotation/QueryField.java
View File

@ -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.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
backend/src/main/java/com/qqchen/deploy/backend/common/annotation/TenantFilter.java → backend/src/main/java/com/qqchen/deploy/backend/framework/annotation/TenantFilter.java
View File

@ -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.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;

6
backend/src/main/java/com/qqchen/deploy/backend/common/api/Response.java → backend/src/main/java/com/qqchen/deploy/backend/framework/api/Response.java
View File

@ -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.framework.enums.ResponseCode;
import com.qqchen.deploy.backend.common.utils.MessageUtils; import com.qqchen.deploy.backend.framework.utils.MessageUtils;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;

5
backend/src/main/java/com/qqchen/deploy/backend/common/config/AppConfig.java → backend/src/main/java/com/qqchen/deploy/backend/framework/config/AppConfig.java
View File

@ -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.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource; 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.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;

2
backend/src/main/java/com/qqchen/deploy/backend/common/config/JacksonConfig.java → backend/src/main/java/com/qqchen/deploy/backend/framework/config/JacksonConfig.java
View File

@ -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.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

2
backend/src/main/java/com/qqchen/deploy/backend/common/config/JpaAuditingConfig.java → backend/src/main/java/com/qqchen/deploy/backend/framework/config/JpaAuditingConfig.java
View File

@ -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.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

4
backend/src/main/java/com/qqchen/deploy/backend/common/config/MessageConfig.java → backend/src/main/java/com/qqchen/deploy/backend/framework/config/MessageConfig.java
View File

@ -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.MessageSource;
import org.springframework.context.annotation.Bean; 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.LocaleResolver;
import org.springframework.web.servlet.i18n.SessionLocaleResolver; import org.springframework.web.servlet.i18n.SessionLocaleResolver;
import java.util.Arrays;
import java.util.List;
import java.util.Locale; import java.util.Locale;
@Configuration @Configuration

2
backend/src/main/java/com/qqchen/deploy/backend/common/context/TenantContext.java → backend/src/main/java/com/qqchen/deploy/backend/framework/context/TenantContext.java
View File

@ -1,4 +1,4 @@
package com.qqchen.deploy.backend.common.context; package com.qqchen.deploy.backend.framework.context;
public class TenantContext { public class TenantContext {
private static final ThreadLocal<String> CURRENT_TENANT = new ThreadLocal<>(); private static final ThreadLocal<String> CURRENT_TENANT = new ThreadLocal<>();

16
backend/src/main/java/com/qqchen/deploy/backend/common/controller/BaseController.java → backend/src/main/java/com/qqchen/deploy/backend/framework/controller/BaseController.java
View File

@ -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.framework.domain.Entity;
import com.qqchen.deploy.backend.common.converter.BaseConverter; import com.qqchen.deploy.backend.framework.converter.BaseConverter;
import com.qqchen.deploy.backend.common.dto.BaseResponse; import com.qqchen.deploy.backend.framework.dto.BaseResponse;
import com.qqchen.deploy.backend.common.query.BaseQuery; import com.qqchen.deploy.backend.framework.query.BaseQuery;
import com.qqchen.deploy.backend.common.dto.BaseRequest; import com.qqchen.deploy.backend.framework.dto.BaseRequest;
import com.qqchen.deploy.backend.common.api.Response; import com.qqchen.deploy.backend.framework.api.Response;
import com.qqchen.deploy.backend.common.service.IBaseService; import com.qqchen.deploy.backend.framework.service.IBaseService;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

6
backend/src/main/java/com/qqchen/deploy/backend/common/converter/BaseConverter.java → backend/src/main/java/com/qqchen/deploy/backend/framework/converter/BaseConverter.java
View File

@ -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.framework.domain.Entity;
import com.qqchen.deploy.backend.common.dto.BaseRequest; import com.qqchen.deploy.backend.framework.dto.BaseRequest;
import org.mapstruct.MappingTarget; import org.mapstruct.MappingTarget;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;

5
backend/src/main/java/com/qqchen/deploy/backend/common/domain/AggregateRoot.java → backend/src/main/java/com/qqchen/deploy/backend/framework/domain/AggregateRoot.java
View File

@ -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.AfterDomainEventPublication;
import org.springframework.data.domain.DomainEvents; import org.springframework.data.domain.DomainEvents;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.List; import java.util.List;
public abstract class AggregateRoot<ID extends Serializable> extends Entity<ID> { public abstract class AggregateRoot<ID extends Serializable> extends Entity<ID> {

2
backend/src/main/java/com/qqchen/deploy/backend/common/domain/Entity.java → backend/src/main/java/com/qqchen/deploy/backend/framework/domain/Entity.java
View File

@ -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.Column;
import jakarta.persistence.EntityListeners; import jakarta.persistence.EntityListeners;

2
backend/src/main/java/com/qqchen/deploy/backend/common/dto/BaseRequest.java → backend/src/main/java/com/qqchen/deploy/backend/framework/dto/BaseRequest.java
View File

@ -1,4 +1,4 @@
package com.qqchen.deploy.backend.common.dto; package com.qqchen.deploy.backend.framework.dto;
import lombok.Data; import lombok.Data;

2
backend/src/main/java/com/qqchen/deploy/backend/common/dto/BaseResponse.java → backend/src/main/java/com/qqchen/deploy/backend/framework/dto/BaseResponse.java
View File

@ -1,4 +1,4 @@
package com.qqchen.deploy.backend.common.dto; package com.qqchen.deploy.backend.framework.dto;
import lombok.Data; import lombok.Data;

2
backend/src/main/java/com/qqchen/deploy/backend/common/enums/QueryType.java → backend/src/main/java/com/qqchen/deploy/backend/framework/enums/QueryType.java
View File

@ -1,4 +1,4 @@
package com.qqchen.deploy.backend.common.enums; package com.qqchen.deploy.backend.framework.enums;
public enum QueryType { public enum QueryType {
EQUAL, // 等于 EQUAL, // 等于

2
backend/src/main/java/com/qqchen/deploy/backend/common/enums/ResponseCode.java → backend/src/main/java/com/qqchen/deploy/backend/framework/enums/ResponseCode.java
View File

@ -1,4 +1,4 @@
package com.qqchen.deploy.backend.common.enums; package com.qqchen.deploy.backend.framework.enums;
import lombok.Getter; import lombok.Getter;

2
backend/src/main/java/com/qqchen/deploy/backend/common/event/DomainEvent.java → backend/src/main/java/com/qqchen/deploy/backend/framework/event/DomainEvent.java
View File

@ -1,4 +1,4 @@
package com.qqchen.deploy.backend.common.event; package com.qqchen.deploy.backend.framework.event;
import lombok.Getter; import lombok.Getter;

6
backend/src/main/java/com/qqchen/deploy/backend/common/exception/BusinessException.java → backend/src/main/java/com/qqchen/deploy/backend/framework/exception/BusinessException.java
View File

@ -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.framework.enums.ResponseCode;
import com.qqchen.deploy.backend.common.utils.MessageUtils; import com.qqchen.deploy.backend.framework.utils.MessageUtils;
import lombok.Getter; import lombok.Getter;
@Getter @Getter

6
backend/src/main/java/com/qqchen/deploy/backend/common/exception/GlobalExceptionHandler.java → backend/src/main/java/com/qqchen/deploy/backend/framework/exception/GlobalExceptionHandler.java
View File

@ -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.framework.api.Response;
import com.qqchen.deploy.backend.common.enums.ResponseCode; import com.qqchen.deploy.backend.framework.enums.ResponseCode;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.bind.annotation.RestControllerAdvice;

4
backend/src/main/java/com/qqchen/deploy/backend/common/filter/TenantFilter.java → backend/src/main/java/com/qqchen/deploy/backend/framework/filter/TenantFilter.java
View File

@ -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.Filter;
import jakarta.servlet.FilterChain; import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException; import jakarta.servlet.ServletException;

2
backend/src/main/java/com/qqchen/deploy/backend/common/integration/dto/ThirdPartyDTO.java → backend/src/main/java/com/qqchen/deploy/backend/framework/integration/dto/ThirdPartyDTO.java
View File

@ -1,4 +1,4 @@
package com.qqchen.deploy.backend.common.integration.dto; package com.qqchen.deploy.backend.framework.integration.dto;
public interface ThirdPartyDTO { public interface ThirdPartyDTO {
// 标记接口，表明这是第三方系统的数据结构 // 标记接口，表明这是第三方系统的数据结构

8
backend/src/main/java/com/qqchen/deploy/backend/common/interceptor/TenantInterceptor.java → backend/src/main/java/com/qqchen/deploy/backend/framework/interceptor/TenantInterceptor.java
View File

@ -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.framework.context.TenantContext;
import com.qqchen.deploy.backend.common.enums.ResponseCode; import com.qqchen.deploy.backend.framework.enums.ResponseCode;
import com.qqchen.deploy.backend.common.exception.BusinessException; import com.qqchen.deploy.backend.framework.exception.BusinessException;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

6
backend/src/main/java/com/qqchen/deploy/backend/common/query/BaseQuery.java → backend/src/main/java/com/qqchen/deploy/backend/framework/query/BaseQuery.java
View File

@ -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.framework.annotation.QueryField;
import com.qqchen.deploy.backend.common.enums.QueryType; import com.qqchen.deploy.backend.framework.enums.QueryType;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;

2
backend/src/main/java/com/qqchen/deploy/backend/common/query/DateRange.java → backend/src/main/java/com/qqchen/deploy/backend/framework/query/DateRange.java
View File

@ -1,4 +1,4 @@
package com.qqchen.deploy.backend.common.query; package com.qqchen.deploy.backend.framework.query;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

2
backend/src/main/java/com/qqchen/deploy/backend/common/query/Range.java → backend/src/main/java/com/qqchen/deploy/backend/framework/query/Range.java
View File

@ -1,4 +1,4 @@
package com.qqchen.deploy.backend.common.query; package com.qqchen.deploy.backend.framework.query;
import lombok.Data; import lombok.Data;

9
backend/src/main/java/com/qqchen/deploy/backend/common/repository/IBaseRepository.java → backend/src/main/java/com/qqchen/deploy/backend/framework/repository/IBaseRepository.java
View File

@ -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.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QuerydslPredicateExecutor; import org.springframework.data.querydsl.QuerydslPredicateExecutor;
import org.springframework.data.repository.NoRepositoryBean; 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.jpa.repository.Modifying;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Collection; import java.util.Collection;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.function.Predicate;
import java.util.Iterator;
import java.util.ArrayList; import java.util.ArrayList;
@NoRepositoryBean @NoRepositoryBean

16
backend/src/main/java/com/qqchen/deploy/backend/common/security/config/SecurityConfig.java → backend/src/main/java/com/qqchen/deploy/backend/framework/security/config/SecurityConfig.java
View File

@ -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.framework.security.filter.JwtAuthenticationFilter;
import com.qqchen.deploy.backend.common.security.handler.CustomAuthenticationEntryPoint; import com.qqchen.deploy.backend.framework.security.handler.CustomAuthenticationEntryPoint;
import com.qqchen.deploy.backend.common.security.util.JwtTokenUtil; import com.qqchen.deploy.backend.framework.security.util.JwtTokenUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; 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.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.http.SessionCreationPolicy; 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.core.userdetails.UserDetailsService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; 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 @Configuration
@EnableWebSecurity @EnableWebSecurity

6
backend/src/main/java/com/qqchen/deploy/backend/common/security/filter/JwtAuthenticationFilter.java → backend/src/main/java/com/qqchen/deploy/backend/framework/security/filter/JwtAuthenticationFilter.java
View File

@ -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.framework.context.TenantContext;
import com.qqchen.deploy.backend.common.security.util.JwtTokenUtil; import com.qqchen.deploy.backend.framework.security.util.JwtTokenUtil;
import jakarta.servlet.FilterChain; import jakarta.servlet.FilterChain;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;

8
backend/src/main/java/com/qqchen/deploy/backend/common/security/handler/CustomAuthenticationEntryPoint.java → backend/src/main/java/com/qqchen/deploy/backend/framework/security/handler/CustomAuthenticationEntryPoint.java
View File

@ -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.fasterxml.jackson.databind.ObjectMapper;
import com.qqchen.deploy.backend.common.api.Response; import com.qqchen.deploy.backend.framework.api.Response;
import com.qqchen.deploy.backend.common.enums.ResponseCode; import com.qqchen.deploy.backend.framework.enums.ResponseCode;
import com.qqchen.deploy.backend.common.utils.MessageUtils; import com.qqchen.deploy.backend.framework.utils.MessageUtils;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
backend/src/main/java/com/qqchen/deploy/backend/common/security/util/JwtTokenUtil.java → backend/src/main/java/com/qqchen/deploy/backend/framework/security/util/JwtTokenUtil.java
View File

@ -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.Claims;
import io.jsonwebtoken.Jwts; import io.jsonwebtoken.Jwts;

6
backend/src/main/java/com/qqchen/deploy/backend/common/service/IBaseService.java → backend/src/main/java/com/qqchen/deploy/backend/framework/service/IBaseService.java
View File

@ -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.framework.domain.Entity;
import com.qqchen.deploy.backend.common.query.BaseQuery; import com.qqchen.deploy.backend.framework.query.BaseQuery;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import java.io.Serializable; import java.io.Serializable;

22
backend/src/main/java/com/qqchen/deploy/backend/common/service/impl/BaseServiceImpl.java → backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java
View File

@ -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.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -6,16 +6,16 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import com.qqchen.deploy.backend.common.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
import com.qqchen.deploy.backend.common.domain.Entity; import com.qqchen.deploy.backend.framework.domain.Entity;
import com.qqchen.deploy.backend.common.enums.QueryType; import com.qqchen.deploy.backend.framework.enums.QueryType;
import com.qqchen.deploy.backend.common.query.BaseQuery; import com.qqchen.deploy.backend.framework.query.BaseQuery;
import com.qqchen.deploy.backend.common.query.DateRange; import com.qqchen.deploy.backend.framework.query.DateRange;
import com.qqchen.deploy.backend.common.query.Range; import com.qqchen.deploy.backend.framework.query.Range;
import com.qqchen.deploy.backend.common.repository.IBaseRepository; import com.qqchen.deploy.backend.framework.repository.IBaseRepository;
import com.qqchen.deploy.backend.common.annotation.QueryField; import com.qqchen.deploy.backend.framework.annotation.QueryField;
import com.qqchen.deploy.backend.common.service.IBaseService; import com.qqchen.deploy.backend.framework.service.IBaseService;
import com.qqchen.deploy.backend.common.utils.EntityPathResolver; import com.qqchen.deploy.backend.framework.utils.EntityPathResolver;
import com.querydsl.core.BooleanBuilder; import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.EntityPath; import com.querydsl.core.types.EntityPath;
import com.querydsl.core.types.Path; import com.querydsl.core.types.Path;

2
backend/src/main/java/com/qqchen/deploy/backend/common/utils/EntityPathResolver.java → backend/src/main/java/com/qqchen/deploy/backend/framework/utils/EntityPathResolver.java
View File

@ -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.EntityPath;
import com.querydsl.core.types.Path; import com.querydsl.core.types.Path;

2
backend/src/main/java/com/qqchen/deploy/backend/common/utils/MessageUtils.java → backend/src/main/java/com/qqchen/deploy/backend/framework/utils/MessageUtils.java
View File

@ -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.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;

2
backend/src/main/java/com/qqchen/deploy/backend/common/utils/PasswordGenerator.java → backend/src/main/java/com/qqchen/deploy/backend/framework/utils/PasswordGenerator.java
View File

@ -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; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

2
backend/src/main/java/com/qqchen/deploy/backend/integration/dto/JenkinsBuildDTO.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.integration.dto; 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; import lombok.Data;
@Data @Data

2
backend/src/main/java/com/qqchen/deploy/backend/integration/dto/JenkinsConnectionDTO.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.integration.dto; 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; import lombok.Data;
@Data @Data

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IDepartmentRepository.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.Department;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsBuildRepository.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.JenkinsBuild;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsConfigRepository.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.JenkinsConfig;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsJobRepository.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.JenkinsJob;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsSyncHistoryRepository.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.JenkinsSyncHistory;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IJenkinsViewRepository.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.JenkinsView;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryBranchRepository.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.RepositoryBranch;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryConfigRepository.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.RepositoryConfig;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryGroupRepository.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.RepositoryGroup;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositoryProjectRepository.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.RepositoryProject;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IRepositorySyncHistoryRepository.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.RepositorySyncHistory;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IRoleMenuRepository.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.RoleMenu;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IRoleRepository.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.Role;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

2
backend/src/main/java/com/qqchen/deploy/backend/repository/ITenantRepository.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.Tenant;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;

3
backend/src/main/java/com/qqchen/deploy/backend/repository/IUserRepository.java
View File

@ -1,10 +1,9 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.User;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Optional; import java.util.Optional;
@Repository @Repository

2
backend/src/main/java/com/qqchen/deploy/backend/repository/IUserRoleRepository.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.repository; 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 com.qqchen.deploy.backend.entity.UserRole;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;

2
backend/src/main/java/com/qqchen/deploy/backend/service/IDepartmentService.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.service; 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 com.qqchen.deploy.backend.entity.Department;
import java.util.List; import java.util.List;

2
backend/src/main/java/com/qqchen/deploy/backend/service/IJenkinsService.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.service; 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; import com.qqchen.deploy.backend.entity.JenkinsConfig;
public interface IJenkinsService extends IBaseService<JenkinsConfig, Long> { public interface IJenkinsService extends IBaseService<JenkinsConfig, Long> {

2
backend/src/main/java/com/qqchen/deploy/backend/service/IMenuService.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.service; 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 com.qqchen.deploy.backend.entity.Menu;
import java.util.List; import java.util.List;

2
backend/src/main/java/com/qqchen/deploy/backend/service/IRepositoryService.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.service; 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 com.qqchen.deploy.backend.entity.RepositoryConfig;
import java.util.List; import java.util.List;

2
backend/src/main/java/com/qqchen/deploy/backend/service/IRoleService.java
View File

@ -1,7 +1,7 @@
package com.qqchen.deploy.backend.service; 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 com.qqchen.deploy.backend.entity.Role;
import java.util.List; import java.util.List;

2
backend/src/main/java/com/qqchen/deploy/backend/service/ITenantService.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.service; 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 com.qqchen.deploy.backend.entity.Tenant;
import java.util.List; import java.util.List;

2
backend/src/main/java/com/qqchen/deploy/backend/service/IUserService.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.service; 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.request.LoginRequest;
import com.qqchen.deploy.backend.dto.response.LoginResponse; import com.qqchen.deploy.backend.dto.response.LoginResponse;
import com.qqchen.deploy.backend.entity.User; import com.qqchen.deploy.backend.entity.User;

2
backend/src/main/java/com/qqchen/deploy/backend/service/impl/DepartmentServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.qqchen.deploy.backend.service.impl; 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.entity.Department;
import com.qqchen.deploy.backend.repository.IDepartmentRepository; import com.qqchen.deploy.backend.repository.IDepartmentRepository;
import com.qqchen.deploy.backend.service.IDepartmentService; import com.qqchen.deploy.backend.service.IDepartmentService;

6
backend/src/main/java/com/qqchen/deploy/backend/service/impl/TenantServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.qqchen.deploy.backend.service.impl; package com.qqchen.deploy.backend.service.impl;
import com.qqchen.deploy.backend.common.exception.BusinessException; import com.qqchen.deploy.backend.framework.exception.BusinessException;
import com.qqchen.deploy.backend.common.enums.ResponseCode; import com.qqchen.deploy.backend.framework.enums.ResponseCode;
import com.qqchen.deploy.backend.common.service.impl.BaseServiceImpl; import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl;
import com.qqchen.deploy.backend.entity.QTenant; import com.qqchen.deploy.backend.entity.QTenant;
import com.qqchen.deploy.backend.entity.Tenant; import com.qqchen.deploy.backend.entity.Tenant;
import com.qqchen.deploy.backend.repository.ITenantRepository; import com.qqchen.deploy.backend.repository.ITenantRepository;

1
backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserDetailsServiceImpl.java
View File

@ -23,7 +23,6 @@ public class UserDetailsServiceImpl implements UserDetailsService {
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
User user = userRepository.findByUsernameAndDeletedFalse(username) User user = userRepository.findByUsernameAndDeletedFalse(username)
.orElseThrow(() -> new UsernameNotFoundException("用户不存在")); .orElseThrow(() -> new UsernameNotFoundException("用户不存在"));
return new org.springframework.security.core.userdetails.User( return new org.springframework.security.core.userdetails.User(
user.getUsername(), user.getUsername(),
user.getPassword(), user.getPassword(),

8
backend/src/main/java/com/qqchen/deploy/backend/service/impl/UserServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.qqchen.deploy.backend.service.impl; package com.qqchen.deploy.backend.service.impl;
import com.qqchen.deploy.backend.common.enums.ResponseCode; import com.qqchen.deploy.backend.framework.enums.ResponseCode;
import com.qqchen.deploy.backend.common.exception.BusinessException; import com.qqchen.deploy.backend.framework.exception.BusinessException;
import com.qqchen.deploy.backend.common.security.util.JwtTokenUtil; import com.qqchen.deploy.backend.framework.security.util.JwtTokenUtil;
import com.qqchen.deploy.backend.common.service.impl.BaseServiceImpl; import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl;
import com.qqchen.deploy.backend.dto.request.LoginRequest; import com.qqchen.deploy.backend.dto.request.LoginRequest;
import com.qqchen.deploy.backend.dto.response.LoginResponse; import com.qqchen.deploy.backend.dto.response.LoginResponse;
import com.qqchen.deploy.backend.entity.User; import com.qqchen.deploy.backend.entity.User;

2
backend/src/main/resources/application.yml
View File

@ -38,7 +38,7 @@ logging:
org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping: TRACE org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping: TRACE
org.hibernate.type.descriptor.sql.BasicBinder: TRACE org.hibernate.type.descriptor.sql.BasicBinder: TRACE
org.hibernate.type.descriptor.sql: 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 com.qqchen.deploy.backend: DEBUG
jwt: jwt:
secret: 'thisIsAVeryVerySecretKeyForJwtTokenGenerationAndValidation123456789' secret: 'thisIsAVeryVerySecretKeyForJwtTokenGenerationAndValidation123456789'