diff --git a/src/main/java/com/sixteam/irs/controller/EnterpriseController.java b/src/main/java/com/sixteam/irs/controller/EnterpriseController.java index 37617c173d7924f7a2fa022afff9cde765011ddd..829acd82bb12898d450c9cbaba0070dc4d00e0ea 100644 --- a/src/main/java/com/sixteam/irs/controller/EnterpriseController.java +++ b/src/main/java/com/sixteam/irs/controller/EnterpriseController.java @@ -4,15 +4,15 @@ import com.sixteam.irs.entity.Enterprise; import com.sixteam.irs.entity.User; import com.sixteam.irs.service.EnterpriseService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.List; @RestController +@CrossOrigin @RequestMapping("/enterprise") public class EnterpriseController { @@ -21,11 +21,10 @@ public class EnterpriseController { //查询所有企业 @RequestMapping("/getAllEnterprise") - public String getAllEnterprise(HttpServletRequest request){ - List getAllEnterprise = enterpriseService.getAllEnterprise(); - request.setAttribute("getAllEnterprise",getAllEnterprise); - System.out.println(getAllEnterprise); - return "/test/enterprise/企业列表页面.html"; + @ResponseBody + public List getAllEnterprise(HttpServletRequest request){ + List enterpriseList = enterpriseService.findAllEnterprise(); + return enterpriseList; } @RequestMapping("/toAddEnterprise") @@ -63,9 +62,11 @@ public class EnterpriseController { @RequestMapping("/toUpdateEnterprise") - public String toUpdateEnterprise(Enterprise enterprise, Model model, Integer id) { + public String toUpdateEnterprise(Enterprise enterprise, Model model) { + Enterprise enterprise1 = enterpriseService.findById(enterprise); + model.addAttribute("enterprise1", enterprise1); return "/test/enterprise/修改企业页面.html"; @@ -73,6 +74,7 @@ public class EnterpriseController { @RequestMapping(value = "/updateEnterprise") public String updateUser(Enterprise enterprise, Model model) { + System.out.println(enterprise); if (enterpriseService.updateEnterprise(enterprise)>0) { return "redirect:/enterprise/getAllEnterprise"; diff --git a/src/main/java/com/sixteam/irs/controller/JurisdictionController.java b/src/main/java/com/sixteam/irs/controller/JurisdictionController.java index 3f3975b32572d190194c064ab104281f85f1ae97..82f4917d09d33a7deae5096e3bb936a267647d6c 100644 --- a/src/main/java/com/sixteam/irs/controller/JurisdictionController.java +++ b/src/main/java/com/sixteam/irs/controller/JurisdictionController.java @@ -36,13 +36,16 @@ public class JurisdictionController { @RequestMapping("/find/findName") public String findJurisdictionName(String name, HttpServletRequest request) { + List ij = jurisdictionService.getJurisdictionByName(name); + if (ij != null) { request.setAttribute("ij", ij); return "/test/jurisdiction/权限列表页面.html"; } else { request.setAttribute("errorMessage", "查询错误"); return "/test/错误页面"; + } } } diff --git a/src/main/java/com/sixteam/irs/controller/RoleController.java b/src/main/java/com/sixteam/irs/controller/RoleController.java index 02224dd1b92012d4bba34d18bd76344032fe6cdd..3ffe30d213291808775e2dfbf08a2257da74a07a 100644 --- a/src/main/java/com/sixteam/irs/controller/RoleController.java +++ b/src/main/java/com/sixteam/irs/controller/RoleController.java @@ -1,26 +1,77 @@ package com.sixteam.irs.controller; import com.sixteam.irs.entity.Role; +import com.sixteam.irs.entity.User; import com.sixteam.irs.service.RoleService; +import com.sixteam.irs.utils.UuidUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpRequest; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import java.util.List; - +@CrossOrigin @RequestMapping("/") @Controller public class RoleController { @Autowired private RoleService roleService; - @RequestMapping("/findAllRole") - public String findAllRole(HttpServletRequest request){ + @RequestMapping("/roleList") + @ResponseBody + public List findAllRole(HttpServletRequest request){ List roleList = roleService.findAll(); - System.out.println(roleList); - request.setAttribute("roleList",roleList); - return "roleList.html"; + return roleList; + } + + @RequestMapping("/delRole") + public String deleteRole(HttpServletRequest request,String id){ + int i = roleService.deleteRole(id); + return "redirect:/roleList"; + } + + @RequestMapping("/toupdate") + public String toupdate(HttpServletRequest request,String id){ + Role role = roleService.findById(id); + request.setAttribute("role",role); + System.out.println(role); + return "test/role/修改角色.html"; + } + + @RequestMapping("/updateRole") + public String updateRole(HttpServletRequest request,Role role){ + int i = roleService.updateRole(role); + if (i>0){ + return "redirect:/roleList"; + }else { + request.setAttribute("data","暂无数据更改"); + return "redirect:/roleList"; + } + } + @RequestMapping("/toAddRole") + public String toAddRole(HttpServletRequest request){ + return "/test/role/添加角色.html"; } + + + @RequestMapping("/addRole") + public String addRole(HttpServletRequest request, Role role){ + role.setrId(UuidUtils.uuid()); + //获取前台传来的用户 + int row = roleService.addRole(role); + + //将用户添加 + if (row >0){ + return "redirect:/roleList"; + }else { + request.setAttribute("data","增不了程序出错"); + return "redirect:/roleList"; + } + + } + + } diff --git a/src/main/java/com/sixteam/irs/controller/UserController.java b/src/main/java/com/sixteam/irs/controller/UserController.java index 3f147b8b429245b739584977a6b2cbea369a262b..4a54570801cdf4985b352ef1449b7928cf6ea028 100644 --- a/src/main/java/com/sixteam/irs/controller/UserController.java +++ b/src/main/java/com/sixteam/irs/controller/UserController.java @@ -1,7 +1,9 @@ package com.sixteam.irs.controller; +import com.sixteam.irs.entity.Role; import com.sixteam.irs.entity.User; +import com.sixteam.irs.service.RoleService; import com.sixteam.irs.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -21,6 +23,8 @@ public class UserController { @Autowired private UserService userService; + @Autowired + private RoleService roleService; @RequestMapping("/test") @ResponseBody @@ -49,13 +53,12 @@ public class UserController { //前往用户管理列表页面 @RequestMapping("/userList") - public String userList(Model model){ + @ResponseBody + public List userList(Model model){ //这里需要查询所有用户,包括角色,包括权限,返回到用户管理列表页面 List userList = userService.findAllUser(); - System.out.println(userList); - model.addAttribute("userList",userList); - return "/test/user/用户列表.html"; + return userList; } //用于ajax,暂时不用管 @@ -66,27 +69,38 @@ public class UserController { return null; } - //删除用户功能 @RequestMapping("/delUser") public String delUser(String id){ - //获取前台传来的用户id,删除该用户 - - - int i = userService.delUser(id); - //返回前端 + if(id !=null) { + int i = userService.delUser(id); + } return "redirect:/userList"; - - + } + @RequestMapping("/toAddUser") + public String toAddUser(HttpServletRequest request){ + List roleList = roleService.findAll(); + request.setAttribute("rolelist",roleList); + return "/test/user/增加用户.html"; } @RequestMapping("/addUser") - public String addUser(){ + public String addUser(HttpServletRequest request,User user,String rid){ //获取前台传来的用户 + int row = userService.addUser(user); + + System.out.println(rid); //将用户添加 - return "redirect:/userList"; + if (row >0){ + return "redirect:/userList"; + }else { + request.setAttribute("data","增不了程序出错"); + return "redirect:/userList"; + } + } + //用户修改功能前的查询单个用户回显网页 @RequestMapping("/toUpdateUser") public String toUpdateUser(String id,HttpServletRequest request){ @@ -137,6 +151,11 @@ public class UserController { } } + @RequestMapping("/touxiang") + public String touxiang(){ + return "/test/头像.html"; + } + // @RequestMapping("/findAllUser") // public String findAllUser(Model model){ diff --git a/src/main/java/com/sixteam/irs/entity/User.java b/src/main/java/com/sixteam/irs/entity/User.java index dae98ce29eec7ffd0d4c22d01b01e00e62664cbf..40dd289aa82c6639cdc5fa765300ae65b5d6d8b4 100644 --- a/src/main/java/com/sixteam/irs/entity/User.java +++ b/src/main/java/com/sixteam/irs/entity/User.java @@ -10,40 +10,10 @@ public class User { private String uPassword;//密码 private String uSex;//性别 private String uBirthDate;//生日 + private Role role; private List roleList;//(平时为空,在管理用户角色时嵌套查询role->Jurisdiction) private List jurisdictionRoleList;//(查询用户时应嵌套查询此列,用于拦截) - @Override - public String toString() { - return "User{" + - "uId='" + uId + '\'' + - ", uName='" + uName + '\'' + - ", uEmail='" + uEmail + '\'' + - ", uPhone='" + uPhone + '\'' + - ", uPassword='" + uPassword + '\'' + - ", uSex='" + uSex + '\'' + - ", uBirthDate='" + uBirthDate + '\'' + - ", roleList=" + roleList + - ", jurisdictionRoleList=" + jurisdictionRoleList + - '}'; - } - - public User() { - super(); - } - - public User(String uId, String uName, String uEmail, String uPhone, String uPassword, String uSex, String uBirthDate, List roleList, List jurisdictionRoleList) { - this.uId = uId; - this.uName = uName; - this.uEmail = uEmail; - this.uPhone = uPhone; - this.uPassword = uPassword; - this.uSex = uSex; - this.uBirthDate = uBirthDate; - this.roleList = roleList; - this.jurisdictionRoleList = jurisdictionRoleList; - } - public String getuId() { return uId; } @@ -100,6 +70,14 @@ public class User { this.uBirthDate = uBirthDate; } + public Role getRole() { + return role; + } + + public void setRole(Role role) { + this.role = role; + } + public List getRoleList() { return roleList; } @@ -115,4 +93,38 @@ public class User { public void setJurisdictionRoleList(List jurisdictionRoleList) { this.jurisdictionRoleList = jurisdictionRoleList; } + public User() { + super(); + } + + public User(String uId, String uName, String uEmail, String uPhone, String uPassword, String uSex, String uBirthDate, Role role, List roleList, List jurisdictionRoleList) { + this.uId = uId; + this.uName = uName; + this.uEmail = uEmail; + this.uPhone = uPhone; + this.uPassword = uPassword; + this.uSex = uSex; + this.uBirthDate = uBirthDate; + this.role = role; + this.roleList = roleList; + this.jurisdictionRoleList = jurisdictionRoleList; + } + + @Override + public String toString() { + return "User{" + + "uId='" + uId + '\'' + + ", uName='" + uName + '\'' + + ", uEmail='" + uEmail + '\'' + + ", uPhone='" + uPhone + '\'' + + ", uPassword='" + uPassword + '\'' + + ", uSex='" + uSex + '\'' + + ", uBirthDate='" + uBirthDate + '\'' + + ", role=" + role + + ", roleList=" + roleList + + ", jurisdictionRoleList=" + jurisdictionRoleList + + '}'; + } + + } diff --git a/src/main/java/com/sixteam/irs/mapper/RoleMapper.java b/src/main/java/com/sixteam/irs/mapper/RoleMapper.java index 7cf17668489975ca7f543bebbacf0da9626f0a39..2d3b5af6a419c796875ff96cfea1306b612e9299 100644 --- a/src/main/java/com/sixteam/irs/mapper/RoleMapper.java +++ b/src/main/java/com/sixteam/irs/mapper/RoleMapper.java @@ -10,4 +10,12 @@ import java.util.List; @Repository public interface RoleMapper { List findAll(); + + Role findById(String id); + + int deleteRole(String id); + + int updateRole(Role role); + + int addRole(Role role); } diff --git a/src/main/java/com/sixteam/irs/service/EnterpriseService.java b/src/main/java/com/sixteam/irs/service/EnterpriseService.java index e2f138b2865bb39595be973cca973f832b62a7a3..9e14be1f0c11d05d0a8745cd103c3107e335bc4d 100644 --- a/src/main/java/com/sixteam/irs/service/EnterpriseService.java +++ b/src/main/java/com/sixteam/irs/service/EnterpriseService.java @@ -6,8 +6,6 @@ import java.util.List; public interface EnterpriseService { - List getAllEnterprise();//查询所有企业 - int addEnterprise(Enterprise enterprise);//添加企业 diff --git a/src/main/java/com/sixteam/irs/service/Impl/EnterpriceServiceImpl.java b/src/main/java/com/sixteam/irs/service/Impl/EnterpriceServiceImpl.java index d1b769e427906ee9faf8d111095f30a67c8ac563..0a585750226d6496a535dec84ccd5e3f7d9dffb6 100644 --- a/src/main/java/com/sixteam/irs/service/Impl/EnterpriceServiceImpl.java +++ b/src/main/java/com/sixteam/irs/service/Impl/EnterpriceServiceImpl.java @@ -15,10 +15,6 @@ public class EnterpriceServiceImpl implements EnterpriseService { @Autowired private EnterpriseMapper enterpriseMapper; - @Override - public List getAllEnterprise() { - return null; - } @Override public List findAllEnterprise() { diff --git a/src/main/java/com/sixteam/irs/service/Impl/RoleServiceImpl.java b/src/main/java/com/sixteam/irs/service/Impl/RoleServiceImpl.java index b8e9ddeb1a2c74d1df1adde808733f98935e1256..2422a1b74df2a516ec1a91649ae99cc46f54b291 100644 --- a/src/main/java/com/sixteam/irs/service/Impl/RoleServiceImpl.java +++ b/src/main/java/com/sixteam/irs/service/Impl/RoleServiceImpl.java @@ -16,4 +16,23 @@ public class RoleServiceImpl implements RoleService { public List findAll() { return roleMapper.findAll(); } + + + + public Role findById(String id){ + return roleMapper.findById(id); + } + + public int deleteRole(String id){ + return roleMapper.deleteRole(id); + } + + public int updateRole(Role role){ + return roleMapper.updateRole(role); + } + + + public int addRole(Role role){ + return roleMapper.addRole(role); + } } diff --git a/src/main/java/com/sixteam/irs/service/RoleService.java b/src/main/java/com/sixteam/irs/service/RoleService.java index 252855e99652a866a781dbd37fa67f504777287c..13c0dd6a982507a19f6223c32dff3e3dd3fc097f 100644 --- a/src/main/java/com/sixteam/irs/service/RoleService.java +++ b/src/main/java/com/sixteam/irs/service/RoleService.java @@ -6,4 +6,13 @@ import java.util.List; public interface RoleService { List findAll(); + + + Role findById(String id); + + int deleteRole(String id); + + int updateRole(Role role); + + int addRole(Role role); } diff --git a/src/main/resources/com/sixteam/irs/mapper/EnterpriseMapper.xml b/src/main/resources/com/sixteam/irs/mapper/EnterpriseMapper.xml index 11cb26f913a6ad56486ebd408533b42cb9ec5364..82edfb523f1609427c565c89f39d1969fdf815d9 100644 --- a/src/main/resources/com/sixteam/irs/mapper/EnterpriseMapper.xml +++ b/src/main/resources/com/sixteam/irs/mapper/EnterpriseMapper.xml @@ -40,7 +40,7 @@ e_type = #{eType}, e_founder = #{eFounder}, - where eId = #{eId} + where e_id = #{eId} \ No newline at end of file diff --git a/src/main/resources/com/sixteam/irs/mapper/RoleMapper.xml b/src/main/resources/com/sixteam/irs/mapper/RoleMapper.xml index c408bb3ee1d14f0c777cd802874d94bf3099c109..03959bf0265aeaf72f99f26b12154b8ada75e97e 100644 --- a/src/main/resources/com/sixteam/irs/mapper/RoleMapper.xml +++ b/src/main/resources/com/sixteam/irs/mapper/RoleMapper.xml @@ -18,5 +18,32 @@ FROM irs_role as r LEFT JOIN irs_jurisdiction_role as jr ON jr.r_id = r.r_id + + + + DELETE FROM irs_role WHERE r_id=#{rId} + + + + INSERT INTO irs_role (r_id,r_name,r_base_type,r_describe) + VALUES (#{rId},#{rName},#{rBaseType},#{rDescribe}) + + + + update irs_role + + r_name = #{rName}, + r_base_type=#{rBaseType}, + r_describe=#{rDescribe}, + + where r_id = #{rId} + + + \ No newline at end of file diff --git a/src/main/resources/com/sixteam/irs/mapper/UserMapper.xml b/src/main/resources/com/sixteam/irs/mapper/UserMapper.xml index db767ac10a5b547ba4bf939543c8120fb4cb1f5a..c3abc964a3f88778fa8eabc45c5a00c0fc37da41 100644 --- a/src/main/resources/com/sixteam/irs/mapper/UserMapper.xml +++ b/src/main/resources/com/sixteam/irs/mapper/UserMapper.xml @@ -67,7 +67,7 @@ where u_id = #{uId} - select * from irs_user where u_email = #{uEmail} and u_password = #{uPassword} or u_phone =#{uPhone} and u_password = #{uPassword} \ No newline at end of file diff --git "a/src/main/resources/templates/test/admin/\347\256\241\347\220\206\345\221\230\351\246\226\351\241\265.html" "b/src/main/resources/templates/test/admin/\347\256\241\347\220\206\345\221\230\351\246\226\351\241\265.html" index 86c116ab1b982aa280d52a4bb0b21cf675840e0d..969515280fb7256966d78c4b0aa79bdcf8030b06 100644 --- "a/src/main/resources/templates/test/admin/\347\256\241\347\220\206\345\221\230\351\246\226\351\241\265.html" +++ "b/src/main/resources/templates/test/admin/\347\256\241\347\220\206\345\221\230\351\246\226\351\241\265.html" @@ -10,7 +10,7 @@

    权限管理系统模块

  • 用户管理

    • 这里可以查看用户的基础信息,用户拥有的角色,以及角色拥有的权限,可以管理用户,以及增删用户的角色

    -
  • 角色管理

    • 这里可以查看角色基础信息,以及角色拥有的权限,可以管理角色,以及开启禁用某角色的某权限

    +
  • 角色管理

    • 这里可以查看角色基础信息,以及角色拥有的权限,可以管理角色,以及开启禁用某角色的某权限

    管理员业务模块

    diff --git "a/src/main/resources/templates/test/enterprise/\344\274\201\344\270\232\345\210\227\350\241\250\351\241\265\351\235\242.html" "b/src/main/resources/templates/test/enterprise/\344\274\201\344\270\232\345\210\227\350\241\250\351\241\265\351\235\242.html" index c6bd1f727eff5438a73d518e2f4473379da23870..66bb25beccf0baac149157089bc52b3077950aa2 100644 --- "a/src/main/resources/templates/test/enterprise/\344\274\201\344\270\232\345\210\227\350\241\250\351\241\265\351\235\242.html" +++ "b/src/main/resources/templates/test/enterprise/\344\274\201\344\270\232\345\210\227\350\241\250\351\241\265\351\235\242.html" @@ -1,5 +1,5 @@ - + Title @@ -19,16 +19,16 @@ 企业创始人 操作 - - id（遍历的值） - 企业名（遍历的值） - 企业介绍（遍历的值） - 企业成立时间（遍历的值） - 企业类型（遍历的值） - 企业创始人（遍历的值） + + id（遍历的值） + 企业名（遍历的值） + 企业介绍（遍历的值） + 企业成立时间（遍历的值） + 企业类型（遍历的值） + 企业创始人（遍历的值） - 删除 - 修改 + 删除 + 修改 diff --git "a/src/main/resources/templates/test/enterprise/\344\277\256\346\224\271\344\274\201\344\270\232\351\241\265\351\235\242.html" "b/src/main/resources/templates/test/enterprise/\344\277\256\346\224\271\344\274\201\344\270\232\351\241\265\351\235\242.html" index 3b753d832eed59876fa7495da090a3329244ec5b..1fb58d113a17a2b47e091f46902c7c2165190fca 100644 --- "a/src/main/resources/templates/test/enterprise/\344\277\256\346\224\271\344\274\201\344\270\232\351\241\265\351\235\242.html" +++ "b/src/main/resources/templates/test/enterprise/\344\277\256\346\224\271\344\274\201\344\270\232\351\241\265\351\235\242.html" @@ -1,5 +1,5 @@ - + Title @@ -8,12 +8,12 @@

    修改企业页面

    - - 公司名：
    - 公司介绍：
    - 公司起始时间：
    - 公司类型：
    - 公司创始人：
    + + 公司名：
    + 公司介绍：
    + 公司起始时间：
    + 公司类型：
    + 公司创始人：
    diff --git "a/src/main/resources/templates/test/enterprise/\346\267\273\345\212\240\344\274\201\344\270\232\351\241\265\351\235\242.html" "b/src/main/resources/templates/test/enterprise/\346\267\273\345\212\240\344\274\201\344\270\232\351\241\265\351\235\242.html" index 20a2db1e7bc7f2e8e041301d0442257f39a2979d..bffe50ce110f635f4f65cc17cd8a90f6cb3db0e5 100644 --- "a/src/main/resources/templates/test/enterprise/\346\267\273\345\212\240\344\274\201\344\270\232\351\241\265\351\235\242.html" +++ "b/src/main/resources/templates/test/enterprise/\346\267\273\345\212\240\344\274\201\344\270\232\351\241\265\351\235\242.html" @@ -8,7 +8,7 @@

    添加企业页面

    - + 公司Id:
    公司名：
    公司介绍：
    公司起始时间：
    diff --git a/src/main/resources/templates/test/index.html b/src/main/resources/templates/test/index.html index 6abb7794b5f905d7ff2690ead27e392a41ac1504..6cb03ac359068432d8b09a74af2f072e2085723b 100644 --- a/src/main/resources/templates/test/index.html +++ b/src/main/resources/templates/test/index.html @@ -5,11 +5,12 @@ Title -

    首页

    +

    首页

    职场百科列表 企业列表 权限列表 -去管理员页面 -去用户页面 + 去管理员页面 + 去用户页面 + 头像 \ No newline at end of file diff --git "a/src/main/resources/templates/test/jurisdiction/\346\235\203\351\231\220\345\210\227\350\241\250\351\241\265\351\235\242.html" "b/src/main/resources/templates/test/jurisdiction/\346\235\203\351\231\220\345\210\227\350\241\250\351\241\265\351\235\242.html" index 635a9553df25506d092120dadfbff2378be0a77f..5f8786259a6722f491eab244ae005996e99e6a9f 100644 --- "a/src/main/resources/templates/test/jurisdiction/\346\235\203\351\231\220\345\210\227\350\241\250\351\241\265\351\235\242.html" +++ "b/src/main/resources/templates/test/jurisdiction/\346\235\203\351\231\220\345\210\227\350\241\250\351\241\265\351\235\242.html" @@ -1,5 +1,5 @@ - + Title @@ -9,19 +9,23 @@ - 查询：
    + + 查询：
    - - - - - - - - +
    +
    + + + + + + + + +
    id权限名
    id（遍历的值）权限名（遍历的值）
    权限名
    id（遍历的值）权限名（遍历的值）
    \ No newline at end of file diff --git "a/src/main/resources/templates/test/role/\344\277\256\346\224\271\350\247\222\350\211\262.html" "b/src/main/resources/templates/test/role/\344\277\256\346\224\271\350\247\222\350\211\262.html" new file mode 100644 index 0000000000000000000000000000000000000000..b31b633eca90346fd8a1682662ee0444dd8478d6 --- /dev/null +++ "b/src/main/resources/templates/test/role/\344\277\256\346\224\271\350\247\222\350\211\262.html" @@ -0,0 +1,38 @@ + + + + + 修改角色 + + +

    修改角色页面

    +
    +
    + + + + + + + + + + + + + + + +
    + 角色名： +
    + 角色类型： +
    + 角色介绍： +
    + +
    +
    +
    + + \ No newline at end of file diff --git "a/src/main/resources/templates/test/role/\346\267\273\345\212\240\350\247\222\350\211\262.html" "b/src/main/resources/templates/test/role/\346\267\273\345\212\240\350\247\222\350\211\262.html" new file mode 100644 index 0000000000000000000000000000000000000000..bf0708ad608a32ba5eea9d7840ea157494a49b83 --- /dev/null +++ "b/src/main/resources/templates/test/role/\346\267\273\345\212\240\350\247\222\350\211\262.html" @@ -0,0 +1,33 @@ + + + + + 增加角色 + + +
    + + +
    + + + + + + + + + + + + + + + + + +
    角色名：
    角色类型：
    角色介绍：
    + +
    + + \ No newline at end of file diff --git "a/src/main/resources/templates/test/role/\350\247\222\350\211\262\345\210\227\350\241\250.html" "b/src/main/resources/templates/test/role/\350\247\222\350\211\262\345\210\227\350\241\250.html" new file mode 100644 index 0000000000000000000000000000000000000000..3678e976737fda8ac9b0d1cd537665e771f2c55c --- /dev/null +++ "b/src/main/resources/templates/test/role/\350\247\222\350\211\262\345\210\227\350\241\250.html" @@ -0,0 +1,28 @@ + + + + + 角色列表 + + +

    这里是角色权限管理的角色列表页

    +

    这里显示后台带来的角色列表

    + + +
    +
    + + + + + + +
    + 删除用户 + 修改用户 + +
    + + \ No newline at end of file diff --git "a/src/main/resources/templates/test/user/\345\242\236\345\212\240\347\224\250\346\210\267.html" "b/src/main/resources/templates/test/user/\345\242\236\345\212\240\347\224\250\346\210\267.html" index c47d4d9c7afd9da2013730e98e7ff36ab5ae54d5..11f566e2a6c2d4bb43b4fa4e508a995c30078636 100644 --- "a/src/main/resources/templates/test/user/\345\242\236\345\212\240\347\224\250\346\210\267.html" +++ "b/src/main/resources/templates/test/user/\345\242\236\345\212\240\347\224\250\346\210\267.html" @@ -1,15 +1,61 @@ - + 增加用户 -

    增加用户

    -

    输入用户数据

    -

    选择用户的角色,暂时不用实现

    - 去添加用户 + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    用户名：
    邮件：
    电话：
    密码：
    性别： + +
    生日：
    + +
    +
    \ No newline at end of file diff --git "a/src/main/resources/templates/test/user/\347\224\250\346\210\267\345\210\227\350\241\250.html" "b/src/main/resources/templates/test/user/\347\224\250\346\210\267\345\210\227\350\241\250.html" index 9aff511771cc9c8c8a82d0811dc917041aa4c514..96bafe2ec76c1c58db798bc99a7923d3fe8139ac 100644 --- "a/src/main/resources/templates/test/user/\347\224\250\346\210\267\345\210\227\350\241\250.html" +++ "b/src/main/resources/templates/test/user/\347\224\250\346\210\267\345\210\227\350\241\250.html" @@ -66,9 +66,10 @@ 删除用户 修改用户 - 添删用户的角色 +
    + 添加用户
    • 角色1
      • diff --git "a/src/main/resources/templates/test/\345\244\264\345\203\217.html" "b/src/main/resources/templates/test/\345\244\264\345\203\217.html" new file mode 100644 index 0000000000000000000000000000000000000000..49872bea50179ef0de937fc271095428f45577eb --- /dev/null +++ "b/src/main/resources/templates/test/\345\244\264\345\203\217.html" @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + User Image + + + + + +