From 28d93227f46d1476a8cc766e99788f04e223c0df Mon Sep 17 00:00:00 2001 From: junjie Date: Mon, 2 Aug 2021 16:34:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/provider/doris/DorisQueryProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java index f55c2d442b..fc995d6e11 100644 --- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java @@ -828,7 +828,7 @@ public class DorisQueryProvider extends QueryProvider { List calcFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample); for (DatasetTableField ele : calcFields) { originField = originField.replaceAll("\\[" + ele.getId() + "]", - String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), ele.getOriginName())); + String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), ele.getDataeaseName())); } return originField; } From e459225f3b31f5db600a4ce4c4d52ee95cd3a28d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 2 Aug 2021 17:52:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E5=85=A8?= =?UTF-8?q?=E5=B1=80token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pom.xml | 2 +- .../dataease/config/Knife4jConfiguration.java | 26 +++++++++++-------- .../src/main/resources/application.properties | 2 ++ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index e3370c8d27..229218d302 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -384,7 +384,7 @@ **/* - false + true diff --git a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java index 0a9717caf4..c8174f6e31 100644 --- a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java +++ b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java @@ -3,6 +3,7 @@ package io.dataease.config; import cn.hutool.core.collection.CollectionUtil; import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -24,6 +25,9 @@ public class Knife4jConfiguration { private final OpenApiExtensionResolver openApiExtensionResolver; + @Value("${app.version}") + private String version; + @Autowired public Knife4jConfiguration(OpenApiExtensionResolver openApiExtensionResolver) { @@ -63,24 +67,20 @@ public class Knife4jConfiguration { private ApiInfo apiInfo(){ return new ApiInfoBuilder() - .title("DataEase很棒~~~！！！") - .license("杭州飞致云信息科技有限公司 1.0-b9") - .description("人人可用的可视化工具") - .termsOfServiceUrl("http://fit2cloud.com/") + .title("DataEase") + .description("人人可用的开源数据可视化分析工具") + .termsOfServiceUrl("https://dataease.io") .contact(new Contact("fit2cloud","https://www.fit2cloud.com/dataease/index.html","dataease@fit2cloud.com")) - .version("1.0") + .version(version) .build(); } private Docket defaultApi(String groupName, String packageName) { List securitySchemes=new ArrayList<>(); + securitySchemes.add(apiKey()); List securityContexts = new ArrayList<>(); securityContexts.add(securityContext()); - HttpAuthenticationScheme httpAuthenticationScheme = HttpAuthenticationScheme.JWT_BEARER_BUILDER - .name(HttpHeaders.AUTHORIZATION) - .description("Bearer Token") - .build(); - securitySchemes.add(httpAuthenticationScheme); + Docket docket=new Docket(DocumentationType.OAS_30) .apiInfo(apiInfo()) .groupName(groupName) @@ -100,12 +100,16 @@ public class Knife4jConfiguration { .build(); } + private ApiKey apiKey() { + return new ApiKey("Authorization", "Authorization", "header"); + } + List defaultAuth() { AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; authorizationScopes[0] = authorizationScope; - return CollectionUtil.newArrayList(new SecurityReference("BearerToken", authorizationScopes)); + return CollectionUtil.newArrayList(new SecurityReference("Authorization", authorizationScopes)); } } diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 3f819de485..5084fb866f 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -32,7 +32,9 @@ knife4j.setting.enableSwaggerModels=false knife4j.setting.enableDocumentManage=false knife4j.setting.enableSearch=false knife4j.setting.enableOpenApi=false +knife4j.setting.enableAfterScript=false +app.version=@project.version@ logging.file.path=/opt/dataease/logs/${spring.application.name}