From 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng
---
src/main/java/com/xcong/farmer/cms/FarmerCmsApplication.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..b4d726e 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 {
@@ -26,6 +27,6 @@
@Override
public void run(String... args) throws Exception {
- webSocketServer.start();
+// webSocketServer.start();
}
}
--
Gitblit v1.9.1