处理用户新增后密码加密及重置密码问题

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -273,7 +273,7 @@ public class SysUserController extends BaseController {
         user.setCreateTime(new Date());
         final String salt = SecurityUtils.salt();
         user.setSalt(salt);
-        user.setPassword(SecurityUtils.passwordAddSalt(user.getPassword(), salt));
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword(), salt));
         user.setOriginalOrgId(user.getOrgId());
         userService.insertUser(user);
         return AjaxResult.success();
@@ -340,7 +340,7 @@ public class SysUserController extends BaseController {
         userService.checkUserDataScope(user.getId());
         final String salt = SecurityUtils.salt();
         user.setSalt(salt);
-        user.setPassword(SecurityUtils.passwordAddSalt(user.getPassword(), salt));
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword(), salt));
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.resetPwd(user));
     }