升级aliyun-sdk-oss

epmet-module/epmet-oss/epmet-oss-server/pom.xml

@@ -14,8 +14,7 @@
 
     <properties>
         <qiniu.version>7.2.22</qiniu.version>
-        <aliyun.oss.version>2.8.3</aliyun.oss.version>
+        <aliyun.oss.version>3.10.2</aliyun.oss.version>
-        <aliyun.core.version>3.2.2</aliyun.core.version>
         <qcloud.cos.version>5.4.4</qcloud.cos.version>
         <fastdfs.version>1.26.2</fastdfs.version>
     </properties>
@@ -82,11 +81,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-core</artifactId>
-            <version>${aliyun.core.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.github.tobato</groupId>
             <artifactId>fastdfs-client</artifactId>

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/cloud/AliyunCloudStorageService.java

@@ -8,7 +8,9 @@
 
 package com.epmet.cloud;
 
+import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.DownloadFileRequest;
 import com.aliyun.oss.model.DownloadFileResult;
 import com.epmet.commons.tools.exception.RenException;
@@ -26,12 +28,8 @@ import java.io.InputStream;
  */
 public class AliyunCloudStorageService extends AbstractCloudStorageService {
 
-    private OSSClient internalClient = null;
+    private OSS internalClient = null;
-    private OSSClient externalClient = null;
+    private OSS externalClient = null;
-
-    {
-
-    }
 
     public AliyunCloudStorageService(CloudStorageConfig config){
         this.config = config;
@@ -43,11 +41,11 @@ public class AliyunCloudStorageService extends AbstractCloudStorageService {
      * @author wxz
      * @date 2021.01.04 13:49
     */
-    public OSSClient getOssClient(String privacyType) {
+    public OSS getOssClient(String privacyType) {
         if (PrivacyType.INTERNAL.equalsIgnoreCase(privacyType)) {
             if (internalClient == null){
                 CloudStorageConfig.AliyunCloudStorageConfigProps props = config.getAliyun().getInternal();
-                internalClient = new OSSClient(props.getAliyunEndPoint(), props.getAliyunAccessKeyId(),
+                internalClient = new OSSClientBuilder().build(props.getAliyunEndPoint(), props.getAliyunAccessKeyId(),
                         props.getAliyunAccessKeySecret());
             }
             return internalClient;
@@ -100,7 +98,7 @@ public class AliyunCloudStorageService extends AbstractCloudStorageService {
     @Override
     public String upload(InputStream inputStream, String path, String privacyType) {
         CloudStorageConfig.AliyunCloudStorageConfigProps props = getPropsByprivacyType(privacyType);
-        OSSClient client = getOssClient(privacyType);
+        OSS client = getOssClient(privacyType);
         try {
             client.putObject(props.getAliyunBucketName(), path, inputStream);
             //client.shutdown();
@@ -114,7 +112,7 @@ public class AliyunCloudStorageService extends AbstractCloudStorageService {
     @Override
     public boolean delete(String objectName,String privacyType) {
         CloudStorageConfig.AliyunCloudStorageConfigProps props = getPropsByprivacyType(privacyType);
-        OSSClient client = getOssClient(privacyType);
+        OSS client = getOssClient(privacyType);
         try {
             client.deleteObject(props.getAliyunBucketName(), objectName);
             //client.shutdown();
@@ -140,7 +138,7 @@ public class AliyunCloudStorageService extends AbstractCloudStorageService {
     @Override
     public void down(String privacyType) throws IOException {
         CloudStorageConfig.AliyunCloudStorageConfigProps props = getPropsByprivacyType(privacyType);
-        OSSClient client = getOssClient(privacyType);
+        OSS client = getOssClient(privacyType);
         try {
 
             /*