Merge branch 'dev' of chenweida/jkzl-starter into dev

admin/admin-client-starter/src/main/java/com/yihu/admin/client/config/WebsocketConfig.java

@@ -37,7 +37,7 @@ public class WebsocketConfig {
    @Bean
    public SimpleEventSender simpleEventSender() {
        return new SimpleEventSender(socketClient.getCurrentClient());
        return new SimpleEventSender(socketClient);
    }
}

admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/sender/SimpleEventSender.java

@@ -1,5 +1,6 @@
package com.yihu.admin.client.websocket.sender;
import com.yihu.admin.client.websocket.SocketClient;
import com.yihu.admin.client.websocket.event.IEvent;
import net.sf.json.JSONObject;
import org.java_websocket.client.WebSocketClient;
@@ -12,11 +13,11 @@ import java.util.Date;
 */
public class SimpleEventSender implements EventSender {
    public SimpleEventSender(WebSocketClient client) {
        this.client = client;
    public SimpleEventSender( SocketClient socketClient) {
        this.socketClient = socketClient;
    }
    private WebSocketClient client;
    private SocketClient socketClient;
    @Override
    public Boolean send(IEvent event) {
@@ -45,7 +46,7 @@ public class SimpleEventSender implements EventSender {
                    }
                }
            }
            client.send(jsonObject.toString());
            socketClient.getCurrentClient().send(jsonObject.toString());
            return true;
        } catch (Exception e) {
            return false;