oss

4dkankan-utils-fyun/src/main/java/com/fdkankan/fyun/oss/UploadToOssUtil.java

@@ -2,6 +2,7 @@ package com.fdkankan.fyun.oss;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
+import com.alibaba.fastjson.JSON;
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.*;
 import com.amazonaws.HttpMethod;
@@ -688,7 +689,7 @@ public class UploadToOssUtil {
 	 * @param objectName
 	 * @return
 	 */
-	public InputStream getObjectContent(String bucketName, String objectName){
+	public String getObjectContent(String bucketName, String objectName){
 		StorageType storageType = StorageType.get(type);
 		switch (storageType){
 			case OSS:
@@ -707,13 +708,31 @@ public class UploadToOssUtil {
 	 * @param objectName
 	 * @return
 	 */
-	public InputStream getObjectContentFromAli(String bucketName, String objectName){
+	public String getObjectContentFromAli(String bucketName, String objectName){
 		//创建oss客户端
 		OSSClient ossClient = new OSSClient(point, key, secrey);
-		// ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
-		OSSObject ossObject = ossClient.getObject(bucketName, objectName);
-		InputStream objectContent = ossObject.getObjectContent();
-		return objectContent;
+		InputStream objectContent = null;
+		StringBuilder contentJson = null;
+		try {
+			// ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
+			OSSObject ossObject = ossClient.getObject(bucketName, objectName);
+			objectContent = ossObject.getObjectContent();
+			contentJson = new StringBuilder();
+			try(BufferedReader reader = new BufferedReader(new InputStreamReader(objectContent))){
+				while (true) {
+					String line = reader.readLine();
+					if (line == null) break;
+					contentJson.append(line);
+				}
+			} catch (IOException e) {
+				log.error("读取scene.json文件流失败", e);
+			}
+			ossClient.shutdown();
+		}catch (Exception e){
+			log.error("oos找不到文件，文件路径：{}", objectName);
+		}
+
+		return contentJson.toString();
 	}
 
 	/**
@@ -722,7 +741,7 @@ public class UploadToOssUtil {
 	 * @param objectName
 	 * @return
 	 */
-	public InputStream getObjectContentFromAws(String bucketName, String objectName){
+	public String getObjectContentFromAws(String bucketName, String objectName){
 		// TODO: 2022/1/21
 		return null;
 	}
@@ -732,7 +751,7 @@ public class UploadToOssUtil {
 	 * @param objectName
 	 * @return
 	 */
-	public InputStream getObjectContentFromLocal(String objectName){
+	public String getObjectContentFromLocal(String objectName){
 		// TODO: 2022/1/21
 		return null;
 	}