|
@@ -29,7 +29,7 @@ import java.util.Objects;
|
|
|
@RestController
|
|
|
@RequestMapping("/auth")
|
|
|
@Api(value = "AuthController", tags ="认证、授权登录")
|
|
|
-public class AuthController {
|
|
|
+public class AuthController {
|
|
|
|
|
|
|
|
|
private final Logger logger = LoggerFactory.getLogger(AuthController.class);
|
|
@@ -51,7 +51,6 @@ public class AuthController {
|
|
|
|
|
|
@PostMapping("/login")
|
|
|
@ApiOperation(value = "账号登录")
|
|
|
- @ApiImplicitParam(value = "authUser",paramType = "body",dataTypeClass = AuthUser.class)
|
|
|
public ResponseEntity<JsonResult<AuthUser>> login(@RequestBody @Valid AuthUser authUser) {
|
|
|
logger.info("用户:{}账号密码登录",authUser.getUserCode());
|
|
|
String captchaCode = authUser.getCaptchaCode();
|
|
@@ -111,7 +110,7 @@ public class AuthController {
|
|
|
String parentUserId = JwtTokenUtil.getUserId(token);
|
|
|
logger.info("用户:{}创建 子账号",parentUserId);
|
|
|
AuthUser parentUser = userService.getById(parentUserId);
|
|
|
- if (Objects.isNull(parentUser) || !StringUtils.isEmpty(parentUser.getParentUerId())) {
|
|
|
+ if (Objects.isNull(parentUser) || !StringUtils.isEmpty(parentUser.getParentUserId())) {
|
|
|
throw new CustomException(500,"您的账号无权是子账号无权创建子账号");
|
|
|
}
|
|
|
if (Objects.isNull(authUser) || StringUtils.isEmpty(authUser.getUserCode())
|
|
@@ -123,7 +122,8 @@ public class AuthController {
|
|
|
}
|
|
|
authUser.setState(true);
|
|
|
authUser.setId(null);
|
|
|
- authUser.setParentUerId(parentUserId);
|
|
|
+ authUser.setAvatarUrl(Constants.DEFAULT_HEAD_IMG);
|
|
|
+ authUser.setParentUserId(parentUserId);
|
|
|
authUser.setCreateTime(Constants.DATE_TIME_FORMATTER.format(LocalDateTime.now()));
|
|
|
boolean ifSave = userService.saveUserAndDigPassword(authUser);
|
|
|
return ResponseEntity.ok(JsonResult.success(ifSave));
|