From c5ba07d4080ba9a4a2bdd6e63aad0f4916fb06ff Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 6 May 2025 16:09:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AF=E8=AF=97=E7=94=BB=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ThirdPartyOAth2Cotroller.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 0b04d7fe4..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); @@ -285,7 +285,7 @@ public class ThirdPartyOAth2Cotroller { } // 验证成功后移除验证码（可选） -// redisTemplate.delete(redisKey); + redisTemplate.delete(redisKey); // 2. 记录信任设备