优化权限模块结构

hsweb-system/hsweb-system-authorization/README.md

@@ -1,9 +1,9 @@
 ## 权限功能模块
 
-提供用户,角色,权限管理
+提供用户,角色,权限管理的配置和管理
 
 ## 授权
-[AuthorizationController](hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/AuthorizationController.java)
+[AuthorizationController](hsweb-system-authorization-web/src/main/java/org/hswebframework/web/controller/authorization/AuthorizationController.java)
 仅进行基础授权,通过触发`AuthorizationListener`,进行自定义控制逻辑.详细方式见:[hsweb-authorization-api](../../hsweb-authorization/hsweb-authorization-api#listener)
 
 ## 权限设置

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-dao/hsweb-system-authorization-dao-api/pom.xml

@@ -3,24 +3,27 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>hsweb-system-authorization-dao</artifactId>
+        <artifactId>hsweb-system-authorization</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hsweb-system-authorization-dao-api</artifactId>
+    <artifactId>hsweb-system-authorization-api</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-commons-dao-api</artifactId>
+            <artifactId>hsweb-commons-service-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-entity</artifactId>
+            <artifactId>hsweb-authorization-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+
     </dependencies>
 </project>

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/ActionEntity.java

@@ -1,7 +1,6 @@
 package org.hswebframework.web.entity.authorization;
 
 import lombok.*;
-import lombok.experimental.Wither;
 import org.hswebframework.web.commons.entity.CloneableEntity;
 import org.springframework.util.StringUtils;
 

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimpleMenuEntity.java

@@ -23,7 +23,6 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimpleMenuGroupBindEntity.java

@@ -21,7 +21,6 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/SimpleMenuGroupEntity.java

@@ -21,8 +21,6 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hswebframework.web.commons.entity.SimpleTreeSortSupportEntity;
 
-import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
 /**

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/bind/SimpleBindRoleUserEntity.java

@@ -6,7 +6,6 @@ import lombok.Setter;
 import org.hswebframework.web.entity.authorization.SimpleUserEntity;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 /**

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-api/src/main/java/org/hswebframework/web/service/authorization/UserService.java

@@ -29,7 +29,7 @@ public interface UserService extends
 
     UserEntity selectByUsername(String username);
 
-    UserEntity selectByUserNameAndPassword(String plainUsername,String plainPassword);
+    UserEntity selectByUserNameAndPassword(String plainUsername, String plainPassword);
 
     String encodePassword(String password, String salt);
 

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/pom.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2016 http://www.hswebframework.org
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>hsweb-system-authorization</artifactId>
-        <groupId>org.hswebframework.web</groupId>
-        <version>3.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>hsweb-system-authorization-controller</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.hswebframework</groupId>
-            <artifactId>hsweb-expands-security</artifactId>
-            <version>${hsweb.expands.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-service-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-commons-controller</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/MenuGroupController.java

@@ -1,59 +0,0 @@
-/*
- *  Copyright 2016 http://www.hswebframework.org
- *  
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  
- */
-
-package org.hswebframework.web.controller.authorization;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.hswebframework.web.authorization.annotation.Authorize;
-import org.hswebframework.web.commons.entity.param.QueryParamEntity;
-import org.hswebframework.web.controller.GenericEntityController;
-import org.hswebframework.web.entity.authorization.MenuGroupEntity;
-import org.hswebframework.web.logging.AccessLogger;
-import org.hswebframework.web.service.authorization.MenuGroupService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 菜单分组
- *
- * @author hsweb-generator-online
- */
-//@RestController
-//@RequestMapping("${hsweb.web.mappings.menu-group:menu-group}")
-//@Authorize(permission = "menu-group",description = "菜单分组管理")
-//@Api(tags = "权限-菜单分组",value = "菜单分组")
-public class MenuGroupController implements GenericEntityController<MenuGroupEntity, String, QueryParamEntity, MenuGroupEntity> {
-
-    private MenuGroupService menuGroupService;
-
-    @Override
-    public MenuGroupEntity modelToEntity(MenuGroupEntity model, MenuGroupEntity entity) {
-        return model;
-    }
-
-    @Autowired
-    public void setMenuGroupService(MenuGroupService menuGroupService) {
-        this.menuGroupService = menuGroupService;
-    }
-
-    @Override
-    public MenuGroupService getService() {
-        return menuGroupService;
-    }
-}

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-dao/hsweb-system-authorization-dao-mybatis/pom.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2016 http://www.hswebframework.org
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~       http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>hsweb-system-authorization-dao</artifactId>
-        <groupId>org.hswebframework.web</groupId>
-        <version>3.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>hsweb-system-authorization-dao-mybatis</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-dao-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-commons-dao-mybatis</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-dao/pom.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>hsweb-system-authorization</artifactId>
-        <groupId>org.hswebframework.web</groupId>
-        <version>3.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>hsweb-system-authorization-dao</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>hsweb-system-authorization-dao-api</module>
-        <module>hsweb-system-authorization-dao-mybatis</module>
-    </modules>
-
-</project>

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/pom.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ /*
-  ~  * Copyright 2016 http://www.hswebframework.org
-  ~  *
-  ~  * Licensed under the Apache License, Version 2.0 (the "License");
-  ~  * you may not use this file except in compliance with the License.
-  ~  * You may obtain a copy of the License at
-  ~  *
-  ~  *     http://www.apache.org/licenses/LICENSE-2.0
-  ~  *
-  ~  * Unless required by applicable law or agreed to in writing, software
-  ~  * distributed under the License is distributed on an "AS IS" BASIS,
-  ~  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  * See the License for the specific language governing permissions and
-  ~  * limitations under the License.
-  ~  */
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>hsweb-system-authorization</artifactId>
-        <groupId>org.hswebframework.web</groupId>
-        <version>3.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>hsweb-system-authorization-entity</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-commons-entity</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hswebframework</groupId>
-            <artifactId>hsweb-easy-orm-rdb</artifactId>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-</project>

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>hsweb-system-authorization-service</artifactId>
+        <artifactId>hsweb-system-authorization</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hsweb-system-authorization-service-simple</artifactId>
+    <artifactId>hsweb-system-authorization-local</artifactId>
 
     <dependencies>
         <dependency>
@@ -17,14 +17,22 @@
             <artifactId>hsweb-expands-security</artifactId>
             <version>${hsweb.expands.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-commons-service-simple</artifactId>
+            <artifactId>hsweb-system-authorization-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-service-api</artifactId>
+            <artifactId>hsweb-commons-dao-mybatis</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hswebframework.web</groupId>
+            <artifactId>hsweb-commons-service-simple</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-dao/hsweb-system-authorization-dao-api/src/main/java/org/hswebframework/web/dao/authorization/MenuDao.java

@@ -22,7 +22,6 @@ import org.hswebframework.web.dao.CrudDao;
 import org.hswebframework.web.entity.authorization.MenuEntity;
 
 /**
- * TODO 完成注释
  *
  * @author zhouhao
  */

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-dao/hsweb-system-authorization-dao-api/src/main/java/org/hswebframework/web/dao/authorization/PermissionDao.java

@@ -4,8 +4,6 @@ import org.hswebframework.web.dao.CrudDao;
 import org.hswebframework.web.entity.authorization.PermissionEntity;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 public interface PermissionDao extends CrudDao<PermissionEntity,String> {

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-dao/hsweb-system-authorization-dao-api/src/main/java/org/hswebframework/web/dao/authorization/RoleDao.java

@@ -4,8 +4,6 @@ import org.hswebframework.web.dao.CrudDao;
 import org.hswebframework.web.entity.authorization.RoleEntity;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 public interface RoleDao extends CrudDao<RoleEntity, String> {

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-dao/hsweb-system-authorization-dao-api/src/main/java/org/hswebframework/web/dao/authorization/UserDao.java

@@ -4,8 +4,6 @@ import org.hswebframework.web.entity.authorization.UserEntity;
 import org.hswebframework.web.dao.CrudDao;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 public interface UserDao extends CrudDao<UserEntity, String> {

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-dao/hsweb-system-authorization-dao-api/src/main/java/org/hswebframework/web/dao/authorization/UserRoleDao.java

@@ -6,8 +6,6 @@ import org.hswebframework.web.entity.authorization.UserRoleEntity;
 import java.util.List;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 public interface UserRoleDao extends Dao {

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/DefaultDataAccessFactory.java

@@ -9,8 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 @Component

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthenticationManager.java

@@ -7,8 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 
-import static org.hswebframework.web.service.authorization.simple.CacheConstants.USER_AUTH_CACHE_NAME;
-
 /**
  * @author zhouhao
  */

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingMenuService.java

@@ -1,12 +1,10 @@
 package org.hswebframework.web.service.authorization.simple;
 
-import org.hswebframework.web.dao.CrudDao;
+import org.hswebframework.web.service.authorization.AuthorizationSettingMenuService;
 import org.hswebframework.web.dao.authorization.AuthorizationSettingMenuDao;
 import org.hswebframework.web.entity.authorization.AuthorizationSettingMenuEntity;
-import org.hswebframework.web.entity.authorization.MenuEntity;
 import org.hswebframework.web.id.IDGenerator;
 import org.hswebframework.web.service.AbstractTreeSortService;
-import org.hswebframework.web.service.authorization.AuthorizationSettingMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -14,7 +12,6 @@ import java.util.List;
 import java.util.Objects;
 
 /**
- * TODO 完成注释
  *
  * @author zhouhao
  */

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java

@@ -36,10 +36,8 @@ import org.hswebframework.web.service.authorization.*;
 import org.hswebframework.web.service.authorization.AuthorizationSettingTypeSupplier.SettingInfo;
 import org.hswebframework.web.validator.group.CreateGroup;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -55,8 +53,6 @@ import static org.hswebframework.web.commons.entity.DataStatus.STATUS_ENABLED;
 import static org.hswebframework.web.entity.authorization.AuthorizationSettingDetailEntity.*;
 import static org.hswebframework.web.entity.authorization.AuthorizationSettingEntity.settingFor;
 import static org.hswebframework.web.entity.authorization.AuthorizationSettingEntity.type;
-import static org.hswebframework.web.service.authorization.simple.CacheConstants.MENU_CACHE_NAME;
-import static org.hswebframework.web.service.authorization.simple.CacheConstants.USER_AUTH_CACHE_NAME;
 import static org.hswebframework.web.service.authorization.simple.CacheConstants.USER_MENU_CACHE_NAME;
 
 /**

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleMenuGroupService.java

@@ -16,6 +16,7 @@
  */
 package org.hswebframework.web.service.authorization.simple;
 
+import org.hswebframework.web.service.authorization.MenuGroupService;
 import org.hswebframework.web.commons.entity.TreeSupportEntity;
 import org.hswebframework.web.dao.authorization.MenuGroupDao;
 import org.hswebframework.web.entity.authorization.MenuEntity;
@@ -25,7 +26,6 @@ import org.hswebframework.web.id.IDGenerator;
 import org.hswebframework.web.service.AbstractTreeSortService;
 import org.hswebframework.web.service.DefaultDSLUpdateService;
 import org.hswebframework.web.service.authorization.MenuGroupBindService;
-import org.hswebframework.web.service.authorization.MenuGroupService;
 import org.hswebframework.web.service.authorization.MenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
@@ -38,15 +38,13 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.hswebframework.web.service.authorization.simple.CacheConstants.MENU_CACHE_NAME;
-
 /**
  * 默认的服务实现
  *
  * @author hsweb-generator-online
  */
 @Service("menuGroupService")
-@CacheConfig(cacheNames = MENU_CACHE_NAME)
+@CacheConfig(cacheNames = CacheConstants.MENU_CACHE_NAME)
 public class SimpleMenuGroupService
         extends AbstractTreeSortService<MenuGroupEntity, String>
         implements MenuGroupService {

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleMenuService.java

@@ -24,10 +24,8 @@ import org.hswebframework.web.id.IDGenerator;
 import org.hswebframework.web.service.AbstractTreeSortService;
 import org.hswebframework.web.service.authorization.MenuService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleUserService.java

@@ -1,6 +1,7 @@
 package org.hswebframework.web.service.authorization.simple;
 
 import org.apache.commons.codec.digest.DigestUtils;
+import org.hswebframework.web.service.authorization.*;
 import org.hswebframework.web.commons.entity.DataStatus;
 import org.hswebframework.web.commons.entity.GenericEntity;
 import org.hswebframework.web.dao.authorization.RoleDao;
@@ -13,8 +14,6 @@ import org.hswebframework.web.entity.authorization.bind.BindRoleUserEntity;
 import org.hswebframework.web.id.IDGenerator;
 import org.hswebframework.web.service.AbstractService;
 import org.hswebframework.web.service.DefaultDSLQueryService;
-import org.hswebframework.web.service.DefaultDSLUpdateService;
-import org.hswebframework.web.service.authorization.*;
 import org.hswebframework.web.service.authorization.events.UserModifiedEvent;
 import org.hswebframework.web.validate.ValidationException;
 import org.hswebframework.utils.ListUtils;
@@ -32,8 +31,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static org.hswebframework.web.service.DefaultDSLUpdateService.*;
-import static org.hswebframework.web.service.authorization.simple.CacheConstants.USER_AUTH_CACHE_NAME;
-import static org.hswebframework.web.service.authorization.simple.CacheConstants.USER_CACHE_NAME;
 
 /**
  * 默认的用户服务实现
@@ -127,7 +124,7 @@ public class SimpleUserService extends AbstractService<UserEntity, String>
     }
 
     @Override
-    @CacheEvict(value = USER_CACHE_NAME, key = "#userEntity.id")
+    @CacheEvict(value = CacheConstants.USER_CACHE_NAME, key = "#userEntity.id")
     public String insert(UserEntity userEntity) {
         //用户名合法性验证
         tryValidateProperty(usernameValidator, UserEntity.username, userEntity.getUsername());
@@ -168,10 +165,10 @@ public class SimpleUserService extends AbstractService<UserEntity, String>
 
     @Override
     @Caching(evict = {
-            @CacheEvict(value = USER_CACHE_NAME, key = "#userId"),
-            @CacheEvict(value = USER_AUTH_CACHE_NAME, key = "#userId"),
-            @CacheEvict(value = USER_AUTH_CACHE_NAME, key = "'user-menu-list:'+#userId"),
-            @CacheEvict(value = USER_AUTH_CACHE_NAME, key = "'menu-tree:'+#userId")
+            @CacheEvict(value = CacheConstants.USER_CACHE_NAME, key = "#userId"),
+            @CacheEvict(value = CacheConstants.USER_AUTH_CACHE_NAME, key = "#userId"),
+            @CacheEvict(value = CacheConstants.USER_AUTH_CACHE_NAME, key = "'user-menu-list:'+#userId"),
+            @CacheEvict(value = CacheConstants.USER_AUTH_CACHE_NAME, key = "'menu-tree:'+#userId")
     })
     public void update(String userId, UserEntity userEntity) {
         userEntity.setId(userId);

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-dao/hsweb-system-authorization-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/MenuGroupMapper.xml

@@ -29,7 +29,7 @@
         <result property="level" column="level" javaType="Integer" jdbcType="DECIMAL"/>
         <result property="sortIndex" column="sort_index" javaType="Long" jdbcType="DECIMAL"/>
         <result property="status" column="status" javaType="Byte" jdbcType="DECIMAL"/>
-        <collection property="bindInfo" column="u_id" select="org.hswebframework.web.dao.menu.MenuGroupBindDao.queryByGroupId"/>
+        <collection property="bindInfo" column="u_id" select="org.hswebframework.web.dao.authorization.MenuGroupBindDao.queryByGroupId"/>
     </resultMap>
 
     <!--用于动态生成sql所需的配置-->

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-model/pom.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~  Copyright 2016 http://www.hswebframework.org
-  ~
-  ~  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  you may not use this file except in compliance with the License.
-  ~  You may obtain a copy of the License at
-  ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  ~
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>hsweb-system-authorization</artifactId>
-        <groupId>org.hswebframework.web</groupId>
-        <version>3.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>hsweb-system-authorization-model</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-commons-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-        </dependency>
-    </dependencies>
-</project>

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/pom.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>hsweb-system-authorization</artifactId>
-        <groupId>org.hswebframework.web</groupId>
-        <version>3.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>hsweb-system-authorization-service</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>hsweb-system-authorization-service-api</module>
-        <module>hsweb-system-authorization-service-simple</module>
-    </modules>
-</project>

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml

@@ -40,17 +40,12 @@
     <dependencies>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-service-simple</artifactId>
+            <artifactId>hsweb-system-authorization-local</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-dao-mybatis</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-controller</artifactId>
+            <artifactId>hsweb-system-authorization-web</artifactId>
             <version>${project.version}</version>
         </dependency>
 

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/main/java/org/hswebframework/web/authorization/starter/AuthorizationAutoConfiguration.java

@@ -21,11 +21,9 @@ package org.hswebframework.web.authorization.starter;
 import org.hswebframework.web.authorization.AuthenticationInitializeService;
 import org.hswebframework.web.authorization.AuthenticationManager;
 import org.hswebframework.web.authorization.simple.DefaultAuthorizationAutoConfiguration;
-import org.hswebframework.web.authorization.token.UserTokenManager;
-import org.hswebframework.web.service.authorization.UserService;
 import org.hswebframework.web.service.authorization.simple.SimpleAuthenticationManager;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -38,7 +36,8 @@ import org.springframework.context.annotation.Import;
  */
 @Configuration
 @ComponentScan({"org.hswebframework.web.service.authorization.simple"
-        , "org.hswebframework.web.controller.authorization"})
+        , "org.hswebframework.web.authorization.controller"})
+@MapperScan("org.hswebframework.web.authorization.dao")
 @AutoConfigureBefore(DefaultAuthorizationAutoConfiguration.class)
 @Import(BasicAuthorizationConfiguration.class)
 public class AuthorizationAutoConfiguration {

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/main/java/org/hswebframework/web/authorization/starter/AutoSyncPermission.java

@@ -18,7 +18,6 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.util.ReflectionUtils;
 
 import java.lang.reflect.Field;
-import java.lang.reflect.Member;
 import java.lang.reflect.Modifier;
 import java.util.*;
 import java.util.function.Function;
@@ -118,7 +117,7 @@ public class AutoSyncPermission implements ApplicationListener<AuthorizeDefiniti
                 if (genType != Object.class) {
                     List<Field> fields = new ArrayList<>();
 
-                    ReflectionUtils.doWithFields(genType, fields::add, field -> field.getModifiers() != Modifier.STATIC);
+                    ReflectionUtils.doWithFields(genType, fields::add, field -> (field.getModifiers() & Modifier.STATIC) == 0);
 
                     for (Field field : fields) {
                         if ("id".equals(field.getName())) {

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-api/pom.xml

@@ -3,33 +3,35 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>hsweb-system-authorization-service</artifactId>
+        <artifactId>hsweb-system-authorization</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hsweb-system-authorization-service-api</artifactId>
+    <artifactId>hsweb-system-authorization-web</artifactId>
+
 
     <dependencies>
         <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-authorization-api</artifactId>
-            <version>${project.version}</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-commons-service-api</artifactId>
+            <artifactId>hsweb-system-authorization-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-entity</artifactId>
+            <artifactId>hsweb-commons-controller</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-dao-api</artifactId>
+            <artifactId>hsweb-system-authorization-model</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/AuthorizationController.java

@@ -15,7 +15,7 @@
  *
  */
 
-package org.hswebframework.web.controller.authorization;
+package org.hswebframework.web.authorization.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,8 +32,6 @@ import org.hswebframework.web.controller.message.ResponseMessage;
 import org.hswebframework.web.entity.authorization.UserEntity;
 import org.hswebframework.web.logging.AccessLogger;
 import org.hswebframework.web.service.authorization.UserService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.http.MediaType;

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/AuthorizationSettingController.java

@@ -15,7 +15,7 @@
  *  
  */
 
-package org.hswebframework.web.controller.authorization;
+package org.hswebframework.web.authorization.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,7 +25,6 @@ import org.hswebframework.web.commons.entity.param.QueryParamEntity;
 import org.hswebframework.web.controller.SimpleGenericEntityController;
 import org.hswebframework.web.controller.message.ResponseMessage;
 import org.hswebframework.web.entity.authorization.AuthorizationSettingEntity;
-import org.hswebframework.web.logging.AccessLogger;
 import org.hswebframework.web.service.authorization.AuthorizationSettingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/MenuController.java

@@ -16,7 +16,7 @@
  *
  */
 
-package org.hswebframework.web.controller.authorization;
+package org.hswebframework.web.authorization.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,7 +28,6 @@ import org.hswebframework.web.controller.SimpleGenericEntityController;
 import org.hswebframework.web.controller.message.ResponseMessage;
 import org.hswebframework.web.entity.authorization.MenuEntity;
 import org.hswebframework.web.entity.authorization.UserMenuEntity;
-import org.hswebframework.web.logging.AccessLogger;
 import org.hswebframework.web.service.authorization.MenuService;
 import org.hswebframework.web.service.authorization.UserMenuManagerService;
 import org.springframework.beans.factory.annotation.Autowired;

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/PermissionController.java

@@ -16,14 +16,13 @@
  *
  */
 
-package org.hswebframework.web.controller.authorization;
+package org.hswebframework.web.authorization.controller;
 
 import io.swagger.annotations.Api;
 import org.hswebframework.web.authorization.annotation.Authorize;
 import org.hswebframework.web.commons.entity.param.QueryParamEntity;
 import org.hswebframework.web.controller.SimpleGenericEntityController;
 import org.hswebframework.web.entity.authorization.PermissionEntity;
-import org.hswebframework.web.logging.AccessLogger;
 import org.hswebframework.web.service.authorization.PermissionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/RoleController.java

@@ -16,7 +16,7 @@
  *
  */
 
-package org.hswebframework.web.controller.authorization;
+package org.hswebframework.web.authorization.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +26,6 @@ import org.hswebframework.web.commons.entity.param.QueryParamEntity;
 import org.hswebframework.web.controller.SimpleGenericEntityController;
 import org.hswebframework.web.controller.message.ResponseMessage;
 import org.hswebframework.web.entity.authorization.RoleEntity;
-import org.hswebframework.web.logging.AccessLogger;
 import org.hswebframework.web.service.authorization.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/UserController.java

@@ -15,7 +15,7 @@
  *
  */
 
-package org.hswebframework.web.controller.authorization;
+package org.hswebframework.web.authorization.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-controller/src/main/java/org/hswebframework/web/controller/authorization/UserSettingController.java

@@ -1,4 +1,4 @@
-package org.hswebframework.web.controller.authorization;
+package org.hswebframework.web.authorization.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;