From 11a0b47dcb760f79f86acc16ad6853dcecded7ef Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <destiny.lin@fanruan.com>
Date: Tue, 6 Aug 2024 15:18:46 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-114392=20FR-FBP=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=AE=BE=E8=AE=A1=E9=80=82=E9=85=8D=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/data/datapane/ChoosePane.java  |  2 +-
 .../data/datapane/connect/DatabaseConnectionPane.java |  2 +-
 .../data/datapane/connect/LocalConnectionSource.java  | 11 +++++++++++
 .../datapane/preview/ConnectionInfoBeanHelper.java    |  4 ++++
 .../data/datapane/preview/PreviewTablePane.java       |  2 +-
 .../wrapper/MultiResultTableDataWrapper.java          |  2 +-
 .../tabledata/wrapper/StoreProcedureDataWrapper.java  |  2 +-
 .../com/fr/design/env/HttpWorkspaceConnector.java     |  2 ++
 .../java/com/fr/design/gui/ilist/TableViewList.java   |  2 +-
 9 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
index 507e4c0ddb..7d0859c0ac 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
@@ -444,7 +444,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
             return TableData.EMPTY_TABLEDATA;
         }
         try {
-            ConnectionRepository.getInstance().testConnection(new ConnectionBean(database));
+            ConnectionRepository.getInstance().testConnection(ConnectionInfoBeanHelper.createConnectionInfoBean(database));
             connect = true;
         } catch (Exception ignored) {
             connect= false;
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 fa640f3eb7..6220903adb 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
@@ -432,7 +432,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             // 返回连接结果
             DriverPage.updateCache();
             final Exception[] exception = new Exception[1];
-            ConnectionRepository.getInstance().testConnection(new ConnectionBean(database));
+            ConnectionRepository.getInstance().testConnection(ConnectionInfoBeanHelper.createConnectionInfoBean(database));
             return null;
         }
 
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 0935de229d..6b97e539c2 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
@@ -6,6 +6,7 @@ import com.fr.decision.webservice.bean.datasource.ConnectionInfoBean;
 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.server.repository.connection.BaseConnectionSource;
 import java.sql.SQLException;
 
@@ -18,6 +19,16 @@ import java.sql.SQLException;
  */
 public class LocalConnectionSource extends BaseConnectionSource {
 
+    @Override
+    public void testConnection(ConnectionInfoBean database) throws Exception {
+        try {
+            // 暂时这么处理，后续最好拉到外层包装一下
+            TransmissionEncryptionManager.setTransEncryptionLevel(1);
+            dataOperator.testConnectionWithException(ConnectionProcessorFactory.createConnection(database));
+        } finally {
+            TransmissionEncryptionManager.removeTransEncryptionLevel();
+        }
+    }
     @Override
     public void add(ConnectionInfoBean bean) throws Exception {
         Connection connection = ConnectionProcessorFactory.createConnection(bean);
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/ConnectionInfoBeanHelper.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/ConnectionInfoBeanHelper.java
index f35932e0e9..806aaed200 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/ConnectionInfoBeanHelper.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/ConnectionInfoBeanHelper.java
@@ -127,6 +127,10 @@ public class ConnectionInfoBeanHelper {
     }
 
     private static String encrypt(String password) {
+        // 如果是空密码或者默认密码，就返回默认的星号回去
+        if (StringUtils.isEmpty(password) || StringUtils.equals(password, DecisionServiceConstants.DEFAULT_PASSWORD)) {
+            return DecisionServiceConstants.DEFAULT_PASSWORD;
+        }
         return TransmissionEncryptionManager.getInstance().getEncryption(WorkplaceConstants.getEncryptionMode()).encrypt(password, WorkplaceConstants.getEncryptionKey());
     }
 
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
index 282e5afe52..345475bf76 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
@@ -590,7 +590,7 @@ public class PreviewTablePane extends BasicPane {
     private void testDBTableDataConnection(TableData tableData) throws Exception {
         if (tableData instanceof DBTableData) {
             try {
-                ConnectionRepository.getInstance().testConnection(new ConnectionBean(((DBTableData) tableData).getDatabase(), tableData.getName()));
+                ConnectionRepository.getInstance().testConnection(ConnectionInfoBeanHelper.createConnectionInfoBean(tableData.getName(), ((DBTableData) tableData).getDatabase()));
             } catch (Exception e) {
                 throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"), e);
             }
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java
index da1d840fe0..6146e30d3a 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java
@@ -195,7 +195,7 @@ public final class MultiResultTableDataWrapper implements TableDataWrapper {
                 if (tableData instanceof StoreProcedure) {
                     try {
                         connectionBar.start();
-                        ConnectionRepository.getInstance().testConnection(new ConnectionBean(((StoreProcedure) getTableData()).getDatabaseConnection()));
+                        ConnectionRepository.getInstance().testConnection(ConnectionInfoBeanHelper.createConnectionInfoBean(((StoreProcedure) getTableData()).getDatabaseConnection()));
                     } catch (Exception e){
                         FineLoggerFactory.getLogger().error(e.getMessage(), e);
                         throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java
index 2080ec460a..4eec58c31e 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java
@@ -182,7 +182,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
                 PreviewTablePane.resetPreviewTable();
                 connectionBar.start();
                 try {
-                    ConnectionRepository.getInstance().testConnection(new ConnectionBean(((StoreProcedure) getTableData()).getDatabaseConnection()));
+                    ConnectionRepository.getInstance().testConnection(ConnectionInfoBeanHelper.createConnectionInfoBean(((StoreProcedure) getTableData()).getDatabaseConnection()));
                 } catch (Exception e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
                     connectionBar.close();
diff --git a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java
index 572e2f583c..f104123a42 100644
--- a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java
+++ b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java
@@ -2,6 +2,7 @@ package com.fr.design.env;
 
 import com.fanruan.workplace.http.HttpConstants;
 import com.fanruan.workplace.http.RepositoryManager;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 import com.fr.workspace.server.repository.compatible.register.CompatibleRegister;
@@ -57,6 +58,7 @@ public class HttpWorkspaceConnector implements WorkspaceConnector {
             if (StringUtils.isEmpty(bean.getAccessToken())) {
                 throw new RuntimeException("Empty token, try connect again and check server");
             }
+            FineLoggerFactory.getLogger().info("[connector] infos:{}", bean.getAccessToken());
             WorkspaceConnection connection = new WorkspaceConnection(
                     UUID.randomUUID().toString(),
                     connectionInfo.getUserName(),
diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java b/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java
index f00c61df45..b6b3a8819a 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java
@@ -104,7 +104,7 @@ public class TableViewList extends UIList {
                 //总共给3次连接的机会
                 while (!status && count > 0) {
                     try {
-                        ConnectionRepository.getInstance().testConnection(new ConnectionBean(datasource, databaseName));
+                        ConnectionRepository.getInstance().testConnection(ConnectionInfoBeanHelper.createConnectionInfoBean(databaseName, datasource));
                         status = true;
                         break;
                     } catch (Exception e) {