|
@@ -31,6 +31,7 @@ import javax.validation.Valid;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import org.springblade.common.excel.utils.ExcelUtil;
|
|
import org.springblade.common.excel.utils.ExcelUtil;
|
|
import org.springblade.common.utils.CacheUtil;
|
|
import org.springblade.common.utils.CacheUtil;
|
|
|
|
+import org.springblade.common.utils.PasswordGeneratorUtil;
|
|
import org.springblade.core.constant.AppConstant;
|
|
import org.springblade.core.constant.AppConstant;
|
|
import org.springblade.core.constant.BladeConstant;
|
|
import org.springblade.core.constant.BladeConstant;
|
|
import org.springblade.core.constant.RoleConstant;
|
|
import org.springblade.core.constant.RoleConstant;
|
|
@@ -269,8 +270,13 @@ public class UserController {
|
|
@ApiOperation(value = "初始化密码", notes = "传入userId集合")
|
|
@ApiOperation(value = "初始化密码", notes = "传入userId集合")
|
|
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
|
|
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
|
|
public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds) {
|
|
public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds) {
|
|
- boolean temp = userService.resetPassword(userIds);
|
|
|
|
- return R.status(temp);
|
|
|
|
|
|
+ String newPassword = PasswordGeneratorUtil.generatePassword(12);
|
|
|
|
+ boolean temp = userService.resetPasswordV2(userIds, newPassword);
|
|
|
|
+ if(temp){
|
|
|
|
+ return R.data("重置密码成功,新密码为:"+newPassword);
|
|
|
|
+ }else{
|
|
|
|
+ return R.fail("重置密码失败.");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|