diff --git a/de-xpack b/de-xpack index 4481e6aa51..4bdf44b1e1 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 4481e6aa512c3f1e37975ef8f34a8fb14a9d9962 +Subproject commit 4bdf44b1e1912ad26b1f20172ca468efb410f985 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java index 06a278eed1..e4a6c542bd 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java @@ -6,6 +6,7 @@ import io.dataease.api.report.dto.ReportInstanceMsgRequest; import io.dataease.api.report.vo.ReportGridVO; import io.dataease.api.xpack.dataFilling.dto.*; import io.dataease.auth.DeApiPath; +import io.dataease.auth.DePermit; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.dto.SimpleDatasourceDTO; import io.dataease.model.BusiNodeRequest; @@ -29,6 +30,7 @@ public interface DataFillingApi { @PostMapping("tree") List tree(@RequestBody BusiNodeRequest request) throws DEException; + @DePermit({"#p0+':read'"}) @GetMapping("/get/{id}") DataFillingDTO get(@PathVariable("id") Long id); 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 d1c7d6427e..6208d52703 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 @@ -6,7 +6,6 @@ import io.dataease.api.sync.datasource.dto.GetDatasourceRequest; import io.dataease.api.sync.datasource.dto.SyncDatasourceDTO; import io.dataease.api.sync.datasource.vo.SyncDatasourceVO; import io.dataease.auth.DeApiPath; -import io.dataease.auth.DePermit; import io.dataease.exception.DEException; import io.dataease.request.BaseGridRequest; import org.springframework.web.bind.annotation.GetMapping; @@ -36,7 +35,7 @@ public interface SyncDatasourceApi { void save(@RequestBody SyncDatasourceDTO dataSourceDTO) throws DEException; @PostMapping("/update") - Map update(@RequestBody SyncDatasourceDTO dataSourceDTO) throws DEException; + Map update(@RequestBody SyncDatasourceDTO dataSourceDTO) throws DEException; @PostMapping("/delete/{datasourceId}") void delete(@PathVariable("datasourceId") String datasourceId) throws DEException; @@ -63,7 +62,7 @@ public interface SyncDatasourceApi { void batchDel(@RequestBody List ids) throws DEException; @PostMapping("/fields") - Map getFields(@RequestBody GetDatasourceRequest getDsRequest) throws DEException ; + Map getFields(@RequestBody GetDatasourceRequest getDsRequest) throws DEException; @GetMapping("/list/{type}") List listByType(@PathVariable("type") String type) throws DEException; @@ -72,6 +71,4 @@ public interface SyncDatasourceApi { List getTableList(@PathVariable("dsId") String dsId) throws DEException; - - } 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 40cdd10ff2..2edeee3c67 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(23, 8), TASK(24, 9), SUMMARY(22, 10), DATA_FILLING(60, 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, 9), TASK(24, 9), SUMMARY(22, 9), DATA_FILLING(60, 8); private long menuId;