Merge pull request #6473 from dataease/dev-v2

Dev v2
2023-11-01 14:57:16 +08:00 · 2023-11-01 14:57:16 +08:00 · d3fc7188e0
commit d3fc7188e0
parent 68d2c08b99 bff2b41f9b
7 changed files with 71 additions and 71 deletions
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java
@ -9,8 +9,6 @@ import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
 import io.dataease.api.dataset.union.UnionDTO;
 import io.dataease.api.dataset.vo.DataSetBarVO;
 import io.dataease.api.ds.vo.DatasourceDTO;
-import io.dataease.api.permissions.user.api.UserApi;
-import io.dataease.api.permissions.user.vo.UserFormVO;
 import io.dataease.commons.constants.OptConstants;
 import io.dataease.dataset.dao.auto.entity.CoreDatasetGroup;
 import io.dataease.dataset.dao.auto.entity.CoreDatasetTable;
@ -36,7 +34,6 @@ import io.dataease.utils.*;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;

@ -69,8 +66,7 @@ public class DatasetGroupManage {
    private CoreDatasetTableMapper coreDatasetTableMapper;
    @Resource
    private CoreDatasourceMapper coreDatasourceMapper;
-    @Autowired(required = false)
-    private UserApi userApi;
+

    @Resource
    private CoreUserManage coreUserManage;
@ -92,13 +88,9 @@ public class DatasetGroupManage {
                CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(datasetGroupInfoDTO.getId());
                datasetGroupInfoDTO.setPid(coreDatasetGroup.getPid());
            }
-            if (userApi == null) {
            checkName(datasetGroupInfoDTO);
-            }
-            if (userApi != null) {
-                datasetGroupInfoDTO.setUpdateBy(userApi.info().getId() + "");
+            datasetGroupInfoDTO.setUpdateBy(AuthUtils.getUser().getUserId() + "");
            datasetGroupInfoDTO.setLastUpdateTime(System.currentTimeMillis());
-            }
            if (StringUtils.equalsIgnoreCase(datasetGroupInfoDTO.getNodeType(), leafType)) {
                if (!rename && ObjectUtils.isEmpty(datasetGroupInfoDTO.getAllFields())) {
                    DEException.throwException(Translator.get("i18n_no_fields"));
@ -116,10 +108,8 @@ public class DatasetGroupManage {
            if (ObjectUtils.isEmpty(datasetGroupInfoDTO.getId())) {
                isCreate = true;
                datasetGroupInfoDTO.setId(IDUtils.snowID());
-                if (userApi != null) {
-                    datasetGroupInfoDTO.setCreateBy(userApi.info().getId() + "");
-                    datasetGroupInfoDTO.setUpdateBy(userApi.info().getId() + "");
-                }
+                datasetGroupInfoDTO.setCreateBy(AuthUtils.getUser().getUserId() + "");
+                datasetGroupInfoDTO.setUpdateBy(AuthUtils.getUser().getUserId() + "");
                datasetGroupInfoDTO.setCreateTime(time);
                datasetGroupInfoDTO.setLastUpdateTime(time);
                datasetGroupInfoDTO.setPid(datasetGroupInfoDTO.getPid() == null ? 0L : datasetGroupInfoDTO.getPid());
@ -156,21 +146,19 @@ public class DatasetGroupManage {
        CoreDatasetGroup coreDatasetGroup = BeanUtils.copyBean(new CoreDatasetGroup(), datasetGroupInfoDTO);
        coreDatasetGroup.setLastUpdateTime(System.currentTimeMillis());
        coreDatasetGroupMapper.updateById(coreDatasetGroup);
-        coreOptRecentManage.saveOpt(datasetGroupInfoDTO.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASET,OptConstants.OPT_TYPE.UPDATE);
+        coreOptRecentManage.saveOpt(datasetGroupInfoDTO.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASET, OptConstants.OPT_TYPE.UPDATE);
    }

    @XpackInteract(value = "authResourceTree", before = false)
    public void innerSave(DatasetGroupInfoDTO datasetGroupInfoDTO) {
        CoreDatasetGroup coreDatasetGroup = BeanUtils.copyBean(new CoreDatasetGroup(), datasetGroupInfoDTO);
        coreDatasetGroupMapper.insert(coreDatasetGroup);
-        coreOptRecentManage.saveOpt(coreDatasetGroup.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASET,OptConstants.OPT_TYPE.NEW);
+        coreOptRecentManage.saveOpt(coreDatasetGroup.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASET, OptConstants.OPT_TYPE.NEW);
    }

    @XpackInteract(value = "authResourceTree", before = false)
    public DatasetGroupInfoDTO move(DatasetGroupInfoDTO datasetGroupInfoDTO) {
-        if (userApi == null) {
        checkName(datasetGroupInfoDTO);
-        }
        if (datasetGroupInfoDTO.getPid() != 0) {
            checkMove(datasetGroupInfoDTO);
        }
@ -178,12 +166,10 @@ public class DatasetGroupManage {
        long time = System.currentTimeMillis();
        CoreDatasetGroup coreDatasetGroup = new CoreDatasetGroup();
        BeanUtils.copyBean(coreDatasetGroup, datasetGroupInfoDTO);
-        if (userApi != null) {
-            datasetGroupInfoDTO.setUpdateBy(userApi.info().getId() + "");
-        }
+        datasetGroupInfoDTO.setUpdateBy(AuthUtils.getUser().getUserId() + "");
        coreDatasetGroup.setLastUpdateTime(time);
        coreDatasetGroupMapper.updateById(coreDatasetGroup);
-        coreOptRecentManage.saveOpt(coreDatasetGroup.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASET,OptConstants.OPT_TYPE.UPDATE);
+        coreOptRecentManage.saveOpt(coreDatasetGroup.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASET, OptConstants.OPT_TYPE.UPDATE);
        return datasetGroupInfoDTO;
    }

@ -194,7 +180,7 @@ public class DatasetGroupManage {
            DEException.throwException("resource not exist");
        }
        Objects.requireNonNull(CommonBeanFactory.getBean(this.getClass())).recursionDel(id);
-        coreOptRecentManage.saveOpt(coreDatasetGroup.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASET,OptConstants.OPT_TYPE.DELETE);
+        coreOptRecentManage.saveOpt(coreDatasetGroup.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASET, OptConstants.OPT_TYPE.DELETE);
    }

    public void recursionDel(Long id) {
@ -235,7 +221,6 @@ public class DatasetGroupManage {
    public DataSetBarVO queryBarInfo(Long id) {
        DataSetBarVO dataSetBarVO = coreDataSetExtMapper.queryBarInfo(id);
        // get creator
-        if (userApi != null) {
        String userName = coreUserManage.getUserName(Long.valueOf(dataSetBarVO.getCreateBy()));
        if (StringUtils.isNotBlank(userName)) {
            dataSetBarVO.setCreator(userName);
@ -244,7 +229,6 @@ public class DatasetGroupManage {
        if (StringUtils.isNotBlank(updateUserName)) {
            dataSetBarVO.setUpdater(updateUserName);
        }
-        }
        dataSetBarVO.setDatasourceDTOList(getDatasource(id));
        return dataSetBarVO;
    }
@ -264,7 +248,7 @@ public class DatasetGroupManage {
            dto.setConfiguration(null);
            return dto;
        }).collect(Collectors.toList());
-        if(ids.size() != datasourceDTOList.size()){
+        if (ids.size() != datasourceDTOList.size()) {
            DEException.throwException("由于数据集所用的数据源已被删除,无法显示数据集");
        }
        return datasourceDTOList;
@ -370,15 +354,13 @@ public class DatasetGroupManage {
        DatasetGroupInfoDTO dto = new DatasetGroupInfoDTO();
        BeanUtils.copyBean(dto, coreDatasetGroup);
        // get creator
-        if (userApi != null) {
-            UserFormVO userFormVO = userApi.queryById(Long.valueOf(dto.getCreateBy()));
-            if (userFormVO != null) {
-                dto.setCreator(userFormVO.getName());
-            }
-            UserFormVO userFormVOUpdateBy = userApi.queryById(Long.valueOf(dto.getUpdateBy()));
-            if (userFormVOUpdateBy != null) {
-                dto.setUpdater(userFormVOUpdateBy.getName());
+        String userName = coreUserManage.getUserName(Long.valueOf(dto.getCreateBy()));
+        if (StringUtils.isNotBlank(userName)) {
+            dto.setCreator(userName);
        }
+        String updateUserName = coreUserManage.getUserName(Long.valueOf(dto.getUpdateBy()));
+        if (StringUtils.isNotBlank(updateUserName)) {
+            dto.setUpdater(updateUserName);
        }
        dto.setUnionSql(null);
        if (StringUtils.equalsIgnoreCase(dto.getNodeType(), "dataset")) {
@ -444,7 +426,7 @@ public class DatasetGroupManage {
            for (CoreDatasetTable datasetTable : datasetTables) {
                if (StringUtils.isNotEmpty(datasetTable.getSqlVariableDetails())) {
                    List<SqlVariableDetails> defaultsSqlVariableDetails = JsonUtil.parseList(datasetTable.getSqlVariableDetails(), listTypeReference);
-                    if(CollectionUtil.isNotEmpty(defaultsSqlVariableDetails)){
+                    if (CollectionUtil.isNotEmpty(defaultsSqlVariableDetails)) {
                        List<String> fullName = new ArrayList<>();
                        geFullName(id, fullName);
                        List<String> finalFullName = CollectionUtil.reverse(fullName);
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java
@ -6,12 +6,10 @@ import io.dataease.api.dataset.dto.DatasetTableDTO;
 import io.dataease.api.dataset.dto.SqlVariableDetails;
 import io.dataease.api.dataset.union.*;
 import io.dataease.api.dataset.union.model.SQLObj;
-import io.dataease.api.permissions.auth.api.InteractiveAuthApi;
 import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO;
 import io.dataease.commons.utils.SqlparserUtils;
 import io.dataease.constant.AuthEnum;
 import io.dataease.dataset.constant.DatasetTableType;
-import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableMapper;
 import io.dataease.dataset.dto.DatasourceSchemaDTO;
 import io.dataease.dataset.utils.DatasetTableTypeConstants;
 import io.dataease.dataset.utils.SqlUtils;
@ -24,6 +22,7 @@ import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.constant.SQLConstants;
 import io.dataease.exception.DEException;
 import io.dataease.i18n.Translator;
+import io.dataease.system.manage.CorePermissionManage;
 import io.dataease.utils.BeanUtils;
 import io.dataease.utils.JsonUtil;
 import jakarta.annotation.Resource;
@ -31,7 +30,6 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;

@ -44,16 +42,14 @@ import java.util.stream.Collectors;
 */
@Component
 public class DatasetSQLManage {
-    @Resource
-    private CoreDatasetTableMapper coreDatasetTableMapper;
-    @Resource
-    private DatasetTableFieldManage datasetTableFieldManage;
+
    @Resource
    private CoreDatasourceMapper coreDatasourceMapper;
    @Resource
    private EngineServer engineServer;
-    @Autowired(required = false)
-    private InteractiveAuthApi interactiveAuthApi;
+
+    @Resource
+    private CorePermissionManage corePermissionManage;

    private static Logger logger = LoggerFactory.getLogger(DatasetSQLManage.class);

@ -328,16 +324,14 @@ public class DatasetSQLManage {

    private String putObj2Map(Map<Long, DatasourceSchemaDTO> dsMap, DatasetTableDTO ds) throws Exception {
        // 通过datasource id校验数据源权限
-        if (interactiveAuthApi != null) {
        BusiPerCheckDTO dto = new BusiPerCheckDTO();
        dto.setId(ds.getDatasourceId());
        dto.setAuthEnum(AuthEnum.READ);
-            try {
-                interactiveAuthApi.checkAuth(dto);
-            } catch (Exception e) {
+        boolean checked = corePermissionManage.checkAuth(dto);
+        if (!checked) {
            DEException.throwException(Translator.get("i18n_no_datasource_permission"));
        }
-        }
+

        String schemaAlias;
        if (StringUtils.equalsIgnoreCase(ds.getType(), DatasetTableType.DB) || StringUtils.equalsIgnoreCase(ds.getType(), DatasetTableType.SQL)) {
--- a/core/core-backend/src/main/java/io/dataease/system/manage/CorePermissionManage.java
+++ b/core/core-backend/src/main/java/io/dataease/system/manage/CorePermissionManage.java
@ -0,0 +1,14 @@
+package io.dataease.system.manage;
+
+import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO;
+import io.dataease.license.config.XpackInteract;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CorePermissionManage {
+
+    @XpackInteract(value = "corePermissionManage", replace = true)
+    public boolean checkAuth(BusiPerCheckDTO dto) {
+        return true;
+    }
+}
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@ -1430,8 +1430,9 @@ export default {
    auth_num: '授权数量',
    version: '版本',
    version_num: '版本号',
-    standard: '标准版',
+    standard: '社区版',
    enterprise: '企业版',
+    Embedded: '嵌入式版',
    support: '获取技术支持',
    update_success: '更新成功',
    serial_no: '序列号',
--- a/core/core-frontend/src/views/about/index.vue
+++ b/core/core-frontend/src/views/about/index.vue
@ -150,7 +150,13 @@ const update = (licKey: string) => {
      <div class="item">
        <div class="label">{{ $t('about.version') }}</div>
        <div class="value">
-          {{ !license?.edition ? $t('about.standard') : $t('about.enterprise') }}
+          {{
+            !license?.edition
+              ? $t('about.standard')
+              : license.edition === 'Embedded'
+              ? $t('about.Embedded')
+              : $t('about.enterprise')
+          }}
        </div>
      </div>
      <div class="item">
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 7a4f9a2de62a8ff0b544f2660bef3838cc09d6de
+Subproject commit 91f3ae793906139d6d761704b95c162de7d26a3d
--- a/sdk/common/src/main/java/io/dataease/utils/VersionUtil.java
+++ b/sdk/common/src/main/java/io/dataease/utils/VersionUtil.java
@ -1,11 +1,14 @@
 package io.dataease.utils;

+import org.springframework.core.env.Environment;
+
 public class VersionUtil {

-    private static final String randomId = IDUtils.randomID(16);

    public static String getRandomVersion() {
-        return randomId;
+        Environment environment = CommonBeanFactory.getBean(Environment.class);
+        assert environment != null;
+        return environment.getProperty("dataease.version", "2.0.0");
    }

 }