feats

src/main/java/com/yunzhi/inte/controller/ImgVidController.java

@@ -1,5 +1,7 @@
 package com.yunzhi.inte.controller;
 
+import com.yunzhi.inte.common.ResponseBean;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
@@ -7,66 +9,63 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
 
 @RestController
 @RequestMapping("/")
 public class ImgVidController {
+
+    @Value("${my.upload-path}")
+    String uploadPath;
+
+    @Value("${my.server-base}")
+    String serverBase;
+
     /**
      * 图片上传。
      *
      * @param fileUpload
      * @return JSONObject
      */
-    @PostMapping(value = "/image/upload" )
+    @PostMapping(value = "/upload" )
     @ResponseBody
-    public void imageUpload(@RequestParam("file") MultipartFile fileUpload) {
+    public ResponseBean imageUpload(@RequestParam("file") MultipartFile fileUpload) throws Exception {
 
         //获取文件名
         String fileName = fileUpload.getOriginalFilename();
-        String tmpFilePath =  "E://image//"  ;
+        String newFileName = String.format("%s/%d-%s", getMonth(), System.currentTimeMillis(), fileName);
 
-        //没有路径就创建路径
-        File tmp = new File(tmpFilePath);
+        // 上传目录以日期分类
+        File tmp = new File(String.format("%s/%s", getUploadPath(), getMonth()));
         if (!tmp.exists()) {
-            tmp.mkdirs();
+            tmp.mkdir();
         }
-        String resourcesPath = tmpFilePath + "//" + fileName;
 
-        File upFile = new File(resourcesPath);
-        try {
-            fileUpload.transferTo(upFile);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        //
+        File upFile = new File(String.format("%s/%s", getUploadPath(), newFileName));
+        fileUpload.transferTo(upFile);
 
+        return ResponseBean.success(new HashMap<String, Object>(){{
+            put("url", String.format("%s/%s", serverBase, newFileName));
+        }});
     }
 
-    /**
-     * 视频上传。
-     *
-     * @param fileUpload
-     * @return JSONObject
-     */
-    @PostMapping(value = "/video/upload" )
-    @ResponseBody
-    public void videoUpload(@RequestParam("file") MultipartFile fileUpload) {
-
-        //获取文件名
-        String fileName = fileUpload.getOriginalFilename();
-        String tmpFilePath =  "E://video//"  ;
-        //没有路径就创建路径
-        File tmp = new File(tmpFilePath);
+    private String getUploadPath() {
+        File tmp = new File(uploadPath);
         if (!tmp.exists()) {
-            tmp.mkdirs();
-        }
-        String resourcesPath = tmpFilePath + "//" + fileName;
-        File upFile = new File(resourcesPath);
-        try {
-            fileUpload.transferTo(upFile);
-        } catch (IOException e) {
-            e.printStackTrace();
+            tmp.mkdir();
         }
 
+        return uploadPath;
+    }
+
+    private String getMonth() {
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+        return now.format(formatter);
     }
 }
 

src/main/java/com/yunzhi/inte/exception/GlobalException.java

@@ -0,0 +1,19 @@
+package com.yunzhi.inte.exception;
+
+import com.yunzhi.inte.common.ResponseBean;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@ControllerAdvice
+@ResponseBody
+public class GlobalException {
+    @ExceptionHandler(Exception.class)
+    public ResponseBean handleException(Exception e){
+        e.printStackTrace();
+        ResponseBean response = new ResponseBean();
+        response.setMessage(e.getMessage());
+        response.setCode(ResponseBean.ERROR_UNAVAILABLE);
+        return response;
+    }
+}

src/main/resources/application.yml

@@ -7,7 +7,7 @@ server:
 spring:
   datasource:
     driver-class-name: org.sqlite.JDBC
-    url: jdbc:sqlite:E:/interface/yunzhi/demo/src/main/resources/db/ybai.db
+    url: jdbc:sqlite:E:\work\jgz\service\db\ybai.db
     username:
     password:
   application:
@@ -15,7 +15,10 @@ spring:
   mvc:
     pathmatch:
       matching-strategy: ANT_PATH_MATCHER
-
+    static-path-pattern: ${my.static-prefix}/**
+  web:
+    resources:
+      static-locations: file:///${my.upload-path}
   servlet:
     multipart:
       max-file-size: 50MB #设置允许单个文件上传的大小
@@ -27,6 +30,11 @@ spring:
 #      ddl-auto: update
 #    show-sql: true
 
+my:
+  server-base: http://192.168.89.147:8087/api
+  upload-path: E:\work\jgz\upload
+  static-prefix: /assets
+
 ###
 mybatis-plus:
   configuration: