From 9d15e0106faf667336ad7d0eca19d7c6d8d1cbf1 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 28 Nov 2024 16:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=20fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E3=80=91=E5=AD=98=E9=87=8F=E6=95=B0=E6=8D=AE=E6=BA=90=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E4=BF=A1=E6=81=AFAES=E5=8A=A0=E5=AF=86=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/manage/DataSourceManage.java   | 28 +++++++++++++------
 .../system/manage/SysParameterManage.java     |  5 ++++
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java b/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java
index 0a79c72d9b..af132fe9c3 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java
@@ -17,10 +17,9 @@ import io.dataease.license.config.XpackInteract;
 import io.dataease.model.BusiNodeRequest;
 import io.dataease.model.BusiNodeVO;
 import io.dataease.operation.manage.CoreOptRecentManage;
-import io.dataease.utils.AuthUtils;
-import io.dataease.utils.BeanUtils;
-import io.dataease.utils.CommunityUtils;
-import io.dataease.utils.TreeUtils;
+import io.dataease.system.dao.auto.entity.CoreSysSetting;
+import io.dataease.system.manage.SysParameterManage;
+import io.dataease.utils.*;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -43,6 +42,9 @@ public class DataSourceManage {
     @Resource
     private CoreOptRecentManage coreOptRecentManage;
 
+    @Resource
+    private SysParameterManage sysParameterManage;
+
     private DatasourceNodeBO rootNode() {
         return new DatasourceNodeBO(0L, "root", false, 7, -1L, 0, "mysql");
     }
@@ -157,10 +159,20 @@ public class DataSourceManage {
     }
 
 
-    public void encryptDsConfig(){
-        coreDatasourceMapper.selectList(null).forEach(dataSource -> {
-            coreDatasourceMapper.updateById(dataSource);
-        });
+    public void encryptDsConfig() {
+        List<CoreSysSetting> coreSysSettings = sysParameterManage.groupList("datasource.encrypt");
+        if (CollectionUtils.isEmpty(coreSysSettings)) {
+            coreDatasourceMapper.selectList(null).forEach(dataSource -> {
+                coreDatasourceMapper.updateById(dataSource);
+            });
+            CoreSysSetting coreSysSetting = new CoreSysSetting();
+            coreSysSetting.setId(IDUtils.snowID());
+            coreSysSetting.setPkey("datasource.encrypt");
+            coreSysSetting.setPval("true");
+            coreSysSetting.setType("text");
+            coreSysSetting.setSort(1);
+            sysParameterManage.insert(coreSysSetting);
+        }
     }
 
     public DatasourceDTO getDs(Long id) {
diff --git a/core/core-backend/src/main/java/io/dataease/system/manage/SysParameterManage.java b/core/core-backend/src/main/java/io/dataease/system/manage/SysParameterManage.java
index 60b7096b99..8c69904f8c 100644
--- a/core/core-backend/src/main/java/io/dataease/system/manage/SysParameterManage.java
+++ b/core/core-backend/src/main/java/io/dataease/system/manage/SysParameterManage.java
@@ -172,4 +172,9 @@ public class SysParameterManage {
         }
         return vo;
     }
+
+    public void insert(CoreSysSetting coreSysSetting) {
+        coreSysSettingMapper.insert(coreSysSetting);
+    }
+
 }