由于使用的是 Hibernate, 在引入 adminweb 上存在很多不兼容的地方，现在只能以当前代码为模板，无限接近 adminweb

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/view/AppPageController.java

@@ -15,8 +15,8 @@ import cn.reghao.autodop.dmaster.app.entity.AppBuilding;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildTime;
 import cn.reghao.autodop.dmaster.app.repository.log.BuildLogRepository;
 import cn.reghao.autodop.dmaster.app.vo.BuildConfig;
-import cn.reghao.autodop.dmaster.auth.UserContext;
-import cn.reghao.autodop.dmaster.auth.model.constant.RoleType;
+import cn.reghao.autodop.dmaster.rbac.UserContext;
+import cn.reghao.autodop.dmaster.rbac.model.constant.RoleType;
 import cn.reghao.autodop.dmaster.utils.db.PageList;
 import cn.reghao.autodop.dmaster.utils.db.PageSort;
 import io.swagger.annotations.Api;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/log/BuildLog.java

@@ -4,7 +4,7 @@ import cn.reghao.util.result.Result;
 import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.CommitInfo;
 import cn.reghao.autodop.dmaster.app.vo.BuildConfig;
-import cn.reghao.autodop.dmaster.auth.UserContext;
+import cn.reghao.autodop.dmaster.rbac.UserContext;
 import cn.reghao.autodop.dmaster.utils.db.BaseDocument;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/UserContext.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/UserContext.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.auth;
+package cn.reghao.autodop.dmaster.rbac;
 
 
-import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
 
 /**
  * 获取当前请求的用户

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/ResourceController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/controller/MenuController.java

@@ -1,10 +1,10 @@
-package cn.reghao.autodop.dmaster.auth.controller;
+package cn.reghao.autodop.dmaster.rbac.controller;
 
 import cn.reghao.util.result.Result;
-import cn.reghao.autodop.dmaster.auth.db.crud.MenuQuery;
-import cn.reghao.autodop.dmaster.auth.model.dto.MenuDTO;
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
-import cn.reghao.autodop.dmaster.auth.service.MenuServiceImpl;
+import cn.reghao.autodop.dmaster.rbac.db.crud.MenuQuery;
+import cn.reghao.autodop.dmaster.rbac.model.dto.MenuDTO;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.service.MenuServiceImpl;
 import cn.reghao.util.result.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,19 +14,20 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author reghao
  * @date 2021-04-04 21:24:18
  */
 @Api(tags = "资源接口")
-@RequestMapping("/api/auth/menu")
+@RequestMapping("/api/rbac/menu")
 @RestController
