From d3e5446447c79948eee93035900401aff50706fb Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期五, 31 三月 2023 15:58:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 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 d848cee..276ce3a 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
@@ -31,6 +31,8 @@
public class AlarmController {
private IVideoAlarmReportService videoAlarmReportService;
+ private static Integer index = 0;
+
@Autowired
private VideoUtil videoUtil;
@@ -67,28 +69,33 @@
// @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);
+
+ }
+
+ private byte[] getBytes(String fileUrl, String OSSAccessKeyId, String Signature) {
try {
+ if (index < 10) {
+ index++;
+ System.out.println("getImages鑾峰彇鍥剧墖鍦板潃锛�" + fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
+ URL url = new URL(fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setConnectTimeout(10 * 1000);
+ conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
- System.out.println("getImages鑾峰彇鍥剧墖鍦板潃锛�" + fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
- URL url = new URL(fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setRequestMethod("GET");
- conn.setConnectTimeout(10 * 1000);
- conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+ InputStream inputStream = conn.getInputStream();// 閫氳繃杈撳叆娴佽幏鍙栧浘鐗囨暟鎹�
- InputStream inputStream = conn.getInputStream();// 閫氳繃杈撳叆娴佽幏鍙栧浘鐗囨暟鎹�
+ byte[] data = readInputStream(inputStream);
+ System.out.println("getImages鑾峰彇鍥剧墖鎴愬姛");
-
- byte[] data = readInputStream(inputStream);
- System.out.println("getImages鑾峰彇鍥剧墖鎴愬姛");
-
-
- System.out.println("getImages -鍥剧墖64");
- System.out.println(Base64.getEncoder().encodeToString(data));
- return data;
-
+ return data;
+ }
} catch (Exception e) {
- System.out.println("getImages鑾峰彇鍥剧墖澶辫触锛�" + e.getMessage());
+ System.out.println(index + "getImages鑾峰彇鍥剧墖澶辫触锛�" + e.getMessage());
+ getBytes(fileUrl, OSSAccessKeyId, Signature);
// e.printStackTrace();
}
return null;
--
Gitblit v1.8.0