From fd25e77cb4a810dfcbf047e9fca92425bcd9b178 Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <destiny.lin@fanruan.com>
Date: Sat, 31 Aug 2024 15:24:10 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-132873=20=E3=80=90fr-fbp=E5=9B=9E?=
 =?UTF-8?q?=E5=BD=92=E3=80=91fbp=E5=B7=A5=E7=A8=8B=EF=BC=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=BF=9E=E6=8E=A5=E9=A9=B1=E5=8A=A8=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/datapane/connect/DatabaseConnectionPane.java    | 9 ++++-----
 .../data/datapane/connect/LocalConnectionSource.java     | 8 ++++++++
 .../fanruan/boot/init/DesignWorkContextComponent.java    | 2 ++
 3 files changed, 14 insertions(+), 5 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 abc1decc5f..60a3df8463 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
@@ -5,7 +5,6 @@ package com.fr.design.data.datapane.connect;
 
 import com.fine.swing.ui.layout.Layouts;
 import com.fine.theme.icon.LazyIcon;
-import com.fine.theme.light.ui.FineRoundBorder;
 import com.fine.theme.utils.FineUIScale;
 import com.fine.theme.utils.FineUIStyle;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
@@ -13,7 +12,6 @@ import com.fr.data.driver.util.JarFileParseUtil;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.impl.JNDIDatabaseConnection;
-import com.fr.data.operator.DataOperatorProvider;
 import com.fr.data.security.ssl.impl.NormalSsl;
 import com.fr.data.solution.ExceptionSolutionSelector;
 import com.fr.data.solution.entity.DriverPage;
@@ -31,14 +29,12 @@ import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 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 com.fr.workspace.engine.exception.DriverUnExistException;
 import org.jetbrains.annotations.NotNull;
-import com.fr.workspace.server.entity.connection.ConnectionBean;
 import com.fr.workspace.server.repository.connection.ConnectionRepository;
 
 import javax.swing.JDialog;
@@ -479,6 +475,9 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             uiLabel.setIcon(new LazyIcon("error", 20));
             message.setText(Toolkit.i18nText("Fine-Design_Basic_Connection_Failed"));
             Connection database = DatabaseConnectionPane.this.updateBean();
+            if (e.getCause() instanceof DriverUnExistException) {
+                ((DriverUnExistException) e.getCause()).setThrowable(new ClassNotFoundException(database.getDriver()));
+            }
             SolutionProcessor select = ExceptionSolutionSelector.get().select(e, database);
             String detail = select.getResultException().getDetailMessage();
             String solution = select.getResultException().getSolution();
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/LocalConnectionSource.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/LocalConnectionSource.java
index 25e9da20d6..54f4c3c048 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/LocalConnectionSource.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/LocalConnectionSource.java
@@ -3,10 +3,12 @@ package com.fr.design.data.datapane.connect;
 import com.fr.data.driver.DriverClassNotFoundException;
 import com.fr.data.impl.Connection;
 import com.fr.decision.webservice.bean.datasource.ConnectionInfoBean;
+import com.fr.decision.webservice.exception.general.DriverNotFoundException;
 import com.fr.decision.webservice.v10.datasource.connection.processor.impl.ConnectionProcessorFactory;
 import com.fr.design.i18n.Toolkit;
 import com.fr.log.FineLoggerFactory;
 import com.fr.security.encryption.transmission.TransmissionEncryptionManager;
+import com.fr.workspace.engine.exception.DriverUnExistException;
 import com.fr.workspace.server.repository.connection.BaseConnectionSource;
 import java.sql.SQLException;
 
@@ -25,6 +27,8 @@ public class LocalConnectionSource extends BaseConnectionSource {
             // 暂时这么处理，后续最好拉到外层包装一下
             TransmissionEncryptionManager.setTransEncryptionLevel(1);
             ConnectionProcessorFactory.testConnectionWithSchemaReturn(database);
+        } catch (DriverNotFoundException e) {
+            throw new DriverUnExistException();
         } finally {
             TransmissionEncryptionManager.removeTransEncryptionLevel();
         }
@@ -36,6 +40,8 @@ public class LocalConnectionSource extends BaseConnectionSource {
             Connection connection = ConnectionProcessorFactory.createConnection(bean);
             validate(bean.getConnectionName(), connection);
             ConnectionProcessorFactory.addConnection(bean);
+        } catch (DriverNotFoundException e) {
+            throw new DriverUnExistException();
         } finally {
             TransmissionEncryptionManager.removeTransEncryptionLevel();
         }
@@ -54,6 +60,8 @@ public class LocalConnectionSource extends BaseConnectionSource {
             Connection connection = ConnectionProcessorFactory.createConnection(bean);
             validate(bean.getConnectionName(), connection);
             ConnectionProcessorFactory.updateConnection(bean.getConnectionName(), bean);
+        } catch (DriverNotFoundException e) {
+            throw new DriverUnExistException();
         } finally {
             TransmissionEncryptionManager.removeTransEncryptionLevel();
         }
diff --git a/designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java b/designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java
index c5e84ae81d..6124f3b06c 100644
--- a/designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java
+++ b/designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java
@@ -49,6 +49,7 @@ import com.fr.workspace.engine.FineWorkspaceFactory;
 import com.fr.workspace.engine.base.FineObjectPool;
 import com.fr.workspace.engine.client.heartbeart.FineWorkspaceHeartbeat;
 import com.fr.workspace.engine.client.heartbeart.WorkspaceHeartbeat;
+import com.fr.workspace.engine.exception.RemoteDriverUnExistHandler;
 import com.fr.workspace.engine.resource.FineWorkResource;
 import com.fr.workspace.engine.resource.FineWorkResourceAdaptor;
 import com.fr.workspace.pool.WorkRPCRegister;
@@ -153,6 +154,7 @@ public class DesignWorkContextComponent {
         RemoteExceptionConvert.registerException(HttpConstants.PASSWORD_EMPTY_ERROR_CODE, new RemoteDesignUserPwdErrorHandler());
         RemoteExceptionConvert.registerException(HttpConstants.LOGIN_LOCK, new RemoteDesignLoginLockHandler());
         RemoteExceptionConvert.registerException(HttpConstants.TPL_HAS_BEAN_UNLOCK, new UnLockedHandler());
+        RemoteExceptionConvert.registerException(HttpConstants.DRIVER_NOT_EXIST, new RemoteDriverUnExistHandler());
     }
 
     private void supplementalCommon() {