From ecd9cf29bb0f11df1e3976e6dda408baecf4d208 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 30 六月 2023 17:51:18 +0800
Subject: [PATCH] 修改三资公开查熏小程序分类问题
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java
index e5babc5..67e65cc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java
@@ -4,6 +4,7 @@
import io.minio.MinioClient;
import io.minio.ObjectStat;
import org.apache.commons.io.IOUtils;
+import org.bouncycastle.util.encoders.Base64;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
@@ -47,7 +48,7 @@
try {
UUID uuid = UUID.randomUUID();
StringBuilder s = new StringBuilder();
- s.append(uuid.toString().replace("-", "")).append("/");
+ s.append(DateUtils.getCurrentDateyymd()).append("-original").append("/");
MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
minioProperties.getSecretKey());
// bucket 不存在，创建
@@ -70,6 +71,36 @@
}
return null;
}
+
+ /**
+ * 文件上传
+ *
+ * @param input
+ * 要上传的文件
+ * @return
+ */
+ public String uploadInputStream(InputStream input, String name) {
+ if (null != input) {
+ try {
+ UUID uuid = UUID.randomUUID();
+ StringBuilder s = new StringBuilder();
+ s.append(DateUtils.getCurrentDateyymd()).append("/");
+ MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
+ minioProperties.getSecretKey());
+ if (!minioClient.bucketExists(minioProperties.getBucket())) {
+ minioClient.makeBucket(minioProperties.getBucket());
+ }
+ String fileName = s.append(name).toString();
+ minioClient.putObject(minioProperties.getBucket(), fileName, input, "application/octet-stream");
+ StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl());
+ String url = fileUrl.append(fileName).toString();
+ return url;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
/**
* 文件上传
*
@@ -81,7 +112,7 @@
try {
UUID uuid = UUID.randomUUID();
StringBuilder s = new StringBuilder();
- s.append(uuid.toString().replace("-", "")).append("/");
+ s.append(DateUtils.getCurrentDateyymd()).append("-original").append("/");
MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
minioProperties.getSecretKey());
// bucket 不存在，创建
@@ -94,7 +125,7 @@
// String fileName = uuid + "/images." + FilenameUtils.getExtension(file.getOriginalFilename());
String fileName = s.append(name).toString();
String contentType = file.getContentType();
- minioClient.putObject(minioProperties.getBucket(), fileName, input, contentType);
+ minioClient.putObject(minioProperties.getBucket(), fileName, input, "application/octet-stream");
StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl());
String url = fileUrl.append(fileName).toString();
return fileName;
@@ -210,4 +241,15 @@
}
}
+
+ public InputStream base64StrToInputStream(String base64string) {
+ ByteArrayInputStream stream = null;
+ try {
+ byte[] bytes = Base64.decode(base64string);
+ stream = new ByteArrayInputStream(bytes);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return stream;
+ }
}
--
Gitblit v1.7.1