Commit 83e64fa4 by Your Name

回滚到最初状态,因为此项目不是自己新建的分支

parent ffecc4f7
...@@ -3,7 +3,6 @@ package cn.timer.api.controller.oss; ...@@ -3,7 +3,6 @@ package cn.timer.api.controller.oss;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -44,8 +43,7 @@ public class OSSController { ...@@ -44,8 +43,7 @@ public class OSSController {
public Result<String> upload(@CurrentUser UserBean userBean, @RequestParam(required = false) String moudle, public Result<String> upload(@CurrentUser UserBean userBean, @RequestParam(required = false) String moudle,
@Param("file") MultipartFile file) { @Param("file") MultipartFile file) {
String url = null; String url = null;
int uuid = (int) (Math.random()*100+1); String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + file.getOriginalFilename();
String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" +uuid+"-"+ file.getOriginalFilename();
if (file == null || file.getSize() <= 0) { if (file == null || file.getSize() <= 0) {
return ResultUtil.error("上传的文件为空,请重新选择!"); return ResultUtil.error("上传的文件为空,请重新选择!");
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment