Merge branch 'feature/upload4Spider' into 'master'

feat: [none] 爬虫用文件上传方法

See merge request rays/pcloud-common-parent!310

pcloud-common/src/main/java/com/pcloud/common/enums/AliyunEnum.java

@@ -15,7 +15,9 @@ public enum AliyunEnum {
 	TRANSCODE("transcode"),		// 转码上传
 	UPLOAD("upload"),			// 普通上传
 	CUT("cut"),					// 剪切
-	MERGE("merge");				// 合并
+	MERGE("merge"),				// 合并
+	SPIDER("spider"),			// 爬虫
+	;
 
 	/**
 	 * 值

pcloud-common/src/main/java/com/pcloud/common/utils/aliyun/OssUtils.java

 package com.pcloud.common.utils.aliyun;
 
 
+import cn.hutool.core.codec.Base64;
 import com.huawei.mpc.client.MpcClient;
 import com.huawei.mpc.client.MpcConfig;
 import com.huawei.mpc.model.ObsObjInfo;
@@ -47,11 +48,12 @@ import com.pcloud.common.utils.httpclient.UrlUtils;
 import com.pcloud.common.utils.rsa.MD5;
 import com.pcloud.common.utils.string.StringTools;
 import com.pcloud.common.utils.string.StringUtil;
-
+import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.validation.constraints.NotNull;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -65,12 +67,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
-
-import cn.hutool.core.codec.Base64;
-import lombok.SneakyThrows;
-
-import javax.validation.constraints.NotNull;
 
 /**
  * @描述：
@@ -2000,4 +1996,22 @@ public class OssUtils {
         return objectExist(AliyunConstant.FILE_BUCKET, objectKey);
     }
 
+    public static UploadResultInfo uploadLocalFile4Spider(String filePath) throws FileException {
+        String fileType = FileUtils.getFileType(filePath);
+        String outObjectKey = getOutObjectKey(AliyunEnum.SPIDER, null, fileType);
+        uploadPointFile2OSS(filePath, AliyunConstant.FILE_BUCKET, outObjectKey);
+        return getResultInfo(outObjectKey, new File(filePath).length(), null, AliyunConstant.FILE_BUCKET);
+    }
+
+    public static UploadResultInfo uploadFileByteSpider(byte[] buff, String fileType) throws FileException {
+        return uploadFileStreamSpider(new ByteArrayInputStream(buff), fileType);
+    }
+
+    public static UploadResultInfo uploadFileStreamSpider(InputStream is, String fileType)
+            throws FileException {
+        String outObjectKey = getOutObjectKey(AliyunEnum.SPIDER, null, fileType);
+        uploadFileStream2OSS(is, AliyunConstant.FILE_BUCKET, outObjectKey);
+        return getResultInfo(outObjectKey, null, null, AliyunConstant.FILE_BUCKET);
+    }
+
 }