Pārlūkot izejas kodu

签名访问、是授权访问、token访问,场景访问密码失效

dsx 1 gadu atpakaļ
vecāks
revīzija
5cb76ce3ad

+ 2 - 0
src/main/java/com/fdkankan/scene/service/IJmgaService.java

@@ -9,4 +9,6 @@ public interface IJmgaService {
 
     public boolean checkSceneViewGign(SceneInfoParamVO param, HttpServletRequest request) throws Exception;
 
+    boolean isBizAuth(String num);
+
 }

+ 13 - 0
src/main/java/com/fdkankan/scene/service/impl/JmgaServiceImpl.java

@@ -2,13 +2,17 @@ package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.DateExtUtil;
+import com.fdkankan.scene.entity.JySceneAuth;
 import com.fdkankan.scene.service.IJmgaService;
+import com.fdkankan.scene.service.IJySceneAuthService;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
 import com.fdkankan.web.util.WebUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
@@ -32,6 +36,9 @@ public class JmgaServiceImpl implements IJmgaService {
     @Value("${scene.view.encrypt-key:3d8904474ebbdbbd81c5952524dad646}")
     private String ENCRYPT_KEY;
 
+    @Autowired
+    private IJySceneAuthService jySceneAuthService;
+
     @Override
     public boolean checkSceneViewGign(SceneInfoParamVO param, HttpServletRequest request) throws Exception{
 
@@ -85,6 +92,12 @@ public class JmgaServiceImpl implements IJmgaService {
         return true;
     }
 
+    @Override
+    public boolean isBizAuth(String num) {
+        long count = jySceneAuthService.count(new LambdaQueryWrapper<JySceneAuth>().eq(JySceneAuth::getNum, num).eq(JySceneAuth::getAuthType, 0));
+        return count > 0 ? true : false;
+    }
+
     public static void main(String[] args) throws NoSuchPaddingException, NoSuchAlgorithmException, BadPaddingException, IllegalBlockSizeException, InvalidKeyException {
 
         String sign = "P9md4QmKxb4VvpUY1pSnG3ycLyJ7c95mloXRrp50m+J6lhs0WHHD5rtPTSI8TXKC";

+ 2 - 10
src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.fdkankan.scene.service.impl;
 import cn.hutool.core.util.CharsetUtil;
 import com.fdkankan.common.constant.*;
 import com.fdkankan.common.util.FileSizeUtil;
+import com.fdkankan.scene.entity.*;
 import com.fdkankan.scene.service.*;
 import com.fdkankan.scene.vo.SaveFiltersParamVO;
 
@@ -39,15 +40,6 @@ import com.fdkankan.scene.bean.StyleBean;
 import com.fdkankan.scene.bean.TagBean;
 import com.fdkankan.scene.bean.VertexBean;
 import com.fdkankan.scene.bean.WallBean;
-import com.fdkankan.scene.entity.CameraDetail;
-import com.fdkankan.scene.entity.Company;
-import com.fdkankan.scene.entity.SceneAsynOperLog;
-import com.fdkankan.scene.entity.SceneDataDownload;
-import com.fdkankan.scene.entity.SceneEditControls;
-import com.fdkankan.scene.entity.SceneEditInfo;
-import com.fdkankan.scene.entity.SceneEditInfoExt;
-import com.fdkankan.scene.entity.ScenePlus;
-import com.fdkankan.scene.entity.ScenePlusExt;
 import com.fdkankan.scene.mapper.ISceneEditInfoMapper;
 import com.fdkankan.scene.vo.BallScreenVideoParamVO;
 import com.fdkankan.scene.vo.BaseDataParamVO;
@@ -616,7 +608,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         }
 
         //江门公安需求,如果是业务授权或者带有签名的链接进来的场景,不需要校验场景查看密码
-        if(StrUtil.isNotEmpty(param.getSign()) || StrUtil.isNotEmpty(param.getUserName())){
+        if(StrUtil.isNotEmpty(param.getSign()) || jmgaService.isBizAuth(num)){
             controls.setShowLock(CommonStatus.NO.code().intValue());
         }