From 88b11c72916d5ce1b6bebc060c234af9bbeee300 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 29 三月 2023 17:38:52 +0800
Subject: [PATCH] 功能优化
---
ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 f467ad8..f9aa42f 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
@@ -17,7 +17,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
@@ -28,8 +27,6 @@
@RestController
@RequestMapping("/API")
public class AlarmController {
-
-
private IVideoAlarmReportService videoAlarmReportService;
@Autowired
@@ -64,14 +61,17 @@
@ApiOperation(value = "鑾峰彇鍥剧墖")
- @GetMapping(value = "/img", produces = MediaType.IMAGE_PNG_VALUE)
+ @GetMapping(value = "/img", produces = {MediaType.IMAGE_JPEG_VALUE, MediaType.IMAGE_PNG_VALUE})
+// @GetMapping(value = "/img")
@ResponseBody
- public byte[] getImages(HttpServletResponse response, @RequestParam String fileUrl) {
+ public byte[] getImages(HttpServletResponse response, @RequestParam String fileUrl,
+ @RequestParam(required = false) String OSSAccessKeyId,
+ @RequestParam(required = false) String Signature) {
try {
URL url = new URL(fileUrl);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
- conn.setConnectTimeout(5 * 1000);
+ conn.setConnectTimeout(10 * 1000);
conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
InputStream inputStream = conn.getInputStream();// 閫氳繃杈撳叆娴佽幏鍙栧浘鐗囨暟鎹�
@@ -80,6 +80,7 @@
return data;
} catch (Exception e) {
+ System.out.println("鑾峰彇鍥剧墖澶辫触锛�" + e.getMessage());
e.printStackTrace();
}
return null;
--
Gitblit v1.8.0