update OSS接口增加通用contentType

疯狂的狮子li

2021-07-20 a4c019ace2841faa6af14b5373a041464c3dbbde

 ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunCloudStorageServiceImpl.java

@@ -3,6 +3,7 @@
import com.aliyun.oss.ClientConfiguration;
import com.aliyun.oss.OSSClient;
import com.aliyun.oss.common.auth.DefaultCredentialProvider;
import com.ruoyi.oss.entity.UploadResult;
import com.ruoyi.oss.enumd.CloudServiceEnumd;
import com.ruoyi.oss.exception.OssException;
import com.ruoyi.oss.factory.OssFactory;
@@ -32,11 +33,15 @@
   @Autowired
   public AliyunCloudStorageServiceImpl(CloudStorageProperties properties) {
      this.properties = properties.getAliyun();
      ClientConfiguration configuration = new ClientConfiguration();
      DefaultCredentialProvider credentialProvider = new DefaultCredentialProvider(
         this.properties.getAccessKeyId(),
         this.properties.getAccessKeySecret());
      client = new OSSClient(this.properties.getEndpoint(), credentialProvider, configuration);
      try {
         ClientConfiguration configuration = new ClientConfiguration();
         DefaultCredentialProvider credentialProvider = new DefaultCredentialProvider(
            this.properties.getAccessKeyId(),
            this.properties.getAccessKeySecret());
         client = new OSSClient(this.properties.getEndpoint(), credentialProvider, configuration);
      } catch (Exception e) {
         throw new IllegalArgumentException("阿里云存储配置错误! 请检查系统配置!");
      }
   }

   @Override
@@ -45,18 +50,18 @@
   }

   @Override
   public String upload(byte[] data, String path) {
      return upload(new ByteArrayInputStream(data), path);
   public UploadResult upload(byte[] data, String path, String contentType) {
      return upload(new ByteArrayInputStream(data), path, contentType);
   }

   @Override
   public String upload(InputStream inputStream, String path) {
   public UploadResult upload(InputStream inputStream, String path, String contentType) {
      try {
         client.putObject(this.properties.getBucketName(), path, inputStream);
      } catch (Exception e) {
         throw new OssException("上传文件失败，请检查配置信息");
      }
      return this.properties.getEndpoint() + "/" + path;
      return new UploadResult().setUrl(properties.getEndpoint() + "/" + path).setFilename(path);
   }

   @Override
@@ -70,13 +75,13 @@
   }

   @Override
   public String uploadSuffix(byte[] data, String suffix) {
      return upload(data, getPath(this.properties.getPrefix(), suffix));
   public UploadResult uploadSuffix(byte[] data, String suffix, String contentType) {
      return upload(data, getPath(this.properties.getPrefix(), suffix), contentType);
   }

   @Override
   public String uploadSuffix(InputStream inputStream, String suffix) {
      return upload(inputStream, getPath(this.properties.getPrefix(), suffix));
   public UploadResult uploadSuffix(InputStream inputStream, String suffix, String contentType) {
      return upload(inputStream, getPath(this.properties.getPrefix(), suffix), contentType);
   }

   @Override