diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java index 5ba1af9d..7e64291c 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java @@ -59,8 +59,8 @@ public class AuthorizationController { * @return token信息 */ @PostMapping("login") - public CzgResult login(@Validated @RequestBody SysLoginDTO loginDTO) { - return CzgResult.success(authorizationService.login(loginDTO)); + public CzgResult login(@Validated @RequestBody SysLoginDTO loginDTO, @RequestHeader(defaultValue = "WEB") String platformType) { + return CzgResult.success(authorizationService.login(loginDTO, platformType)); } /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/AuthorizationService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/AuthorizationService.java index 4d5b4b45..14242000 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/AuthorizationService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/AuthorizationService.java @@ -10,5 +10,5 @@ import com.czg.account.vo.LoginVO; public interface AuthorizationService { Object getCaptcha(); - LoginVO login(SysLoginDTO loginDTO); + LoginVO login(SysLoginDTO loginDTO, String platformType); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java index 28e5eea4..d56aba81 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java @@ -74,7 +74,7 @@ public class AuthorizationServiceImpl implements AuthorizationService { } @Override - public LoginVO login(SysLoginDTO loginDTO) { + public LoginVO login(SysLoginDTO loginDTO, String platType) { Object code = redisService.get(RedisCst.LOGIN_CODE + loginDTO.uuid()); if (!"666666".equals(loginDTO.code()) && (code == null || !code.equals(loginDTO.code().toLowerCase()))) { throw new ApiNotPrintException("验证码错误"); @@ -91,7 +91,7 @@ public class AuthorizationServiceImpl implements AuthorizationService { if (sysUser == null) { throw new ApiNotPrintException("登录账号不存在"); } - if (StatusEnum.DISABLE.value() == sysUser.getStatus()) { + if ("WEB".equals(platType) && StatusEnum.DISABLE.value() == sysUser.getStatus()) { throw new ApiNotPrintException("账户未启用"); }