Parcourir la source

Merge branch 'master' of https://github.com/java110/MicroCommunity

wuxw il y a 6 ans
Parent
commit
62d277337f

+ 1 - 0
WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java

@@ -72,6 +72,7 @@ public class GetFileSMOImpl extends BaseComponentSMO implements IGetFileSMO {
                 .replace("data:image/webp;base64,", "")
                 .replace("data:image/png;base64,", "")
                 .replace("data:image/jpeg;base64,", "")
+                .replace("data:application/octet-stream;base64,","")
         );
 
         return new ResponseEntity<Object>(context, headers, HttpStatus.OK);

+ 4 - 1
java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java

@@ -67,7 +67,10 @@ public class FtpUploadTemplate {
             } else if (imageBase64.contains("data:image/webp;base64,")) {
                 imageBase64 = imageBase64.replace("data:image/webp;base64,", "");
                 fileName += ".jpg";
-            } else {
+            } else if(imageBase64.contains("data:application/octet-stream;base64,")){
+                imageBase64 = imageBase64.replace("data:application/octet-stream;base64,", "");
+                fileName += ".jpg";
+            }else {
                 fileName += ".jpg";
             }
             FTPFile[] fs = ftpClient.listFiles(fileName);