From e9b0059e5ee9551f7b9b81c9358ce3d42886ae9a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 26 三月 2024 13:29:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UnLoadGlassModule/src/main/java/com/mes/MesApplication.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/UnLoadGlassModule/src/main/java/com/mes/MesApplication.java b/UnLoadGlassModule/src/main/java/com/mes/MesApplication.java
index 9cc84b5..c438a67 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/MesApplication.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/MesApplication.java
@@ -1,24 +1,19 @@
package com.mes;
-import com.mes.common.PlcTools.S7object;
+import com.mes.tools.WebSocketServer;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.transaction.annotation.Transactional;
-//springboot 鍚姩鍏ュ彛
@SpringBootApplication
@EnableCaching
-@EnableTransactionManagement//浜嬪姟娉ㄨВ
-//@Transactional//鍦╯ervice閲岄潰鏈夊琛ㄦ搷浣滐紝寮�鍚簨鍔℃敞瑙�
+@EnableTransactionManagement
public class MesApplication {
public static void main(String[] args) {
- SpringApplication.run(MesApplication.class, args);
- try {
- //new NettyServer(12345).start();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
+ SpringApplication springApplication = new SpringApplication(MesApplication.class);
+ ConfigurableApplicationContext applicationContext = springApplication.run(args);
+ WebSocketServer.setApplicationContext(applicationContext);
}
}
--
Gitblit v1.8.0