From 2e1b594ca9bbd2af5b4e713746221705591ada52 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 29 四月 2024 09:42:01 +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 | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 95a9a73..42b56a2 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/CacheGlassModuleApplication.java
@@ -1,11 +1,15 @@
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 springfox.documentation.swagger2.annotations.EnableSwagger2;
+import com.mes.edgstoragecage.service.*;
/**
* @Author : zhoush
@@ -21,7 +25,10 @@
public static void main(String[] args) {
try {
- 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