From 8fed9c6ac4a47f539d31027040203e7895618e27 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Tue, 13 Apr 2021 15:50:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.3=E3=80=91=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=BB=E6=95=B0=E6=8D=AE=E6=BA=90=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exception/enums/DatasourceContainerExceptionEnum.java  | 7 ++++++-
 .../modular/service/impl/DatabaseInfoServiceImpl.java      | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/exception/enums/DatasourceContainerExceptionEnum.java b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/exception/enums/DatasourceContainerExceptionEnum.java
index f417f9898..219e2e0c7 100644
--- a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/exception/enums/DatasourceContainerExceptionEnum.java
+++ b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/exception/enums/DatasourceContainerExceptionEnum.java
@@ -96,7 +96,12 @@ public enum DatasourceContainerExceptionEnum implements AbstractExceptionEnum {
     /**
      * 数据源信息不存在
      */
-    DATASOURCE_INFO_NOT_EXISTED(RuleConstants.BUSINESS_ERROR_TYPE_CODE + DatasourceContainerConstants.DS_CTN_EXCEPTION_STEP_CODE + "12", "数据源信息不存在，数据源id为：{}");
+    DATASOURCE_INFO_NOT_EXISTED(RuleConstants.BUSINESS_ERROR_TYPE_CODE + DatasourceContainerConstants.DS_CTN_EXCEPTION_STEP_CODE + "12", "数据源信息不存在，数据源id为：{}"),
+
+    /**
+     * 主数据源不能删除
+     */
+    MASTER_DATASOURCE_CANT_DELETE(RuleConstants.BUSINESS_ERROR_TYPE_CODE + DatasourceContainerConstants.DS_CTN_EXCEPTION_STEP_CODE + "13", "主数据源不能删除！");
 
     /**
      * 错误编码
diff --git a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
index 966aded56..8979d7232 100644
--- a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
+++ b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
@@ -96,7 +96,7 @@ public class DatabaseInfoServiceImpl extends ServiceImpl<DatabaseInfoMapper, Dat
 
         // 不能删除主数据源
         if (MASTER_DATASOURCE_NAME.equals(databaseInfo.getDbName())) {
-            throw new DatasourceContainerException(DATASOURCE_INFO_NOT_EXISTED);
+            throw new DatasourceContainerException(MASTER_DATASOURCE_CANT_DELETE);
         }
 
         // 删除库中的数据源记录