From 7172829138e1b2ea424f05130fb5edb8042eb2c2 Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Thu, 1 Feb 2024 12:42:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=90=8C=E6=AD=A5=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=97=A0=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/api/sync/datasource/api/SyncDatasourceApi.java | 3 --- .../main/java/io/dataease/api/sync/task/api/TaskLogApi.java | 4 ++-- .../src/main/java/io/dataease/constant/AuthResourceEnum.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java index 4b10ea7f75..8c261f29dc 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java +++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java @@ -26,11 +26,9 @@ import static io.dataease.constant.AuthResourceEnum.SYNC_DATASOURCE; @DeApiPath(value = "/sync/datasource", rt = SYNC_DATASOURCE) public interface SyncDatasourceApi { - @DePermit("m:read") @PostMapping("/source/pager/{goPage}/{pageSize}") IPage sourcePager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody BaseGridRequest request); - @DePermit("m:read") @PostMapping("/target/pager/{goPage}/{pageSize}") IPage targetPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody BaseGridRequest request); @@ -52,7 +50,6 @@ public interface SyncDatasourceApi { @PostMapping("/getSchema") List getSchema(@RequestBody SyncDatasourceDTO dataSourceDTO) throws DEException; - @DePermit({"#p0+':manage'"}) @GetMapping("/validate/{datasourceId}") SyncDatasourceDTO validate(@PathVariable("datasourceId") String datasourceId) throws DEException; diff --git a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskLogApi.java b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskLogApi.java index 925eec1254..8dd37e4862 100644 --- a/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskLogApi.java +++ b/sdk/api/api-sync/src/main/java/io/dataease/api/sync/task/api/TaskLogApi.java @@ -7,13 +7,13 @@ import io.dataease.auth.DeApiPath; import io.dataease.request.BaseGridRequest; import org.springframework.web.bind.annotation.*; -import static io.dataease.constant.AuthResourceEnum.TASK_LOG; +import static io.dataease.constant.AuthResourceEnum.TASK; /** * @author fit2cloud * @date 2023/12/4 12:43 **/ -@DeApiPath(value = "/sync/task/log", rt = TASK_LOG) +@DeApiPath(value = "/sync/task/log", rt = TASK) public interface TaskLogApi { @PostMapping("/pager/{goPage}/{pageSize}") IPage pager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody BaseGridRequest request); diff --git a/sdk/common/src/main/java/io/dataease/constant/AuthResourceEnum.java b/sdk/common/src/main/java/io/dataease/constant/AuthResourceEnum.java index 60270644d1..bef3c219ee 100644 --- a/sdk/common/src/main/java/io/dataease/constant/AuthResourceEnum.java +++ b/sdk/common/src/main/java/io/dataease/constant/AuthResourceEnum.java @@ -2,7 +2,7 @@ package io.dataease.constant; public enum AuthResourceEnum { - PANEL(2, 1), SCREEN(3, 2), DATASET(5, 3), DATASOURCE(6, 4), SYSTEM(7, 0), USER(8, 5), ROLE(8, 6), ORG(9, 7), SYNC_DATASOURCE(10, 8), TASK(11, 9),TASK_LOG(12, 10), SUMMARY(13, 11); + PANEL(2, 1), SCREEN(3, 2), DATASET(5, 3), DATASOURCE(6, 4), SYSTEM(7, 0), USER(8, 5), ROLE(8, 6), ORG(9, 7), SYNC_DATASOURCE(23, 8), TASK(24, 9), SUMMARY(22, 10); private long menuId;