From f179075e507d30dc0284ea78e6296e26320d52a5 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 09 五月 2024 13:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 42b56a2..376cca1 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java
@@ -1,15 +1,12 @@
package com.mes;
-import com.mes.common.WebSocketServer;
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.context.ConfigurableApplicationContext;
+import org.springframework.scheduling.annotation.EnableScheduling;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
-import com.mes.edgstoragecage.service.*;
/**
* @Author : zhoush
@@ -21,14 +18,15 @@
@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);
+// SpringApplication springApplication = new SpringApplication(CacheGlassModuleApplication.class);
+// ConfigurableApplicationContext applicationContext = springApplication.run(args);
+// WebSocketServer.setApplicationContext(applicationContext);
+ SpringApplication.run(CacheGlassModuleApplication.class, args);
} catch (Exception e) {
log.error(e.getMessage());
}
--
Gitblit v1.8.0