ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -19,10 +19,7 @@ import com.sandu.common.security.token.TokenProvider; import com.sandu.common.util.IpUtil; import com.sandu.common.util.ResponseUtil; import com.sandu.ximon.admin.param.AdminLoginParam; import com.sandu.ximon.admin.param.AdminParam; import com.sandu.ximon.admin.param.PwdParam; import com.sandu.ximon.admin.param.ReceiveParam; import com.sandu.ximon.admin.param.*; import com.sandu.ximon.admin.security.PermissionConfig; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.admin.service.*; @@ -245,7 +242,7 @@ * 修改我的密码 */ @Log("修改当前用户密码") @PutMapping("/updateMyPassword") @PostMapping("/updateMyPassword") public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) { boolean result; if (SecurityUtils.getClientId() == null) { @@ -261,6 +258,21 @@ } } /** * 修改管理员的密码 */ @Log("修改管理员的密码") @PostMapping("/updateAdminPassword") public ResponseVO<Object> updateAdminPassword(@Validated @RequestBody UserPwsParm param) { boolean result = adminService.updateAdminPassword(param); if (result) { return ResponseUtil.success("修改成功"); } else { return ResponseUtil.fail("修改失败"); } } // @PutMapping("/updateStatus/{id}") // public ResponseVO<Object> updateStatus(@PathVariable Long id, @RequestParam(value = "status") Integer status) { // checkLevel(id); ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper; import com.sandu.common.domain.ResponseVO; import com.sandu.common.enums.ResponseStatusEnums; import com.sandu.common.log.Log; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.security.LoginUserInfo; import com.sandu.common.security.annotation.AnonymousAccess; @@ -14,10 +15,7 @@ import com.sandu.common.util.IpUtil; import com.sandu.common.util.ResponseUtil; import com.sandu.ximon.admin.dto.ClientDto; import com.sandu.ximon.admin.param.AddClientPrarm; import com.sandu.ximon.admin.param.AdminLoginParam; import com.sandu.ximon.admin.param.ResetClientPasswordPrarm; import com.sandu.ximon.admin.param.UpdateClientPrarm; import com.sandu.ximon.admin.param.*; import com.sandu.ximon.admin.security.PermissionConfig; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.admin.service.ClientRoleRelationService; @@ -74,15 +72,20 @@ } } // @PostMapping("/resetClientPassword") // public ResponseVO<Object> resetClientPassword(@RequestBody @Validated ResetClientPasswordPrarm resetClientPasswordPrarm) { // boolean b = clientService.resetPassword(resetClientPasswordPrarm); // if (b) { // return ResponseUtil.success("修改成功"); // } else { // return ResponseUtil.fail("修改失败"); // } // } /** * 修改普通用户的密码 */ @Log("修改普通用户的密码") @PostMapping("/updateClientPassword") public ResponseVO<Object> updateClientPassword(@Validated @RequestBody UserPwsParm param) { boolean result = clientService.updateAdminPassword(param); if (result) { return ResponseUtil.success("修改成功"); } else { return ResponseUtil.fail("修改失败"); } } @PostMapping("/delete/{id}") public ResponseVO<Object> deleteClient(@PathVariable Long id) { ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
@@ -10,6 +10,7 @@ import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.param.AdminParam; import com.sandu.ximon.admin.param.PwdParam; import com.sandu.ximon.admin.param.UserPwsParm; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.dao.bo.AdminBo; import com.sandu.ximon.dao.domain.Admin; @@ -112,7 +113,7 @@ } /** * 修改密码 * 修改当前登录用户密码 * * @param param * @return @@ -134,6 +135,23 @@ } } /** * 修改管理员的密码 * * @param param * @return */ public boolean updateAdminPassword(UserPwsParm param) { Admin admin = getOne(Wrappers.lambdaQuery(Admin.class).eq(Admin::getId, param.getUserid())); if (admin == null) { throw new BusinessException("用户不存在"); } //加密新密码 admin.setPassword(passwordEncoder.encode(param.getNewPass())); return updateById(admin); } public boolean deleteAdmin(Long adminId) { Admin admin = getById(adminId); if (admin == null) { ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -6,11 +6,9 @@ import com.sandu.common.execption.BusinessException; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.param.AddClientPrarm; import com.sandu.ximon.admin.param.PwdParam; import com.sandu.ximon.admin.param.ResetClientPasswordPrarm; import com.sandu.ximon.admin.param.UpdateClientPrarm; import com.sandu.ximon.admin.param.*; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.dao.domain.Admin; import com.sandu.ximon.dao.domain.Client; import com.sandu.ximon.dao.domain.ClientRoleRelation; import com.sandu.ximon.dao.domain.Role; @@ -115,6 +113,12 @@ return updateById(client); } /** * 修改当前登录用户密码 * * @param param * @return */ public boolean resetPassword(PwdParam param) { Client client = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, SecurityUtils.getUserDetails().getUserId())); @@ -134,6 +138,23 @@ } } /** * 修改管理员的密码 * * @param param * @return */ public boolean updateAdminPassword(UserPwsParm param) { Client client = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, param.getUserid())); if (client == null) { throw new BusinessException("用户不存在"); } //加密新密码 client.setPassword(passwordEncoder.encode(param.getNewPass())); return updateById(client); } public boolean deleteClient(Long id) { //判断删除用户是否存在 Client one = getById(id);
