Ver Fonte

org.dromara.maxkey.web.component to org.dromara.maxkey.entity

shimingxy há 2 meses atrás
pai
commit
9614b82e0f

+ 1 - 1
maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeAttributes.java → 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;
 

+ 1 - 1
maxkey-core/src/main/java/org/dromara/maxkey/web/component/TreeNode.java → 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<String,Object> attr存储节点数据.

+ 2 - 2
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;

+ 2 - 2
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;

+ 0 - 4
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  ConcurrentHashMap<String ,String >navigationsMap=null;
-	
 	/*
 	 * 请求前处理
 	 *  (non-Javadoc)