diff --git a/core/core-frontend/src/config/axios/service.ts b/core/core-frontend/src/config/axios/service.ts index 944bdc38e1..7875bba7c3 100644 --- a/core/core-frontend/src/config/axios/service.ts +++ b/core/core-frontend/src/config/axios/service.ts @@ -143,6 +143,15 @@ service.interceptors.response.use( message: response.data.msg, showClose: true }) + if (response.data.code === 80001) { + // localStorage.clear() + localStorage.setItem('DE-GATEWAY-FLAG', response.data.msg) + let queryRedirectPath = '/workbranch/index' + if (router.currentRoute.value.fullPath) { + queryRedirectPath = router.currentRoute.value.fullPath as string + } + router.push(`/login?redirect=${queryRedirectPath}`) + } } return Promise.reject(response.data.msg) diff --git a/de-xpack b/de-xpack index 438f36fc4b..4173e5de6f 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 438f36fc4b459721ae0d88e365e4982f35fa1600 +Subproject commit 4173e5de6f6791f0f3206be6de91322b07e9af78 diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java index 34dc18ca2d..72b3367cba 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/api/InteractiveAuthApi.java @@ -3,8 +3,10 @@ package io.dataease.api.permissions.auth.api; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.api.permissions.auth.dto.*; -import io.dataease.auth.vo.TokenVO; +import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO; +import io.dataease.api.permissions.auth.dto.BusiResourceCreator; +import io.dataease.api.permissions.auth.dto.BusiResourceEditor; +import io.dataease.api.permissions.auth.dto.BusiResourceMover; import io.dataease.model.BusiNodeRequest; import io.dataease.model.BusiNodeVO; import io.swagger.v3.oas.annotations.Operation; @@ -58,9 +60,6 @@ public interface InteractiveAuthApi { @GetMapping("/resource/checkDel/{id}") boolean checkDel(@PathVariable("id") Long id); - @Operation(hidden = true) - TokenVO outAuthPlatformLogin(@RequestBody OutAuthPlatformLoginRequest request); - @Operation(summary = "移动资源") @ApiOperationSupport(order = 7) @PostMapping("/moveResource") diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/OutAuthPlatformLoginRequest.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/OutAuthPlatformLoginRequest.java deleted file mode 100644 index ce8c30a65b..0000000000 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/OutAuthPlatformLoginRequest.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.dataease.api.permissions.auth.dto; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class OutAuthPlatformLoginRequest implements Serializable { - - private String account; - - private Integer origin; - - private String email; -} diff --git a/sdk/common/src/main/java/io/dataease/result/ResultCode.java b/sdk/common/src/main/java/io/dataease/result/ResultCode.java index 1926dd732a..86ad357993 100644 --- a/sdk/common/src/main/java/io/dataease/result/ResultCode.java +++ b/sdk/common/src/main/java/io/dataease/result/ResultCode.java @@ -37,7 +37,9 @@ public enum ResultCode { INTERFACE_EXCEED_LOAD(60006, "接口负载过高"), /* 权限错误:70001-79999 */ - PERMISSION_NO_ACCESS(70001, "无访问权限"); + PERMISSION_NO_ACCESS(70001, "无访问权限"), + + USER_NO_QUOTA(80001, "没有用户配额"); private Integer code;