优化代码

Your Name

2023-06-06 fe3b0f4a3c46892f08421dd4c4d0937fb8a87f93

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

@@ -1,12 +1,11 @@
package com.java110.core.client;

import com.aliyun.oss.OSSClient;
import com.java110.utils.cache.MappingCache;
import com.java110.core.log.LoggerFactory;
import com.java110.utils.util.Base64Convert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.OSSUtil;
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;

@@ -65,7 +64,7 @@
            byte[] context = Base64Convert.base64ToByte(imageBase64);
            is = new ByteArrayInputStream(context);

            OSSUtil.uploadByInputStream(ossClient, is,  ftpPath + urlPath);
            OSSUtil.uploadByInputStream(ossClient, is, ftpPath + urlPath);
        } catch (Exception e) {
            logger.error("上传文件失败", e);
            throw new IllegalArgumentException("上传文件失败");
@@ -111,8 +110,7 @@
        return fileName;
    }

    public String upload(InputStream inputStream,  String ftpPath) {
        String fileName = "";
    public String upload(InputStream inputStream, String ftpPath) {
        OSSClient ossClient = null;
        try {
            ossClient = OSSUtil.getOSSClient();
@@ -122,7 +120,7 @@
            throw new IllegalArgumentException("上传文件失败");
        } finally {
        }
        return fileName;
        return ftpPath;
    }

    /*
@@ -255,4 +253,20 @@
        return null;
    }


    public InputStream download(String fileName) {
        OSSClient ossClient = null;
        InputStream is = null;
        try {
            ossClient = OSSUtil.getOSSClient();
            is = OSSUtil.getInputStreamByOSS(ossClient, fileName);
            if (null == is) {
                throw new FileNotFoundException(fileName);
            }
        } catch (Exception e) {
            logger.error("ftp通过文件名称获取远程文件流", e);
        }
        return is;
    }

}