Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c

 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());
    }
    /**
     * 用户进入系统监听