This commit is contained in:
zjf committed 2025-05-15 19:12:04 +08:00
1 parent 0ff90611b7
commit 0aeb6c0ec7
1 file changed
+6 -6
@@ -218,12 +218,12 @@ public class ThirdPartyOAth2Cotroller {
if(!CollectionUtils.isEmpty(sysUserList)){
SysUser sysUser = sysUserList.get(0);
//判断当前用户设备是否信任
// String md5 = DeviceFingerprintUtil.generate(httpServletRequest);
// R<UserTrustedDeviceEntity> userTrustedDeviceR = remoteUserTrustedDeviceService.getUserTrustedDeviceByIdAndMD5(sysUser.getPhone(), md5);
// UserTrustedDeviceEntity userTrustedDevice = userTrustedDeviceR.getData();
// if (userTrustedDevice == null || userTrustedDevice.getExpireTime().isBefore(LocalDateTime.now())){
// return R.failed(-1,"请先信任设备");
// }
String md5 = DeviceFingerprintUtil.generate(httpServletRequest);
R<UserTrustedDeviceEntity> userTrustedDeviceR = remoteUserTrustedDeviceService.getUserTrustedDeviceByIdAndMD5(sysUser.getPhone(), md5);
UserTrustedDeviceEntity userTrustedDevice = userTrustedDeviceR.getData();
if (userTrustedDevice == null || userTrustedDevice.getExpireTime().isBefore(LocalDateTime.now())){
return R.failed(-1,"请先信任设备");
}
//登录成功生成token
UserTokenDTO userTokenDTO = new UserTokenDTO();
userTokenDTO.setSysUser(sysUser);