From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java |   78 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 77 insertions(+), 1 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 fb7c843..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 不存在,创建
@@ -64,6 +65,70 @@
                 StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl());
                 String url = fileUrl.append(fileName).toString();
                 return url;
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        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;
+    }
+    /**
+     * 文件上传
+     *
+     * @param file 要上传的文件
+     * @return
+     */
+    public String uploadRetFileName(MultipartFile file, String name) {
+        if (null != file) {
+            try {
+                UUID uuid = UUID.randomUUID();
+                StringBuilder s = new StringBuilder();
+                s.append(DateUtils.getCurrentDateyymd()).append("-original").append("/");
+                MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
+                        minioProperties.getSecretKey());
+                // bucket 不存在,创建
+                if (!minioClient.bucketExists(minioProperties.getBucket())) {
+                    minioClient.makeBucket(minioProperties.getBucket());
+                }
+                // 得到文件流
+                InputStream input = file.getInputStream();
+                // 文件名
+                // String fileName = uuid + "/images." + FilenameUtils.getExtension(file.getOriginalFilename());
+                String fileName = s.append(name).toString();
+                String contentType = file.getContentType();
+                minioClient.putObject(minioProperties.getBucket(), fileName, input, "application/octet-stream");
+                StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl());
+                String url = fileUrl.append(fileName).toString();
+                return fileName;
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -176,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