From 132acb1483ded8d390b7ae866935b1e05aae109f Mon Sep 17 00:00:00 2001 From: asp_ly Date: Mon, 23 Dec 2024 21:25:05 +0800 Subject: [PATCH] 1 --- .../api/ExternalSystemApiController.java | 6 +-- .../converter/ExternalSystemConverter.java | 4 +- .../backend/deploy/entity/Environment.java | 4 +- .../entity/ExternalSystem.java | 2 +- .../entity/JenkinsBuild.java | 9 ++-- .../{system => deploy}/entity/JenkinsJob.java | 6 +-- .../entity/JenkinsSyncHistory.java | 26 ++++------- .../entity/JenkinsView.java | 6 +-- .../backend/deploy/entity/ProjectGroup.java | 8 +++- .../entity/RepositoryBranch.java | 2 +- .../entity/RepositoryGroup.java | 2 +- .../entity/RepositoryProject.java | 2 +- .../entity/RepositorySyncHistory.java | 2 +- .../enums/ExternalSystemSyncStatus.java | 7 +++ .../backend/deploy/enums/JenkinsSyncType.java | 8 ++++ .../IExternalSystemIntegration.java | 4 +- .../integration/impl/GitIntegration.java | 6 +-- .../integration/impl/JenkinsIntegration.java | 6 +-- .../repository/IExternalSystemRepository.java | 4 +- .../repository/IJenkinsBuildRepository.java | 4 +- .../repository/IJenkinsJobRepository.java | 13 ++++++ .../IJenkinsSyncHistoryRepository.java | 4 +- .../repository/IJenkinsViewRepository.java | 13 ++++++ .../IRepositoryBranchRepository.java | 4 +- .../IRepositoryGroupRepository.java | 4 +- .../IRepositoryProjectRepository.java | 4 +- .../IRepositorySyncHistoryRepository.java | 4 +- .../service/IExternalSystemService.java | 4 +- .../impl/ExternalSystemServiceImpl.java | 10 ++-- .../service/impl/ProjectGroupServiceImpl.java | 15 ++++++ .../system/converter/RepositoryConverter.java | 6 +-- .../backend/system/entity/JenkinsConfig.java | 46 ------------------- .../repository/IJenkinsConfigRepository.java | 13 ------ .../repository/IJenkinsJobRepository.java | 26 ----------- .../repository/IJenkinsViewRepository.java | 15 ------ .../db/migration/V1.0.1__init_data.sql | 22 ++++----- 36 files changed, 136 insertions(+), 185 deletions(-) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/api/ExternalSystemApiController.java (92%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/converter/ExternalSystemConverter.java (81%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/entity/ExternalSystem.java (97%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/entity/JenkinsBuild.java (83%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/entity/JenkinsJob.java (88%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/entity/JenkinsSyncHistory.java (66%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/entity/JenkinsView.java (81%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/entity/RepositoryBranch.java (96%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/entity/RepositoryGroup.java (95%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/entity/RepositoryProject.java (96%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/entity/RepositorySyncHistory.java (96%) create mode 100644 backend/src/main/java/com/qqchen/deploy/backend/deploy/enums/ExternalSystemSyncStatus.java create mode 100644 backend/src/main/java/com/qqchen/deploy/backend/deploy/enums/JenkinsSyncType.java rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/integration/IExternalSystemIntegration.java (83%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/integration/impl/GitIntegration.java (89%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/integration/impl/JenkinsIntegration.java (91%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/repository/IExternalSystemRepository.java (86%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/repository/IJenkinsBuildRepository.java (82%) create mode 100644 backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsJobRepository.java rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/repository/IJenkinsSyncHistoryRepository.java (73%) create mode 100644 backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsViewRepository.java rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/repository/IRepositoryBranchRepository.java (86%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/repository/IRepositoryGroupRepository.java (85%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/repository/IRepositoryProjectRepository.java (86%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/repository/IRepositorySyncHistoryRepository.java (73%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/service/IExternalSystemService.java (85%) rename backend/src/main/java/com/qqchen/deploy/backend/{system => deploy}/service/impl/ExternalSystemServiceImpl.java (95%) delete mode 100644 backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsConfig.java delete mode 100644 backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsConfigRepository.java delete mode 100644 backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsJobRepository.java delete mode 100644 backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsViewRepository.java diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/api/ExternalSystemApiController.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/api/ExternalSystemApiController.java similarity index 92% rename from backend/src/main/java/com/qqchen/deploy/backend/system/api/ExternalSystemApiController.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/api/ExternalSystemApiController.java index 1fc006de..a9e318d4 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/api/ExternalSystemApiController.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/api/ExternalSystemApiController.java @@ -1,11 +1,11 @@ -package com.qqchen.deploy.backend.system.api; +package com.qqchen.deploy.backend.deploy.api; -import com.qqchen.deploy.backend.system.entity.ExternalSystem; +import com.qqchen.deploy.backend.deploy.entity.ExternalSystem; import com.qqchen.deploy.backend.framework.api.Response; import com.qqchen.deploy.backend.framework.controller.BaseController; import com.qqchen.deploy.backend.system.model.ExternalSystemDTO; import com.qqchen.deploy.backend.system.model.query.ExternalSystemQuery; -import com.qqchen.deploy.backend.system.service.IExternalSystemService; +import com.qqchen.deploy.backend.deploy.service.IExternalSystemService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/converter/ExternalSystemConverter.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/converter/ExternalSystemConverter.java similarity index 81% rename from backend/src/main/java/com/qqchen/deploy/backend/system/converter/ExternalSystemConverter.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/converter/ExternalSystemConverter.java index c42391d0..99610ab9 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/converter/ExternalSystemConverter.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/converter/ExternalSystemConverter.java @@ -1,6 +1,6 @@ -package com.qqchen.deploy.backend.system.converter; +package com.qqchen.deploy.backend.deploy.converter; -import com.qqchen.deploy.backend.system.entity.ExternalSystem; +import com.qqchen.deploy.backend.deploy.entity.ExternalSystem; import com.qqchen.deploy.backend.framework.converter.BaseConverter; import com.qqchen.deploy.backend.system.model.ExternalSystemDTO; import org.mapstruct.Mapper; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Environment.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Environment.java index 8c4bdda9..d331c035 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Environment.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Environment.java @@ -7,6 +7,7 @@ import jakarta.persistence.*; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.ArrayList; import java.util.List; /** @@ -65,7 +66,6 @@ public class Environment extends Entity { /** * 关联的项目组列表 */ -// @ManyToMany(mappedBy = "environments") @ManyToMany(mappedBy = "environments") - private List projectGroups; + private List projectGroups = new ArrayList<>(); } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/ExternalSystem.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/ExternalSystem.java similarity index 97% rename from backend/src/main/java/com/qqchen/deploy/backend/system/entity/ExternalSystem.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/ExternalSystem.java index 160eb094..b8a89946 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/ExternalSystem.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/ExternalSystem.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.system.entity; +package com.qqchen.deploy.backend.deploy.entity; import com.qqchen.deploy.backend.system.enums.ExternalSystemAuthTypeEnum; import com.qqchen.deploy.backend.system.enums.ExternalSystemSyncStatusEnum; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsBuild.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/JenkinsBuild.java similarity index 83% rename from backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsBuild.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/JenkinsBuild.java index 15bd2c85..24a8f77d 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsBuild.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/JenkinsBuild.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.system.entity; +package com.qqchen.deploy.backend.deploy.entity; import com.qqchen.deploy.backend.framework.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity; @@ -16,8 +16,8 @@ import java.time.LocalDateTime; @LogicDelete public class JenkinsBuild extends Entity { - @Column(name = "jenkins_id", nullable = false) - private Long jenkinsId; + @Column(name = "external_system_id", nullable = false) + private Long external_system_id; @Column(name = "job_id", nullable = false) private Long jobId; @@ -33,7 +33,8 @@ public class JenkinsBuild extends Entity { @Column(name = "start_time", nullable = false) private LocalDateTime startTime; - + + @Column(name = "duration", nullable = false) private Long duration; @Column(name = "trigger_cause", columnDefinition = "TEXT") diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsJob.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/JenkinsJob.java similarity index 88% rename from backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsJob.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/JenkinsJob.java index d8995a0e..16adab24 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsJob.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/JenkinsJob.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.system.entity; +package com.qqchen.deploy.backend.deploy.entity; import com.qqchen.deploy.backend.framework.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity; @@ -21,8 +21,8 @@ import java.time.LocalDateTime; @LogicDelete public class JenkinsJob extends Entity { - @Column(name = "jenkins_id", nullable = false) - private Long jenkinsId; + @Column(name = "external_system_id", nullable = false) + private Long external_system_id; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "view_id") diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsSyncHistory.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/JenkinsSyncHistory.java similarity index 66% rename from backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsSyncHistory.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/JenkinsSyncHistory.java index b29cb4a1..3a96a597 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsSyncHistory.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/JenkinsSyncHistory.java @@ -1,5 +1,7 @@ -package com.qqchen.deploy.backend.system.entity; +package com.qqchen.deploy.backend.deploy.entity; +import com.qqchen.deploy.backend.deploy.enums.ExternalSystemSyncStatus; +import com.qqchen.deploy.backend.deploy.enums.JenkinsSyncType; import com.qqchen.deploy.backend.framework.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; @@ -18,16 +20,16 @@ import java.time.LocalDateTime; @LogicDelete public class JenkinsSyncHistory extends Entity { - @Column(name = "jenkins_id", nullable = false) - private Long jenkinsId; + @Column(name = "external_system_id", nullable = false) + private Long external_system_id; @Column(name = "sync_type", nullable = false) @Enumerated(EnumType.STRING) - private SyncType syncType; + private JenkinsSyncType syncType; @Column(nullable = false) @Enumerated(EnumType.STRING) - private SyncStatus status; + private ExternalSystemSyncStatus status; @Column(name = "start_time", nullable = false) private LocalDateTime startTime; @@ -38,16 +40,4 @@ public class JenkinsSyncHistory extends Entity { @Column(name = "error_message", columnDefinition = "TEXT") private String errorMessage; - public enum SyncType { - ALL, // 全量同步 - VIEW, // 同步视图 - JOB, // 同步作业 - BUILD // 同步构建记录 - } - - public enum SyncStatus { - SUCCESS, // 同步成功 - FAILED, // 同步失败 - RUNNING // 同步中 - } -} \ No newline at end of file +} \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsView.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/JenkinsView.java similarity index 81% rename from backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsView.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/JenkinsView.java index 5cf39e9c..1d72796f 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsView.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/JenkinsView.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.system.entity; +package com.qqchen.deploy.backend.deploy.entity; import com.qqchen.deploy.backend.framework.annotation.LogicDelete; @@ -15,8 +15,8 @@ import lombok.EqualsAndHashCode; @LogicDelete public class JenkinsView extends Entity { - @Column(name = "jenkins_id", nullable = false) - private Long jenkinsId; + @Column(name = "external_system_id", nullable = false) + private Long external_system_id; @Column(name = "view_name", nullable = false) private String viewName; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/ProjectGroup.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/ProjectGroup.java index 63139504..34215b68 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/ProjectGroup.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/ProjectGroup.java @@ -4,7 +4,10 @@ import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.*; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.SQLDelete; +import org.hibernate.annotations.Where; +import java.util.ArrayList; import java.util.List; /** @@ -14,6 +17,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @jakarta.persistence.Entity @Table(name = "deploy_project_group") +@SQLDelete(sql = "UPDATE deploy_project_group SET deleted = true WHERE id = ?; DELETE FROM deploy_project_group_environment WHERE project_group_id = ?") +@Where(clause = "deleted = false") public class ProjectGroup extends Entity { /** @@ -61,6 +66,5 @@ public class ProjectGroup extends Entity { joinColumns = @JoinColumn(name = "project_group_id"), inverseJoinColumns = @JoinColumn(name = "environment_id") ) - private List environments; - + private List environments = new ArrayList<>(); } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/RepositoryBranch.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryBranch.java similarity index 96% rename from backend/src/main/java/com/qqchen/deploy/backend/system/entity/RepositoryBranch.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryBranch.java index e3fbfb44..6ea16879 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/RepositoryBranch.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryBranch.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.system.entity; +package com.qqchen.deploy.backend.deploy.entity; import com.qqchen.deploy.backend.framework.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/RepositoryGroup.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryGroup.java similarity index 95% rename from backend/src/main/java/com/qqchen/deploy/backend/system/entity/RepositoryGroup.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryGroup.java index d88dc2db..1118ef20 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/RepositoryGroup.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryGroup.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.system.entity; +package com.qqchen.deploy.backend.deploy.entity; import com.qqchen.deploy.backend.framework.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/RepositoryProject.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryProject.java similarity index 96% rename from backend/src/main/java/com/qqchen/deploy/backend/system/entity/RepositoryProject.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryProject.java index 8647c071..f29d2d9c 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/RepositoryProject.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryProject.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.system.entity; +package com.qqchen.deploy.backend.deploy.entity; import com.qqchen.deploy.backend.framework.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/RepositorySyncHistory.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositorySyncHistory.java similarity index 96% rename from backend/src/main/java/com/qqchen/deploy/backend/system/entity/RepositorySyncHistory.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositorySyncHistory.java index 6df52974..b7bc3482 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/RepositorySyncHistory.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositorySyncHistory.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.system.entity; +package com.qqchen.deploy.backend.deploy.entity; import com.qqchen.deploy.backend.framework.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/enums/ExternalSystemSyncStatus.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/enums/ExternalSystemSyncStatus.java new file mode 100644 index 00000000..8daa053a --- /dev/null +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/enums/ExternalSystemSyncStatus.java @@ -0,0 +1,7 @@ +package com.qqchen.deploy.backend.deploy.enums; + +public enum ExternalSystemSyncStatus { + SUCCESS, // 同步成功 + FAILED, // 同步失败 + RUNNING // 同步中 +} \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/enums/JenkinsSyncType.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/enums/JenkinsSyncType.java new file mode 100644 index 00000000..a645ad1d --- /dev/null +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/enums/JenkinsSyncType.java @@ -0,0 +1,8 @@ +package com.qqchen.deploy.backend.deploy.enums; + +public enum JenkinsSyncType { + ALL, // 全量同步 + VIEW, // 同步视图 + JOB, // 同步作业 + BUILD // 同步构建记录 + } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/integration/IExternalSystemIntegration.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/IExternalSystemIntegration.java similarity index 83% rename from backend/src/main/java/com/qqchen/deploy/backend/system/integration/IExternalSystemIntegration.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/IExternalSystemIntegration.java index 8cb76c23..684362a0 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/integration/IExternalSystemIntegration.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/IExternalSystemIntegration.java @@ -1,6 +1,6 @@ -package com.qqchen.deploy.backend.system.integration; +package com.qqchen.deploy.backend.deploy.integration; -import com.qqchen.deploy.backend.system.entity.ExternalSystem; +import com.qqchen.deploy.backend.deploy.entity.ExternalSystem; import com.qqchen.deploy.backend.system.enums.ExternalSystemTypeEnum; /** diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/integration/impl/GitIntegration.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/GitIntegration.java similarity index 89% rename from backend/src/main/java/com/qqchen/deploy/backend/system/integration/impl/GitIntegration.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/GitIntegration.java index a96a638a..3cb48a7c 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/integration/impl/GitIntegration.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/GitIntegration.java @@ -1,8 +1,8 @@ -package com.qqchen.deploy.backend.system.integration.impl; +package com.qqchen.deploy.backend.deploy.integration.impl; -import com.qqchen.deploy.backend.system.entity.ExternalSystem; +import com.qqchen.deploy.backend.deploy.entity.ExternalSystem; import com.qqchen.deploy.backend.system.enums.ExternalSystemTypeEnum; -import com.qqchen.deploy.backend.system.integration.IExternalSystemIntegration; +import com.qqchen.deploy.backend.deploy.integration.IExternalSystemIntegration; import lombok.extern.slf4j.Slf4j; import org.springframework.http.*; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/integration/impl/JenkinsIntegration.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/JenkinsIntegration.java similarity index 91% rename from backend/src/main/java/com/qqchen/deploy/backend/system/integration/impl/JenkinsIntegration.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/JenkinsIntegration.java index a9e0bb57..665ada09 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/integration/impl/JenkinsIntegration.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/JenkinsIntegration.java @@ -1,8 +1,8 @@ -package com.qqchen.deploy.backend.system.integration.impl; +package com.qqchen.deploy.backend.deploy.integration.impl; -import com.qqchen.deploy.backend.system.entity.ExternalSystem; +import com.qqchen.deploy.backend.deploy.integration.IExternalSystemIntegration; +import com.qqchen.deploy.backend.deploy.entity.ExternalSystem; import com.qqchen.deploy.backend.system.enums.ExternalSystemTypeEnum; -import com.qqchen.deploy.backend.system.integration.IExternalSystemIntegration; import lombok.extern.slf4j.Slf4j; import org.springframework.http.*; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IExternalSystemRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IExternalSystemRepository.java similarity index 86% rename from backend/src/main/java/com/qqchen/deploy/backend/system/repository/IExternalSystemRepository.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IExternalSystemRepository.java index 3a5d7c12..b7dd281e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IExternalSystemRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IExternalSystemRepository.java @@ -1,6 +1,6 @@ -package com.qqchen.deploy.backend.system.repository; +package com.qqchen.deploy.backend.deploy.repository; -import com.qqchen.deploy.backend.system.entity.ExternalSystem; +import com.qqchen.deploy.backend.deploy.entity.ExternalSystem; import com.qqchen.deploy.backend.system.enums.ExternalSystemTypeEnum; import com.qqchen.deploy.backend.framework.repository.IBaseRepository; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsBuildRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsBuildRepository.java similarity index 82% rename from backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsBuildRepository.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsBuildRepository.java index 516e6bd6..16af2feb 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsBuildRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsBuildRepository.java @@ -1,8 +1,8 @@ -package com.qqchen.deploy.backend.system.repository; +package com.qqchen.deploy.backend.deploy.repository; import com.qqchen.deploy.backend.framework.repository.IBaseRepository; -import com.qqchen.deploy.backend.system.entity.JenkinsBuild; +import com.qqchen.deploy.backend.deploy.entity.JenkinsBuild; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsJobRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsJobRepository.java new file mode 100644 index 00000000..51e39297 --- /dev/null +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsJobRepository.java @@ -0,0 +1,13 @@ +package com.qqchen.deploy.backend.deploy.repository; + +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; +import com.qqchen.deploy.backend.deploy.entity.JenkinsJob; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +@Repository +public interface IJenkinsJobRepository extends IBaseRepository { + +} \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsSyncHistoryRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsSyncHistoryRepository.java similarity index 73% rename from backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsSyncHistoryRepository.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsSyncHistoryRepository.java index 5cb4e570..81ef2777 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsSyncHistoryRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsSyncHistoryRepository.java @@ -1,8 +1,8 @@ -package com.qqchen.deploy.backend.system.repository; +package com.qqchen.deploy.backend.deploy.repository; import com.qqchen.deploy.backend.framework.repository.IBaseRepository; -import com.qqchen.deploy.backend.system.entity.JenkinsSyncHistory; +import com.qqchen.deploy.backend.deploy.entity.JenkinsSyncHistory; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsViewRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsViewRepository.java new file mode 100644 index 00000000..6a6f1ee6 --- /dev/null +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IJenkinsViewRepository.java @@ -0,0 +1,13 @@ +package com.qqchen.deploy.backend.deploy.repository; + + +import com.qqchen.deploy.backend.framework.repository.IBaseRepository; +import com.qqchen.deploy.backend.deploy.entity.JenkinsView; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface IJenkinsViewRepository extends IBaseRepository { + +} \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IRepositoryBranchRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryBranchRepository.java similarity index 86% rename from backend/src/main/java/com/qqchen/deploy/backend/system/repository/IRepositoryBranchRepository.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryBranchRepository.java index 430a18a8..7eb51ebd 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IRepositoryBranchRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryBranchRepository.java @@ -1,7 +1,7 @@ -package com.qqchen.deploy.backend.system.repository; +package com.qqchen.deploy.backend.deploy.repository; import com.qqchen.deploy.backend.framework.repository.IBaseRepository; -import com.qqchen.deploy.backend.system.entity.RepositoryBranch; +import com.qqchen.deploy.backend.deploy.entity.RepositoryBranch; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IRepositoryGroupRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryGroupRepository.java similarity index 85% rename from backend/src/main/java/com/qqchen/deploy/backend/system/repository/IRepositoryGroupRepository.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryGroupRepository.java index 929177fc..926e8c41 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IRepositoryGroupRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryGroupRepository.java @@ -1,7 +1,7 @@ -package com.qqchen.deploy.backend.system.repository; +package com.qqchen.deploy.backend.deploy.repository; import com.qqchen.deploy.backend.framework.repository.IBaseRepository; -import com.qqchen.deploy.backend.system.entity.RepositoryGroup; +import com.qqchen.deploy.backend.deploy.entity.RepositoryGroup; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IRepositoryProjectRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryProjectRepository.java similarity index 86% rename from backend/src/main/java/com/qqchen/deploy/backend/system/repository/IRepositoryProjectRepository.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryProjectRepository.java index 17484e0f..b50888b6 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IRepositoryProjectRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryProjectRepository.java @@ -1,7 +1,7 @@ -package com.qqchen.deploy.backend.system.repository; +package com.qqchen.deploy.backend.deploy.repository; import com.qqchen.deploy.backend.framework.repository.IBaseRepository; -import com.qqchen.deploy.backend.system.entity.RepositoryProject; +import com.qqchen.deploy.backend.deploy.entity.RepositoryProject; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IRepositorySyncHistoryRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositorySyncHistoryRepository.java similarity index 73% rename from backend/src/main/java/com/qqchen/deploy/backend/system/repository/IRepositorySyncHistoryRepository.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositorySyncHistoryRepository.java index 70e49427..2bc60989 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IRepositorySyncHistoryRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositorySyncHistoryRepository.java @@ -1,8 +1,8 @@ -package com.qqchen.deploy.backend.system.repository; +package com.qqchen.deploy.backend.deploy.repository; import com.qqchen.deploy.backend.framework.repository.IBaseRepository; -import com.qqchen.deploy.backend.system.entity.RepositorySyncHistory; +import com.qqchen.deploy.backend.deploy.entity.RepositorySyncHistory; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/service/IExternalSystemService.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/IExternalSystemService.java similarity index 85% rename from backend/src/main/java/com/qqchen/deploy/backend/system/service/IExternalSystemService.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/service/IExternalSystemService.java index 9215752d..a674a969 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/service/IExternalSystemService.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/IExternalSystemService.java @@ -1,6 +1,6 @@ -package com.qqchen.deploy.backend.system.service; +package com.qqchen.deploy.backend.deploy.service; -import com.qqchen.deploy.backend.system.entity.ExternalSystem; +import com.qqchen.deploy.backend.deploy.entity.ExternalSystem; import com.qqchen.deploy.backend.framework.service.IBaseService; import com.qqchen.deploy.backend.system.model.ExternalSystemDTO; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/service/impl/ExternalSystemServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ExternalSystemServiceImpl.java similarity index 95% rename from backend/src/main/java/com/qqchen/deploy/backend/system/service/impl/ExternalSystemServiceImpl.java rename to backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ExternalSystemServiceImpl.java index 033e10dc..2afb9e15 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/service/impl/ExternalSystemServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ExternalSystemServiceImpl.java @@ -1,6 +1,6 @@ -package com.qqchen.deploy.backend.system.service.impl; +package com.qqchen.deploy.backend.deploy.service.impl; -import com.qqchen.deploy.backend.system.entity.ExternalSystem; +import com.qqchen.deploy.backend.deploy.entity.ExternalSystem; import com.qqchen.deploy.backend.system.enums.ExternalSystemAuthTypeEnum; import com.qqchen.deploy.backend.system.enums.ExternalSystemSyncStatusEnum; import com.qqchen.deploy.backend.system.enums.ExternalSystemTypeEnum; @@ -9,10 +9,10 @@ import com.qqchen.deploy.backend.framework.enums.ResponseCode; import com.qqchen.deploy.backend.framework.exception.BusinessException; import com.qqchen.deploy.backend.framework.exception.UniqueConstraintException; import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl; -import com.qqchen.deploy.backend.system.integration.IExternalSystemIntegration; +import com.qqchen.deploy.backend.deploy.integration.IExternalSystemIntegration; import com.qqchen.deploy.backend.system.model.ExternalSystemDTO; -import com.qqchen.deploy.backend.system.repository.IExternalSystemRepository; -import com.qqchen.deploy.backend.system.service.IExternalSystemService; +import com.qqchen.deploy.backend.deploy.repository.IExternalSystemRepository; +import com.qqchen.deploy.backend.deploy.service.IExternalSystemService; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ProjectGroupServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ProjectGroupServiceImpl.java index 270065a0..a6d63126 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ProjectGroupServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ProjectGroupServiceImpl.java @@ -4,9 +4,24 @@ import com.qqchen.deploy.backend.deploy.dto.ProjectGroupDTO; import com.qqchen.deploy.backend.deploy.entity.ProjectGroup; import com.qqchen.deploy.backend.deploy.service.IProjectGroupService; import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl; +import jakarta.persistence.Query; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service public class ProjectGroupServiceImpl extends BaseServiceImpl implements IProjectGroupService { + @Override + @Transactional + public void delete(Long id) { + // 1. 先删除中间表数据 + Query query = entityManager.createNativeQuery( + "DELETE FROM deploy_project_group_environment WHERE project_group_id = :projectGroupId" + ); + query.setParameter("projectGroupId", id); + query.executeUpdate(); + + // 2. 再调用父类的删除方法（逻辑删除ProjectGroup） + super.delete(id); + } } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/converter/RepositoryConverter.java b/backend/src/main/java/com/qqchen/deploy/backend/system/converter/RepositoryConverter.java index d3a49fc8..414ec86c 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/converter/RepositoryConverter.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/system/converter/RepositoryConverter.java @@ -1,8 +1,8 @@ package com.qqchen.deploy.backend.system.converter; -import com.qqchen.deploy.backend.system.entity.RepositoryGroup; -import com.qqchen.deploy.backend.system.entity.RepositoryProject; -import com.qqchen.deploy.backend.system.entity.RepositoryBranch; +import com.qqchen.deploy.backend.deploy.entity.RepositoryGroup; +import com.qqchen.deploy.backend.deploy.entity.RepositoryProject; +import com.qqchen.deploy.backend.deploy.entity.RepositoryBranch; import com.qqchen.deploy.backend.system.model.dto.RepositoryGroupDTO; import com.qqchen.deploy.backend.system.model.dto.RepositoryProjectDTO; import com.qqchen.deploy.backend.system.model.dto.RepositoryBranchDTO; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsConfig.java b/backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsConfig.java deleted file mode 100644 index a6f8a67d..00000000 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/entity/JenkinsConfig.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.qqchen.deploy.backend.system.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; -import lombok.EqualsAndHashCode; - -import java.time.LocalDateTime; - -@Data -@EqualsAndHashCode(callSuper = true) -@jakarta.persistence.Entity -@Table(name = "deploy_jenkins_config") -@LogicDelete -public class JenkinsConfig extends Entity { - - @Column(nullable = false) - private String name; - - @Column(nullable = false) - private String url; - - @Column(nullable = false) - private String username; - - @Column(nullable = false) - private String password; - - private Integer sort; - - private String remark; - - @Column(name = "last_all_sync_time") - private LocalDateTime lastAllSyncTime; - - @Column(name = "last_view_sync_time") - private LocalDateTime lastViewSyncTime; - - @Column(name = "last_job_sync_time") - private LocalDateTime lastJobSyncTime; - - @Column(name = "last_build_sync_time") - private LocalDateTime lastBuildSyncTime; -} \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsConfigRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsConfigRepository.java deleted file mode 100644 index a9e93f68..00000000 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsConfigRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.qqchen.deploy.backend.system.repository; - - -import com.qqchen.deploy.backend.framework.repository.IBaseRepository; -import com.qqchen.deploy.backend.system.entity.JenkinsConfig; -import org.springframework.stereotype.Repository; - -import java.util.List; -@Repository -public interface IJenkinsConfigRepository extends IBaseRepository { - List findByDeletedFalseOrderBySort(); - boolean existsByNameAndDeletedFalse(String name); -} \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsJobRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsJobRepository.java deleted file mode 100644 index 037abaa2..00000000 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsJobRepository.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.qqchen.deploy.backend.system.repository; - -import com.qqchen.deploy.backend.framework.repository.IBaseRepository; -import com.qqchen.deploy.backend.system.entity.JenkinsJob; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; -@Repository -public interface IJenkinsJobRepository extends IBaseRepository { - List findByJenkinsIdAndDeletedFalse(Long jenkinsId); - List findByJenkinsIdAndJobNameAndDeletedFalse(Long jenkinsId, String jobName); - void deleteByJenkinsIdAndDeletedFalse(Long jenkinsId); - - @Query("SELECT j FROM JenkinsJob j " + - "JOIN FETCH j.view v " + - "WHERE j.jenkinsId = :jenkinsId " + - "AND v.viewName = :viewName " + - "AND j.deleted = false " + - "AND v.deleted = false") - List findJobsByJenkinsIdAndViewName( - @Param("jenkinsId") Long jenkinsId, - @Param("viewName") String viewName - ); -} \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsViewRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsViewRepository.java deleted file mode 100644 index e0283f55..00000000 --- a/backend/src/main/java/com/qqchen/deploy/backend/system/repository/IJenkinsViewRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.qqchen.deploy.backend.system.repository; - - -import com.qqchen.deploy.backend.framework.repository.IBaseRepository; -import com.qqchen.deploy.backend.system.entity.JenkinsView; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface IJenkinsViewRepository extends IBaseRepository { - List findByJenkinsIdAndDeletedFalse(Long jenkinsId); - List findByJenkinsIdAndViewNameAndDeletedFalse(Long jenkinsId, String viewName); - void deleteByJenkinsIdAndDeletedFalse(Long jenkinsId); -} \ No newline at end of file diff --git a/backend/src/main/resources/db/migration/V1.0.1__init_data.sql b/backend/src/main/resources/db/migration/V1.0.1__init_data.sql index 7a1ed007..11f8fc59 100644 --- a/backend/src/main/resources/db/migration/V1.0.1__init_data.sql +++ b/backend/src/main/resources/db/migration/V1.0.1__init_data.sql @@ -61,8 +61,6 @@ VALUES (4, '菜单管理', '/system/menu', '/src/pages/system/menu/index', 'MenuOutlined', 2, 1, 30, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE), -- 部门管理 (5, '部门管理', '/system/department', '/src/pages/system/department/index', 'ApartmentOutlined', 2, 1, 40, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE), --- 三方系统 -(70, '三方系统', '/system/external', '/src/pages/system/external/index', 'ApiOutlined', 2, 1, 70, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE), -- 工作流管理 (100, '工作流管理', '/workflow', 'Layout', 'DeploymentUnitOutlined', 1, NULL, 2, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE), @@ -79,7 +77,9 @@ VALUES (203, '项目组管理', '/deploy/project-group', '/src/pages/Deploy/ProjectGroup/List/index', 'ProjectOutlined', 2, 200, 2, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE), -(202, '应用管理', '/deploy/applications', '/src/pages/Deploy/Application/List/index', 'AppstoreOutlined', 2, 200, 3, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE); +(204, '应用管理', '/deploy/applications', '/src/pages/Deploy/Application/List/index', 'AppstoreOutlined', 2, 200, 3, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE), +-- 三方系统 +(205, '三方系统管理', '/deploy/external', '/src/pages/Deploy/external/index', 'ApiOutlined', 2, 200, 70, FALSE, TRUE, 'system', '2024-01-01 00:00:00', 0, FALSE); -- 初始化角色数据 INSERT INTO sys_role (id, create_time, code, name, type, description, sort) @@ -118,7 +118,7 @@ SELECT 1, id FROM sys_menu; -- 超级管理员拥有所有菜单权限 INSERT INTO sys_role_menu (role_id, menu_id) VALUES (2, 1), (2, 2), (2, 3), (2, 4), (2, 5), -- 系统管理员拥有系统管理相关权限 -(3, 70); -- 普通用户拥有三方系统权限 +(3, 205); -- 普通用户拥有三方系统权限 -- 初始化权限模板 INSERT INTO sys_permission_template (id, create_time, code, name, type, description, enabled) @@ -131,7 +131,7 @@ INSERT INTO sys_template_menu (template_id, menu_id) SELECT 1, id FROM sys_menu; -- 完整权限模板关联所有菜单 INSERT INTO sys_template_menu (template_id, menu_id) -VALUES (2, 70); -- 基础权限模板关联三方系统菜单 +VALUES (2, 205); -- 基础权限模板关联三方系统菜单 -- 初始化权限数据 INSERT INTO sys_permission (id, create_time, menu_id, code, name, type, sort) @@ -149,12 +149,12 @@ VALUES (8, NOW(), 3, 'system:role:delete', '角色删除', 'FUNCTION', 4), -- 三方系统权限 -(9, NOW(), 70, 'system:external:list', '三方系统列表', 'FUNCTION', 1), -(10, NOW(), 70, 'system:external:create', '三方系统创建', 'FUNCTION', 2), -(11, NOW(), 70, 'system:external:update', '三方系统修改', 'FUNCTION', 3), -(12, NOW(), 70, 'system:external:delete', '三方系统删除', 'FUNCTION', 4), -(13, NOW(), 70, 'system:external:test', '连接测试', 'FUNCTION', 5), -(14, NOW(), 70, 'system:external:sync', '数据同步', 'FUNCTION', 6); +(9, NOW(), 205, 'system:external:list', '三方系统列表', 'FUNCTION', 1), +(10, NOW(), 205, 'system:external:create', '三方系统创建', 'FUNCTION', 2), +(11, NOW(), 205, 'system:external:update', '三方系统修改', 'FUNCTION', 3), +(12, NOW(), 205, 'system:external:delete', '三方系统删除', 'FUNCTION', 4), +(13, NOW(), 205, 'system:external:test', '连接测试', 'FUNCTION', 5), +(14, NOW(), 205, 'system:external:sync', '数据同步', 'FUNCTION', 6); -- -------------------------------------------------------------------------------------- -- 初始化外部系统数据