Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

wuxw

2022-09-08 6cd222d13f03901362f9a4c36a204e1e0b93a6e4

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

@@ -7,7 +7,7 @@
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.java110.core.log.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;

@@ -79,8 +79,8 @@
            } else if (imageBase64.contains("data:application/octet-stream;base64,")) {
                imageBase64 = imageBase64.replace("data:application/octet-stream;base64,", "");
                fileName += ".jpg";
            } else if (imageBase64.contains("mp4") || imageBase64.contains("MP4") || imageBase64.contains("AVI") || imageBase64.contains("avi")
                    || imageBase64.contains("WMV") || imageBase64.contains("wmv")) {
            } else if (imageBase64.contains(".mp4") || imageBase64.contains(".MP4") || imageBase64.contains(".AVI") || imageBase64.contains(".avi")
                    || imageBase64.contains(".WMV") || imageBase64.contains(".wmv")) {
                fileName += ".mp4";
            } else {
                fileName += ".jpg";