From ee235e9f68ca87b8b4e27243b5c727e1c6ed9b6f Mon Sep 17 00:00:00 2001
From: yuan <1363654894@qq.com>
Date: Fri, 6 Sep 2024 10:37:26 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/compile/FilesCompilerLoad.java   | 18 ++---------------
 .../java/com/muyu/upload/ALiYunUpload.java    | 20 +++++++------------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/cloud-rule-engine/src/main/java/com/muyu/compile/FilesCompilerLoad.java b/cloud-rule-engine/src/main/java/com/muyu/compile/FilesCompilerLoad.java
index 497be53..c5574b4 100644
--- a/cloud-rule-engine/src/main/java/com/muyu/compile/FilesCompilerLoad.java
+++ b/cloud-rule-engine/src/main/java/com/muyu/compile/FilesCompilerLoad.java
@@ -39,21 +39,7 @@ public class FilesCompilerLoad {
                 System.out.println("编译失败");
             }
 
-            try {
-                String classContent = "";
-                BufferedReader bufferedReader = new BufferedReader(new FileReader("/home/lib/com/muyu/generate/"+fileName+ MethodSuffix.CLASSSUFFIX));
-                String line;
-                while ((line = bufferedReader.readLine()) != null) {
-                    System.out.println(line);
-                    classContent += line;
-                }
-                bufferedReader.close();
-                log.info("文件存储:" + fileName + MethodSuffix.CLASSSUFFIX);
-                ALiYunUpload.uploadClassFiles(classContent,fileName);
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+            ALiYunUpload.uploadClassFiles(fileName,"/home/lib/com/muyu/generate/"+fileName+ MethodSuffix.CLASSSUFFIX);
 
         return Result.success();
     }
@@ -63,7 +49,7 @@ public class FilesCompilerLoad {
         try {
             // class文件路径
             String externalClassFilePath = "/home/lib/com/muyu/generate/"+fileName + MethodSuffix.CLASSSUFFIX;
-            log.info(externalClassFilePath);
+            log.info("class文件路径:[{}]",externalClassFilePath);
             Path path = Paths.get(externalClassFilePath);
 
             String externalClassDir = externalClassFilePath.substring(0, externalClassFilePath.lastIndexOf('/'));
diff --git a/cloud-rule-engine/src/main/java/com/muyu/upload/ALiYunUpload.java b/cloud-rule-engine/src/main/java/com/muyu/upload/ALiYunUpload.java
index 50bb6fd..7cc07d3 100644
--- a/cloud-rule-engine/src/main/java/com/muyu/upload/ALiYunUpload.java
+++ b/cloud-rule-engine/src/main/java/com/muyu/upload/ALiYunUpload.java
@@ -7,8 +7,10 @@ import com.muyu.common.core.domain.Result;
 import com.muyu.compile.FilesCompilerLoad;
 import com.muyu.constant.MethodSuffix;
 import com.muyu.load.OSSFileLoad;
+import lombok.extern.log4j.Log4j2;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.nio.charset.StandardCharsets;
 
 /**
@@ -18,6 +20,7 @@ import java.nio.charset.StandardCharsets;
  * @name：ALiYunUpload
  * @Date：2024/8/30 下午7:05
  */
+@Log4j2
 public class ALiYunUpload {
 
     // Endpoint以华东1（杭州）为例，其它Region请按实际情况填写
@@ -65,9 +68,7 @@ public class ALiYunUpload {
 
     }
 
-    public static Result<Object> uploadClassFiles(String classContent, String fileName) {
-
-        System.out.println(classContent);
+    public static Result<Object> uploadClassFiles(String fileName,String filePath) {
 
         System.out.println(fileName+ MethodSuffix.CLASSSUFFIX);
 
@@ -77,21 +78,14 @@ public class ALiYunUpload {
         String objectName = "build/version/class/"+fileName+ MethodSuffix.CLASSSUFFIX;
 
         try {
-            // 将内容转换为字节数组输入流
-            ByteArrayInputStream inputStream = new ByteArrayInputStream(classContent.getBytes(StandardCharsets.UTF_8));
 
-            // 构造上传请求
-            PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, objectName, inputStream);
+            ossClient.putObject(bucketName, objectName, new File(filePath));
 
-            // 执行上传操作
-            ossClient.putObject(putObjectRequest);
-
-            OSSFileLoad.streamingClassDownload(fileName);
-            System.out.println(fileName+ MethodSuffix.CLASSSUFFIX);
+            log.info("文件[{}]存储成功",fileName+ MethodSuffix.CLASSSUFFIX);
             return Result.success(null,"文件"+fileName+".class"+"存储成功");
 
         } catch (Exception e) {
-            e.printStackTrace();
+            log.info("文件[{}]存储失败",fileName+ MethodSuffix.CLASSSUFFIX+"错误信息:[{}]"+e.getMessage());
             return Result.error(null,"文件"+fileName+".class"+"存储失败");
         } finally {
             // 关闭OSSClient