孙永军 пре 1 година
родитељ
комит
d3d1665489

+ 4 - 3
src/main/java/com/sxtvs/open/api/h5template/service/impl/OSSService.java

@@ -103,15 +103,16 @@ public class OSSService {
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(IoUtil.readBytes(file.getInputStream()));
         String fileUrl = dir + file.getOriginalFilename();
+        String encodeUrl = dir + URLEncoder.encode(Objects.requireNonNull(file.getOriginalFilename()), StandardCharsets.UTF_8);
 
         if (FileMagic.valueOf(new BufferedInputStream(file.getInputStream())) == FileMagic.OOXML && Objects.requireNonNull(file.getOriginalFilename()).endsWith(".doc")){
             fileUrl += "x";
+            encodeUrl += "x";
         }
         ossClient.putObject(bucket, fileUrl , inputStream);
         inputStream.reset();
 
-        String encodedString = URLEncoder.encode(fileUrl, StandardCharsets.UTF_8);
-        return "https://cxzx.smcic.net/" + encodedString;
+        return "https://cxzx.smcic.net/" + encodeUrl;
     }
 
     public void bidDel(Long id){
@@ -192,11 +193,11 @@ public class OSSService {
         }
 
         String fileUrl = dir + oname;
+        String encodedString = dir + URLEncoder.encode(oname, StandardCharsets.UTF_8);
         ossClient.putObject(bucket, fileUrl , new ByteArrayInputStream(fos.toByteArray()));
         fos.close();
         fis.reset();
 
-        String encodedString = URLEncoder.encode(fileUrl, StandardCharsets.UTF_8);
         document.close();
         xwpfDocument.close();