|
|
@@ -5,9 +5,12 @@ import cn.dev33.satoken.secure.BCrypt;
|
|
|
import cn.hutool.core.lang.tree.Tree;
|
|
|
import cn.hutool.core.util.ArrayUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
+import com.vber.common.core.constant.ConfigKeyConstants;
|
|
|
import com.vber.common.core.constant.SystemConstants;
|
|
|
import com.vber.common.core.domain.R;
|
|
|
import com.vber.common.core.domain.model.LoginUser;
|
|
|
+import com.vber.common.core.service.ConfigService;
|
|
|
+import com.vber.common.core.utils.SpringUtils;
|
|
|
import com.vber.common.core.utils.StreamUtils;
|
|
|
import com.vber.common.core.utils.StringUtils;
|
|
|
import com.vber.common.encrypt.annotation.ApiEncrypt;
|
|
|
@@ -180,7 +183,8 @@ public class SysUserController extends BaseController {
|
|
|
return R.fail("当前租户下用户名额不足,请联系管理员");
|
|
|
}
|
|
|
}
|
|
|
- user.setPassword(BCrypt.hashpw(user.getPassword()));
|
|
|
+ String password = StringUtils.isBlank(user.getPassword()) ? SpringUtils.getBean(ConfigService.class).getConfigValue(ConfigKeyConstants.SYS_USER_INIT_PASSWORD) : user.getPassword();
|
|
|
+ user.setPassword(BCrypt.hashpw(password));
|
|
|
return toAjax(userService.insertUser(user));
|
|
|
}
|
|
|
|