From 9614b82e0ffdca3efa5bcb0f41e5672587508b45 Mon Sep 17 00:00:00 2001 From: shimingxy Date: Tue, 11 Mar 2025 10:31:12 +0800 Subject: [PATCH] org.dromara.maxkey.web.component to org.dromara.maxkey.entity --- .../main/java/org/dromara/maxkey/entity}/TreeAttributes.java | 2 +- .../src/main/java/org/dromara/maxkey/entity}/TreeNode.java | 2 +- .../maxkey/web/idm/contorller/OrganizationsController.java | 4 ++-- .../web/permissions/contorller/ResourcesController.java | 4 ++-- .../maxkey/web/interceptor/RestApiPermissionAdapter.java | 4 ---- 5 files changed, 6 insertions(+), 10 deletions(-) rename {maxkey-core/src/main/java/org/dromara/maxkey/web/component => maxkey-common/src/main/java/org/dromara/maxkey/entity}/TreeAttributes.java (97%) rename {maxkey-core/src/main/java/org/dromara/maxkey/web/component => maxkey-common/src/main/java/org/dromara/maxkey/entity}/TreeNode.java (98%) diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeAttributes.java b/maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeAttributes.java similarity index 97% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeAttributes.java rename to maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeAttributes.java index 897d0f60..cd4a1bc4 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeAttributes.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeAttributes.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dromara.maxkey.web.component; +package org.dromara.maxkey.entity; import java.util.ArrayList; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeNode.java b/maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeNode.java similarity index 98% rename from maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeNode.java rename to maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeNode.java index e641fb07..90463ea0 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeNode.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/entity/TreeNode.java @@ -15,7 +15,7 @@ */ -package org.dromara.maxkey.web.component; +package org.dromara.maxkey.entity; /** * 数控件的节点 使用HashMap attr存储节点数据. diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java index 1cbd34d8..8ea91d76 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/idm/contorller/OrganizationsController.java @@ -33,13 +33,13 @@ import org.dromara.maxkey.constants.ConstsAct; import org.dromara.maxkey.constants.ConstsActResult; import org.dromara.maxkey.entity.ExcelImport; import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.TreeAttributes; +import org.dromara.maxkey.entity.TreeNode; import org.dromara.maxkey.entity.idm.Organizations; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.persistence.service.HistorySystemLogsService; import org.dromara.maxkey.persistence.service.OrganizationsService; import org.dromara.maxkey.util.ExcelUtils; -import org.dromara.maxkey.web.component.TreeAttributes; -import org.dromara.maxkey.web.component.TreeNode; import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.dromara.mybatis.jpa.query.Query; import org.slf4j.Logger; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java index b6009fa5..ba5aedf5 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java @@ -24,12 +24,12 @@ import org.dromara.maxkey.constants.ConstsEntryType; import org.dromara.maxkey.constants.ConstsAct; import org.dromara.maxkey.constants.ConstsActResult; import org.dromara.maxkey.entity.Message; +import org.dromara.maxkey.entity.TreeAttributes; +import org.dromara.maxkey.entity.TreeNode; import org.dromara.maxkey.entity.idm.UserInfo; import org.dromara.maxkey.entity.permissions.Resources; import org.dromara.maxkey.persistence.service.HistorySystemLogsService; import org.dromara.maxkey.persistence.service.ResourcesService; -import org.dromara.maxkey.web.component.TreeAttributes; -import org.dromara.maxkey.web.component.TreeNode; import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.dromara.mybatis.jpa.query.Query; import org.slf4j.Logger; diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java index 34f28c33..4e955ac2 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.web.interceptor; -import java.util.concurrent.ConcurrentHashMap; - import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.web.AuthorizationUtils; import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; @@ -53,8 +51,6 @@ public class RestApiPermissionAdapter implements AsyncHandlerInterceptor { @Autowired ProviderManager oauth20ClientAuthenticationManager; - static ConcurrentHashMapnavigationsMap=null; - /* * 请求前处理 * (non-Javadoc)