From a67506723c8c8e6f0d223b864eaa69423a2710a8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 11 Mar 2021 16:48:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java
index b9c7a94..844f12b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/xlfeedback/controller/XlfeedbackController.java
@@ -18,6 +18,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.minio.MinioClient;
+import io.minio.errors.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -38,11 +40,16 @@
import org.springblade.jfpt.xlfeedback.wrapper.XlfeedbackWrapper;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import org.xmlpull.v1.XmlPullParserException;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -232,4 +239,22 @@
return R.data(link);
}
+
+ @PostMapping("put-objects")
+ public R put(@RequestParam MultipartFile file) throws InvalidPortException, InvalidEndpointException, IOException, XmlPullParserException, NoSuchAlgorithmException, InvalidKeyException, InvalidArgumentException, InternalException, NoResponseException, InvalidBucketNameException, InsufficientDataException, ErrorResponseException, RegionConflictException {
+ MinioClient minioClient = new MinioClient("http://36.134.81.48:9000","adminminio","adminminio");
+ if (!minioClient.bucketExists("jfpt")) { //是否存在名为“test”的bucket
+ minioClient.makeBucket("jfpt");
+ }
+ String fileName = file.getOriginalFilename();
+ String newName ="upload/"+UUID.randomUUID().toString().replaceAll("-", "")
+ + fileName.substring(fileName.lastIndexOf("."));
+ InputStream inputStream = file.getInputStream(); //获取file的inputStream
+ minioClient.putObject("jfpt", newName, inputStream, "application/octet-stream");//上传
+ inputStream.close();
+ String url = minioClient.getObjectUrl("jfpt", newName); //文件访问路径
+ return R.data(url);
+ }
+
+
}
--
Gitblit v1.9.3