From 0aeb6c0ec7162c577e2f6387859ba86b1370bcb7 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 15 May 2025 19:12:04 +0800 Subject: [PATCH] 1 --- .../controller/ThirdPartyOAth2Cotroller.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java index d20090ea2..f4af37895 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java @@ -218,12 +218,12 @@ public class ThirdPartyOAth2Cotroller { if(!CollectionUtils.isEmpty(sysUserList)){ SysUser sysUser = sysUserList.get(0); //判断当前用户设备是否信任 -// String md5 = DeviceFingerprintUtil.generate(httpServletRequest); -// R 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 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);