From 5073a245f53fd5ca936e779be8c6b9b19d42f67d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 09:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/JxkgApplication.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/JxkgApplication.java b/src/main/java/com/ycl/jxkg/JxkgApplication.java
index 3df1b54..d05cc11 100644
--- a/src/main/java/com/ycl/jxkg/JxkgApplication.java
+++ b/src/main/java/com/ycl/jxkg/JxkgApplication.java
@@ -1,9 +1,12 @@
package com.ycl.jxkg;
import com.ycl.jxkg.config.property.SystemConfig;
+import com.ycl.jxkg.server.WebsocketServer;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
@@ -12,6 +15,7 @@
* Copyright (C), 2020-2024, 姝︽眽鎬濈淮璺宠穬绉戞妧鏈夐檺鍏徃
* @date 2021/12/25 9:45
*/
+@EnableScheduling
@SpringBootApplication
@EnableTransactionManagement
@EnableConfigurationProperties(value = { SystemConfig.class})
@@ -23,6 +27,7 @@
* @param args the input arguments
*/
public static void main(String[] args) {
- SpringApplication.run(JxkgApplication.class, args);
+ ConfigurableApplicationContext context = SpringApplication.run(JxkgApplication.class, args);
+ WebsocketServer.setApplicationContext(context);
}
}
--
Gitblit v1.8.0