将 templates.rbac 中的文件移动到 templates.admin

web/src/main/java/cn/reghao/devops/web/account/controller/page/MenuPageController.java

@@ -29,14 +29,14 @@ public class MenuPageController {
         }
 
         model.addAttribute("enabled", enabled);
-        return "/rbac/menu/index";
+        return "/admin/menu/index";
     }
 
     @ApiOperation(value = "资源添加页面")
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @GetMapping(value = "/add")
     public String addMenuPage(Model model) {
-        return "/rbac/menu/add";
+        return "/admin/menu/add";
     }
 
     @ApiOperation(value = "资源编辑页面")
@@ -44,7 +44,7 @@ public class MenuPageController {
     @GetMapping("/edit/{id}")
     public String toEdit(@PathVariable("id") Menu menu, Model model) {
         model.addAttribute("menu", menu);
-        return "/rbac/menu/edit";
+        return "/admin/menu/edit";
     }
 
     // TODO Hibernate 会根据传入的 id 自动查找相应的 Menu
@@ -54,6 +54,6 @@ public class MenuPageController {
     public String roleListWithResource(@PathVariable("id") Menu menu, Model model) {
         List<RoleVO> list = menu.getRoles().stream().map(RoleVO::new).collect(Collectors.toList());
         model.addAttribute("list", list);
-        return "/rbac/menu/roles";
+        return "/admin/menu/roles";
     }
 }

web/src/main/java/cn/reghao/devops/web/account/controller/page/RolePageController.java

@@ -42,14 +42,14 @@ public class RolePageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", page.getContent());
-        return "/rbac/role/index";
+        return "/admin/role/index";
     }
 
     @ApiOperation("角色新增页面")
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @GetMapping("/add")
     public String addRolePage() {
-        return "/rbac/role/add";
+        return "/admin/role/add";
     }
 
     @ApiOperation("角色编辑页面")
@@ -58,7 +58,7 @@ public class RolePageController {
     public String editRolePage(@PathVariable("id") int id, Model model) {
         RoleVO vo = roleService.getRoleVOById(id);
         model.addAttribute("role", vo);
-        return "/rbac/role/add";
+        return "/admin/role/add";
     }
 
     @ApiOperation("角色详细信息页面")
@@ -67,7 +67,7 @@ public class RolePageController {
     public String roleDetailPage(@PathVariable("id") int id, Model model) {
         RoleVO vo = roleService.getRoleVOById(id);
         model.addAttribute("role", vo);
-        return "/rbac/role/detail";
+        return "/admin/role/detail";
     }
 
     @ApiOperation("设置角色可访问的资源页面")
@@ -75,7 +75,7 @@ public class RolePageController {
     @GetMapping("/menus/{id}")
     public String menusPage(@PathVariable(value = "id") Integer id, Model model){
         model.addAttribute("roleId", id);
-        return "/rbac/role/menus";
+        return "/admin/role/menus";
     }
 
     @ApiOperation("拥有角色的所有用户页面")
@@ -84,6 +84,6 @@ public class RolePageController {
     public String userListWithRole(@PathVariable("id") Integer roleId, Model model) {
         List<User> list = roleService.getRoleUsers(roleId);
         model.addAttribute("list", list);
-        return "/rbac/role/users";
+        return "/admin/role/users";
     }
 }

web/src/main/java/cn/reghao/devops/web/account/controller/page/UserPageController.java

@@ -43,13 +43,13 @@ public class UserPageController {
     public String userInfoPage(Model model) {
         User user = UserContext.getUser();
         model.addAttribute("user", user);
-        return "/rbac/user/userinfo";
+        return "/admin/user/userinfo";
     }
 
     @ApiOperation(value = "修改个人密码页面")
     @GetMapping("/passwd/edit")
     public String editPasswdPage(Model model) {
-        return "/rbac/user/userpasswd";
+        return "/admin/user/userpasswd";
     }
 
     @ApiOperation(value = "用户列表页面")
@@ -76,7 +76,7 @@ public class UserPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", page.getContent());
-        return "/rbac/user/index";
+        return "/admin/user/index";
     }
 
     @ApiOperation(value = "新增用户页面")
@@ -86,7 +86,7 @@ public class UserPageController {
         Set<RoleVO> allRoles = roleService.getAllRoles();
         model.addAttribute("allRoles", allRoles);
         model.addAttribute("userRoles", Collections.emptySet());
-        return "/rbac/user/add";
+        return "/admin/user/add";
     }
 
     @ApiOperation(value = "用户详细信息页面")
@@ -99,7 +99,7 @@ public class UserPageController {
 
         model.addAttribute("roles", names.toString());
         model.addAttribute("user", user);
-        return "/rbac/user/detail";
+        return "/admin/user/detail";
     }
 
     @ApiOperation(value = "重置用户密码页面")
@@ -107,7 +107,7 @@ public class UserPageController {
     @GetMapping("/passwd/{id}")
     public String modifyPasswordPage(@PathVariable("id") Integer id, Model model) {
         model.addAttribute("id", id);
-        return "/rbac/user/passwd";
+        return "/admin/user/passwd";
     }
 
     @ApiOperation(value = "用户角色分配页面")
@@ -121,6 +121,6 @@ public class UserPageController {
         model.addAttribute("id", userId);
         model.addAttribute("list", allRoles);
         model.addAttribute("authRoles", userRoles);
-        return "/rbac/user/role";
+        return "/admin/user/role";
     }
 }