-public class ResourceController {
+public class MenuController {
     private final MenuServiceImpl menuServiceImpl;
     private final MenuQuery menuQuery;
 
-    public ResourceController(MenuServiceImpl menuServiceImpl, MenuQuery menuQuery) {
+    public MenuController(MenuServiceImpl menuServiceImpl, MenuQuery menuQuery) {
         this.menuServiceImpl = menuServiceImpl;
         this.menuQuery = menuQuery;
     }
@@ -60,10 +61,16 @@ public class ResourceController {
         return WebBody.result(result);
     }
 
-    @ApiOperation(value = "获取所有的资源")
+    @ApiOperation(value = "获取指定状态的菜单")
     @GetMapping(value = "/{isEnabled}", produces = MediaType.APPLICATION_JSON_VALUE)
     public String list(@PathVariable(value = "isEnabled") Boolean isEnabled) {
-        List<Menu> list = menuQuery.getSortedMenusByStatus(isEnabled);
+        List<Menu> list = menuQuery.getSortedMenusByStatus(isEnabled).stream()
+                .peek(menu -> {
+                    menu.getRoles().forEach(role -> {
+                        role.setMenus(null);
+                    });
+                })
+                .collect(Collectors.toList());
         return WebBody.success(list);
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/RoleController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/controller/RoleController.java

@@ -1,9 +1,9 @@
-package cn.reghao.autodop.dmaster.auth.controller;
+package cn.reghao.autodop.dmaster.rbac.controller;
 
-import cn.reghao.autodop.dmaster.auth.db.crud.MenuQuery;
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
-import cn.reghao.autodop.dmaster.auth.service.RoleService;
+import cn.reghao.autodop.dmaster.rbac.db.crud.MenuQuery;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.service.RoleService;
 import cn.reghao.util.result.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +20,7 @@ import java.util.Set;
  * @date 2021-04-04 21:24:18
  */
 @Api(tags = "角色接口")
-@RequestMapping("/api/auth/role")
+@RequestMapping("/api/rbac/role")
 @RestController
 public class RoleController {
     private MenuQuery menuQuery;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/UserController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/controller/UserController.java

@@ -1,12 +1,12 @@
-package cn.reghao.autodop.dmaster.auth.controller;
+package cn.reghao.autodop.dmaster.rbac.controller;
 
 import cn.reghao.util.result.WebBody;
-import cn.reghao.autodop.dmaster.auth.model.dto.UserInfo;
-import cn.reghao.autodop.dmaster.auth.model.dto.UserRole;
-import cn.reghao.autodop.dmaster.auth.model.po.UserAuthority;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
-import cn.reghao.autodop.dmaster.auth.service.UserService;
+import cn.reghao.autodop.dmaster.rbac.model.dto.UserInfo;
+import cn.reghao.autodop.dmaster.rbac.model.dto.UserRole;
+import cn.reghao.autodop.dmaster.rbac.model.po.UserAuthority;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.MediaType;
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
  * @date 2021-04-04 21:24:18
  */
 @Api(tags = "用户接口")
-@RequestMapping("/api/auth/user")
+@RequestMapping("/api/rbac/user")
 @RestController
 public class UserController {
     private UserService userService;

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/controller/HomePageController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/controller/page/HomePageController.java

@@ -1,9 +1,9 @@
-package cn.reghao.autodop.dmaster.view.controller;
+package cn.reghao.autodop.dmaster.rbac.controller.page;
 
-import cn.reghao.autodop.dmaster.auth.UserContext;
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
-import cn.reghao.autodop.dmaster.view.service.HomeService;
+import cn.reghao.autodop.dmaster.rbac.UserContext;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.service.HomeService;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.web.servlet.error.ErrorController;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/ResourcePageController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/controller/page/MenuPageController.java

@@ -1,10 +1,10 @@
-package cn.reghao.autodop.dmaster.auth.controller;
+package cn.reghao.autodop.dmaster.rbac.controller.page;
 
-import cn.reghao.autodop.dmaster.auth.db.crud.MenuQuery;
-import cn.reghao.autodop.dmaster.auth.db.crud.RoleQuery;
-import cn.reghao.autodop.dmaster.auth.model.dto.MenuDTO;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.db.crud.MenuQuery;
+import cn.reghao.autodop.dmaster.rbac.db.crud.RoleQuery;
+import cn.reghao.autodop.dmaster.rbac.model.dto.MenuDTO;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
@@ -18,13 +18,13 @@ import java.util.*;
  * @date 2021-04-04 21:24:18
  */
 @Api(tags = "资源页面")
-@RequestMapping("/auth/menu")
+@RequestMapping("/rbac/menu")
 @Controller
-public class ResourcePageController {
+public class MenuPageController {
     private final RoleQuery roleQuery;
     private final MenuQuery menuQuery;
 
-    public ResourcePageController(RoleQuery roleQuery, MenuQuery menuQuery) {
+    public MenuPageController(RoleQuery roleQuery, MenuQuery menuQuery) {
         this.roleQuery = roleQuery;
         this.menuQuery = menuQuery;
     }
@@ -37,7 +37,7 @@ public class ResourcePageController {
         }
 
         model.addAttribute("isEnabled", isEnabled);
-        return "/auth/menu/index";
+        return "/rbac/menu/index";
     }
 
     @ApiOperation(value = "资源添加页面")
@@ -55,7 +55,7 @@ public class ResourcePageController {
         model.addAttribute("allRoles", allRoles);
         model.addAttribute("menuRoles", menuRoles);
         model.addAttribute("pMenu", pMenu);
-        return "/auth/menu/add";
+        return "/rbac/menu/add";
     }
 
     @ApiOperation(value = "资源编辑页面")
@@ -76,7 +76,7 @@ public class ResourcePageController {
         model.addAttribute("menuRoles", menuRoles);
         model.addAttribute("menu", new MenuDTO(menu));
         model.addAttribute("pMenu", pMenu);
-        return "/auth/menu/edit";
+        return "/rbac/menu/edit";
     }
 
     // TODO Hibernate 会根据传入的 id 自动查找相应的 Menu
@@ -85,13 +85,13 @@ public class ResourcePageController {
     public String roleListWithResource(@PathVariable("id") Menu menu, Model model) {
         List<Role> list = new ArrayList<>(menu.getRoles());
         model.addAttribute("list", list);
-        return "/auth/menu/roles";
+        return "/rbac/menu/roles";
     }
 
     @ApiOperation(value = "资源详细信息页面")
     @GetMapping("/detail/{id}")
     public String toDetail(@PathVariable("id") Menu menu, Model model) {
         model.addAttribute("menu", menu);
-        return "/auth/menu/detail";
+        return "/rbac/menu/detail";
     }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/RolePageController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/controller/page/RolePageController.java

@@ -1,8 +1,8 @@
-package cn.reghao.autodop.dmaster.auth.controller;
+package cn.reghao.autodop.dmaster.rbac.controller.page;
 
-import cn.reghao.autodop.dmaster.auth.db.crud.RoleQuery;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
-import cn.reghao.autodop.dmaster.auth.model.vo.RoleVO;
+import cn.reghao.autodop.dmaster.rbac.db.crud.RoleQuery;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.model.vo.RoleVO;
 import cn.reghao.autodop.dmaster.utils.db.PageList;
 import cn.reghao.autodop.dmaster.utils.db.PageSort;
 import io.swagger.annotations.Api;
@@ -21,7 +21,7 @@ import java.util.List;
  * @date 2021-04-04 21:24:18
  */
 @Api(tags = "角色页面")
-@RequestMapping("/auth/role")
+@RequestMapping("/rbac/role")
 @Controller
 public class RolePageController {
     private RoleQuery roleQuery;
@@ -47,13 +47,13 @@ public class RolePageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", pageList.getList());
-        return "/auth/role/index";
+        return "/rbac/role/index";
     }
 
     @ApiOperation("角色新增页面")
     @GetMapping("/add")
     public String addRolePage() {
-        return "/auth/role/add";
+        return "/rbac/role/add";
     }
 
     @ApiOperation("角色编辑页面")
@@ -61,7 +61,7 @@ public class RolePageController {
     public String editRolePage(@PathVariable("id") int id, Model model) {
         RoleVO vo = roleQuery.getRoleVOById(id);
         model.addAttribute("role", vo);
-        return "/auth/role/add";
+        return "/rbac/role/add";
     }
 
     @ApiOperation("角色详细信息页面")
@@ -69,14 +69,14 @@ public class RolePageController {
     public String roleDetailPage(@PathVariable("id") int id, Model model) {
         RoleVO vo = roleQuery.getRoleVOById(id);
         model.addAttribute("role", vo);
-        return "/auth/role/detail";
+        return "/rbac/role/detail";
     }
 
     @ApiOperation("设置角色可访问的资源页面")
     @GetMapping("/menus/{id}")
     public String menusPage(@PathVariable(value = "id") Integer id, Model model){
         model.addAttribute("id", id);
-        return "/auth/role/menus";
+        return "/rbac/role/menus";
     }
 
     @ApiOperation("拥有角色的所有用户页面")
@@ -84,6 +84,6 @@ public class RolePageController {
     public String userListWithRole(@PathVariable("id") Integer roleId, Model model) {
         List<User> list = roleQuery.getUsersByRoleId(roleId);
         model.addAttribute("list", list);
-        return "/auth/role/users";
+        return "/rbac/role/users";
     }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/UserPageController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/controller/page/UserPageController.java

@@ -1,10 +1,10 @@
-package cn.reghao.autodop.dmaster.auth.controller;
+package cn.reghao.autodop.dmaster.rbac.controller.page;
 
-import cn.reghao.autodop.dmaster.auth.db.crud.RoleQuery;
-import cn.reghao.autodop.dmaster.auth.db.crud.UserQuery;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
-import cn.reghao.autodop.dmaster.auth.model.vo.UserVO;
+import cn.reghao.autodop.dmaster.rbac.db.crud.RoleQuery;
+import cn.reghao.autodop.dmaster.rbac.db.crud.UserQuery;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.model.vo.UserVO;
 import cn.reghao.autodop.dmaster.utils.db.PageList;
 import cn.reghao.autodop.dmaster.utils.db.PageSort;
 import io.swagger.annotations.Api;
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
  * @date 2021-04-04 21:24:18
  */
 @Api(tags = "用户页面")
-@RequestMapping("/auth/user")
+@RequestMapping("/rbac/user")
 @Controller
 public class UserPageController {
     private UserQuery userQuery;
@@ -54,7 +54,7 @@ public class UserPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", pageList.getList());
-        return "/auth/user/index";
+        return "/rbac/user/index";
     }
 
     @ApiOperation(value = "新增用户页面")
@@ -65,7 +65,7 @@ public class UserPageController {
 
         model.addAttribute("allRoles", allRoles);
         model.addAttribute("userRoles", userRoles);
-        return "/auth/user/add";
+        return "/rbac/user/add";
     }
 
     @ApiOperation(value = "用户信息编辑页面")
@@ -77,7 +77,7 @@ public class UserPageController {
         model.addAttribute("allRoles", allRoles);
         model.addAttribute("userRoles", userRoles);
         model.addAttribute("user", user);
-        return "/auth/user/edit";
+        return "/rbac/user/edit";
     }
 
     @ApiOperation(value = "用户详细信息页面")
@@ -89,14 +89,14 @@ public class UserPageController {
 
         model.addAttribute("roles", names.toString());
         model.addAttribute("user", user);
-        return "/auth/user/detail";
+        return "/rbac/user/detail";
     }
 
     @ApiOperation(value = "用户修改密码页面")
     @GetMapping("/passwd/{id}")
     public String modifyPasswordPage(@PathVariable("id") Integer id, Model model) {
         model.addAttribute("id", id);
-        return "/auth/user/passwd";
+        return "/rbac/user/passwd";
     }
 
     @ApiOperation(value = "用户角色分配页面")
@@ -109,6 +109,6 @@ public class UserPageController {
         model.addAttribute("id", userId);
         model.addAttribute("list", roles);
         model.addAttribute("authRoles", authRoles);
-        return "/auth/user/role";
+        return "/rbac/user/role";
     }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/crud/MenuCrud.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/db/crud/MenuCrud.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.auth.db.crud;
+package cn.reghao.autodop.dmaster.rbac.db.crud;
 
-import cn.reghao.autodop.dmaster.auth.db.repository.MenuRepository;
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.db.repository.MenuRepository;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/crud/MenuQuery.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/db/crud/MenuQuery.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.auth.db.crud;
+package cn.reghao.autodop.dmaster.rbac.db.crud;
 
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
-import cn.reghao.autodop.dmaster.auth.db.repository.MenuRepository;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.db.repository.MenuRepository;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/crud/RoleCrud.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/db/crud/RoleCrud.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.auth.db.crud;
+package cn.reghao.autodop.dmaster.rbac.db.crud;
 
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
-import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.db.repository.RoleRepository;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/crud/RoleQuery.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/db/crud/RoleQuery.java

@@ -1,11 +1,11 @@
-package cn.reghao.autodop.dmaster.auth.db.crud;
+package cn.reghao.autodop.dmaster.rbac.db.crud;
 
-import cn.reghao.autodop.dmaster.auth.model.po.UserAuthority;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
-import cn.reghao.autodop.dmaster.auth.model.vo.RoleVO;
-import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
-import cn.reghao.autodop.dmaster.auth.db.repository.UserRepository;
+import cn.reghao.autodop.dmaster.rbac.model.po.UserAuthority;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.model.vo.RoleVO;
+import cn.reghao.autodop.dmaster.rbac.db.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.rbac.db.repository.UserRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/crud/UserCrud.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/db/crud/UserCrud.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.auth.db.crud;
+package cn.reghao.autodop.dmaster.rbac.db.crud;
 
-import cn.reghao.autodop.dmaster.auth.db.repository.UserRepository;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.db.repository.UserRepository;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
 import org.springframework.stereotype.Service;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/crud/UserQuery.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/db/crud/UserQuery.java

@@ -1,11 +1,11 @@
-package cn.reghao.autodop.dmaster.auth.db.crud;
+package cn.reghao.autodop.dmaster.rbac.db.crud;
 
-import cn.reghao.autodop.dmaster.auth.model.po.UserAuthority;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
-import cn.reghao.autodop.dmaster.auth.model.vo.UserVO;
-import cn.reghao.autodop.dmaster.auth.db.repository.RoleRepository;
-import cn.reghao.autodop.dmaster.auth.db.repository.UserRepository;
+import cn.reghao.autodop.dmaster.rbac.model.po.UserAuthority;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.model.vo.UserVO;
+import cn.reghao.autodop.dmaster.rbac.db.repository.RoleRepository;
+import cn.reghao.autodop.dmaster.rbac.db.repository.UserRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/repository/MenuRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/db/repository/MenuRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.auth.db.repository;
+package cn.reghao.autodop.dmaster.rbac.db.repository;
 
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/repository/RoleRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/db/repository/RoleRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.auth.db.repository;
+package cn.reghao.autodop.dmaster.rbac.db.repository;
 
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/db/repository/UserRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/db/repository/UserRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.auth.db.repository;
+package cn.reghao.autodop.dmaster.rbac.db.repository;
 
-import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/constant/DataStatus.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/constant/DataStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.model.constant;
+package cn.reghao.autodop.dmaster.rbac.model.constant;
 
 /**
  * @author reghao

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/constant/MenuType.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/constant/MenuType.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.model.constant;
+package cn.reghao.autodop.dmaster.rbac.model.constant;
 
 /**
  * 菜单类型

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/constant/RoleType.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/constant/RoleType.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.model.constant;
+package cn.reghao.autodop.dmaster.rbac.model.constant;
 
 /**
  * 角色类型

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/constant/UserGender.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/constant/UserGender.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.model.constant;
+package cn.reghao.autodop.dmaster.rbac.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/dto/MenuDTO.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/dto/MenuDTO.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.auth.model.dto;
+package cn.reghao.autodop.dmaster.rbac.model.dto;
 
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.NoArgsConstructor;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/dto/UserInfo.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/dto/UserInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.model.dto;
+package cn.reghao.autodop.dmaster.rbac.model.dto;
 
 import lombok.Data;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/dto/UserRole.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/dto/UserRole.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.auth.model.dto;
+package cn.reghao.autodop.dmaster.rbac.model.dto;
 
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/po/Menu.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/po/Menu.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.model.po;
+package cn.reghao.autodop.dmaster.rbac.model.po;
 
 import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import lombok.Data;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/po/Role.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/po/Role.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.model.po;
+package cn.reghao.autodop.dmaster.rbac.model.po;
 
 import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/po/User.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/po/User.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.model.po;
+package cn.reghao.autodop.dmaster.rbac.model.po;
 
 import cn.reghao.autodop.dmaster.utils.db.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/po/UserAuthority.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/po/UserAuthority.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.model.po;
+package cn.reghao.autodop.dmaster.rbac.model.po;
 
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/vo/MenuVO.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/vo/MenuVO.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.auth.model.vo;
+package cn.reghao.autodop.dmaster.rbac.model.vo;
 
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
 import lombok.Data;
 
 import java.io.Serializable;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/vo/RoleVO.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/vo/RoleVO.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.auth.model.vo;
+package cn.reghao.autodop.dmaster.rbac.model.vo;
 
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
 import cn.reghao.util.text.DateTimeConverter;
 import lombok.Data;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/model/vo/UserVO.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/vo/UserVO.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.auth.model.vo;
+package cn.reghao.autodop.dmaster.rbac.model.vo;
 
-import cn.reghao.autodop.dmaster.auth.model.constant.UserGender;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.model.constant.UserGender;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
 import cn.reghao.util.text.DateTimeConverter;
 import lombok.Data;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/config/LoginRedirectFilter.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/security/LoginRedirectFilter.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.auth.config;
+package cn.reghao.autodop.dmaster.rbac.security;
 
-import cn.reghao.autodop.dmaster.auth.UserContext;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.UserContext;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/config/UserDetailsServiceImpl.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/security/UserDetailsServiceImpl.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.auth.config;
+package cn.reghao.autodop.dmaster.rbac.security;
 
-import cn.reghao.autodop.dmaster.auth.model.po.User;
-import cn.reghao.autodop.dmaster.auth.service.UserService;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.service.UserService;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/config/UsernamePasswordAuthProvider.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/security/UsernamePasswordAuthProvider.java

@@ -1,8 +1,8 @@
-package cn.reghao.autodop.dmaster.auth.config;
+package cn.reghao.autodop.dmaster.rbac.security;
 
 import cn.reghao.util.security.Cryptor;
 import cn.reghao.util.security.Md5Cryptor;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/config/UsernamePasswordException.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/security/UsernamePasswordException.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.config;
+package cn.reghao.autodop.dmaster.rbac.security;
 
 import org.springframework.security.core.AuthenticationException;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/config/WebAuthFailureHandlerImpl.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/security/WebAuthFailureHandlerImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.config;
+package cn.reghao.autodop.dmaster.rbac.security;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.AuthenticationException;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/config/WebAuthSuccessHandlerImpl.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/security/WebAuthSuccessHandlerImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.config;
+package cn.reghao.autodop.dmaster.rbac.security;
 
 import cn.reghao.util.result.WebBody;
 import org.springframework.security.core.Authentication;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/config/WebSecurityConfig.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/security/WebSecurityConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.auth.config;
+package cn.reghao.autodop.dmaster.rbac.security;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/service/HomeService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/service/HomeService.java

@@ -1,8 +1,8 @@
-package cn.reghao.autodop.dmaster.view.service;
+package cn.reghao.autodop.dmaster.rbac.service;
 
-import cn.reghao.autodop.dmaster.auth.db.crud.RoleQuery;
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.db.crud.RoleQuery;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/MenuService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/service/MenuService.java

@@ -1,8 +1,8 @@
-package cn.reghao.autodop.dmaster.auth.service;
+package cn.reghao.autodop.dmaster.rbac.service;
 
 import cn.reghao.util.result.Result;
-import cn.reghao.autodop.dmaster.auth.model.dto.MenuDTO;
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.model.dto.MenuDTO;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
 
 /**
  * @author reghao

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/MenuServiceImpl.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/service/MenuServiceImpl.java

@@ -1,14 +1,14 @@
-package cn.reghao.autodop.dmaster.auth.service;
+package cn.reghao.autodop.dmaster.rbac.service;
 
 import cn.reghao.util.result.Result;
 import cn.reghao.util.result.ResultStatus;
-import cn.reghao.autodop.dmaster.auth.db.crud.MenuCrud;
-import cn.reghao.autodop.dmaster.auth.db.crud.MenuQuery;
-import cn.reghao.autodop.dmaster.auth.db.crud.RoleCrud;
-import cn.reghao.autodop.dmaster.auth.model.constant.MenuType;
-import cn.reghao.autodop.dmaster.auth.model.dto.MenuDTO;
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.db.crud.MenuCrud;
+import cn.reghao.autodop.dmaster.rbac.db.crud.MenuQuery;
+import cn.reghao.autodop.dmaster.rbac.db.crud.RoleCrud;
+import cn.reghao.autodop.dmaster.rbac.model.constant.MenuType;
+import cn.reghao.autodop.dmaster.rbac.model.dto.MenuDTO;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/RoleService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/service/RoleService.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.auth.service;
+package cn.reghao.autodop.dmaster.rbac.service;
 
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
 
 import java.util.Set;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/RoleServiceImpl.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/service/RoleServiceImpl.java

@@ -1,10 +1,10 @@
-package cn.reghao.autodop.dmaster.auth.service;
+package cn.reghao.autodop.dmaster.rbac.service;
 
-import cn.reghao.autodop.dmaster.auth.db.crud.RoleCrud;
-import cn.reghao.autodop.dmaster.auth.db.crud.RoleQuery;
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.db.crud.RoleCrud;
+import cn.reghao.autodop.dmaster.rbac.db.crud.RoleQuery;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/UserService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/service/UserService.java

@@ -1,8 +1,8 @@
-package cn.reghao.autodop.dmaster.auth.service;
+package cn.reghao.autodop.dmaster.rbac.service;
 
-import cn.reghao.autodop.dmaster.auth.model.po.User;
-import cn.reghao.autodop.dmaster.auth.model.dto.UserInfo;
-import cn.reghao.autodop.dmaster.auth.model.dto.UserRole;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.model.dto.UserInfo;
+import cn.reghao.autodop.dmaster.rbac.model.dto.UserRole;
 
 /**
  * @author reghao

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/service/UserServiceImpl.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/service/UserServiceImpl.java

@@ -1,14 +1,14 @@
-package cn.reghao.autodop.dmaster.auth.service;
+package cn.reghao.autodop.dmaster.rbac.service;
 
 import cn.reghao.util.security.Cryptor;
 import cn.reghao.util.security.Md5Cryptor;
 import cn.reghao.util.security.Salt;
-import cn.reghao.autodop.dmaster.auth.db.crud.UserCrud;
-import cn.reghao.autodop.dmaster.auth.db.crud.UserQuery;
-import cn.reghao.autodop.dmaster.auth.model.dto.UserInfo;
-import cn.reghao.autodop.dmaster.auth.model.dto.UserRole;
-import cn.reghao.autodop.dmaster.auth.model.po.UserAuthority;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.db.crud.UserCrud;
+import cn.reghao.autodop.dmaster.rbac.db.crud.UserQuery;
+import cn.reghao.autodop.dmaster.rbac.model.dto.UserInfo;
+import cn.reghao.autodop.dmaster.rbac.model.dto.UserRole;
+import cn.reghao.autodop.dmaster.rbac.model.po.UserAuthority;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/thymeleaf/TimoDialect.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/thymeleaf/TimoDialect.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.view.thymeleaf;
+package cn.reghao.autodop.dmaster.rbac.thymeleaf;
 
-import cn.reghao.autodop.dmaster.view.thymeleaf.attribute.SelectDictAttrProcessor;
-import cn.reghao.autodop.dmaster.view.thymeleaf.attribute.SelectListAttrProcessor;
+import cn.reghao.autodop.dmaster.rbac.thymeleaf.attribute.SelectDictAttrProcessor;
+import cn.reghao.autodop.dmaster.rbac.thymeleaf.attribute.SelectListAttrProcessor;
 import org.thymeleaf.dialect.AbstractProcessorDialect;
 import org.thymeleaf.dialect.IExpressionObjectDialect;
 import org.thymeleaf.expression.IExpressionObjectFactory;

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/thymeleaf/TimoExpressionObjectFactory.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/thymeleaf/TimoExpressionObjectFactory.java

@@ -1,8 +1,8 @@
-package cn.reghao.autodop.dmaster.view.thymeleaf;
+package cn.reghao.autodop.dmaster.rbac.thymeleaf;
 
-import cn.reghao.autodop.dmaster.view.thymeleaf.utility.DictUtil;
-import cn.reghao.autodop.dmaster.view.thymeleaf.utility.LogUtil;
-import cn.reghao.autodop.dmaster.view.thymeleaf.utility.PageUtil;
+import cn.reghao.autodop.dmaster.rbac.thymeleaf.utility.DictUtil;
+import cn.reghao.autodop.dmaster.rbac.thymeleaf.utility.LogUtil;
+import cn.reghao.autodop.dmaster.rbac.thymeleaf.utility.PageUtil;
 import org.thymeleaf.context.IExpressionContext;
 import org.thymeleaf.expression.IExpressionObjectFactory;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/thymeleaf/attribute/SelectDictAttrProcessor.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/thymeleaf/attribute/SelectDictAttrProcessor.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.view.thymeleaf.attribute;
+package cn.reghao.autodop.dmaster.rbac.thymeleaf.attribute;
 
 import cn.reghao.autodop.dmaster.app.constant.EnvList;
-import cn.reghao.autodop.dmaster.auth.model.constant.MenuType;
+import cn.reghao.autodop.dmaster.rbac.model.constant.MenuType;
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.context.ITemplateContext;
 import org.thymeleaf.engine.AttributeName;

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/thymeleaf/attribute/SelectListAttrProcessor.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/thymeleaf/attribute/SelectListAttrProcessor.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.view.thymeleaf.attribute;
+package cn.reghao.autodop.dmaster.rbac.thymeleaf.attribute;
 
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.context.ITemplateContext;

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/thymeleaf/config/ThymeleafAutoConfig.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/thymeleaf/config/ThymeleafAutoConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.view.thymeleaf.config;
+package cn.reghao.autodop.dmaster.rbac.thymeleaf.config;
 
 import org.springframework.context.annotation.ComponentScan;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/thymeleaf/config/ThymeleafConfig.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/thymeleaf/config/ThymeleafConfig.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.view.thymeleaf.config;
+package cn.reghao.autodop.dmaster.rbac.thymeleaf.config;
 
-import cn.reghao.autodop.dmaster.view.thymeleaf.TimoDialect;
+import cn.reghao.autodop.dmaster.rbac.thymeleaf.TimoDialect;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/thymeleaf/utility/DictUtil.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/thymeleaf/utility/DictUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.view.thymeleaf.utility;
+package cn.reghao.autodop.dmaster.rbac.thymeleaf.utility;
 
 /*import com.linln.common.utils.EhCacheUtil;
 import com.linln.modules.system.domain.Dict;
@@ -7,7 +7,6 @@ import com.linln.common.utils.SpringContextUtil;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.Element;*/
 
-import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/thymeleaf/utility/LogUtil.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/thymeleaf/utility/LogUtil.java

@@ -1,14 +1,10 @@
-package cn.reghao.autodop.dmaster.view.thymeleaf.utility;
+package cn.reghao.autodop.dmaster.rbac.thymeleaf.utility;
 
 /*import com.linln.common.utils.EntityBeanUtil;
 import com.linln.common.utils.SpringContextUtil;
 import com.linln.modules.system.domain.ActionLog;
 import com.linln.modules.system.service.ActionLogService;*/
 
-import javax.persistence.Table;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
 /**
  * @author 小懒虫
  * @date 2018/10/16

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/thymeleaf/utility/PageUtil.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/thymeleaf/utility/PageUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.view.thymeleaf.utility;
+package cn.reghao.autodop.dmaster.rbac.thymeleaf.utility;
 
 import org.springframework.data.domain.Page;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/view/thymeleaf/xml/Timo-Dialect.xml → dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/thymeleaf/xml/Timo-Dialect.xml

@@ -23,11 +23,11 @@
         xmlns="http://www.thymeleaf.org/extras/dialect"
         prefix="mo"
         namespace-uri="https://gitee.com/aun/Timo"
-        class="cn.reghao.autodop.dmaster.view.thymeleaf.TimoDialect">
+        class="cn.reghao.autodop.dmaster.rbac.thymeleaf.TimoDialect">
 
     <!-- 自定义属性标签 -->
     <attribute-processor name="list"
-                         class="cn.reghao.autodop.dmaster.view.thymeleaf.attribute.SelectListAttrProcessor">
+                         class="cn.reghao.autodop.dmaster.rbac.thymeleaf.attribute.SelectListAttrProcessor">
         <documentation><![CDATA[
 		自定义下拉列表生成标签，值可以为数组和集合！
 		mo-selected属性：默认选择的值
@@ -35,7 +35,7 @@
 		]]></documentation>
     </attribute-processor>
     <attribute-processor name="dict"
-                         class="cn.reghao.autodop.dmaster.view.thymeleaf.attribute.SelectDictAttrProcessor">
+                         class="cn.reghao.autodop.dmaster.rbac.thymeleaf.attribute.SelectDictAttrProcessor">
         <documentation><![CDATA[
 		根据字典标识生成下拉列表，值可以为数组和集合！
 		mo-selected属性：默认选择的值
@@ -44,8 +44,8 @@
     </attribute-processor>
 
     <!-- 自定义对象工具 -->
-    <expression-object name="pageUtil" class="cn.reghao.autodop.dmaster.view.thymeleaf.utility.PageUtil"/>
-    <expression-object name="dicts" class="cn.reghao.autodop.dmaster.view.thymeleaf.utility.DictUtil"/>
+    <expression-object name="pageUtil" class="cn.reghao.autodop.dmaster.rbac.thymeleaf.utility.PageUtil"/>
+    <expression-object name="dicts" class="cn.reghao.autodop.dmaster.rbac.thymeleaf.utility.DictUtil"/>
 
 
 </dialect>

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/controller/TestController.java

@@ -1,11 +1,11 @@
 package cn.reghao.autodop.dmaster.sys.controller;
 
-import cn.reghao.autodop.dmaster.auth.db.crud.*;
-import cn.reghao.autodop.dmaster.auth.model.constant.MenuType;
-import cn.reghao.autodop.dmaster.auth.model.po.UserAuthority;
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.db.crud.*;
+import cn.reghao.autodop.dmaster.rbac.model.constant.MenuType;
+import cn.reghao.autodop.dmaster.rbac.model.po.UserAuthority;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
 import cn.reghao.util.result.WebBody;
 import cn.reghao.util.security.Cryptor;
 import cn.reghao.util.security.Md5Cryptor;

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/service/SysConfig.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.sys.service;
 
-import cn.reghao.autodop.dmaster.auth.model.po.Menu;
-import cn.reghao.autodop.dmaster.auth.model.po.Role;
-import cn.reghao.autodop.dmaster.auth.model.po.User;
+import cn.reghao.autodop.dmaster.rbac.model.po.Menu;
+import cn.reghao.autodop.dmaster.rbac.model.po.Role;
+import cn.reghao.autodop.dmaster.rbac.model.po.User;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

dmaster/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-cn.reghao.autodop.dmaster.view.thymeleaf.config.ThymeleafAutoConfig
+cn.reghao.autodop.dmaster.rbac.thymeleaf.config.ThymeleafAutoConfig

dmaster/src/main/resources/application.yml

@@ -14,6 +14,16 @@ spring:
     active: @profile.active@
   banner:
     location: classpath:banner.txt
+  mvc:
+    dispatch-options-request: true
+  thymeleaf:
+    prefix: classpath:/templates
+    suffix: .html
+    mode: HTML
+    encoding: utf-8
+    servlet:
+      content-type: text/html
+    cache: false
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.zaxxer.hikari.HikariDataSource
@@ -35,14 +45,4 @@ spring:
       hibernate:
         hbm2ddl:
           auto: update
-        dialect: org.hibernate.dialect.MySQL57Dialect
-  mvc:
-    dispatch-options-request: true
-  thymeleaf:
-    prefix: classpath:/templates
-    suffix: .html
-    mode: HTML
-    encoding: utf-8
-    servlet:
-      content-type: text/html
-    cache: false
+        dialect: org.hibernate.dialect.MySQL57Dialect

dmaster/src/main/resources/templates/auth/menu/add.html → dmaster/src/main/resources/templates/rbac/menu/add.html

@@ -6,7 +6,7 @@
 </head>
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/auth/menu}">
+    <form th:action="@{/api/rbac/menu}">
         <div class="layui-form-item">
             <label class="layui-form-label required">名字</label>
             <div class="layui-input-inline">
@@ -36,7 +36,7 @@
             <label class="layui-form-label required">父级菜单</label>
             <div class="layui-input-inline">
                 <label>
-                    <input class="layui-input select-tree" th:attr="data-url=@{/api/auth/menu/1}, data-value=${pMenu?.id}"
+                    <input class="layui-input select-tree" th:attr="data-url=@{/api/rbac/menu/1}, data-value=${pMenu?.id}"
                            type="text" name="pid"  placeholder="请选择父级菜单（必须是目录类型）">
                 </label>
             </div>
@@ -54,7 +54,7 @@
             <div class="layui-input-inline">
                 <label>
                     <select class="select-pos" name="pos" lay-verify="pos"
-                            th:attr="data-url=@{/api/auth/menu/sorted}, data-id=${menu?.id}, data-pos=${menu?.pos}"></select>
+                            th:attr="data-url=@{/api/rbac/menu/sorted}, data-id=${menu?.id}, data-pos=${menu?.pos}"></select>
                 </label>
             </div>
             <div class="layui-input-info">（之后）</div>

dmaster/src/main/resources/templates/auth/menu/edit.html → dmaster/src/main/resources/templates/rbac/menu/edit.html

@@ -5,7 +5,7 @@
 </head>
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/auth/menu/edit}">
+    <form th:action="@{/api/rbac/menu/edit}">
         <input type="hidden" name="menuId" th:value="${menu.menuId}"/>
         <div class="layui-form-item">
             <label class="layui-form-label required">名字</label>
@@ -36,7 +36,7 @@
             <label class="layui-form-label required">父级菜单</label>
             <div class="layui-input-inline">
                 <label>
-                    <input class="layui-input select-tree" th:attr="data-url=@{/api/auth/menu/1}, data-value=${pMenu.id}"
+                    <input class="layui-input select-tree" th:attr="data-url=@{/api/rbac/menu/1}, data-value=${pMenu.id}"
                            type="text" name="pid"  placeholder="请选择父级菜单（必须是目录类型）" th:value="${pMenu?.name}">
                 </label>
             </div>
@@ -46,7 +46,7 @@
             <div class="layui-input-inline">
                 <label>
                     <select class="select-pos" name="pos" lay-verify="pos"
-                            th:attr="data-url=@{/api/auth/menu/sorted}, data-id=${menu.menuId}, data-pos=${menu.pos}"></select>
+                            th:attr="data-url=@{/api/rbac/menu/sorted}, data-id=${menu.menuId}, data-pos=${menu.pos}"></select>
                 </label>
             </div>
             <div class="layui-input-info">（之后）</div>

dmaster/src/main/resources/templates/auth/menu/index.html → dmaster/src/main/resources/templates/rbac/menu/index.html

@@ -5,7 +5,7 @@
         <link rel="stylesheet" th:href="@{/lib/zTree_v3/css/zTreeStyle/zTreeStyle.css}" type="text/css">
     </head>
     <body class="timo-layout-page">
-        <div class="layui-card timo-tree" th:attr="data-url=@{'/api/auth/menu/' + ${isEnabled}}">
+        <div class="layui-card timo-tree" th:attr="data-url=@{'/api/rbac/menu/' + ${isEnabled}}">
             <div class="layui-card-header timo-card-header">
                 <span>
                     <i class="fa fa-bars"></i>
@@ -35,7 +35,7 @@
                         </div>
                         <div class="pull-right screen-btn-group">
                             <button class="layui-btn open-popup popup-add" data-title="添加资源"
-                                    th:attr="data-url=@{/auth/menu/add}">
+                                    th:attr="data-url=@{/rbac/menu/add}">
                                 <i class="fa fa-plus"></i>
                                 添加
                             </button>
@@ -45,10 +45,10 @@
                                 </button>
                                 <dl class="layui-nav-child layui-anim layui-anim-upbit">
                                     <dd>
-                                        <a class="ajax-status" th:href="@{/auth/menu/status/1}">启用</a>
+                                        <a class="ajax-status" th:href="@{/rbac/menu/status/1}">启用</a>
                                     </dd>
                                     <dd>
-                                        <a class="ajax-status" th:href="@{/auth/menu/status/0}">停用</a>
+                                        <a class="ajax-status" th:href="@{/rbac/menu/status/0}">停用</a>
                                     </dd>
                                 </dl>
                             </div>
@@ -84,19 +84,19 @@
                                     <td>{{type}}</td>
                                     <td>
                                         <a class="open-popup" data-title="已授予的角色"
-                                           th:attr="data-url=@{'/auth/menu/roleList/{{id}}'}" data-size="800,600"
+                                           th:attr="data-url=@{'/rbac/menu/roleList/{{id}}'}" data-size="800,600"
                                            href="#">查看</a>
                                     </td>
                                     <td>
                                         <a class="open-popup popup-edit" data-title="编辑资源"
-                                           th:attr="data-url=@{'/auth/menu/edit/{{id}}'}" href="#">编辑
+                                           th:attr="data-url=@{'/rbac/menu/edit/{{id}}'}" href="#">编辑
                                         </a>
                                         <a class="open-popup" data-title="详细信息"
-                                           th:attr="data-url=@{'/auth/menu/detail/{{id}}'}"
+                                           th:attr="data-url=@{'/rbac/menu/detail/{{id}}'}"
                                            data-size="800,600" href="#">详细
                                         </a>
                                         <a class="ajax-delete popup-delete" th:attr="data-msg='确定要删除 {{name}}?'"
-                                           th:href="@{'/api/auth/menu/{{id}}'}">删除
+                                           th:href="@{'/api/rbac/menu/{{id}}'}">删除
                                         </a>
                                     </td>
                                 </tr>

dmaster/src/main/resources/templates/auth/role/add.html → dmaster/src/main/resources/templates/rbac/role/add.html

@@ -4,7 +4,7 @@
 </head>
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/auth/role}">
+    <form th:action="@{/api/rbac/role}">
         <input type="hidden" name="id" th:if="${role}" th:value="${role?.roleId}"/>
         <div class="layui-form-item">
             <label class="layui-form-label required">角色</label>

dmaster/src/main/resources/templates/auth/role/index.html → dmaster/src/main/resources/templates/rbac/role/index.html

@@ -25,7 +25,7 @@
                 </div>
             </div>
             <div class="pull-right screen-btn-group">
-                <button class="layui-btn open-popup" data-title="添加角色" th:attr="data-url=@{/auth/role/add}"
+                <button class="layui-btn open-popup" data-title="添加角色" th:attr="data-url=@{/rbac/role/add}"
                         data-size="460,357">
                     <i class="fa fa-plus"></i> 添加
                 </button>
@@ -52,21 +52,21 @@
                     <td th:text="${item.createTime}">创建时间</td>
                     <td>
                         <a class="open-popup" data-title="拥有角色的用户"
-                           th:attr="data-url=@{'/auth/role/users/'+${item.roleId}}" data-size="800,600"
+                           th:attr="data-url=@{'/rbac/role/users/'+${item.roleId}}" data-size="800,600"
                            href="#">查看</a>
                     </td>
                     <td>
                         <a class="open-popup" data-title="资源授权"
-                           th:attr="data-url=@{'/auth/role/menus/'+${item.roleId}}" data-size="800,600"
+                           th:attr="data-url=@{'/rbac/role/menus/'+${item.roleId}}" data-size="800,600"
                            href="#">设置</a>
                     </td>
                     <td>
-                        <a class="open-popup" data-title="编辑角色" th:attr="data-url=@{'/auth/role/edit/'+${item.roleId}}"
+                        <a class="open-popup" data-title="编辑角色" th:attr="data-url=@{'/rbac/role/edit/'+${item.roleId}}"
                            data-size="460,357" href="#">编辑</a>
-                        <a class="open-popup" data-title="详细信息" th:attr="data-url=@{'/auth/role/detail/'+${item.roleId}}"
+                        <a class="open-popup" data-title="详细信息" th:attr="data-url=@{'/rbac/role/detail/'+${item.roleId}}"
                            data-size="800,600" href="#">详细</a>
                         <a class="ajax-delete" th:attr="data-msg='确定要删除 '+ ${item.title} + '?'"
-                           th:href="@{'/api/auth/role/' + ${item.roleId}}">删除</a>
+                           th:href="@{'/api/rbac/role/' + ${item.roleId}}">删除</a>
                     </td>
                 </tr>
                 </tbody>

dmaster/src/main/resources/templates/auth/role/menus.html → dmaster/src/main/resources/templates/rbac/role/menus.html

@@ -1,108 +1,108 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
-    <link rel="stylesheet" th:href="@{/lib/zTree_v3/css/zTreeStyle/zTreeStyle.css}" type="text/css">
-    <style>
-        .ztree{
-            margin-left: 12px;
-            margin-bottom: 70px;
-        }
-        .timo-compile .timo-finally{
-            position: fixed;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            padding-bottom: 14px;
-            margin-bottom: 0;
-            background-color: #ffffff;
-        }
-    </style>
-</head>
-<body>
-<div class="layui-form timo-compile">
-    <ul id="authTree" class="ztree" th:attr="data-url=@{'/api/auth/role/menus/'+${id}}"></ul>
-    <div class="layui-form-item timo-finally">
-        <button id="submit" class="layui-btn" th:attr="data-url=@{/api/auth/role/menus}, data-id=${id}">
-            <i class="fa fa-check-circle"></i> 保存
-        </button>
-        <button class="layui-btn btn-secondary close-popup">
-            <i class="fa fa-times-circle"></i> 关闭
-        </button>
-    </div>
-</div>
-<script th:replace="/common/template :: script"></script>
-<script type="text/javascript" th:src="@{/js/plugins/jquery-2.2.4.min.js}"></script>
-<script type="text/javascript" th:src="@{/lib/zTree_v3/js/jquery.ztree.core.min.js}"></script>
-<script type="text/javascript" th:src="@{/lib/zTree_v3/js/jquery.ztree.excheck.min.js}"></script>
-<SCRIPT type="text/javascript">
-    $(function(){
-        var setting = {
-            check: {
-                enable: true,
-                chkboxType: { "Y" : "ps", "N" : "ps" }
-            },
-            data: {
-                simpleData: {
-                    enable: true
-                }
-            }
-        };
-
-        // 初始化 ztree
-        $.get($("#authTree").data("url"), function(result){
-            console.log(result)
-            var keyPid = [];
-            result.data.forEach(function(item){
-                keyPid[item.pid] = true;
-            });
-            var zNodes =[];
-            result.data.forEach(function (item) {
-                var menu = {
-                    id: item.id,
-                    pId: item.pid,
-                    name: item.name
-                };
-                if(item.pid === 0){
-                    menu.open = true;
-                }
-                if(item.url.indexOf("/index") !== -1 && keyPid[item.id]){
-                    var index = {
-                        id: item.id*-1,
-                        pId: item.id,
-                        name: "列表"
-                    };
-                    if(item.remark === "auth:true"){
-                        index.checked = true;
-                    }
-                    zNodes.push(index);
-                }
-                if(item.remark === "auth:true"){
-                    menu.checked = true;
-                }
-                zNodes.push(menu);
-            });
-            $.fn.zTree.init($("#authTree"), setting, zNodes);
-        });
-
-        // 提交请求
-        $("#submit").click(function () {
-            var zTreeObj = $.fn.zTree.getZTreeObj("authTree");
-            var menuList = zTreeObj.getCheckedNodes(true);
-            var menuIds = [];
-            menuIds.push("id="+$(this).data("id"));
-            menuList.forEach(function(item){
-                if(item.id > 0){
-                    menuIds.push("menuId="+item.id);
-                }
-            });
-            $.post($(this).data("url"), menuIds.join("&"), function(result){
-                if (result.data == null) {
-                    result.data = 'submit[refresh]';
-                }
-                $.fn.Messager(result);
-            });
-        });
-    });
-</SCRIPT>
-</body>
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:replace="/common/template :: header(~{::title},~{::link},~{::style})">
+    <link rel="stylesheet" th:href="@{/lib/zTree_v3/css/zTreeStyle/zTreeStyle.css}" type="text/css">
+    <style>
+        .ztree{
+            margin-left: 12px;
+            margin-bottom: 70px;
+        }
+        .timo-compile .timo-finally{
+            position: fixed;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            padding-bottom: 14px;
+            margin-bottom: 0;
+            background-color: #ffffff;
+        }
+    </style>
+</head>
+<body>
+<div class="layui-form timo-compile">
+    <ul id="authTree" class="ztree" th:attr="data-url=@{'/api/rbac/role/menus/'+${id}}"></ul>
+    <div class="layui-form-item timo-finally">
+        <button id="submit" class="layui-btn" th:attr="data-url=@{/api/rbac/role/menus}, data-id=${id}">
+            <i class="fa fa-check-circle"></i> 保存
+        </button>
+        <button class="layui-btn btn-secondary close-popup">
+            <i class="fa fa-times-circle"></i> 关闭
+        </button>
+    </div>
+</div>
+<script th:replace="/common/template :: script"></script>
+<script type="text/javascript" th:src="@{/js/plugins/jquery-2.2.4.min.js}"></script>
+<script type="text/javascript" th:src="@{/lib/zTree_v3/js/jquery.ztree.core.min.js}"></script>
+<script type="text/javascript" th:src="@{/lib/zTree_v3/js/jquery.ztree.excheck.min.js}"></script>
+<SCRIPT type="text/javascript">
+    $(function(){
+        var setting = {
+            check: {
+                enable: true,
+                chkboxType: { "Y" : "ps", "N" : "ps" }
+            },
+            data: {
+                simpleData: {
+                    enable: true
+                }
+            }
+        };
+
+        // 初始化 ztree
+        $.get($("#authTree").data("url"), function(result){
+            console.log(result)
+            var keyPid = [];
+            result.data.forEach(function(item){
+                keyPid[item.pid] = true;
+            });
+            var zNodes =[];
+            result.data.forEach(function (item) {
+                var menu = {
+                    id: item.id,
+                    pId: item.pid,
+                    name: item.name
+                };
+                if(item.pid === 0){
+                    menu.open = true;
+                }
+                if(item.url.indexOf("/index") !== -1 && keyPid[item.id]){
+                    var index = {
+                        id: item.id*-1,
+                        pId: item.id,
+                        name: "列表"
+                    };
+                    if(item.remark === "auth:true"){
+                        index.checked = true;
+                    }
+                    zNodes.push(index);
+                }
+                if(item.remark === "auth:true"){
+                    menu.checked = true;
+                }
+                zNodes.push(menu);
+            });
+            $.fn.zTree.init($("#authTree"), setting, zNodes);
+        });
+
+        // 提交请求
+        $("#submit").click(function () {
+            var zTreeObj = $.fn.zTree.getZTreeObj("authTree");
+            var menuList = zTreeObj.getCheckedNodes(true);
+            var menuIds = [];
+            menuIds.push("id="+$(this).data("id"));
+            menuList.forEach(function(item){
+                if(item.id > 0){
+                    menuIds.push("menuId="+item.id);
+                }
+            });
+            $.post($(this).data("url"), menuIds.join("&"), function(result){
+                if (result.data == null) {
+                    result.data = 'submit[refresh]';
+                }
+                $.fn.Messager(result);
+            });
+        });
+    });
+</SCRIPT>
+</body>
 </html>

dmaster/src/main/resources/templates/auth/role/users.html → dmaster/src/main/resources/templates/rbac/role/users.html

@@ -23,7 +23,7 @@
             <tbody>
             <tr th:each="item:${list}">
                 <td>[[${item.nickname}]]</td>
-                <td><a th:href="@{'/auth/user/detail/'+${item.id}}">查看</a></td>
+                <td><a th:href="@{'/rbac/user/detail/'+${item.id}}">查看</a></td>
             </tr>
             <tr th:if="${list.isEmpty()}">
                 <td style="text-align: center" colspan="3">未有分配该角色的用户</td>

dmaster/src/main/resources/templates/auth/user/add.html → dmaster/src/main/resources/templates/rbac/user/add.html

@@ -3,7 +3,7 @@
 <head th:replace="/common/template :: header(~{::title},~{::link},~{::style})"></head>
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/auth/user}">
+    <form th:action="@{/api/rbac/user}">
         <div class="layui-form-item">
             <label class="layui-form-label required">登录名</label>
             <div class="layui-input-inline">

dmaster/src/main/resources/templates/auth/user/edit.html → dmaster/src/main/resources/templates/rbac/user/edit.html

@@ -3,7 +3,7 @@
 <head th:replace="/common/template :: header(~{::title},~{::link},~{::style})"></head>
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/auth/user/modify}">
+    <form th:action="@{/api/rbac/user/modify}">
         <input type="hidden" name="userId" th:value="${user.id}"/>
         <div class="layui-form-item">
             <label class="layui-form-label required">登录名</label>

dmaster/src/main/resources/templates/auth/user/index.html → dmaster/src/main/resources/templates/rbac/user/index.html

@@ -25,15 +25,15 @@
             </div>
             <div class="pull-right screen-btn-group">
                 <div class="btn-group-right">
-                    <button class="layui-btn open-popup" data-title="添加用户" th:attr="data-url=@{/auth/user/add}"
+                    <button class="layui-btn open-popup" data-title="添加用户" th:attr="data-url=@{/rbac/user/add}"
                              data-size="auto">
                         <i class="fa fa-plus"></i> 添加
                     </button>
                     <div class="btn-group">
                         <button class="layui-btn">启用/禁用<span class="caret"></span></button>
                         <dl class="layui-nav-child layui-anim layui-anim-upbit">
-                            <dd><a class="ajax-status" th:href="@{/api/auth/user/status/1}">启用</a></dd>
-                            <dd><a class="ajax-status" th:href="@{/api/auth/user/status/0}">禁用</a></dd>
+                            <dd><a class="ajax-status" th:href="@{/api/rbac/user/status/1}">启用</a></dd>
+                            <dd><a class="ajax-status" th:href="@{/api/rbac/user/status/0}">禁用</a></dd>
                         </dl>
                     </div>
                 </div>
@@ -72,21 +72,21 @@
                     <td th:text="${item.status}">状态</td>
                     <td>
                         <a class="open-popup" data-title="分配角色"
-                           th:attr="data-url=@{'/auth/user/role/'+${item.userId}}" data-size="640,480"
+                           th:attr="data-url=@{'/rbac/user/role/'+${item.userId}}" data-size="640,480"
                            href="#">设置</a>
                     </td>
                     <td>
                         <a class="open-popup" data-title="修改密码"
-                           th:attr="data-url=@{'/auth/user/passwd/'+${item.userId}}" data-size="640,480"
+                           th:attr="data-url=@{'/rbac/user/passwd/'+${item.userId}}" data-size="640,480"
                            href="#">修改</a>
                     </td>
                     <td>
-                        <a class="open-popup" data-title="编辑用户" th:attr="data-url=@{'/auth/user/edit/'+${item.userId}}"
+                        <a class="open-popup" data-title="编辑用户" th:attr="data-url=@{'/rbac/user/edit/'+${item.userId}}"
                            data-size="640,480" href="#">编辑</a>
-                        <a class="open-popup" data-title="详细信息" th:attr="data-url=@{'/auth/user/detail/'+${item.userId}}"
+                        <a class="open-popup" data-title="详细信息" th:attr="data-url=@{'/rbac/user/detail/'+${item.userId}}"
                            data-size="640,480" href="#">详细</a>
                         <a class="ajax-delete" th:attr="data-msg='确定要删除 '+ ${item.username} + '?'"
-                           th:href="@{'/api/auth/user/' + ${item.userId}}">删除</a>
+                           th:href="@{'/api/rbac/user/' + ${item.userId}}">删除</a>
                     </td>
                 </tr>
                 </tbody>

dmaster/src/main/resources/templates/auth/user/passwd.html → dmaster/src/main/resources/templates/rbac/user/passwd.html

@@ -4,7 +4,7 @@
 </head>
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/auth/user/passwd}">
+    <form th:action="@{/api/rbac/user/passwd}">
         <input type="hidden" name="id" th:value="${id}"/>
         <div class="layui-form-item">
             <label class="layui-form-label">新密码</label>

dmaster/src/main/resources/templates/auth/user/role.html → dmaster/src/main/resources/templates/rbac/user/role.html

@@ -20,7 +20,7 @@
 </head>
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/auth/user/role}">
+    <form th:action="@{/api/rbac/user/role}">
         <input type="hidden" name="userId" th:value="${id}"/>
         <div class="layui-form-item">
             <div class="layui-input-block">