diff --git a/cloud/fIle-center/src/main/java/com/sincere/file/control/FileControl.java b/cloud/fIle-center/src/main/java/com/sincere/file/control/FileControl.java index 3340e08..14f83e0 100644 --- a/cloud/fIle-center/src/main/java/com/sincere/file/control/FileControl.java +++ b/cloud/fIle-center/src/main/java/com/sincere/file/control/FileControl.java @@ -1,35 +1,19 @@ package com.sincere.file.control; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.alibaba.fastjson.serializer.ValueFilter; import com.sincere.file.model.FileInfo; -import com.sincere.file.model.question.QuestionDataModel; +import com.sincere.file.model.result.Result; +import com.sincere.file.model.result.ResultFile; import com.sincere.file.service.FileService; -import com.sincere.file.utils.FileUtil; -import com.sincere.file.utils.PoiUtils; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.poi.xwpf.usermodel.Document; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.configurationprocessor.json.JSONException; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -import org.springframework.web.client.RestTemplate; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; import java.util.List; @RestController @@ -54,6 +38,23 @@ public class FileControl { } + @PostMapping("upload") + @ApiOperation("上传文件(重复文件会新增1)") + public Result upload(@RequestParam("imgFile") MultipartFile file, HttpServletRequest request) throws Exception { + + String ossPath = request.getHeader("ossPath");//oss的二级目录 + + FileInfo fileInfo = fileService.upload(file, ossPath); + List fileList = new ArrayList<>(); + ResultFile resultFile = new ResultFile(); + resultFile.setUrl(fileInfo.getUrl()); + resultFile.setName(fileInfo.getName()); + resultFile.setHref(""); + fileList.add(resultFile); + return Result.genSuccessResult(fileList); + + } + @PostMapping("fileUpload1") @ApiOperation("上传文件") diff --git a/cloud/fIle-center/src/main/java/com/sincere/file/model/result/Result.java b/cloud/fIle-center/src/main/java/com/sincere/file/model/result/Result.java new file mode 100644 index 0000000..f3a255d --- /dev/null +++ b/cloud/fIle-center/src/main/java/com/sincere/file/model/result/Result.java @@ -0,0 +1,42 @@ +package com.sincere.file.model.result; + +/** + * Created with IntelliJ IDEA. + * + * @Auther: xuquan + * @Date: 2021/08/24 14:29 + * @Description: 统一API响应结果封装 + */ +public class Result { + + private int errno; + private T data; + + public int getErrno() { + return errno; + } + + public void setErrno(int errno) { + this.errno = errno; + } + + public T getData() { + return data; + } + + public Result setCode(int errno) { + this.errno =errno; + return this; + } + + Result setData(T data) { + this.data = data; + return this; + } + + public static Result genSuccessResult(T data) { + return new Result() + .setCode(0) + .setData(data); + } +} diff --git a/cloud/fIle-center/src/main/java/com/sincere/file/model/result/ResultFile.java b/cloud/fIle-center/src/main/java/com/sincere/file/model/result/ResultFile.java new file mode 100644 index 0000000..27022fb --- /dev/null +++ b/cloud/fIle-center/src/main/java/com/sincere/file/model/result/ResultFile.java @@ -0,0 +1,23 @@ +package com.sincere.file.model.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * Created with IntelliJ IDEA. + * + * @Auther: xuquan + * @Date: 2021/08/24 14:29 + * @Description: + */ +@Data +public class ResultFile implements Serializable { + + private static final long serialVersionUID = -1L; + private String href; + private String name; + private String url; + +} -- libgit2 0.21.0