Pull request #14412: REPORT-114392 FR-FBP版本本地设计适配 数据连接适配

Merge in DESIGN/design from ~DESTINY.LIN/design:mss/2.0 to mss/2.0

* commit '666af23c67871d301fe188420440e48075b7ee3c':
  REPORT-114392 FR-FBP版本本地设计适配 数据连接适配

build.gradle

@@ -83,6 +83,7 @@ allprojects {
         // 门户
         implementation 'com.fr.portal:fine-portal:' + apiVersion
         implementation 'com.fr.portal:fine-portal-api:' + apiVersion
+        implementation 'com.fr.portal:fine-portal-datasource:' + carinaVersion
         // cbb
         implementation 'com.fr.essential:fine-essential:' + cbbVersion
         implementation 'com.fr.cbb:fine-universal-skeleton:' + cbbVersion
@@ -98,6 +99,7 @@ allprojects {
         implementation 'com.fr.auth:fine-auth:' + apiVersion
         implementation 'com.fr.auth:fine-auth-api:' + apiVersion
         // lic
+        implementation 'com.fr.license:fine-license:' + apiVersion
         implementation 'com.fr.license:fine-license-api:' + apiVersion
         // cluster
         implementation 'com.fr.cluster:fine-cluster-api:' + apiVersion
@@ -116,7 +118,6 @@ allprojects {
         implementation 'io.socket:socket.io-client:0.7.0'
         implementation('com.fr.third:fine-third:' + frVersion) { exclude group: "com.fr.cbb", module: "fine-cbb" }
         implementation 'com.fr.core:fine-core:' + frDevVersion
-        implementation 'com.fr.activator:fine-activator:' + frVersion
         implementation 'com.fr.datasource:fine-datasource-api:' + fdlVersion
         implementation 'com.fr.datasource:fine-datasource-core:' + fdlVersion
         implementation 'com.fr.datasource:fine-datasource-web:' + fdlVersion

designer-base/src/main/java/com/fr/design/data/datapane/preview/ConnectionInfoBeanHelper.java

@@ -19,10 +19,10 @@ import com.fr.decision.webservice.bean.datasource.JDBCConnectionBean;
 import com.fr.decision.webservice.utils.DecisionServiceConstants;
 import com.fr.decision.webservice.v10.datasource.connection.processor.impl.ConnectionProcessorFactory;
 import com.fr.decision.webservice.v10.datasource.connection.processor.impl.JDBCConnectionProcessor;
-import com.fr.security.encryption.transmission.TransmissionEncryptors;
+import com.fr.security.encryption.transmission.TransmissionEncryptionManager;
 import com.fr.stable.StringUtils;
 import com.fr.third.fasterxml.jackson.databind.ObjectMapper;
-
+import com.fr.workspace.server.repository.WorkplaceConstants;
 /**
  * 数据连接传输工具类
  *
@@ -95,7 +95,7 @@ public class ConnectionInfoBeanHelper {
                 .user(jdbcConnection.getUser())
                 .driver(jdbcConnection.getDriver())
                 // 关键中的关键，由设计器发出的请求如果要携带密码，不能传明文，必须必须必须传加密后的密码
-                .password(withPassword ? TransmissionEncryptors.getInstance().encrypt(jdbcConnection.getPassword()) : DecisionServiceConstants.DEFAULT_PASSWORD)
+                .password(withPassword ? encrypt(jdbcConnection.getPassword()) : DecisionServiceConstants.DEFAULT_PASSWORD)
                 .schema(jdbcConnection.getSchema())
                 .url(jdbcConnection.getURL())
                 .creator(jdbcConnection.getCreator())
@@ -126,4 +126,8 @@ public class ConnectionInfoBeanHelper {
                 .verifyCa(jdbcConnection.getSsl().getSslType() == SslType.NORMAL && ((NormalSsl) jdbcConnection.getSsl()).isVerifyCa());
     }
 
+    private static String encrypt(String password) {
+        return TransmissionEncryptionManager.getInstance().getEncryption(WorkplaceConstants.getEncryptionMode()).encrypt(password, WorkplaceConstants.getEncryptionKey());
+    }
+
 }