diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppPasswordAuthStrategy.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppPasswordAuthStrategy.java index 2d1b0468..02cfa6e1 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppPasswordAuthStrategy.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppPasswordAuthStrategy.java @@ -13,6 +13,7 @@ import com.fuyuanshen.common.core.constant.Constants; import com.fuyuanshen.common.core.constant.GlobalConstants; import com.fuyuanshen.common.core.constant.SystemConstants; import com.fuyuanshen.common.core.domain.model.AppLoginUser; +import com.fuyuanshen.common.core.domain.model.AppPasswordLoginBody; import com.fuyuanshen.common.core.domain.model.LoginUser; import com.fuyuanshen.common.core.domain.model.PasswordLoginBody; import com.fuyuanshen.common.core.enums.LoginType; @@ -56,25 +57,19 @@ public class AppPasswordAuthStrategy implements IAuthStrategy { @Override public LoginVo login(String body, SysClientVo client) { - PasswordLoginBody loginBody = JsonUtils.parseObject(body, PasswordLoginBody.class); + AppPasswordLoginBody loginBody = JsonUtils.parseObject(body, AppPasswordLoginBody.class); ValidatorUtils.validate(loginBody); String tenantId = loginBody.getTenantId(); String username = loginBody.getUsername(); String password = loginBody.getPassword(); - String code = loginBody.getCode(); - String uuid = loginBody.getUuid(); - -// boolean captchaEnabled = captchaProperties.getEnable(); -// // 验证码开关 -// if (captchaEnabled) { -// validateCaptcha(tenantId, username, code, uuid); -// } AppLoginUser loginUser = TenantHelper.dynamic(tenantId, () -> { AppUserVo user = loadUserByUsername(username); - loginService.checkLogin(LoginType.PASSWORD, tenantId, username, () -> !StringUtils.equals(password, user.getPassword())); + loginService.checkLogin(LoginType.PASSWORD, tenantId, username, () -> !password.equals(user.getPassword())); + // 此处可根据登录用户的数据不同 自行创建 loginUser return loginService.buildLoginUser(user); }); + loginUser.setClientKey(client.getClientKey()); loginUser.setDeviceType(client.getDeviceType()); SaLoginParameter model = new SaLoginParameter(); diff --git a/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/AppPasswordLoginBody.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/AppPasswordLoginBody.java index 1a167799..79159529 100644 --- a/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/AppPasswordLoginBody.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/AppPasswordLoginBody.java @@ -25,7 +25,7 @@ public class AppPasswordLoginBody extends LoginBody { * 用户密码 */ @NotBlank(message = "{user.password.not.blank}") - @Length(min = 5, max = 30, message = "{user.password.length.valid}") +// @Length(min = 5, max = 30, message = "{user.password.length.valid}") private String password; }