From f53ed687a63a70e307826f244e9109ddddf2e5f9 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sun, 21 Mar 2021 21:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.2=E3=80=91=E6=9B=B4=E6=96=B0flyway?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=BF=87=E7=A8=8B=EF=BC=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=A9=B1=E5=8A=A8=E6=94=B9=E4=B8=BA=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE=20I3BY48?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/db/api/exception/DaoException.java        | 5 +++++
 .../kernel/db/api/exception/enums/FlywayExceptionEnum.java | 4 ++--
 .../roses/kernel/db/flyway/FlywayInitListener.java         | 7 ++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/DaoException.java b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/DaoException.java
index f7ef1da58..990c84f13 100644
--- a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/DaoException.java
+++ b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/DaoException.java
@@ -24,6 +24,7 @@
  */
 package cn.stylefeng.roses.kernel.db.api.exception;
 
+import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.db.api.constants.DbConstants;
 import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
@@ -40,4 +41,8 @@ public class DaoException extends ServiceException {
         super(DbConstants.DB_MODULE_NAME, exception);
     }
 
+    public DaoException(AbstractExceptionEnum exception, Object... params) {
+        super(DbConstants.DB_MODULE_NAME, exception.getErrorCode(), StrUtil.format(exception.getUserTip(), params));
+    }
+
 }
diff --git a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/FlywayExceptionEnum.java b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/FlywayExceptionEnum.java
index 067614060..2f1dcdce8 100644
--- a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/FlywayExceptionEnum.java
+++ b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/exception/enums/FlywayExceptionEnum.java
@@ -41,12 +41,12 @@ public enum FlywayExceptionEnum implements AbstractExceptionEnum {
     /**
      * 获取不到application.yml中的数据库配置
      */
-    DB_CONFIG_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + DbConstants.DB_EXCEPTION_STEP_CODE + "01", "获取不到application.yml中的数据库配置，无法为flyway创建数据库链接"),
+    DB_CONFIG_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + DbConstants.DB_EXCEPTION_STEP_CODE + "01", "获取不到application.yml中的数据库配置，无法为flyway创建数据库链接，请检查spring.datasource配置"),
 
     /**
      * flyway执行迁移异常
      */
-    FLYWAY_MIGRATE_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + DbConstants.DB_EXCEPTION_STEP_CODE + "02", "脚本错误，flyway执行迁移异常");
+    FLYWAY_MIGRATE_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + DbConstants.DB_EXCEPTION_STEP_CODE + "02", "脚本错误，flyway执行迁移异常，具体原因：{}");
 
     /**
      * 错误编码
diff --git a/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java b/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java
index b4e2ea966..b8539b5b9 100644
--- a/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java
+++ b/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java
@@ -59,6 +59,7 @@ public class FlywayInitListener implements ApplicationListener<ApplicationContex
         String dataSourceUrl = environment.getProperty("spring.datasource.url");
         String dataSourceUsername = environment.getProperty("spring.datasource.username");
         String dataSourcePassword = environment.getProperty("spring.datasource.password");
+        String driverClassName = environment.getProperty("spring.datasource.driver-class-name");
 
         // flyway的配置
         String enabledStr = environment.getProperty("spring.flyway.enabled");
@@ -78,7 +79,7 @@ public class FlywayInitListener implements ApplicationListener<ApplicationContex
         }
 
         // 如果有为空的配置，终止执行
-        if (ObjectUtil.hasEmpty(dataSourceUrl, dataSourceUsername, dataSourcePassword)) {
+        if (ObjectUtil.hasEmpty(dataSourceUrl, dataSourceUsername, dataSourcePassword, driverClassName)) {
             throw new DaoException(FlywayExceptionEnum.DB_CONFIG_ERROR);
         }
 
@@ -104,7 +105,7 @@ public class FlywayInitListener implements ApplicationListener<ApplicationContex
             assert dataSourceUrl != null;
             // 手动创建数据源
             dmDataSource = new DriverManagerDataSource();
-            dmDataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+            dmDataSource.setDriverClassName(driverClassName);
             dmDataSource.setUrl(dataSourceUrl);
             dmDataSource.setUsername(dataSourceUsername);
             dmDataSource.setPassword(dataSourcePassword);
@@ -128,7 +129,7 @@ public class FlywayInitListener implements ApplicationListener<ApplicationContex
 
         } catch (Exception e) {
             log.error("flyway初始化失败", e);
-            throw new DaoException(FlywayExceptionEnum.FLYWAY_MIGRATE_ERROR);
+            throw new DaoException(FlywayExceptionEnum.FLYWAY_MIGRATE_ERROR, e.getMessage());
         }
     }