diff --git a/Dockerfile b/Dockerfile index 75e7eb3..47483b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ COPY ./cloud-etl-server/target/cloud-engine.jar /home/app.jar COPY ./cloud-etl-server/target/classes /home/lib -COPY ./cloud-etl-server/target/classes/com/muyu/home/lib/com/muyu/abstract/*.jar /home/lib/ +#COPY ./cloud-etl-server/target/classes/com/muyu/home/lib/com/muyu/abstract/*.jar /home/lib/ ENTRYPOINT ["java","-jar","-Dfile.encoding=UTF-8"] diff --git a/cloud-etl-common/src/main/java/com/muyu/context/GenerateConstant.java b/cloud-etl-common/src/main/java/com/muyu/context/GenerateConstant.java index e476ad6..045a1b8 100644 --- a/cloud-etl-common/src/main/java/com/muyu/context/GenerateConstant.java +++ b/cloud-etl-common/src/main/java/com/muyu/context/GenerateConstant.java @@ -57,20 +57,4 @@ public class GenerateConstant { "}"; } -// public static String selectType(String level) { -// String type = ""; -// switch (level) { -// case "F": -// type = DATA_FIELD; -// break; -// case "R": -// type = DATA_RECORD; -// break; -// case "C": -// type = DATA_SET; -// break; -// } -// return type; -// } - } diff --git a/cloud-etl-server/src/main/java/com/muyu/javacomplier/OSSFileDownload.java b/cloud-etl-server/src/main/java/com/muyu/javacomplier/OSSFileDownload.java index d7a2d73..5e459f8 100644 --- a/cloud-etl-server/src/main/java/com/muyu/javacomplier/OSSFileDownload.java +++ b/cloud-etl-server/src/main/java/com/muyu/javacomplier/OSSFileDownload.java @@ -4,9 +4,10 @@ import com.aliyun.oss.OSSClient; import com.aliyun.oss.model.GetObjectRequest; import com.aliyun.oss.model.ObjectMetadata; import com.muyu.domain.constants.Result; +import lombok.extern.log4j.Log4j2; import java.io.File; - +@Log4j2 public class OSSFileDownload { private static final String endpoint = "https://oss-cn-shanghai.aliyuncs.com"; @@ -27,21 +28,21 @@ public class OSSFileDownload { // 判断 bucket 是否存在 Boolean flag_bucket = ossClient.doesBucketExist(bucketName); if (!flag_bucket) { - System.out.println("bucket不存在"); + log.info("bucket不存在"); return Result.error("bucket不存在"); } String objectName = fileName + ".java"; Boolean flag_file = ossClient.doesObjectExist(bucketName, filePath + objectName); if (!flag_file) { - System.out.println("预下载文件不存在"); + log.info("预下载文件不存在"); return Result.error("预下载文件不存在"); } // 本地文件下载路径 String localPath = "/home/" + objectName; ObjectMetadata object = ossClient.getObject(new GetObjectRequest(bucketName, filePath + objectName), new File(localPath)); - System.out.println("文件路径是:" + filePath); - System.out.println("新文件路径是:" + localPath); - System.out.println("文件名称为:" + object); + log.info("文件路径是:" + filePath); + log.info("新文件路径是:" + localPath); + log.info("文件名称为:" + object); ossClient.shutdown(); return Result.success(source); } diff --git a/cloud-etl-server/src/main/java/com/muyu/test/JavaClass.java b/cloud-etl-server/src/main/java/com/muyu/test/JavaClass.java index 3a2194e..212d3c6 100644 --- a/cloud-etl-server/src/main/java/com/muyu/test/JavaClass.java +++ b/cloud-etl-server/src/main/java/com/muyu/test/JavaClass.java @@ -1,22 +1,21 @@ package com.muyu.test; import com.muyu.domain.constants.Result; +import lombok.extern.log4j.Log4j2; import javax.tools.JavaCompiler; import javax.tools.ToolProvider; - +@Log4j2 public class JavaClass { public static Result compile(String fileName) { JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); String[] strings = {"-classpath", "/home/lib", "-verbose", "-d", "/home/lib", "/home/" + fileName + ".java"}; - System.out.println("路径参数是:"+strings); int result = compiler.run(null, null, null, strings); - System.out.println("编译结果是:"+result); if (result == 0) { - System.out.println("编译成功,生成的.class文件位于源代码同目录"); + log.info("编译成功,生成的.class文件位于源代码同目录"); } else { - System.out.println("编译失败"); + log.info("编译失败"); } return Result.success(); }