From 0e1151ae8c94153b27fd04dd4feeb84ecba9da08 Mon Sep 17 00:00:00 2001
From: xiqiu <xiqiu@fanruan.com>
Date: Tue, 1 Jun 2021 11:26:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-52987=20=20=20=E4=BF=AE=E5=A4=8Ddata?=
 =?UTF-8?q?operator=E7=9A=84=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98;=E9=A1=BA?=
 =?UTF-8?q?=E5=B8=A6=E4=BF=AE=E5=A4=8D=E5=8F=91=E7=8E=B0=E7=9A=84=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connect/DatabaseConnectionPane.java       | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
index 209f4ab7da..18f4d94405 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
@@ -6,7 +6,7 @@ package com.fr.design.data.datapane.connect;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.impl.JNDIDatabaseConnection;
-import com.fr.data.operator.DataOperator;
+import com.fr.data.operator.DataOperatorProvider;
 import com.fr.data.solution.ExceptionSolutionSelector;
 import com.fr.data.solution.entity.DriverPage;
 import com.fr.data.solution.processor.ClassNotFoundExceptionSolutionProcessor;
@@ -22,9 +22,12 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.rpc.ExceptionHandler;
+import com.fr.rpc.RPCInvokerExceptionInfo;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.StringUtils;
+import com.fr.workspace.WorkContext;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
@@ -93,7 +96,26 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                     Connection database = DatabaseConnectionPane.this.updateBean();
                     // 返回连接结果
                     DriverPage.updateCache();
-                    DataOperator.getInstance().testConnectionWithException(database);
+                    final Exception[] exception = new Exception[1];
+                    WorkContext.getCurrent().get(DataOperatorProvider.class, new ExceptionHandler() {
+                        @Override
+                        public Object callHandler(RPCInvokerExceptionInfo exceptionInfo) {
+                            // 正常调用发生的异常也会被捕获，因此需要对异常类型进行判断，如果是NoSuchMethodException 就要去调用 testConnection
+                            // 如果不是 NoSuchMethodException  保存下异常上下文
+                            // 两种情况下异常都需要抛出
+                            if (exceptionInfo.getException() instanceof NoSuchMethodException) {
+                                if (!WorkContext.getCurrent().get(DataOperatorProvider.class).testConnection(database)) {
+                                    exception[0] = new Exception(Toolkit.i18nText("Fine-Design_Description_Of_Test_Connection"));
+                                }
+                            } else {
+                                exception[0] = exceptionInfo.getException();
+                            }
+                            return null;
+                        }
+                    }).testConnectionWithException(database);
+                    if (exception[0] != null) {
+                        throw exception[0];
+                    }
                     return null;
                 }
 

From e17b41cb912045745bf7c84ab07f0f482d61e82d Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Tue, 1 Jun 2021 11:46:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-51683=20=E5=AF=B9=E8=B1=A1/classload?=
 =?UTF-8?q?er=E8=BF=87=E6=BB=A4=E7=BC=A9=E7=95=A5=E5=9B=BE=20=E5=89=AA?=
 =?UTF-8?q?=E6=9E=9D=E5=8A=A0=E9=80=9F=E6=9F=A5=E6=89=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/file/filter/ClassFilter.java   | 3 +++
 .../src/main/java/com/fr/design/mod/ModClassFilter.java        | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/file/filter/ClassFilter.java b/designer-base/src/main/java/com/fr/design/file/filter/ClassFilter.java
index c04d806345..6c998f4ef1 100644
--- a/designer-base/src/main/java/com/fr/design/file/filter/ClassFilter.java
+++ b/designer-base/src/main/java/com/fr/design/file/filter/ClassFilter.java
@@ -5,6 +5,8 @@ import java.util.HashSet;
 import java.util.Set;
 
 /**
+ * classloader查找过滤器
+ *
  * 过滤无需遍历的jdk class
  *
  * @author hades
@@ -26,6 +28,7 @@ public class ClassFilter implements Filter<String> {
         FILTER_SET.add("java.awt.image.BufferedImage");
         FILTER_SET.add("sun.awt.AppContext");
         FILTER_SET.add("com.fr.poly.creator.ECBlockCreator");
+        FILTER_SET.add("com.fr.form.ui.ElementCaseImage");
     }
 
     @Override
diff --git a/designer-base/src/main/java/com/fr/design/mod/ModClassFilter.java b/designer-base/src/main/java/com/fr/design/mod/ModClassFilter.java
index 4bf02549a4..7caa88ac49 100644
--- a/designer-base/src/main/java/com/fr/design/mod/ModClassFilter.java
+++ b/designer-base/src/main/java/com/fr/design/mod/ModClassFilter.java
@@ -5,6 +5,8 @@ import java.util.HashSet;
 import java.util.Set;
 
 /**
+ * 联动修改的类过滤器
+ *
  * @author hades
  * @version 10.0
  * Created by hades on 2021/5/31
@@ -24,6 +26,7 @@ public class ModClassFilter implements Filter<String> {
         FILTER_SET.add("sun.awt.AppContext");
         FILTER_SET.add("com.fr.poly.creator.ECBlockCreator");
         FILTER_SET.add("io.netty.channel.nio.SelectedSelectionKeySet");
+        FILTER_SET.add("com.fr.form.ui.ElementCaseImage");
     }
 
     @Override