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

wuxw

2020-02-28 62d277337f838bbc47c82b08f118e58c35f6a0a1

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

@@ -24,7 +24,7 @@
     * private static String userPassword ="MXUsssMjhssE+*=a3C4\\0";//密码
     */
    private static String ftpPath = "uploadFiles"; // 文件上传目录
    private FTPClient ftpClient = null;

    private static String LOCAL_CHARSET = "GBK";
    private static String SERVER_CHARSET = "ISO-8859-1";
    private final static String localpath = "F:/";//下载到F盘下
@@ -41,6 +41,7 @@
    public String upload(String imageBase64, String server, int port,
                         String userName, String userPassword, String ftpPath) {
        String fileName = "";
        FTPClient ftpClient = null;
        try {
            ftpClient = new FTPClient();
            // request.setCharacterEncoding("utf-8");
@@ -66,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);
@@ -106,6 +110,7 @@
    public String upload(MultipartFile uploadFile, String server, int port,
                         String userName, String userPassword, String ftpPath) {
        String fileName = "";
        FTPClient ftpClient = null;
        try {
            // request.setCharacterEncoding("utf-8");
            ftpClient = new FTPClient();
@@ -153,7 +158,9 @@
     */
    public byte[] downFileByte(String remotePath, String fileName, String server, int port, String userName, String userPassword) {
        byte[] return_arraybyte = null;
        FTPClient ftpClient = null;
        try {
            ftpClient = new FTPClient();
            ftpClient.connect(server, port);
            ftpClient.login(userName, userPassword);
            ftpClient.enterLocalPassiveMode();