优化代码

java110

2023-08-11 3424a01617671b3ed919a9aa878c03b1e0e4c897

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

old mode 100644
new mode 100755
@@ -1,13 +1,15 @@
package com.java110.core.client;

import com.alibaba.fastjson.JSONObject;
import com.aliyun.oss.OSSClient;
import com.java110.core.factory.LogFactory;
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.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;

@@ -43,6 +45,8 @@
        String fileName = "";
        OSSClient ossClient = null;
        ByteArrayInputStream is = null;
        String urlPath = "";
        String resMsg = "上传成功";
        try {
            ossClient = OSSUtil.getOSSClient();
            fileName = UUID.randomUUID().toString();
@@ -61,14 +65,15 @@
            } else {
                fileName += ".jpg";
            }
            ftpPath = ftpPath + IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;

            urlPath = IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
            byte[] context = Base64Convert.base64ToByte(imageBase64);
            is = new ByteArrayInputStream(context);
            OSSUtil.uploadByInputStream(ossClient, is, "java110", ftpPath);

            OSSUtil.uploadByInputStream(ossClient, is, ftpPath + urlPath);
        } catch (Exception e) {
            logger.error("上传文件失败", e);
            throw new IllegalArgumentException("上传文件失败");
            resMsg = e.getMessage()+e.getLocalizedMessage();
            throw new IllegalArgumentException("上传文件失败" + e.getMessage());
        } finally {
            if (is != null) {
                try {
@@ -77,8 +82,11 @@
                    e.printStackTrace();
                }
            }

            LogFactory.saveOutLog("OSS", "文件", new ResponseEntity(resMsg, HttpStatus.OK));

        }
        return IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
        return urlPath;
    }


@@ -93,8 +101,9 @@
        try {
            ossClient = OSSUtil.getOSSClient();
            fileName = UUID.randomUUID().toString() + "." + uploadFile.getOriginalFilename().substring(uploadFile.getOriginalFilename().lastIndexOf(".") + 1);
            fileName = IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
            is = uploadFile.getInputStream();
            OSSUtil.uploadByInputStream(ossClient, is, "java110", ftpPath);
            OSSUtil.uploadByInputStream(ossClient, is, ftpPath + fileName);
        } catch (Exception e) {
            // logger.error("上传文件失败", e);
            throw new IllegalArgumentException("上传文件失败");
@@ -110,6 +119,19 @@
        return fileName;
    }

    public String upload(InputStream inputStream, String ftpPath) {
        OSSClient ossClient = null;
        try {
            ossClient = OSSUtil.getOSSClient();
            OSSUtil.uploadByInputStream(ossClient, inputStream, ftpPath);
        } catch (Exception e) {
            // logger.error("上传文件失败", e);
            throw new IllegalArgumentException("上传文件失败");
        } finally {
        }
        return ftpPath;
    }

    /*
     *文件下载工具方法
     */
@@ -121,7 +143,7 @@
        ByteArrayInputStream fis = null;
        try {
            ossClient = OSSUtil.getOSSClient();
            OSSUtil.getInputStreamByOSS(ossClient, "java110", remotePath + fileName);
            ins = OSSUtil.getInputStreamByOSS(ossClient, remotePath + fileName);
            byteOut = new ByteArrayOutputStream();
            byte[] buf = new byte[2048];
            int bufsize = 0;
@@ -187,7 +209,7 @@
        ByteArrayInputStream fis = null;
        try {
            ossClient = OSSUtil.getOSSClient();
            is = OSSUtil.getInputStreamByOSS(ossClient, "java110", remotePath + fileName);
            is = OSSUtil.getInputStreamByOSS(ossClient, remotePath + fileName);
            if (null == is) {
                throw new FileNotFoundException(remotePath);
            }
@@ -240,4 +262,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;
    }

}