From 14a01f5e2728e784f510ac7df3ee799849a1cb17 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 23 Apr 2025 16:32:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=88=E7=A7=BB=E9=99=A4=E8=AF=97=E7=94=BB?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=95=88=E9=AA=8C=EF=BC=8C=E5=BE=85=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 2425e6386..0b04d7fe4 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);