Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wang

2024-03-26 ea073afc6b4bc758990ac60f5e33254d1143272c

 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//在service里面有多表操作，开启事务注解
@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);
    }
}