Merge pull request #6530 in DESIGN/design from bugfix/10.0 to release/10.0

* commit '52823132d028fda601a9b368d298b3a5eeb7aae4':
  REPORT-62016 BI插件匹配检测
  REPORT-59614 远程设计下无推送日志

designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java

@@ -64,6 +64,11 @@ public class VersionCheckUtils {
     private static final String ID = "id";
     private static final String VERSION = "version";
     private static final String NAME = "name";
+    private static final String RUNNING = "running";
+    private static final String SYNC = "sync";
+    private static final String GROUP = "group";
+    private static final String BI = "bi";
+    private static final String BIPREFIX = "com.finebi";
     private static final Set<String> pluginsNeedIgnore = new HashSet<>();
     static {
         pluginsNeedIgnore.addAll(Arrays.asList(
@@ -263,13 +268,10 @@ public class VersionCheckUtils {
         Map<String, String> pluginsNameMap = ReportHelper.getPluginNameMap();
         for (int i = 0; i < remotePlugins.size(); i++) {
             remotePlugin = remotePlugins.getJSONObject(i);
-            if (ComparatorUtils.equals(remotePlugin.getString("running"), "false") || (remotePlugin.containsKey("sync") && !remotePlugin.getBoolean("sync"))) {
+            if (isPluginNeedIgnore(remotePlugin)) {
                 continue;
             }
             String remotePluginID = remotePlugin.getString(ID);
-            if (pluginsNeedIgnore.contains(remotePluginID)) {
-                continue;
-            }
             if (localPluginsMap.containsKey(remotePluginID)) {
                 if (ComparatorUtils.equals(localPluginsMap.get(remotePluginID).getVersion(), remotePlugin.getString(VERSION))) {
                     continue;
@@ -290,6 +292,12 @@ public class VersionCheckUtils {
         return differentPlugins;
     }
 
+    private static boolean isPluginNeedIgnore(JSONObject remotePlugin) {
+        return ComparatorUtils.equals(remotePlugin.getString(RUNNING), "false") || (remotePlugin.containsKey(SYNC) && !remotePlugin.getBoolean(SYNC))
+                || (remotePlugin.containsKey(GROUP) && ComparatorUtils.equals(remotePlugin.containsKey(GROUP), BI) || remotePlugin.getString(ID).startsWith(BIPREFIX)
+                || pluginsNeedIgnore.contains(remotePlugin.getString(ID)));
+    }
+
     public static JSONArray syncPlugins(JSONArray differentPlugins) {
         Set<String> uninstallFailed = uninstallPlugins(differentPlugins);
         List<PluginMarker> plugins = getSyncPlugins(differentPlugins, uninstallFailed);

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

@@ -115,6 +115,7 @@ public class DesignerSocketIO {
 
     private static IO.Options createOptions() {
         IO.Options options = new IO.Options();
+        options.path = WebSocketConfig.getInstance().getSocketContext();
         try {
             if (ComparatorUtils.equals(currentProtocol, HTTPS)) {
                 options.sslContext = getSSLContext();