From c68a46c7b29a7f5a21a76ea5e230cd140c2694d8 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 19 四月 2023 17:28:44 +0800
Subject: [PATCH] 获取图片将时间有效期参数过滤掉

---
 ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
index 276ce3a..83980a1 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java
@@ -14,6 +14,7 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -21,6 +22,8 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Base64;
+import java.util.Dictionary;
+import java.util.Hashtable;
 
 /**
  * @author admin
@@ -31,7 +34,7 @@
 public class AlarmController {
     private IVideoAlarmReportService videoAlarmReportService;
 
-    private static Integer index = 0;
+    private static Dictionary<String, Integer> sessionDic = new Hashtable<>();
 
     @Autowired
     private VideoUtil videoUtil;
@@ -68,17 +71,21 @@
     @GetMapping(value = "/img", produces = {MediaType.IMAGE_JPEG_VALUE, MediaType.IMAGE_PNG_VALUE})
 //    @GetMapping(value = "/img")
     @ResponseBody
-    public byte[] getImages(HttpServletResponse response, @RequestParam String fileUrl, @RequestParam String OSSAccessKeyId, @RequestParam String Signature) {
-
-        index = 0;
-        return getBytes(fileUrl, OSSAccessKeyId, Signature);
+    public byte[] getImages(HttpServletRequest request, HttpServletResponse response,
+                            @RequestParam String fileUrl, @RequestParam(required = false) String OSSAccessKeyId,
+                            @RequestParam(required = false) String Signature) {
+        String sessionId = request.getSession().getId();
+        sessionDic.put(sessionId, 0);
+        return getBytes(fileUrl, OSSAccessKeyId, Signature, sessionId);
 
     }
 
-    private byte[] getBytes(String fileUrl, String OSSAccessKeyId, String Signature) {
+    private byte[] getBytes(String fileUrl, String OSSAccessKeyId, String Signature, String sessionId) {
+        int index = sessionDic.get(sessionId);
         try {
-            if (index < 10) {
-                index++;
+            if (sessionDic.get(sessionId) < 10) {
+                sessionDic.remove(sessionId);
+                fileUrl = fileUrl.replace("Expires","v");
                 System.out.println("getImages鑾峰彇鍥剧墖鍦板潃锛�" + fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
                 URL url = new URL(fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
                 HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -94,9 +101,12 @@
                 return data;
             }
         } catch (Exception e) {
-            System.out.println(index + "getImages鑾峰彇鍥剧墖澶辫触锛�" + e.getMessage());
-            getBytes(fileUrl, OSSAccessKeyId, Signature);
-            // e.printStackTrace();
+            index++;
+            sessionDic.put(sessionId, index);
+            System.out.println(index + "-getImages鑾峰彇鍥剧墖澶辫触锛�" + e.getMessage());
+            e.printStackTrace();
+            getBytes(fileUrl, OSSAccessKeyId, Signature, sessionId);
+
         }
         return null;
     }

--
Gitblit v1.8.0