From 5205972eb706f5d00ebe3d0e95bf1afa9cfd2d79 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 28 Nov 2024 12:19:33 +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=E6=95=B0=E6=8D=AE=E6=BA=90=E8=BF=9E=E6=8E=A5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AFAES=E5=8A=A0=E5=AF=86=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/chart/charts/impl/table/TableInfoHandler.java | 1 -
 .../src/main/java/io/dataease/config/MybatisConfig.java    | 2 ++
 .../io/dataease/datasource/manage/DataSourceManage.java    | 7 +++++++
 .../io/dataease/listener/DataSourceInitStartListener.java  | 5 ++++-
 .../src/custom-component/de-time-clock/CustomAttr.vue      | 7 ++++++-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java
index 38b25d90c4..0d87d54348 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java
@@ -97,7 +97,6 @@ public class TableInfoHandler extends DefaultChartHandler {
                         fieldDTO = allField;
                     }
                 }
-                assert fieldDTO != null;
                 if (fieldDTO != null && fieldDTO.isAgg()) {
                     sqlMeta.getXFields().get(i).setFieldName("'-'");
                 }
diff --git a/core/core-backend/src/main/java/io/dataease/config/MybatisConfig.java b/core/core-backend/src/main/java/io/dataease/config/MybatisConfig.java
index efee728872..bf8ec58902 100644
--- a/core/core-backend/src/main/java/io/dataease/config/MybatisConfig.java
+++ b/core/core-backend/src/main/java/io/dataease/config/MybatisConfig.java
@@ -2,6 +2,7 @@ package io.dataease.config;
 
 
 import io.dataease.commons.utils.MybatisInterceptorConfig;
+import io.dataease.datasource.dao.auto.entity.CoreDatasource;
 import io.dataease.datasource.dao.auto.entity.CoreDeEngine;
 import io.dataease.interceptor.MybatisInterceptor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -22,6 +23,7 @@ public class MybatisConfig {
         MybatisInterceptor interceptor = new MybatisInterceptor();
         List<MybatisInterceptorConfig> configList = new ArrayList<>();
         configList.add(new MybatisInterceptorConfig(CoreDeEngine.class, "configuration"));
+        configList.add(new MybatisInterceptorConfig(CoreDatasource.class, "configuration"));
         interceptor.setInterceptorConfigList(configList);
         return interceptor;
     }
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 a5c0a94e14..0a79c72d9b 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
@@ -156,6 +156,13 @@ public class DataSourceManage {
         coreOptRecentManage.saveOpt(sourceData.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASOURCE, OptConstants.OPT_TYPE.UPDATE);
     }
 
+
+    public void encryptDsConfig(){
+        coreDatasourceMapper.selectList(null).forEach(dataSource -> {
+            coreDatasourceMapper.updateById(dataSource);
+        });
+    }
+
     public DatasourceDTO getDs(Long id) {
         CoreDatasource coreDatasource = coreDatasourceMapper.selectById(id);
         DatasourceDTO dto = new DatasourceDTO();
diff --git a/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java b/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
index 2e618ad5bd..a473a371f8 100644
--- a/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
+++ b/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
@@ -1,6 +1,7 @@
 package io.dataease.listener;
 
 import io.dataease.datasource.dao.auto.entity.CoreDatasourceTask;
+import io.dataease.datasource.manage.DataSourceManage;
 import io.dataease.datasource.manage.DatasourceSyncManage;
 import io.dataease.datasource.manage.EngineManage;
 import io.dataease.datasource.provider.CalciteProvider;
@@ -26,6 +27,8 @@ public class DataSourceInitStartListener implements ApplicationListener<Applicat
     @Resource
     private DatasourceServer datasourceServer;
     @Resource
+    private DataSourceManage dataSourceManage;
+    @Resource
     private DatasourceTaskServer datasourceTaskServer;
     @Resource
     private CalciteProvider calciteProvider;
@@ -71,7 +74,7 @@ public class DataSourceInitStartListener implements ApplicationListener<Applicat
         } catch (Exception e) {
             e.printStackTrace();
         }
-
+        dataSourceManage.encryptDsConfig();
     }
 
 
diff --git a/core/core-frontend/src/custom-component/de-time-clock/CustomAttr.vue b/core/core-frontend/src/custom-component/de-time-clock/CustomAttr.vue
index f0b6af4fba..6390c7fede 100644
--- a/core/core-frontend/src/custom-component/de-time-clock/CustomAttr.vue
+++ b/core/core-frontend/src/custom-component/de-time-clock/CustomAttr.vue
@@ -14,7 +14,12 @@ const { curComponent } = storeToRefs(dvMainStore)
 </script>
 
 <template>
-  <el-collapse-item :effect="themes" :title="t('visualization.position')" name="position" v-if="!dashboardActive">
+  <el-collapse-item
+    :effect="themes"
+    :title="t('visualization.position')"
+    name="position"
+    v-if="!dashboardActive"
+  >
     <component-position :themes="themes" />
   </el-collapse-item>
 </template>