From df0b4b2a6e34766de8231c392597fac4e68f85e2 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 3 Nov 2022 16:50:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(=E6=A8=A1=E6=9D=BF=E5=B8=82?= =?UTF-8?q?=E5=9C=BA):=20=E5=A2=9E=E5=8A=A0=E6=A8=A1=E6=9D=BF=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E5=88=86=E7=B1=BB=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/commons/utils/HttpClientConfig.java | 4 ++-- .../java/io/dataease/dto/templateMarket/TemplateCategory.java | 2 ++ .../service/templateMarket/TemplateMarketService.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/utils/HttpClientConfig.java b/backend/src/main/java/io/dataease/commons/utils/HttpClientConfig.java index 819ac172ce..8786d3fcb0 100755 --- a/backend/src/main/java/io/dataease/commons/utils/HttpClientConfig.java +++ b/backend/src/main/java/io/dataease/commons/utils/HttpClientConfig.java @@ -15,9 +15,9 @@ public class HttpClientConfig { private Map header = new HashMap<>(); // 设置连接超时时间,单位毫秒 - private int connectTimeout = 5000; + private int connectTimeout = 30000; // 设置从connect Manager获取Connection 超时时间,单位毫秒。这个属性是新加的属性,因为目前版本是可以共享连接池的 - private int connectionRequestTimeout = 5000; + private int connectionRequestTimeout = 30000; // 请求获取数据的超时时间,单位毫秒。 如果访问一个接口,多少时间内无法返回数据,就直接放弃此次调用 private int socketTimeout = 60000; diff --git a/backend/src/main/java/io/dataease/dto/templateMarket/TemplateCategory.java b/backend/src/main/java/io/dataease/dto/templateMarket/TemplateCategory.java index dd78b81ec4..29dee68bf8 100644 --- a/backend/src/main/java/io/dataease/dto/templateMarket/TemplateCategory.java +++ b/backend/src/main/java/io/dataease/dto/templateMarket/TemplateCategory.java @@ -14,4 +14,6 @@ public class TemplateCategory { private String name; private String slug; + + private Integer priority; } diff --git a/backend/src/main/java/io/dataease/service/templateMarket/TemplateMarketService.java b/backend/src/main/java/io/dataease/service/templateMarket/TemplateMarketService.java index 427d111358..658c23aa91 100644 --- a/backend/src/main/java/io/dataease/service/templateMarket/TemplateMarketService.java +++ b/backend/src/main/java/io/dataease/service/templateMarket/TemplateMarketService.java @@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -76,7 +77,7 @@ public class TemplateMarketService { String resultStr = marketGet(basicInfo.getTemplateMarketUlr()+CATEGORIES_API,basicInfo.getTemplateAccessKey()); List categories = JSONObject.parseObject(resultStr).getJSONArray("data").toJavaList(TemplateCategory.class); if(CollectionUtils.isNotEmpty(categories)){ - return categories.stream().map(TemplateCategory :: getName).collect(Collectors.toList()); + return categories.stream().sorted(Comparator.comparing(TemplateCategory::getPriority)).map(TemplateCategory :: getName).collect(Collectors.toList()); }else{ return null; } From 8eff2f492c6eb866b004394b02b6bd0cf7c4e7f3 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 3 Nov 2022 17:04:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=20=E5=AF=BC=E5=85=A5=E7=94=A8=E6=88=B7=E4=BD=BF=E7=94=A8xlsx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pom.xml | 2 +- backend/src/main/resources/excel/user.xls | Bin 19456 -> 0 bytes backend/src/main/resources/excel/user.xlsx | Bin 0 -> 9779 bytes 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 backend/src/main/resources/excel/user.xls create mode 100644 backend/src/main/resources/excel/user.xlsx diff --git a/backend/pom.xml b/backend/pom.xml index f1e772b196..c7e3ce2630 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -378,7 +378,7 @@ UTF-8 - xls + xlsx diff --git a/backend/src/main/resources/excel/user.xls b/backend/src/main/resources/excel/user.xls deleted file mode 100644 index 96e7fd1e0128e9f35b55a32869f677beace57642..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19456 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 K&;8$Sf&T$@AE(9u diff --git a/backend/src/main/resources/excel/user.xlsx b/backend/src/main/resources/excel/user.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..a5945bc275d7f08a3a7e0570abc04106d57c9971 GIT binary patch literal 9779 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 literal 0 HcmV?d00001