重置密码改为自定义

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -321,8 +321,10 @@ public class UserController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "初始化密码", notes = "传入userId集合")
 	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
-	public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds) {
-		boolean temp = userService.resetPassword(userIds);
+//	public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds) {
+	public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds,
+						   @ApiParam(value = "密码", readOnly = true) @RequestParam(value = "newPassword") String password) {
+		boolean temp = userService.resetPassword(userIds, password);
 		redisClient.basicData("user");
 		return R.status(temp);
 	}

blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java

@@ -148,9 +148,10 @@ public interface IUserService extends BaseService<User> {
 	 * 初始化密码
 	 *
 	 * @param userIds
+	 * @param password
 	 * @return
 	 */
-	boolean resetPassword(String userIds);
+	boolean resetPassword(String userIds, String password);
 
 	/**
 	 * 修改密码

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -285,9 +285,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	}
 
 	@Override
-	public boolean resetPassword(String userIds) {
+	public boolean resetPassword(String userIds, String password) {
 		User user = new User();
-		user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
+//		user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
+		user.setPassword(DigestUtil.encrypt(password));
 		user.setUpdateTime(DateUtil.now());
 		return this.update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toLongList(userIds)));
 	}