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

@@ -104,7 +104,7 @@ jugg:
     #下载时的baseUrl，与domain的区别：会在url后面拼接/**作为静态资源的url，而domain是后端系统的具体域名，下载时的完整url例如：upload.domain + upload.url/xxx.jpg
     url: /oss
     #下载时的域名
-    domain: http://localhost:8080
+    domain: http://erp.qgutech.com/api
     #上传文件的路径
     location: D:\upload\upload-data
   # 安全上传

@@ -19,6 +19,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
@@ -31,6 +32,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 文件收纳箱 Controller
@@ -66,6 +68,19 @@ public class FileBoxController extends DefaultBaseController {
   }
 
   /**
+   * 上传文件公共方法
+   */
+  @ApiOperation("上传文件公共方法")
+  @PostMapping("/uploadFile")
+  public InvokeResult<Map<String, String>> uploadFile(@Valid MultipartFile file) {
+
+    Map<String, String> map = fileBoxService.uploadFile(file);
+
+    return InvokeResultBuilder.success(map);
+  }
+
+
+  /**
    * 查询列表
    */
   @ApiOperation("查询列表")

@@ -34,7 +34,10 @@ import com.lframework.xingyun.comp.vo.sw.filebox.UpdateFileBoxVo;
 import com.lframework.xingyun.comp.vo.sw.filebox.UploadFileBoxVo;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -210,6 +213,21 @@ public class FileBoxServiceImpl extends
     }
   }
 
+  @Transactional(rollbackFor = Exception.class)
+  @Override
+  public Map<String, String> uploadFile(MultipartFile file) {
+    UploadDto uploadDto = UploadUtil.upload(file,
+            CollectionUtil.toList("filebox", SecurityUtil.getCurrentUser().getId()), true);
+    //文件名
+    String name = file.getOriginalFilename();
+    String securityUploadRecordId = uploadDto.getSecurityUploadRecordId();
+    Map<String, String> map = new HashMap<>();
+    map.put("fileName", name);
+    map.put("fileId", securityUploadRecordId);
+
+    return map;
+  }
+
   @Override
   public void cleanCacheByKey(Serializable key) {
 

@@ -7,7 +7,10 @@ import com.lframework.xingyun.comp.vo.sw.filebox.CreateFileBoxDirVo;
 import com.lframework.xingyun.comp.vo.sw.filebox.QueryFileBoxVo;
 import com.lframework.xingyun.comp.vo.sw.filebox.UpdateFileBoxVo;
 import com.lframework.xingyun.comp.vo.sw.filebox.UploadFileBoxVo;
+import org.springframework.web.multipart.MultipartFile;
+
 import java.util.List;
+import java.util.Map;
 
 /**
  * 文件收纳箱 Service
@@ -63,4 +66,11 @@ public interface FileBoxService extends BaseMpService<FileBox> {
    */
   void upload(UploadFileBoxVo vo);
 
+  /**
+   * 上传文件公共方法
+   *
+   * @param file
+   */
+  Map<String, String> uploadFile(MultipartFile file);
+
 }