bonus_houqin

This commit is contained in:
sxu 2025-02-16 10:30:43 +08:00
parent c8756899e3
commit 717d2a0ad5
2 changed files with 9 additions and 1 deletions

View File

@ -156,6 +156,12 @@ public class TokenController {
login.setExpireIn((Long) map.get("expires_in")); login.setExpireIn((Long) map.get("expires_in"));
login.setLogin((boolean) map.get("isLogin")); login.setLogin((boolean) map.get("isLogin"));
return R.ok(login); return R.ok(login);
} else if (LoginType.PHONE_PASSWORD.equals(form.getLoginType()) || LoginType.PHONE_OTP.equals(form.getLoginType())) {
Map<String, Object> map = tokenService.createToken(login);
login.setToken((String) map.get("access_token"));
login.setExpireIn((Long) map.get("expires_in"));
login.setLogin((boolean) map.get("isLogin"));
return R.ok(login);
} else { } else {
return R.ok(tokenService.createToken(login)); return R.ok(tokenService.createToken(login));
} }

View File

@ -3,6 +3,7 @@ package com.bonus.auth.service;
import com.bonus.common.core.constant.SecurityConstants; import com.bonus.common.core.constant.SecurityConstants;
import com.bonus.common.core.domain.R; import com.bonus.common.core.domain.R;
import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.encryption.AesEncryptUtil;
import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.encryption.Sm4Utils;
import com.bonus.config.SystemConfig; import com.bonus.config.SystemConfig;
import com.bonus.system.api.RemoteUserService; import com.bonus.system.api.RemoteUserService;
@ -47,7 +48,8 @@ public class PhonePasswordLoginStrategy implements LoginStrategy {
// 处理IP校验 // 处理IP校验
passwordValidatorService.validateIpBlacklist(user.getUserName()); passwordValidatorService.validateIpBlacklist(user.getUserName());
// 验证密码 // 验证密码
passwordService.validate(user, password, System.currentTimeMillis()); String inputPassword = AesEncryptUtil.aesDecode(password); //绿智食堂前端把密码加密后传至后端需先解开再做比较
passwordService.validate(user, inputPassword, System.currentTimeMillis());
//校验用户启用状态 //校验用户启用状态
passwordValidatorService.validateUserStatus(user.getUserName(), user); passwordValidatorService.validateUserStatus(user.getUserName(), user);