From 69830f1a3b084ad6800c8013268624a11d7fa5f3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 11 Jan 2024 09:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cms' into anentang
---
src/main/java/com/xcong/farmer/cms/FarmerCmsApplication.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/FarmerCmsApplication.java b/src/main/java/com/xcong/farmer/cms/FarmerCmsApplication.java
index 1ee1f2f..3019699 100644
--- a/src/main/java/com/xcong/farmer/cms/FarmerCmsApplication.java
+++ b/src/main/java/com/xcong/farmer/cms/FarmerCmsApplication.java
@@ -1,5 +1,6 @@
package com.xcong.farmer.cms;
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
import com.xcong.farmer.cms.netty.server.WebSocketServer;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +13,7 @@
* @author helius
*/
@EnableSwagger2
-@SpringBootApplication
+@SpringBootApplication(exclude = DruidDataSourceAutoConfigure.class)
@MapperScan("com.xcong.farmer.cms.modules.*.mapper")
@MapperScan("com.xcong.farmer.cms.modules.*.dao")
public class FarmerCmsApplication implements CommandLineRunner {
--
Gitblit v1.9.1