From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/service/MinioAccessService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/service/MinioAccessService.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/service/MinioAccessService.java
index 2bc51f6..c1e1095 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/service/MinioAccessService.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/service/MinioAccessService.java
@@ -1,6 +1,7 @@
package com.gkhy.safePlatform.minioFile.service;
-import com.gkhy.safePlatform.minioFile.config.MinioConfig;
+//import com.gkhy.safePlatform.minioFile.config.MinioConfig;
+import com.gkhy.safePlatform.commons.config.file.MinioConfig;
import com.gkhy.safePlatform.minioFile.utils.UUIDUtil;
import io.minio.GetPresignedObjectUrlArgs;
import io.minio.MinioClient;
@@ -15,7 +16,6 @@
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.Map;
-import java.util.UUID;
@Service
public class MinioAccessService {
@@ -56,10 +56,12 @@
return url;
}
- public String getPresignUrl(String prefixName ,String suffixName){
+ public Map<String, String> getPresignUrl(String prefixName ,String suffixName){
String uuid= UUIDUtil.initUUID();
String objName = prefixName+uuid+suffixName;
String url = null;
+ Map<String,String> resMap = new HashMap<>();
+ resMap.put("fileName",objName);
try {
Map<String, String> reqParams = new HashMap<>();
reqParams.put("response-content-type", "application/json");
@@ -70,6 +72,7 @@
.expiry(60*2)
.extraQueryParams(reqParams)
.build());
+ resMap.put("uploadUrl",url);
} catch (ErrorResponseException e) {
e.printStackTrace();
} catch (InsufficientDataException e) {
@@ -89,7 +92,7 @@
} catch (ServerException e) {
e.printStackTrace();
}
- return url;
+ return resMap;
}
--
Gitblit v1.9.2