LeoN před 5 roky
rodič
revize
d486f366a0

+ 3 - 2
src/main/java/com/mokamrp/privates/controller/FileContorller.java

@@ -9,18 +9,19 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
  * @author leon 通用上传
  */
-@Controller
+@RestController
 @RequestMapping("/file")
 public class FileContorller {
     @Autowired
     public FileService fileService;
 
-    @PostMapping("upload")
+    @PostMapping("/upload")
     public Object upload(@RequestParam("file") MultipartFile zipFile){
         String url = fileService.uploadToOss(zipFile);
         return AjaxResult.success(url);

+ 19 - 11
src/main/java/com/mokamrp/privates/service/impl/FileServiceImpl.java

@@ -10,8 +10,11 @@ import com.mokamrp.privates.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
 
 import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -33,16 +36,21 @@ public class FileServiceImpl implements FileService {
     @Autowired
     public OSS oss;
 
-    public String uploadToOss(MultipartFile zipFile){
-        String originalFileName = zipFile.getOriginalFilename();
-        String exland = originalFileName.substring(originalFileName.lastIndexOf("."));
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-        Date currentTime = new Date();
-        String dateStr = formatter.format(currentTime);
-        String randStr = StringUtils.getRandomString(10);
-        String filePath = ossConfiguration.UPLOAD_DIR + dateStr+"/"+randStr+"."+exland;
-        PutObjectResult res = oss.putObject(ossConfiguration.getBucketName(),filePath,new ByteArrayInputStream(zipFile.toString().getBytes()));
-        String url = ossConfiguration.getHost() + filePath;
-        return url;
+    public String uploadToOss(MultipartFile zipFile) {
+        try{
+            InputStream inputStream = zipFile.getInputStream();
+            String originalFileName = zipFile.getOriginalFilename();
+            String exland = originalFileName.substring(originalFileName.lastIndexOf("."));
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmm");
+            Date currentTime = new Date();
+            String dateStr = formatter.format(currentTime);
+            String randStr = StringUtils.getRandomString(10);
+            String filePath = ossConfiguration.UPLOAD_DIR + dateStr+"/"+randStr+exland;
+            PutObjectResult res = oss.putObject(ossConfiguration.getBucketName(),filePath,inputStream);
+            String url = ossConfiguration.getHost() + filePath;
+            return url;
+        }catch (Exception e){
+            return "";
+        }
     }
 }

+ 1 - 1
src/main/resources/application-local.properties

@@ -32,7 +32,7 @@ aliyun.bucketName=mini-short-video-test
 spring.servlet.multipart.max-request-size=10MB
 spring.servlet.multipart.max-file-size=10MB
 
-xxl.sso.server=https://sso.mokamrp.com/sso
+xxl.sso.server=https://sso.mokamrp.com/sso 
 xxl.sso.logout.path=/logout
 xxl-sso.excluded.paths=/healthy
 #xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0