diff --git a/pear-entrance/src/main/resources/templates/system/user/editPassword.html b/pear-entrance/src/main/resources/templates/system/user/editPassword.html index 2b4530b1588ca8d29eb07776ccde3ff1b28e9f60..3757ad38fb9a1e1f2a00aae99d5521cfa63db3e4 100644 --- a/pear-entrance/src/main/resources/templates/system/user/editPassword.html +++ b/pear-entrance/src/main/resources/templates/system/user/editPassword.html @@ -55,6 +55,7 @@ $.ajax({ url: '/system/user/editPassword', data: JSON.stringify(data.field), + contentType: 'application/json', dataType: 'json', type: 'put', success: function (result) { diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysUserController.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysUserController.java index e7598c3b3c279ddf217b75b472853b3a12d008ef..3c1113680d54777176b9ea498002de1f9aa0554b 100644 --- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysUserController.java +++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysUserController.java @@ -13,6 +13,7 @@ import com.pearadmin.common.web.domain.response.Result; import com.pearadmin.common.web.domain.response.ResultTable; import com.pearadmin.system.domain.SysUser; import com.pearadmin.system.domain.SysMenu; +import com.pearadmin.system.dto.EditPassword; import com.pearadmin.system.service.ISysRoleService; import com.pearadmin.system.service.ISysUserService; import io.swagger.annotations.Api; @@ -24,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; + import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.Arrays; @@ -33,26 +35,26 @@ import java.util.List; * Describe: 用户控制器 * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 - * */ + */ @RestController @RequestMapping("system/user") -@Api(value="用户controller",tags={"用户操作接口"}) +@Api(value = "用户controller", tags = {"用户操作接口"}) public class SysUserController extends BaseController { /** * Describe: 基础路径 - * */ + */ private static String MODULE_PATH = "system/user/"; /** * Describe: 用户模块服务 - * */ + */ @Resource private ISysUserService sysUserService; /** * Describe: 角色模块服务 - * */ + */ @Resource private ISysRoleService sysRoleService; @@ -60,11 +62,11 @@ public class SysUserController extends BaseController { * Describe: 获取用户列表视图 * Param ModelAndView * Return 用户列表视图 - * */ + */ @GetMapping("main") - @ApiOperation(value="获取用户列表视图") + @ApiOperation(value = "获取用户列表视图") @PreAuthorize("hasPermission('/system/user/main','sys:user:main')") - public ModelAndView main( ){ + public ModelAndView main() { return JumpPage(MODULE_PATH + "main"); } @@ -72,40 +74,40 @@ public class SysUserController extends BaseController { * Describe: 获取用户列表数据 * Param ModelAndView * Return 用户列表数据 - * */ + */ @GetMapping("data") - @ApiOperation(value="获取用户列表数据") + @ApiOperation(value = "获取用户列表数据") @PreAuthorize("hasPermission('/system/user/data','sys:user:data')") - @Logging(title = "查询用户",describe = "查询用户",type = BusinessType.QUERY) - public ResultTable data(PageDomain pageDomain, SysUser param){ - PageInfo pageInfo = sysUserService.page(param,pageDomain); - return pageTable(pageInfo.getList(),pageInfo.getTotal()); + @Logging(title = "查询用户", describe = "查询用户", type = BusinessType.QUERY) + public ResultTable data(PageDomain pageDomain, SysUser param) { + PageInfo pageInfo = sysUserService.page(param, pageDomain); + return pageTable(pageInfo.getList(), pageInfo.getTotal()); } /** * Describe: 用户新增视图 * Param ModelAndView * Return 返回用户新增视图 - * */ + */ @GetMapping("add") - @ApiOperation(value="获取用户新增视图") + @ApiOperation(value = "获取用户新增视图") @PreAuthorize("hasPermission('/system/user/add','sys:user:add')") - public ModelAndView add(Model model){ - model.addAttribute("sysRoles",sysRoleService.list(null)); - return JumpPage(MODULE_PATH+"add"); + public ModelAndView add(Model model) { + model.addAttribute("sysRoles", sysRoleService.list(null)); + return JumpPage(MODULE_PATH + "add"); } /** * Describe: 用户新增接口 * Param ModelAndView * Return 操作结果 - * */ + */ @RepeatSubmit @PostMapping("save") - @ApiOperation(value="保存用户数据") + @ApiOperation(value = "保存用户数据") @PreAuthorize("hasPermission('/system/user/add','sys:user:add')") - @Logging(title = "新增用户",describe = "新增用户",type = BusinessType.ADD) - public Result save(@RequestBody SysUser sysUser){ + @Logging(title = "新增用户", describe = "新增用户", type = BusinessType.ADD) + public Result save(@RequestBody SysUser sysUser) { sysUser.setLogin("0"); sysUser.setEnable("1"); sysUser.setStatus("1"); @@ -121,13 +123,13 @@ public class SysUserController extends BaseController { * Describe: 用户修改视图 * Param ModelAndView * Return 返回用户修改视图 - * */ + */ @GetMapping("edit") - @ApiOperation(value="获取用户修改视图") + @ApiOperation(value = "获取用户修改视图") @PreAuthorize("hasPermission('/system/user/edit','sys:user:edit')") - public ModelAndView edit(Model model,String userId){ - model.addAttribute("sysRoles",sysUserService.getUserRole(userId)); - model.addAttribute("sysUser",sysUserService.getById(userId)); + public ModelAndView edit(Model model, String userId) { + model.addAttribute("sysRoles", sysUserService.getUserRole(userId)); + model.addAttribute("sysUser", sysUserService.getById(userId)); return JumpPage(MODULE_PATH + "edit"); } @@ -135,42 +137,45 @@ public class SysUserController extends BaseController { * Describe: 用户密码修改视图 * Param ModelAndView * Return 返回用户密码修改视图 - * */ + */ @GetMapping("editPassword") - public ModelAndView editPasswordView(){ + public ModelAndView editPasswordView() { return JumpPage(MODULE_PATH + "editPassword"); } @PutMapping("editPassword") - public Result editPassword(String oldPassword,String newPassword,String confirmPassword){ + public Result editPassword(@RequestBody EditPassword editPassword) { + String oldPassword = editPassword.getOldPassword(); + String newPassword = editPassword.getNewPassword(); + String confirmPassword = editPassword.getConfirmPassword(); SysUser sysUser = (SysUser) ServletUtil.getSession().getAttribute("currentUser"); SysUser editUser = sysUserService.getById(sysUser.getUserId()); - if(Strings.isBlank(confirmPassword) - || Strings.isBlank(newPassword) - || Strings.isBlank(oldPassword)){ + if (Strings.isBlank(confirmPassword) + || Strings.isBlank(newPassword) + || Strings.isBlank(oldPassword)) { return failure("输入不能为空"); } - if(!new BCryptPasswordEncoder().matches(oldPassword,editUser.getPassword())){ + if (!new BCryptPasswordEncoder().matches(oldPassword, editUser.getPassword())) { return failure("密码验证失败"); } - if(!newPassword.equals(confirmPassword)){ + if (!newPassword.equals(confirmPassword)) { return failure("两次密码输入不一致"); } editUser.setPassword(new BCryptPasswordEncoder().encode(newPassword)); boolean result = sysUserService.update(editUser); - return decide(result,"修改成功","修改失败"); + return decide(result, "修改成功", "修改失败"); } /** * Describe: 用户修改接口 * Param ModelAndView * Return 返回用户修改接口 - * */ + */ @PutMapping("update") - @ApiOperation(value="修改用户数据") + @ApiOperation(value = "修改用户数据") @PreAuthorize("hasPermission('/system/user/edit','sys:user:edit')") - @Logging(title = "修改用户",describe = "修改用户",type = BusinessType.EDIT) - public Result update(@RequestBody SysUser sysUser){ + @Logging(title = "修改用户", describe = "修改用户", type = BusinessType.EDIT) + public Result update(@RequestBody SysUser sysUser) { sysUserService.saveUserRole(sysUser.getUserId(), Arrays.asList(sysUser.getRoleIds().split(","))); boolean result = sysUserService.update(sysUser); return decide(result); @@ -180,12 +185,12 @@ public class SysUserController extends BaseController { * Describe: 用户批量删除接口 * Param: ids * Return: ResuBean - * */ + */ @DeleteMapping("batchRemove/{ids}") - @ApiOperation(value="批量删除用户") + @ApiOperation(value = "批量删除用户") @PreAuthorize("hasPermission('/system/user/remove','sys:user:remove')") - @Logging(title = "删除用户",describe = "删除用户",type = BusinessType.REMOVE) - public Result batchRemove(@PathVariable String ids){ + @Logging(title = "删除用户", describe = "删除用户", type = BusinessType.REMOVE) + public Result batchRemove(@PathVariable String ids) { boolean result = sysUserService.batchRemove(ids.split(",")); return decide(result); } @@ -194,15 +199,15 @@ public class SysUserController extends BaseController { * Describe: 用户删除接口 * Param: id * Return: ResuBean - * */ + */ @Transactional @DeleteMapping("remove/{id}") - @ApiOperation(value="删除用户数据") + @ApiOperation(value = "删除用户数据") @PreAuthorize("hasPermission('/system/user/remove','sys:user:remove')") - @Logging(title = "删除用户",describe = "删除用户",type = BusinessType.REMOVE) - public Result remove(@PathVariable String id){ + @Logging(title = "删除用户", describe = "删除用户", type = BusinessType.REMOVE) + public Result remove(@PathVariable String id) { // TODO remove userRole data - boolean result = sysUserService.remove(id); + boolean result = sysUserService.remove(id); return decide(result); } @@ -210,23 +215,23 @@ public class SysUserController extends BaseController { * Describe: 根据 username 获取菜单数据 * Param SysRole * Return 执行结果 - * */ + */ @GetMapping("getUserMenu") @ApiOperation(value = "获取用户菜单数据") - public List getUserMenu(){ + public List getUserMenu() { SysUser sysUser = (SysUser) SecurityUtil.currentUser().getPrincipal(); List menus = sysUserService.getUserMenu(sysUser.getUsername()); - return sysUserService.toUserMenu(menus,"0"); + return sysUserService.toUserMenu(menus, "0"); } /** * Describe: 根据 userId 开启用户 * Param: SysUser * Return: 执行结果 - * */ + */ @PutMapping("enable") @ApiOperation(value = "开启用户登录") - public Result enable(@RequestBody SysUser sysUser){ + public Result enable(@RequestBody SysUser sysUser) { sysUser.setEnable("1"); boolean result = sysUserService.update(sysUser); return decide(result); @@ -236,10 +241,10 @@ public class SysUserController extends BaseController { * Describe: 根据 userId 禁用用户 * Param: SysUser * Return: 执行结果 - * */ + */ @PutMapping("disable") @ApiOperation(value = "禁用用户登录") - public Result disable(@RequestBody SysUser sysUser){ + public Result disable(@RequestBody SysUser sysUser) { sysUser.setEnable("0"); boolean result = sysUserService.update(sysUser); return decide(result); @@ -249,12 +254,12 @@ public class SysUserController extends BaseController { * Describe: 跳转用户个人资料 * Param: null * Return: ModelAndView - * */ + */ @GetMapping("center") @ApiOperation(value = "个人资料") - public ModelAndView center(Model model){ + public ModelAndView center(Model model) { SysUser sysUser = (SysUser) SecurityUtil.currentUser().getPrincipal(); - model.addAttribute("userInfo",sysUserService.getById(sysUser.getUserId())); + model.addAttribute("userInfo", sysUserService.getById(sysUser.getUserId())); return JumpPage(MODULE_PATH + "center"); } diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/dto/EditPassword.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/dto/EditPassword.java new file mode 100644 index 0000000000000000000000000000000000000000..7700f40f805de36b04c3b987b423e8b5afe6449f --- /dev/null +++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/dto/EditPassword.java @@ -0,0 +1,22 @@ +package com.pearadmin.system.dto; + +import lombok.Getter; +import lombok.Setter; + +/** + * @Author: Heiky + * @Date: 2020/12/31 16:46 + * @Description: + */ + +@Getter +@Setter +public class EditPassword { + + private String oldPassword; + + private String newPassword; + + private String confirmPassword; + +}