Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0

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

designer-realize/src/test/java/com/fr/design/mainframe/app/DesignerAppUtilsTest.java

@@ -3,15 +3,11 @@ package com.fr.design.mainframe.app;
 import com.fr.invoke.Reflect;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.context.PluginMarkerAdapter;
-import com.fr.plugin.engine.remote.PluginRemoteSync;
 import com.fr.stable.TemplateIOErrorContextHolder;
 import com.fr.third.guava.collect.Multimap;
-import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.api.easymock.PowerMock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.util.Collection;
@@ -24,7 +20,6 @@ import java.util.HashSet;
  * Created by vito on 2021/5/31
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({PluginRemoteSync.class})
 public class DesignerAppUtilsTest {
     @Test
     public void testDealWithErrorDetailMultiLineAndCache() {
@@ -62,17 +57,17 @@ public class DesignerAppUtilsTest {
     @Test
     public void testRearrange() {
         // 远程插件模拟注册
-        PluginRemoteSync pluginRemoteSync = EasyMock.createMock(PluginRemoteSync.class);
-        EasyMock.expect(pluginRemoteSync.getPluginRemoteStatusByIdIndex()).andReturn(new HashMap<String, PluginRemoteSync.PluginStatus>(){{
-            put("com.fr.plugin1", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin1","1",true).get());
-            put("com.fr.plugin2", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin2","1",true).get());
-            put("com.fr.plugin3", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin3","1",false).get());
-            put("com.fr.plugin4", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin4","1",false).get());
-        }}).anyTimes();
-        EasyMock.replay(pluginRemoteSync);
-        PowerMock.mockStaticPartial(PluginRemoteSync.class, "getInstance");
-        EasyMock.expect(PluginRemoteSync.getInstance()).andReturn(pluginRemoteSync).anyTimes();
-        PowerMock.replay(PluginRemoteSync.class);
+//        PluginRemoteSync pluginRemoteSync = EasyMock.createMock(PluginRemoteSync.class);
+//        EasyMock.expect(pluginRemoteSync.getPluginRemoteStatusByIdIndex()).andReturn(new HashMap<String, PluginRemoteSync.PluginStatus>(){{
+//            put("com.fr.plugin1", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin1","1",true).get());
+//            put("com.fr.plugin2", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin2","1",true).get());
+//            put("com.fr.plugin3", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin3","1",false).get());
+//            put("com.fr.plugin4", Reflect.on(PluginRemoteSync.PluginStatus.class).call("create","com.fr.plugin4","1",false).get());
+//        }}).anyTimes();
+//        EasyMock.replay(pluginRemoteSync);
+//        PowerMock.mockStaticPartial(PluginRemoteSync.class, "getInstance");
+//        EasyMock.expect(PluginRemoteSync.getInstance()).andReturn(pluginRemoteSync).anyTimes();
+//        PowerMock.replay(PluginRemoteSync.class);
 
         // 本地插件模拟检查
         TemplateIOErrorContextHolder.registerPluginNameMap(new HashMap<String, String>() {{