From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 13 May 2024 18:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/feign/OssClient.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/feign/OssClient.java b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/feign/OssClient.java
index dc4c96d..5deb967 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/feign/OssClient.java
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/feign/OssClient.java
@@ -11,6 +11,7 @@
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -79,4 +80,18 @@
 
 		return R.data(result);
 	}
+
+	@PostMapping(value = UPLOAD_FILE)
+	public String uploadFile(String fileName,  MultipartFile file) throws Exception{
+
+//		InputStream inputStream = new ByteArrayInputStream(bytes);
+
+		BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
+
+		String link = bladeFile.getLink();
+		if (link.indexOf("http://10.42.6.251:8082") != -1) {
+			link= link.replace("http://10.42.6.251:8082", "https://sk.hubeishuiyi.cn/gminio");
+		}
+		return link;
+	}
 }

--
Gitblit v1.9.3