Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch

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

@@ -67,13 +67,13 @@ public class AliyunCloudStorageService extends AbstractCloudStorageService {
     @Override
     public String uploadSuffix(byte[] data, String suffix, String privacyType) {
         CloudStorageConfig.AliyunCloudStorageConfigProps props = getPropsByprivacyType(privacyType);
-        return upload(data, getPath(props.getAliyunPrefix(), suffix), privacyType);
+        return upload(data, getPath(props.getAliyunPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override
     public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) {
         CloudStorageConfig.AliyunCloudStorageConfigProps props = getPropsByprivacyType(privacyType);
-        return upload(inputStream, getPath(props.getAliyunPrefix(), suffix), privacyType);
+        return upload(inputStream, getPath(props.getAliyunPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override

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

@@ -46,12 +46,12 @@ public class LocalCloudStorageService extends AbstractCloudStorageService {
 
     @Override
     public String uploadSuffix(byte[] data, String suffix, String privacyType) {
-        return upload(data, getPath(config.getLocalPrefix(), suffix), privacyType);
+        return upload(data, getPath(config.getLocalPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override
     public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) {
-        return upload(inputStream, getPath(config.getLocalPrefix(), suffix), privacyType);
+        return upload(inputStream, getPath(config.getLocalPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override

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

@@ -76,12 +76,12 @@ public class QcloudCloudStorageService extends AbstractCloudStorageService {
 
     @Override
     public String uploadSuffix(byte[] data, String suffix, String privacyType) {
-        return upload(data, getPath(config.getQcloudPrefix(), suffix), privacyType);
+        return upload(data, getPath(config.getQcloudPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override
     public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) {
-        return upload(inputStream, getPath(config.getQcloudPrefix(), suffix), privacyType);
+        return upload(inputStream, getPath(config.getQcloudPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override

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

@@ -70,12 +70,12 @@ public class QiniuCloudStorageService extends AbstractCloudStorageService {
 
     @Override
     public String uploadSuffix(byte[] data, String suffix, String privacyType) {
-        return upload(data, getPath(config.getQiniuPrefix(), suffix), privacyType);
+        return upload(data, getPath(config.getQiniuPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override
     public String uploadSuffix(InputStream inputStream, String suffix, String privacyType) {
-        return upload(inputStream, getPath(config.getQiniuPrefix(), suffix), privacyType);
+        return upload(inputStream, getPath(config.getQiniuPrefix(), suffix, privacyType), privacyType);
     }
 
     @Override