From 72a45406d5fc364717e10bccfd23de786f414984 Mon Sep 17 00:00:00 2001
From: Harrison <Harrison@fanruan.com>
Date: Thu, 11 Jan 2024 19:09:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20REPORT-111603=E3=80=90=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E6=80=A7=E8=83=BD=E3=80=91=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=8D=8F=E8=AE=AE=E5=8F=98=E6=9B=B4=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=B0=BD=E9=87=8F=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E4=B8=8E=E6=AD=A3=E5=B8=B8=E7=9A=84=E5=BC=82=E5=B8=B8=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C=E4=B8=80=E8=87=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connect/DatabaseConnectionPane.java       | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

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 02b84c170..df5d5d81f 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
@@ -22,6 +22,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.file.ConnectionService;
+import com.fr.license.exception.DataBaseNotSupportedException;
 import com.fr.log.FineLoggerFactory;
 import com.fr.rpc.ExceptionHandler;
 import com.fr.rpc.RPCInvokerExceptionInfo;
@@ -29,6 +30,8 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
+import com.fr.workspace.rpc.exception.ServerInvokeException;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
@@ -475,7 +478,8 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
             message.setText(Toolkit.i18nText("Fine-Design_Basic_Connection_Failed"));
             Connection database = DatabaseConnectionPane.this.updateBean();
-            SolutionProcessor select = ExceptionSolutionSelector.get().select(e, database);
+            Throwable throwable = catchThrowable(e);
+            SolutionProcessor select = ExceptionSolutionSelector.get().select(throwable, database);
             String detail = select.getResultException().getDetailMessage();
             String solution = select.getResultException().getSolution();
             if (select instanceof ClassNotFoundExceptionSolutionProcessor) {
@@ -486,6 +490,31 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             okButton.setEnabled(true);
         }
 
+        /**
+         * 兼容一下 json 序列化后的异常逻辑，如果发现是 {@link ServerInvokeException}
+         * 则尝试转化为对应的异常，然后传递下去。
+         * 否则还是返回原异常
+         *
+         * @param e 异常
+         * @return 异常
+         */
+        @NotNull
+        private Throwable catchThrowable(ExecutionException e) {
+
+            Throwable rootEx = e;
+            while (rootEx.getCause() != null) {
+                rootEx = rootEx.getCause();
+            }
+            if (rootEx instanceof ServerInvokeException) {
+                // 异常兼容处理
+                String errorCode = ((ServerInvokeException) rootEx).getErrorCode();
+                if (DataBaseNotSupportedException.DB_UNSUPPORTED_ERROR_CODE.equals(errorCode)) {
+                    return new DataBaseNotSupportedException(rootEx.getMessage());
+                }
+            }
+            return e;
+        }
+
         private void showClassNotFoundUI(String detailMessage, String solution) {
             JPanel gridJpanel = new JPanel();
             gridJpanel.setLayout(new GridLayout(5, 1, 0, 5));