Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-api-cloud

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<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);
@@ -285,7 +285,7 @@ public class ThirdPartyOAth2Cotroller {
         }
 
          // 验证成功后移除验证码（可选）
-//            redisTemplate.delete(redisKey);
+            redisTemplate.delete(redisKey);
 
 
         // 2. 记录信任设备