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

xuhy

22 小时以前 3b6789ae8cb8138533b2cc362f37ad94b605a58d

 ZuulZYTravel/src/main/java/com/sinata/zuul/util/applets/WebSocketHandler.java

@@ -23,7 +23,7 @@
    //用于websocket握手的处理类
    private WebSocketServerHandshaker handshaker;

    private static final String WEB_SOCKET_URL = "wss://localhost:9090/websocket";
    private static final String WEB_SOCKET_URL = "ws://localhost:9090/websocket";