From 517c5705b6b999a07e149137f7feb233003a042c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 8 Apr 2022 11:39:40 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=20Mybatis=20=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=20=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=20=E4=B8=A5=E6=A0=BC=E6=A8=A1=E5=BC=8F=20=E6=89=BE=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E6=BA=90=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml     |  2 ++
 .../src/main/resources/application-prod.yml    |  2 ++
 .../web/exception/GlobalExceptionHandler.java  | 18 +++++++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 4f3fca117..d5994e430 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -47,6 +47,8 @@ spring:
       p6spy: true
       # 设置默认的数据源或者数据源组,默认值即为 master
       primary: master
+      # 严格模式 匹配不到数据源则报错
+      strict: true
       datasource:
         # 主库数据源
         master:
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 51392215e..0b9b9878c 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -54,6 +54,8 @@ spring:
       p6spy: false
       # 设置默认的数据源或者数据源组,默认值即为 master
       primary: master
+      # 严格模式 匹配不到数据源则报错
+      strict: true
       datasource:
         # 主库数据源
         master:
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
index 0af1b69ea..326c96a7b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
@@ -9,9 +9,10 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.exception.DemoModeException;
 import com.ruoyi.common.exception.ServiceException;
 import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.MyBatisSystemException;
 import org.springframework.context.support.DefaultMessageSourceResolvable;
-import org.springframework.validation.BindException;
 import org.springframework.dao.DuplicateKeyException;
+import org.springframework.validation.BindException;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -82,6 +83,21 @@ public class GlobalExceptionHandler {
         return R.fail("数据库中已存在该记录，请联系管理员确认");
     }
 
+    /**
+     * Mybatis系统异常 通用处理
+     */
+    @ExceptionHandler(MyBatisSystemException.class)
+    public R<Void> handleCannotFindDataSourceException(MyBatisSystemException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        String message = e.getMessage();
+        if (message.contains("CannotFindDataSourceException")) {
+            log.error("请求地址'{}', 未找到数据源", requestURI);
+            return R.fail("未找到数据源，请联系管理员确认");
+        }
+        log.error("请求地址'{}', Mybatis系统异常", requestURI, e);
+        return R.fail(message);
+    }
+
     /**
      * 业务异常
      */