Code optimization

WeDataSphere · Oct 29, 2024 · 21210f7 · 21210f7
1 parent b5bada7
commit 21210f7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.../src/main/scala/org/apache/linkis/engineplugin/hive/executor/HiveEngineConnExecutor.scala b/.../src/main/scala/org/apache/linkis/engineplugin/hive/executor/HiveEngineConnExecutor.scala
@@ -52,6 +52,7 @@ import org.apache.linkis.storage.domain.{Column, DataType}
 import org.apache.linkis.storage.resultset.ResultSetFactory
 import org.apache.linkis.storage.resultset.table.{TableMetaData, TableRecord}
 
+import org.apache.commons.collections.MapUtils
 import org.apache.commons.lang3.StringUtils
 import org.apache.hadoop.hive.common.HiveInterruptUtils
 import org.apache.hadoop.hive.conf.HiveConf
@@ -139,7 +140,8 @@ class HiveEngineConnExecutor(
       engineExecutorContext: EngineExecutionContext,
       code: String
   ): ExecuteResponse = {
-    readResByObject = engineExecutorContext.getProperties.getOrDefault(
+    readResByObject = MapUtils.getBoolean(
+      engineExecutorContext.getProperties,
       JobRequestConstants.LINKIS_HIVE_EC_READ_RESULT_BY_OBJECT,
       false
     )

diff --git a/...rver/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java b/...rver/src/main/java/org/apache/linkis/datasourcemanager/core/restful/RestfulApiHelper.java
@@ -74,7 +74,8 @@ public static void encryptPasswordKey(
             Object password = connectParams.get(keyDefinition.getKey());
             if (null != password) {
               String passwordStr = String.valueOf(password);
-              if (AESUtils.LINKIS_DATASOURCE_AES_SWITCH.getValue()) {
+              if (AESUtils.LINKIS_DATASOURCE_AES_SWITCH.getValue()
+                  && !connectParams.containsKey("isEncrypt")) {
                 passwordStr =
                     AESUtils.encrypt(passwordStr, AESUtils.LINKIS_DATASOURCE_AES_KEY.getValue());
                 connectParams.put("isEncrypt", "1");

diff --git a/...ice/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java b/...ice/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java
@@ -18,6 +18,7 @@
 package org.apache.linkis.metadata.query.service;
 
 import org.apache.linkis.common.conf.CommonVars;
+import org.apache.linkis.common.utils.AESUtils;
 import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
 
 import java.io.Closeable;
@@ -73,7 +74,9 @@ public MongoDbConnection(
       String database,
       Map<String, Object> extraParams)
       throws ClassNotFoundException, Exception {
-    connectMessage = new ConnectMessage(host, port, username, password, database, extraParams);
+    connectMessage =
+        new ConnectMessage(
+            host, port, username, AESUtils.isDecryptByConf(password), database, extraParams);
     conn = getDBConnection(connectMessage, database);
   }