From 7885832c819f7922eddf20480cd9e4d4e97b265e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 21 八月 2023 15:47:14 +0800
Subject: [PATCH] #oss实装

---
 src/main/java/com/zy/crm/manager/controller/PlanController.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index c27f9fb..920f19e 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -225,9 +225,11 @@
     public R insertFile(@RequestParam("planId") String planId,@RequestParam MultipartFile file){
         try{
             InputStream inputStream = file.getInputStream();
+            // 鑾峰彇鏂囦欢鐨勫唴瀹圭被鍨�
+            String contentType = file.getContentType();
             String suffix = getFileSuffix(file.getOriginalFilename());
-//            String url = ossService.upload(inputStream, suffix);
-            String url = "http://tjdt.oss-cn-hangzhou.aliyuncs.com/"+file.getOriginalFilename();
+            String url = ossService.upload(inputStream, suffix,contentType);
+//            String url = "http://tjdt.oss-cn-hangzhou.aliyuncs.com/"+file.getOriginalFilename();
             String[] names = url.split("com/");
             String name= names[1];
             String[] split = planId.split("-");
@@ -298,7 +300,7 @@
 
     @RequestMapping(value = "/plan/download/file/auth")
 //    @ManagerAuth
-    public void downloadFile(@RequestParam("downloadUrl") String downloadUrl,HttpServletResponse response){
+    public R downloadFile(@RequestParam("downloadUrl") String downloadUrl,HttpServletResponse response){
 //        System.out.println("---寮�濮�---");
 //        MultipartFile
         try{
@@ -306,10 +308,12 @@
             String name= names[1];
 //            ResponseEntity<Resource> resourceResponseEntity = FileSaveExampleUtil.downloadFile(downloadUrl, response);
 //            return R.ok(resourceResponseEntity);
-            ossService.download(name);
+            String download = ossService.download(name);
+            return R.ok().add(download);
         }catch (Exception e){
 
         }
+        return R.error();
     }
 
 

--
Gitblit v1.9.1