Browse Source

Merge pull request #7111 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '57f997fcbcac99b985eccacd39fb086d4101bb9c':
  CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
  REPORT-64095 websocket频繁出现断开又连上问题
feature/10.0
superman 3 years ago
parent
commit
bf3225e260
  1. 3
      designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java

3
designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java

@ -34,6 +34,8 @@ import io.socket.client.IO;
import io.socket.client.Socket; import io.socket.client.Socket;
import io.socket.emitter.Emitter; import io.socket.emitter.Emitter;
import io.socket.engineio.client.transports.Polling;
import io.socket.engineio.client.transports.WebSocket;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.security.KeyStore; import java.security.KeyStore;
@ -116,6 +118,7 @@ public class DesignerSocketIO {
private static IO.Options createOptions() { private static IO.Options createOptions() {
IO.Options options = new IO.Options(); IO.Options options = new IO.Options();
options.path = WebSocketConfig.getInstance().getSocketContext(); options.path = WebSocketConfig.getInstance().getSocketContext();
options.transports = new String[]{WebSocket.NAME, Polling.NAME};
try { try {
if (ComparatorUtils.equals(currentProtocol, HTTPS)) { if (ComparatorUtils.equals(currentProtocol, HTTPS)) {
options.sslContext = getSSLContext(); options.sslContext = getSSLContext();

Loading…
Cancel
Save