diff --git a/cloud-rule-engine/src/main/java/com/muyu/load/OSSFileLoad.java b/cloud-rule-engine/src/main/java/com/muyu/load/OSSFileLoad.java index d4339d1..a259d68 100644 --- a/cloud-rule-engine/src/main/java/com/muyu/load/OSSFileLoad.java +++ b/cloud-rule-engine/src/main/java/com/muyu/load/OSSFileLoad.java @@ -28,32 +28,31 @@ public class OSSFileLoad { // bucket private static final String bucketName = "java-web-generating-class"; - public static void streamingDownload(String fileName) { + public static Result streamingDownload(String fileName) { + String source = null; try { // 创建 OSSClient 实例 OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret); // 判断 bucket 是否存在 Boolean flag_bucket = ossClient.doesBucketExist(bucketName); if (!flag_bucket) { - Result.error("bucket不存在"); - return; + return Result.error("bucket不存在"); } // 判断 要下载的文件 是否存在 Boolean flag_file = ossClient.doesObjectExist(bucketName, fileName); if (!flag_file) { - Result.error("预下载文件不存在"); - return; + return Result.error("预下载文件不存在"); } // ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流 OSSObject ossObject = ossClient.getObject(bucketName, fileName); // 按行读取文件内容 BufferedReader reader = new BufferedReader(new InputStreamReader(ossObject.getObjectContent())); - String source = null; + while(true){ String line = reader.readLine(); - source = source + line; + source += line; if (line == null) break; } System.out.println(source); @@ -69,6 +68,7 @@ public class OSSFileLoad { } catch (IOException e) { e.fillInStackTrace(); } + return Result.success(source); } } diff --git a/cloud-rule-server/src/main/java/com/muyu/controller/RuleVersionController.java b/cloud-rule-server/src/main/java/com/muyu/controller/RuleVersionController.java index dd3c3e9..ca8ef7e 100644 --- a/cloud-rule-server/src/main/java/com/muyu/controller/RuleVersionController.java +++ b/cloud-rule-server/src/main/java/com/muyu/controller/RuleVersionController.java @@ -62,7 +62,9 @@ public class RuleVersionController { ruleVersionService.save(RuleVersion.addBuild(ruleVersionAddReq)); Result objectResult = ALiYunUpload.uploadFiles(ruleVersionAddReq.getRuleVersionText(), ruleVersionAddReq.getRuleVersionType()); System.out.println(objectResult.getMsg()); - OSSFileLoad.streamingDownload(ruleVersionAddReq.getRuleVersionType()+".java"); + Result result = OSSFileLoad.streamingDownload(ruleVersionAddReq.getRuleVersionType() + ".java"); + System.out.println("--------------"); + System.out.println(result.getData()); return Result.success(null,"操作成功"); }