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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

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