[DEV:文件服务] 上线测试服务器1<Auto> -e:test -m:file-service -type:single -v:1.4…

… -rp:8089 -de:<-e ACTIVE=dev -e UNIQUE_ID=0 -e SERVER_PORT=8089>

src/main/java/com/example/filesystem/controller/OSSOperatorController.java

@@ -5,16 +5,23 @@
 import com.example.filesystem.pojo.vo.DownloadFileVO;
 import com.example.filesystem.pojo.vo.OSSFileVO;
 import com.example.filesystem.pojo.vo.UploadFileVO;
+import com.example.filesystem.util.ConcurrentUtil;
 import org.apache.tomcat.jni.OS;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 /**
  * @Description
@@ -28,6 +35,8 @@ public class OSSOperatorController {
     @Resource
     AbstractOSSFileStrategy strategy;
 
+    private static final ExecutorService executorService = Executors.newFixedThreadPool(50);
+
     @PostMapping("/upload")
     public Result<?> upload(@Validated OSSFileVO commonFileVO){
         UploadFileVO res = strategy.upload(commonFileVO);
@@ -40,4 +49,25 @@ public Result<?> download(@Validated DownloadFileVO commonFileVO){
         return Result.success(res);
     }
 
+    @PostMapping("/upload/list")
+    public Result<?> upload(MultipartFile[] files,String[] md5List,String[] pathList,String bucket){
+        ArrayList<UploadFileVO> res = new ArrayList<>();
+        OSSFileVO ossFileVO = new OSSFileVO();
+        ossFileVO.setFile(files[0]);
+        ossFileVO.setPath(pathList[0]);
+        ossFileVO.setMd5(md5List[0]);
+        ossFileVO.setBucket(bucket);
+        Callable<UploadFileVO> file1 = ()->strategy.upload(ossFileVO);
+        ossFileVO.setFile(files[1]);
+        ossFileVO.setPath(pathList[1]);
+        ossFileVO.setMd5(md5List[1]);
+        Callable<UploadFileVO> file2 = ()->strategy.upload(ossFileVO);
+
+        Future<UploadFileVO> res1 = ConcurrentUtil.doJob(executorService, file1);
+        Future<UploadFileVO> res2 = ConcurrentUtil.doJob(executorService, file2);
+
+        res.add(ConcurrentUtil.futureGet(res1));
+        res.add(ConcurrentUtil.futureGet(res2));
+        return Result.success(res);
+    }
 }

src/main/java/com/example/filesystem/exception/GlobalExceptionHandler.java

@@ -31,7 +31,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(BaseException.class)
     public Result handleException(HttpServletRequest request,
                                   Exception ex) {
-        logger.error("Handle Exception Request Url:{},Exception:{}", request.getRequestURL(), ex);
+        logger.error("Handle Exception Request Url:%s,Exception:%s", request.getRequestURL(), ex);
         Result result;
         //系统异常
         if (ex instanceof BaseException) {

src/main/java/com/example/filesystem/pojo/vo/OSSFileVO.java

@@ -19,4 +19,5 @@ public class OSSFileVO extends CommonFileVO{
 
     @NotBlank(message = "bucket不能为空")
     private String bucket;
+
 }

src/main/java/com/example/filesystem/util/ConcurrentUtil.java

@@ -0,0 +1,29 @@
+package com.example.filesystem.util;
+
+import com.example.filesystem.common.BaseException;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+
+/**
+ * @Description
+ * @Author welsir
+ * @Date 2023/12/23 20:03
+ */
+public class ConcurrentUtil {
+
+    public static <T> Future<T> doJob(ExecutorService executorService, Callable<T> callable) {
+        return executorService.submit(callable);
+    }
+
+    public static <T> T futureGet(Future<T> future) {
+        try {
+            return future.get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new BaseException(e.toString());
+        }
+    }
+
+}