From f076cee66fa176715cd9bb4ac84778b6ed166513 Mon Sep 17 00:00:00 2001
From: dingzhongyuan <dingzhongyuan@kinggrid.com>
Date: Mon, 21 Jun 2021 17:35:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=EF=BC=8C=E5=90=AF=E5=8A=A8=E7=B1=BB=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E5=8E=9F=E7=8A=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java       | 2 +-
 .../com/ruoyi/system/service/impl/SysConfigServiceImpl.java     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index f60978bed..365687a03 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -11,7 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author ruoyi
  */
 
-@SpringBootApplication
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class RuoYiApplication
 {
     public static void main(String[] args)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index 55ea8b6a3..7f5352d9f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -67,7 +67,6 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
 	 * @return 参数配置信息
 	 */
 	@Override
-//	@DataSource(DataSourceType.MASTER)
 	public SysConfig selectConfigById(Long configId) {
 		return baseMapper.selectById(configId);
 	}