上传minio文件返回的预览路径都用公网

simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/MinioController.java

@@ -8,10 +8,11 @@ import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.configuration.minio.SubMinioClient;
 import com.css.simulation.resource.common.util.MinioUtil;
-import io.minio.*;
+import io.minio.CreateMultipartUploadResponse;
+import io.minio.GetPresignedObjectUrlArgs;
+import io.minio.ListPartsResponse;
 import io.minio.errors.*;
 import io.minio.http.Method;
-import io.minio.messages.Item;
 import io.minio.messages.Part;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,7 +22,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
@@ -62,7 +62,7 @@ public class MinioController {
                 bucketName,
                 objectName
         );
-        String previewUrl = MinioUtil.getPreviewUrl(minioClientPrivate, Method.GET, bucketName, objectName);
+        String previewUrl = MinioUtil.getPreviewUrl(minioClientPublic, Method.GET, bucketName, objectName);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, "请求成功！", previewUrl);
     }
 
@@ -99,7 +99,7 @@ public class MinioController {
     }
 
     @RequestMapping("/preview")
-    public void preview(@RequestParam("objectName") String objectName, HttpServletResponse response ) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
+    public void preview(@RequestParam("objectName") String objectName, HttpServletResponse response) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
         InputStream inputStream = MinioUtil.downloadToStream(
                 minioClientPrivate,
                 bucketName,
@@ -112,7 +112,7 @@ public class MinioController {
     @RequestMapping("/getPreviewUrl")
     public ResponseBodyVO<String> getPreviewUrl(@RequestBody @Validated MinioParameter minioParameter) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
         String previewUrl = MinioUtil.getPreviewUrl(minioClientPublic, Method.GET, bucketName, minioParameter.getObjectName());
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS,"请求成功！", previewUrl);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, "请求成功！", previewUrl);
     }
 
     @RequestMapping("/createMultipartUpload")
@@ -171,6 +171,7 @@ public class MinioController {
         minioClientPrivate.completeMultipartUpload(bucketName, null, objectName, uploadId, partArr, null, null);
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, "合并成功！");
     }
+
     @PostMapping("/remove")
     public void download(
             @RequestBody @Validated MinioParameter minioParameter

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/FileController.java

@@ -34,7 +34,7 @@ public class FileController {
     private FileDownService fileDownService;
 
     @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ResponseBodyVO<Map> uploadWj(@RequestParam("file") MultipartFile multipartFile, HttpServletRequest request) {
+    public ResponseBodyVO<Map<String,String>> uploadWj(@RequestParam("file") MultipartFile multipartFile, HttpServletRequest request) {
         //获取文件类型
         String type = request.getParameter("type");
         String objectPath = request.getParameter("objectPath");
@@ -45,19 +45,19 @@ public class FileController {
             if (type.equals(DictConstants.VEHICLE_IMG_FILE)) {
                 fileName = "/" + DictConstants.VEHICLE_IMG_FILE + "/" + nowTime + "/" + randomCode + "/" + multipartFile.getOriginalFilename();
             } else {
-                new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "文件类型错误！");
+                new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "文件类型错误！");
             }
-            ResponseBodyVO<String> respon = fileDownService.upload(multipartFile, fileName);
-            if(respon.isStatus()){
-                String previewUrl = respon.getInfo();
-                Map map = new HashMap();
+            ResponseBodyVO<String> response = fileDownService.upload(multipartFile, fileName);
+            if(response.isStatus()){
+                String previewUrl = response.getInfo();
+                Map<String,String> map = new HashMap<>();
                 map.put("previewUrl", previewUrl);
                 map.put("fileName", fileName);
-                return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, map);
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, map);
             }
-            new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "上传失败！");
+            new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "上传失败！");
         }
-        return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "文件流file为空，请检查！");
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "文件流file为空，请检查！");
     }
 
     @PostMapping(value = "/download")