From 2cd8f35436fd324431f1ae78196f8140ecb3d8b0 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 14 十一月 2024 11:25:11 +0800
Subject: [PATCH] Merge branch '视频专网' of http://42.193.1.25:9521/r/~qirong/qyspzw into 视频专网

---
 ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java
index 30d109e..c6680c9 100644
--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java
@@ -20,7 +20,7 @@
  * @author zendwang
  */
 @AutoConfiguration
-@ConditionalOnProperty(value = "websocket.enabled", havingValue = "true")
+@ConditionalOnProperty(value = "websocket.enabled", havingValue = "false")
 @EnableConfigurationProperties(WebSocketProperties.class)
 @EnableWebSocket
 public class WebSocketConfig {

--
Gitblit v1.8.0