Browse Source

Pull request #7110: 无jira 解决冲突

Merge in DESIGN/design from ~HADES/design:release/11.0 to release/11.0

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

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

@ -55,6 +55,8 @@ import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Cursor; import java.awt.Cursor;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
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.io.IOException; import java.io.IOException;
@ -137,6 +139,8 @@ 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.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