Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/kiisoo/ic/activity/controller/FileController.java

@@ -4,6 +4,7 @@ import com.kiisoo.ic.common.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,6 +20,9 @@ import java.util.UUID;
 @Slf4j
 public class FileController extends BaseController {
 
+    @Value("${upload.path}")
+    private String uploadPath;
+
     @ApiOperation(value = "上传文件")
     @PostMapping(value = "/upload")
     public Map<String, Object> upload(@RequestParam(value = "file", required = false) MultipartFile file) {
@@ -27,11 +31,11 @@ public class FileController extends BaseController {
         if (fileName == null) return fail();
         fileName = renameToUUID(fileName);
         try {
-            File targetPath = new File("upload");
+            File targetPath = new File(uploadPath);
             if (!targetPath.exists()) {
                 boolean state = targetPath.mkdirs();
             }
-            FileOutputStream out = new FileOutputStream("upload/" + fileName);
+            FileOutputStream out = new FileOutputStream(uploadPath + fileName);
             out.write(file.getBytes());
             out.flush();
             out.close();

src/main/resources/application-dev.yml

@@ -52,7 +52,7 @@ server:
     context-path: /kiisoo-ic
 
 upload:
-  path: /usr/local/share/applications/bsdgy/upload
+  path: /usr/local/share/applications/bsdgy/upload/
 
 bsd:
   vip: http://vtest.bsd.cn/BSD_WXAPP/miniProgram/getMemberDtlByUnionId?token=