From a40cd1e08a9ec8ff500ba59e750aac8fcf3fc273 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 2 Mar 2022 16:09:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8F=AF=E9=80=89=E6=8B=A9[API]?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/auth/api/demo.java | 28 ------------------- .../auth/service/impl/ShiroServiceImpl.java | 1 - frontend/src/views/dataset/add/AddUnion.vue | 2 +- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 backend/src/main/java/io/dataease/auth/api/demo.java diff --git a/backend/src/main/java/io/dataease/auth/api/demo.java b/backend/src/main/java/io/dataease/auth/api/demo.java deleted file mode 100644 index 04d7ce9c57..0000000000 --- a/backend/src/main/java/io/dataease/auth/api/demo.java +++ /dev/null @@ -1,28 +0,0 @@ -package io.dataease.auth.api; - - -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONObject; - -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - - - -@RestController -@RequestMapping("api/data") -public class demo { - @ApiOperation("查询") - @GetMapping("demo") - public Object listByTableId() { - JSONArray jsonArray = new JSONArray(); - for(int i=0;i<10;i++){ - JSONObject jsonObject = new JSONObject(); - for(int j=0;j<1;j++){ - jsonObject.set("column" +i + j, "value"+i+j); - } - jsonArray.put(jsonObject); - } - return jsonArray; - } -} diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java index be7213cde8..26c74635c7 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java @@ -20,7 +20,6 @@ public class ShiroServiceImpl implements ShiroService { // ---------------------------------------------------------- // 放行Swagger2页面,需要放行这些 - filterChainDefinitionMap.put("/api/data/demo", ANON); filterChainDefinitionMap.put("/doc.html**", "doc"); filterChainDefinitionMap.put("/deApi**", ANON); filterChainDefinitionMap.put("/swagger-ui.html", ANON); diff --git a/frontend/src/views/dataset/add/AddUnion.vue b/frontend/src/views/dataset/add/AddUnion.vue index 4620258a46..83212808f6 100644 --- a/frontend/src/views/dataset/add/AddUnion.vue +++ b/frontend/src/views/dataset/add/AddUnion.vue @@ -139,7 +139,7 @@ export default { allChildCount: 0 }, name: '关联数据集', - customType: ['db', 'sql', 'excel'], + customType: ['db', 'sql', 'excel', 'api'], selectDsDialog: false, // 弹框临时选中的数据集 tempDs: {},