Bläddra i källkod

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

chenweida 6 år sedan
förälder
incheckning
d54d151c63

+ 2 - 1
admin/admin-client-starter/src/main/java/com/yihu/admin/client/websocket/SocketClient.java

@ -17,6 +17,7 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
import java.net.URI;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@ -47,7 +48,7 @@ public class SocketClient {
        String completeAddress = hostAddress + ":" + clientPort;
        Map<String, String> httpHeaders = new HashMap<>();
        httpHeaders.put("address", completeAddress);
        httpHeaders.put("id", MD5.GetMD5Code(completeAddress));
        httpHeaders.put("id", MD5.GetMD5Code(completeAddress+new Date().getTime()));
        client = new WebSocketClient(

+ 2 - 2
demo/demo-eureka/src/main/resources/application.yml

@ -14,9 +14,9 @@ spring:
      properties:
        client:
          transport:
            sniff: true  #开启嗅探集群  用nginx代理一层过后会出现ip解析失败问题
            sniff: false  #开启嗅探集群  用nginx代理一层过后会出现ip解析失败问题
      jest:
        discovery-enabled: true #开启嗅探
        discovery-enabled: false #开启嗅探
        conn-timeout: 60 # 连接时间单位是秒
        read-timeout: 60 # 读取时间单位是秒
        multith-readed: true #开启多线程