fix: 【数据源】数据源连接信息AES加密存储

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("'-'");
                 }

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;
     }

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();

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();
     }
 
 

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>