From 7f6f5e04b7cc1b82bdd631b7739a433dcef6c26d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Tue, 24 Sep 2024 08:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=B6=85=E6=97=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/many/datasource/factory/DruidDataSourceFactory.java | 3 ++-
 .../com/muyu/system/saas/controller/SysUserController.java     | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java
index 7ceb782..78f2d8a 100644
--- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java
+++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java
@@ -24,6 +24,7 @@ public class DruidDataSourceFactory {
     public DruidDataSource create(DataSourceInfo dataSourceInfo) {
         DruidDataSource druidDataSource = new DruidDataSource();
         druidDataSource.setUrl(dataSourceInfo.getUrl());
+        druidDataSource.setConnectTimeout(10000);
         druidDataSource.setUsername(dataSourceInfo.getUserName());
         druidDataSource.setPassword(dataSourceInfo.getPassword());
         druidDataSource.setBreakAfterAcquireFailure(true);
@@ -33,7 +34,7 @@ public class DruidDataSourceFactory {
             log.info("{} -> 数据源连接成功", dataSourceInfo.getKey());
             return druidDataSource;
         } catch (SQLException throwables) {
-            log.error("数据源 {} 连接失败,用户名：{}，密码 {}",dataSourceInfo.getUrl(),dataSourceInfo.getUserName(),dataSourceInfo.getPassword());
+            log.error("数据源 {} 连接失败,用户名：{}，密码 {}, 原因:{}",dataSourceInfo.getUrl(),dataSourceInfo.getUserName(),dataSourceInfo.getPassword(), throwables);
             return null;
         }
     }
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java
index 7ecba35..6f98288 100644
--- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java
+++ b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java
@@ -4,7 +4,6 @@ import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.security.annotation.InnerAuth;
-import com.muyu.common.system.domain.LoginUser;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.system.saas.service.SysUserService;