From a9674f2fdd767d37a920e08535d8ab7d88746796 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 11 十二月 2023 14:21:52 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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 40068e6..02babf2 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
@@ -23,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.xml.bind.DatatypeConverter;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -120,12 +121,28 @@
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);
-
+ if (StringUtils.isNotBlank(fileUrl)) {
+ String sessionId = request.getSession().getId();
+ sessionDic.put(sessionId, 0);
+ return getBytes(fileUrl, OSSAccessKeyId, Signature, sessionId);
+ } else {
+ return null;
+ }
}
+ @ApiOperation(value = "鑾峰彇鍥剧墖")
+ @GetMapping(value = "/img/base64")
+// @GetMapping(value = "/img")
+ @ResponseBody
+ public String getImagesBase64(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);
+ byte[] bytes = getBytes(fileUrl, OSSAccessKeyId, Signature, sessionId);
+ String base64 = DatatypeConverter.printBase64Binary(bytes);
+ return base64;
+ }
@GetMapping(value = "/index")
@ResponseBody
@@ -141,7 +158,12 @@
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);
+ URL url = null;
+ if (StringUtils.isNotBlank(OSSAccessKeyId) && StringUtils.isNotBlank(Signature)) {
+ url = new URL(fileUrl + "&OSSAccessKeyId=" + OSSAccessKeyId + "&Signature=" + Signature);
+ } else {
+ url = new URL(fileUrl);
+ }
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
conn.setConnectTimeout(10 * 1000);
--
Gitblit v1.8.0