From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/component/websoket/WebSocketPushHandler.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/component/websoket/WebSocketPushHandler.java b/zq-erp/src/main/java/com/matrix/component/websoket/WebSocketPushHandler.java
index aa53291..5344831 100644
--- a/zq-erp/src/main/java/com/matrix/component/websoket/WebSocketPushHandler.java
+++ b/zq-erp/src/main/java/com/matrix/component/websoket/WebSocketPushHandler.java
@@ -27,10 +27,12 @@
private static final List<WebSoketMessageObserver> observerList=new ArrayList<>();
+
public WebSocketPushHandler(){
LogUtil.info("WebSocketPushHandler初始化");
//注册观察者
- addObserver(new WebSoketMessageRabbitObserver());
+ //addObserver(new WebSoketMessageRabbitObserver());
+ addObserver(new WebSoketScanQrCodeLoginObserver());
}
/**
* 用户进入系统监听
--
Gitblit v1.9.1