Skip to content

D
dsk-cr20g
Commit 5dd28c13 authored by 施翔轲's avatar 施翔轲
Browse files
Options

修复用户管理重置密码未解码bug

parent f5af1829
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
dsk-admin/src/main/java/com/dsk/web/controller/system/SysUserController.java
View file @ 5dd28c13
...@@ -37,10 +37,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -37,10 +37,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* 用户信息 * 用户信息
...@@ -209,7 +206,7 @@ public class SysUserController extends BaseController { ...@@ -209,7 +206,7 @@ public class SysUserController extends BaseController {
public R<Void> resetPwd(@RequestBody SysUser user) { public R<Void> resetPwd(@RequestBody SysUser user) {
userService.checkUserAllowed(user); userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId()); userService.checkUserDataScope(user.getUserId());
user.setPassword(BCrypt.hashpw(user.getPassword())); user.setPassword(BCrypt.hashpw(new String(Base64.getDecoder().decode(user.getPassword()))));
return toAjax(userService.resetPwd(user)); return toAjax(userService.resetPwd(user));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment