From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 10 五月 2024 16:29:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java
index e1eb378..376cca1 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java
@@ -2,12 +2,11 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
-import com.mes.edgstoragecage.service.*;
 
 /**
  * @Author : zhoush
@@ -19,12 +18,16 @@
 @MapperScan("com.mes.*.mapper")
 @EnableDiscoveryClient
 @EnableSwagger2
+@EnableScheduling
 public class CacheGlassModuleApplication {
 
     public static void main(String[] args) {
         try {
+//            SpringApplication springApplication = new SpringApplication(CacheGlassModuleApplication.class);
+//            ConfigurableApplicationContext applicationContext = springApplication.run(args);
+//            WebSocketServer.setApplicationContext(applicationContext);
             SpringApplication.run(CacheGlassModuleApplication.class, args);
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error(e.getMessage());
         }
 

--
Gitblit v1.8.0