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

wuxw

2020-02-28 62d277337f838bbc47c82b08f118e58c35f6a0a1

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

 WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java

@@ -72,6 +72,7 @@
                .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);

 java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java

@@ -67,7 +67,10 @@
            } 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);