Merge pull request #4802 in DESIGN/design from final/10.0 to release/10.0

* commit '4352be8f742815aa2aa28cdaba241b6aab033ff3':
  REPORT-54643 最新的persist分支安装设计器内存监控安装失败且会导致面板无法编辑  漏传代码
  REPORT-54643 最新的persist分支安装设计器内存监控安装失败且会导致面板无法编辑
  REPORT-54643  回退
  REPORT-54643  回退
  REPORT-54643 最新的persist分支安装设计器内存监控安装失败且会导致面板无法编辑
  REPORT-54643 最新的persist分支安装设计器内存监控安装失败且会导致面板无法编辑
  REPORT-54574 远程设计环境不一致提示内容中，性能插件下的六个包被分别识别为了插件

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@@ -72,6 +72,8 @@ import com.fr.start.OemHandler;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 import org.jetbrains.annotations.Nullable;
 
@@ -179,6 +181,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
     private int contentHeight = (int) (java.awt.Toolkit.getDefaultToolkit().getScreenSize().getHeight());
 
+    private Map<WindowListener, SafeWindowListener> map = new HashMap<>();
+
     private WindowAdapter windowAdapter = new WindowAdapter() {
 
         @Override
@@ -535,6 +539,21 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         }
     }
 
+    @Override
+    public synchronized void addWindowListener(WindowListener l) {
+        SafeWindowListener safeWindowListener = new SafeWindowListener(l);
+        map.put(l, safeWindowListener);
+        super.addWindowListener(safeWindowListener);
+    }
+
+    @Override
+    public synchronized void removeWindowListener(WindowListener l) {
+        SafeWindowListener safeWindowListener = map.remove(l);
+        if (safeWindowListener != null) {
+            super.removeWindowListener(safeWindowListener);
+        }
+    }
+
     private void addMacOsListener() {
         OSSupportCenter.buildAction(new MacOsAddListenerAction(), SupportOSImpl.DOCK_QUIT);
     }

designer-base/src/main/java/com/fr/design/mainframe/SafeWindowListener.java

@@ -0,0 +1,84 @@
+package com.fr.design.mainframe;
+
+import com.fr.log.FineLoggerFactory;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+
+/**
+ *  保证监听运行出错也不影响其他功能正常使用
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/6/30
+ */
+public class SafeWindowListener implements WindowListener {
+
+    private final WindowListener windowListener;
+
+    public SafeWindowListener(WindowListener windowListener) {
+        this.windowListener = windowListener;
+    }
+
+    @Override
+    public void windowOpened(WindowEvent e) {
+        try {
+            windowListener.windowOpened(e);
+        } catch (Throwable throwable) {
+            FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable);
+        }
+    }
+
+    @Override
+    public void windowClosing(WindowEvent e) {
+        try {
+            windowListener.windowClosing(e);
+        } catch (Throwable throwable) {
+            FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable);
+        }
+    }
+
+    @Override
+    public void windowClosed(WindowEvent e) {
+        try {
+            windowListener.windowClosed(e);
+        } catch (Throwable throwable) {
+            FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable);
+        }
+    }
+
+    @Override
+    public void windowIconified(WindowEvent e) {
+        try {
+            windowListener.windowIconified(e);
+        } catch (Throwable throwable) {
+            FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable);
+        }
+    }
+
+    @Override
+    public void windowDeiconified(WindowEvent e) {
+        try {
+            windowListener.windowDeiconified(e);
+        } catch (Throwable throwable) {
+            FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable);
+        }
+    }
+
+    @Override
+    public void windowActivated(WindowEvent e) {
+        try {
+            windowListener.windowActivated(e);
+        } catch (Throwable throwable) {
+            FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable);
+        }
+    }
+
+    @Override
+    public void windowDeactivated(WindowEvent e) {
+        try {
+            windowListener.windowDeactivated(e);
+        }  catch (Throwable throwable) {
+            FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable);
+        }
+    }
+}

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

@@ -39,6 +39,7 @@ import java.lang.reflect.Method;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -59,6 +60,21 @@ public class VersionCheckUtils {
     private static final String ID = "id";
     private static final String VERSION = "version";
     private static final String NAME = "name";
+    private static final Set<String> pluginsNeedIgnore = new HashSet<>();
+    static {
+        pluginsNeedIgnore.addAll(Arrays.asList(
+                "com.fr.plugin.performance.newexecutetool",
+                "com.fr.plugin.performance.newline",
+                "com.fr.plugin.performance.pdfstream",
+                "com.fr.plugin.performance.dzstartemptyfile",
+                "com.fr.plugin.performance.treenode.button.optimization",
+                "com.fr.plugin.performance.druid",
+                "com.fr.plugin.performance.reducecalculation",
+                "com.fr.plugin.performance.fasttree",
+                "com.fr.plugin.performance.paralleldsloader",
+                "com.fr.plugin.cloud.analytics.v10"
+        ));
+    }
 
 
     public static boolean versionCheck(String envName) {
@@ -236,6 +252,9 @@ public class VersionCheckUtils {
                 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;