diff --git a/backend/pom.xml b/backend/pom.xml
index 88b4824bc1..c9c4416ece 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -13,10 +13,8 @@
UTF-8
- 1.6.0
+ 1.7.1
1.8
- 1.1.3
- 2.7.8
20.1.0
@@ -80,6 +78,10 @@
org.springframework.boot
spring-boot-starter-websocket
+
+ com.google.code.gson
+ gson
+
@@ -115,7 +117,7 @@
org.apache.commons
commons-collections4
- 4.1
+ 4.4
org.apache.commons
@@ -127,11 +129,11 @@
commons-codec
-
+
@@ -140,11 +142,7 @@
1.2.32
-
- org.python
- jython-standalone
- 2.7.0
-
+
com.microsoft.sqlserver
@@ -164,17 +162,7 @@
19.7.0.0
-
-
- org.apache.dubbo
- dubbo
- ${dubbo.version}
-
-
- org.apache.zookeeper
- zookeeper
- 3.4.14
-
+
org.apache.curator
curator-framework
@@ -186,22 +174,7 @@
4.0.1
-
-
- org.apache.dubbo
- dubbo-registry-nacos
- ${dubbo.version}
-
-
- com.alibaba.nacos
- nacos-api
- ${nacos.version}
-
-
- com.alibaba.nacos
- nacos-client
- ${nacos.version}
-
+
com.alibaba
@@ -301,12 +274,7 @@
json
20171018
-
-
- com.aliyun
- alibaba-dingtalk-service-sdk
- 1.0.1
-
+
org.apache.httpcomponents
httpclient
@@ -319,7 +287,7 @@
0.11.7
-
+
diff --git a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
index c50b91b9c7..852384b7a6 100644
--- a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
@@ -6,7 +6,7 @@ import io.dataease.commons.exception.DEException;
import io.dataease.datasource.provider.DatasourceProvider;
import io.dataease.datasource.provider.ProviderFactory;
import io.dataease.datasource.request.DatasourceRequest;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java
index fa97f5af66..ea0d4abc91 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java
@@ -1,19 +1,19 @@
package io.dataease.service.dataset;
-import com.alibaba.nacos.common.util.UuidUtils;
import io.dataease.base.domain.DatasetGroup;
import io.dataease.base.domain.DatasetGroupExample;
import io.dataease.base.mapper.DatasetGroupMapper;
import io.dataease.commons.utils.BeanUtils;
import io.dataease.controller.request.dataset.DataSetGroupRequest;
import io.dataease.dto.dataset.DataSetGroupDTO;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.UUID;
import java.util.stream.Collectors;
/**
@@ -27,7 +27,7 @@ public class DataSetGroupService {
public DataSetGroupDTO save(DatasetGroup datasetGroup) {
if (StringUtils.isEmpty(datasetGroup.getId())) {
- datasetGroup.setId(UuidUtils.generateUuid());
+ datasetGroup.setId(UUID.randomUUID().toString());
datasetGroup.setCreateTime(System.currentTimeMillis());
datasetGroupMapper.insert(datasetGroup);
} else {
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java
index c62d53483f..7b469d1319 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java
@@ -1,6 +1,5 @@
package io.dataease.service.dataset;
-import com.alibaba.nacos.common.util.UuidUtils;
import io.dataease.base.domain.DatasetTableField;
import io.dataease.base.domain.DatasetTableFieldExample;
import io.dataease.base.mapper.DatasetTableFieldMapper;
@@ -10,6 +9,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
+import java.util.UUID;
/**
* @Author gin
@@ -28,7 +28,7 @@ public class DataSetTableFieldsService {
public DatasetTableField save(DatasetTableField datasetTableField) {
if (StringUtils.isEmpty(datasetTableField.getId())) {
- datasetTableField.setId(UuidUtils.generateUuid());
+ datasetTableField.setId(UUID.randomUUID().toString());
datasetTableFieldMapper.insert(datasetTableField);
} else {
datasetTableFieldMapper.updateByPrimaryKey(datasetTableField);
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 7ddd18503b..e25776bcb4 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -1,8 +1,6 @@
package io.dataease.service.dataset;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.common.util.UuidUtils;
+
import com.google.gson.Gson;
import io.dataease.base.domain.DatasetTable;
import io.dataease.base.domain.DatasetTableExample;
@@ -11,7 +9,6 @@ import io.dataease.base.domain.Datasource;
import io.dataease.base.mapper.DatasetTableMapper;
import io.dataease.base.mapper.DatasourceMapper;
import io.dataease.commons.utils.BeanUtils;
-import io.dataease.commons.utils.SessionUtils;
import io.dataease.controller.request.dataset.DataSetTableRequest;
import io.dataease.datasource.constants.DatasourceTypes;
import io.dataease.datasource.dto.TableFiled;
@@ -19,12 +16,9 @@ import io.dataease.datasource.provider.DatasourceProvider;
import io.dataease.datasource.provider.ProviderFactory;
import io.dataease.datasource.request.DatasourceRequest;
import io.dataease.dto.dataset.DataTableInfoDTO;
-import jnr.ffi.Struct;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.python.apache.xerces.xs.StringList;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import java.text.MessageFormat;
import java.util.*;
@@ -51,7 +45,7 @@ public class DataSetTableService {
public DatasetTable save(DatasetTable datasetTable) throws Exception {
if (StringUtils.isEmpty(datasetTable.getId())) {
- datasetTable.setId(UuidUtils.generateUuid());
+ datasetTable.setId(UUID.randomUUID().toString());
datasetTable.setCreateTime(System.currentTimeMillis());
DataTableInfoDTO dataTableInfoDTO = new DataTableInfoDTO();
if (StringUtils.equalsIgnoreCase("db", datasetTable.getType())) {
@@ -136,7 +130,8 @@ public class DataSetTableService {
} catch (Exception e) {
}
- JSONArray jsonArray = new JSONArray();
+
+ /*JSONArray jsonArray = new JSONArray();
if (CollectionUtils.isNotEmpty(data)) {
data.forEach(ele -> {
JSONObject jsonObject = new JSONObject();
@@ -145,8 +140,19 @@ public class DataSetTableService {
}
jsonArray.add(jsonObject);
});
+ }*/
+ List