孙永军 vor 1 Jahr
Ursprung
Commit
18ee42d58e

+ 6 - 5
src/main/java/com/sxtvs/open/api/h5template/service/impl/OSSService.java

@@ -96,15 +96,15 @@ public class OSSService {
         return "https://cxzx.smcic.net/" + fileUrl;
     }
 
-    @SneakyThrows
-    public String bidPut(MultipartFile file, Long id) {
+
+    public String bidPut(MultipartFile file, Long id) throws IOException {
 
         String dir = "open/bid/" + id + "/";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(IoUtil.readBytes(file.getInputStream()));
         String fileUrl = dir + file.getOriginalFilename();
 
-        if (FileMagic.valueOf(file.getInputStream()) == FileMagic.OOXML && Objects.requireNonNull(file.getOriginalFilename()).endsWith(".doc")){
+        if (FileMagic.valueOf(new BufferedInputStream(file.getInputStream())) == FileMagic.OOXML && Objects.requireNonNull(file.getOriginalFilename()).endsWith(".doc")){
             fileUrl += "x";
         }
         ossClient.putObject(bucket, fileUrl , inputStream);
@@ -166,7 +166,7 @@ public class OSSService {
 
 
 
-    public String bidDocPut(MultipartFile file,  Long id)  {
+    public String bidDocPut(MultipartFile file,  Long id) throws IOException {
         try {
 
 
@@ -214,13 +214,14 @@ public class OSSService {
     public String bidUpload(MultipartFile multipartFile, Long id)  {
         try {
             String s;
-            if(FileMagic.valueOf(multipartFile.getInputStream()) == FileMagic.OLE2){
+            if(FileMagic.valueOf(new BufferedInputStream(multipartFile.getInputStream())) == FileMagic.OLE2){
                 s = bidDocPut(multipartFile, id);
             }else{
                 s = bidPut(multipartFile, id);
             }
             return s;
         }catch (Exception e){
+            e.printStackTrace();
             log.error("上传失败");
             throw new BizException("上传失败");
         }