【change】文件上传优化

club-oss/pom.xml

@@ -20,17 +20,9 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-dependencies</artifactId>
-            <version>2.4.2</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.4.2</version>
             <exclusions>
                 <exclusion>
                     <artifactId>spring-boot-starter-logging</artifactId>
@@ -64,7 +56,6 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
-
     </dependencies>
 
     <dependencyManagement>
@@ -93,6 +84,25 @@
         </dependencies>
     </dependencyManagement>
 
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <!--打包成jar包时的名字-->
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.3.0.RELEASE</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <repositories>
         <repository>
             <id>central</id>
@@ -107,18 +117,5 @@
             </snapshots>
         </repository>
     </repositories>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 
 </project>
\ No newline at end of file

club-oss/src/main/java/com/lssst/oss/adapter/MinioStorageAdapter.java

@@ -4,6 +4,7 @@ package com.lssst.oss.adapter;
 import com.lssst.oss.entity.FileInfo;
 import com.lssst.oss.util.MinioUtil;
 import lombok.SneakyThrows;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -14,10 +15,15 @@ import java.util.List;
  * minioIO存储适配器
  */
 public class MinioStorageAdapter implements StorageAdapter {
-
     @Resource
     private MinioUtil minioUtil;
 
+    /**
+     * minioUrl
+     */
+    @Value("${minio.url}")
+    private String url;
+
     @Override
     @SneakyThrows
     public void createBucket(String bucket) {
@@ -29,9 +35,9 @@ public class MinioStorageAdapter implements StorageAdapter {
     public void uploadFile(MultipartFile uploadFile, String bucket, String objectName) {
         minioUtil.createBucket(bucket);
         if (objectName != null) {
-            minioUtil.uploadFile(uploadFile.getInputStream(), bucket, objectName + "/" + uploadFile.getName());
+            minioUtil.uploadFile(uploadFile.getInputStream(), bucket, objectName + "/" + uploadFile.getOriginalFilename());
         } else {
-            minioUtil.uploadFile(uploadFile.getInputStream(), bucket, uploadFile.getName());
+            minioUtil.uploadFile(uploadFile.getInputStream(), bucket, uploadFile.getOriginalFilename());
         }
     }
 
@@ -68,9 +74,8 @@ public class MinioStorageAdapter implements StorageAdapter {
     @Override
     @SneakyThrows
     public String getUrl(String bucket, String objectName) {
-        return minioUtil.getPreviewFileUrl(bucket, objectName);
+        return url + "/" + bucket + "/" + objectName;
     }
 
-
 }
 

club-oss/src/main/java/com/lssst/oss/controller/FileController.java

 package com.lssst.oss.controller;
 
 
+import com.lssst.oss.entity.Result;
 import com.lssst.oss.service.FileService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -14,6 +15,7 @@ import java.util.List;
 
 @RestController
 public class FileController {
+
     @Resource
     private FileService fileService;
 
@@ -32,10 +34,10 @@ public class FileController {
      * 上传文件
      */
     @RequestMapping("/upload")
-    public String upload(MultipartFile uploadFile, String bucket, String objectName) throws Exception {
-        return fileService.uploadFile(uploadFile, bucket, objectName);
+    public Result upload(MultipartFile uploadFile, String bucket, String objectName) throws Exception {
+        String url = fileService.uploadFile(uploadFile, bucket, objectName);
+        return Result.ok(url);
     }
 
 
-
 }

club-oss/src/main/java/com/lssst/oss/entity/Result.java

+package com.lssst.oss.entity;
+
+
+import lombok.Data;
+
+@Data
+public class Result<T> {
+
+    private Boolean success;
+
+    private Integer code;
+
+    private String message;
+
+    private T data;
+
+    public static Result ok(){
+        Result result = new Result();
+        result.setSuccess(true);
+        result.setCode(ResultCodeEnum.SUCCESS.getCode());
+        result.setMessage(ResultCodeEnum.SUCCESS.getDesc());
+        return result;
+    }
+
+    public static <T> Result ok(T data){
+        Result result = new Result();
+        result.setSuccess(true);
+        result.setCode(ResultCodeEnum.SUCCESS.getCode());
+        result.setMessage(ResultCodeEnum.SUCCESS.getDesc());
+        result.setData(data);
+        return result;
+    }
+
+    public static Result fail(){
+        Result result = new Result();
+        result.setSuccess(false);
+        result.setCode(ResultCodeEnum.FAIL.getCode());
+        result.setMessage(ResultCodeEnum.FAIL.getDesc());
+        return result;
+    }
+
+    public static <T> Result fail(T data){
+        Result result = new Result();
+        result.setSuccess(false);
+        result.setCode(ResultCodeEnum.FAIL.getCode());
+        result.setMessage(ResultCodeEnum.FAIL.getDesc());
+        result.setData(data);
+        return result;
+    }
+
+}

club-oss/src/main/java/com/lssst/oss/entity/ResultCodeEnum.java

+package com.lssst.oss.entity;
+
+
+import lombok.Getter;
+
+@Getter
+public enum ResultCodeEnum {
+
+    SUCCESS(200,"成功"),
+    FAIL(500,"失败");
+
+    public int code;
+
+    public String desc;
+
+    ResultCodeEnum(int code,String desc){
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static ResultCodeEnum getByCode(int codeVal){
+        for(ResultCodeEnum resultCodeEnum : ResultCodeEnum.values()){
+            if(resultCodeEnum.code == codeVal){
+                return resultCodeEnum;
+            }
+        }
+        return null;
+    }
+
+}
+

club-oss/src/main/java/com/lssst/oss/service/FileService.java

@@ -33,7 +33,7 @@ public class FileService {
      */
     public String uploadFile(MultipartFile uploadFile, String bucket, String objectName){
         storageAdapter.uploadFile(uploadFile,bucket,objectName);
+        objectName = objectName + "/" + uploadFile.getOriginalFilename();
         return storageAdapter.getUrl(bucket, objectName);
     }
-
-}
+}
\ No newline at end of file

club-oss/src/main/java/com/lssst/oss/util/MinioUtil.java

@@ -40,7 +40,7 @@ public class MinioUtil {
      */
     public void uploadFile(InputStream inputStream, String bucket, String objectName) throws Exception {
         minioClient.putObject(PutObjectArgs.builder().bucket(bucket).object(objectName)
-                .stream(inputStream, -1, Integer.MAX_VALUE).build());
+                .stream(inputStream, -1, 5242889L).build());
     }
 
     /**