From 758e7eeeed17949de6a57e26c3e28bd808c9ac21 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 2 Jan 2025 18:55:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=9B=A0=E5=8A=A0=E5=AF=86=E5=AF=BC=E8=87=B4Excel=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E5=AF=BC=E5=85=A5=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/provider/ExcelUtils.java       | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
index 5db83078e8..780ce51064 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
@@ -12,16 +12,14 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.dataease.api.ds.vo.ExcelFileData;
 import io.dataease.api.ds.vo.ExcelSheetData;
+import io.dataease.commons.utils.EncryptUtils;
 import io.dataease.datasource.dao.auto.entity.CoreDatasource;
 import io.dataease.exception.DEException;
 import io.dataease.extensions.datasource.dto.DatasetTableDTO;
 import io.dataease.extensions.datasource.dto.DatasourceDTO;
 import io.dataease.extensions.datasource.dto.DatasourceRequest;
 import io.dataease.extensions.datasource.dto.TableField;
-import io.dataease.utils.AuthUtils;
-import io.dataease.utils.ConfigUtils;
-import io.dataease.utils.JsonUtil;
-import io.dataease.utils.ModelUtils;
+import io.dataease.utils.*;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;
@@ -87,27 +85,43 @@ public class ExcelUtils {
 
     public static Map<String, String> getTableNamesMap(String configration) throws DEException {
         Map<String, String> result = new HashMap<>();
+        JsonNode rootNode = null;
+        // 兼容历史未加密信息
         try {
-            JsonNode rootNode = objectMapper.readTree(configration);
+            rootNode = objectMapper.readTree((String) EncryptUtils.aesDecrypt(configration));
+        } catch (Exception e) {
+            try {
+                rootNode = objectMapper.readTree(configration);
+            } catch (Exception ex) {
+                DEException.throwException(ex);
+            }
+        }
+        if(rootNode != null) {
             for (int i = 0; i < rootNode.size(); i++) {
                 result.put(rootNode.get(i).get("tableName").asText(), rootNode.get(i).get("deTableName").asText());
             }
-        } catch (Exception e) {
-            DEException.throwException(e);
         }
-
         return result;
     }
 
     public static String getFileName(CoreDatasource datasource) throws DEException {
+        JsonNode rootNode = null;
         try {
-            JsonNode rootNode = objectMapper.readTree(datasource.getConfiguration());
+            rootNode = objectMapper.readTree((String) EncryptUtils.aesDecrypt(datasource.getConfiguration()));
+        } catch (Exception e) {
+            try {
+                rootNode = objectMapper.readTree(datasource.getConfiguration());
+            } catch (Exception ex) {
+                DEException.throwException(ex);
+            }
+        }
+        if (rootNode != null) {
             for (int i = 0; i < rootNode.size(); i++) {
                 return rootNode.get(i).get("fileName").asText();
             }
-        } catch (Exception e) {
-            DEException.throwException(e);
         }
+
+
         return "";
     }