From 6a54f0eaaf0d37c504a65e0a913a322a644a46dd Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Wed, 4 Sep 2024 11:15:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpom=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HelloWorld.java                                    |  1 -
 cloud-etl-server/pom.xml                           | 14 --------------
 .../com/muyu/javacomplier/JavaStringCompiler.java  |  2 +-
 .../muyu/javacomplier/MemoryJavaFileManager.java   |  2 +-
 .../java/com/muyu/javacomplier/OssDownload.java    |  2 +-
 5 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 HelloWorld.java

diff --git a/HelloWorld.java b/HelloWorld.java
deleted file mode 100644
index 7769f07..0000000
--- a/HelloWorld.java
+++ /dev/null
@@ -1 +0,0 @@
-public class HelloWorld { public static void main(String[] args) { System.out.println("Hello, world!"); } }
\ No newline at end of file
diff --git a/cloud-etl-server/pom.xml b/cloud-etl-server/pom.xml
index 943e556..0bfa6db 100644
--- a/cloud-etl-server/pom.xml
+++ b/cloud-etl-server/pom.xml
@@ -42,13 +42,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-
-<<<<<<< HEAD
-
-<!--        //创建测试工程，引入依赖-->
-=======
-        <!--        //创建测试工程，引入依赖-->
->>>>>>> 6153133e0ae6ba8fbc2d841bc887a2893fd758a4
         <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>
@@ -60,10 +53,6 @@
             <artifactId>jaxb-api</artifactId>
             <version>2.3.1</version>
         </dependency>
-<<<<<<< HEAD
-=======
-
->>>>>>> 6153133e0ae6ba8fbc2d841bc887a2893fd758a4
         <dependency>
             <groupId>javax.activation</groupId>
             <artifactId>activation</artifactId>
@@ -121,11 +110,8 @@
             <artifactId>junit</artifactId>
         </dependency>
 
-<<<<<<< HEAD
 
 
-=======
->>>>>>> 6153133e0ae6ba8fbc2d841bc887a2893fd758a4
         <!--        &lt;!&ndash;         XllJob定时任务 &ndash;&gt;-->
         <!--        <dependency>-->
         <!--            <groupId>com.muyu</groupId>-->
diff --git a/cloud-etl-server/src/main/java/com/muyu/javacomplier/JavaStringCompiler.java b/cloud-etl-server/src/main/java/com/muyu/javacomplier/JavaStringCompiler.java
index 59a3fe4..03e30d1 100644
--- a/cloud-etl-server/src/main/java/com/muyu/javacomplier/JavaStringCompiler.java
+++ b/cloud-etl-server/src/main/java/com/muyu/javacomplier/JavaStringCompiler.java
@@ -40,7 +40,7 @@ public class JavaStringCompiler {
 	 *             If compile error.
 	 */
 	public Map<String, byte[]> compile(String fileName, String source) throws IOException {
-		try (com.itranswarp.compiler.MemoryJavaFileManager manager = new com.itranswarp.compiler.MemoryJavaFileManager(stdManager)) {
+		try (MemoryJavaFileManager manager = new MemoryJavaFileManager(stdManager)) {
 			JavaFileObject javaFileObject = manager.makeStringSource(fileName, source);
 			CompilationTask task = compiler.getTask(null, manager, null, null, null, Arrays.asList(javaFileObject));
 			Boolean result = task.call();
diff --git a/cloud-etl-server/src/main/java/com/muyu/javacomplier/MemoryJavaFileManager.java b/cloud-etl-server/src/main/java/com/muyu/javacomplier/MemoryJavaFileManager.java
index 70bb217..6453afa 100644
--- a/cloud-etl-server/src/main/java/com/muyu/javacomplier/MemoryJavaFileManager.java
+++ b/cloud-etl-server/src/main/java/com/muyu/javacomplier/MemoryJavaFileManager.java
@@ -1,4 +1,4 @@
-package com.itranswarp.compiler;
+package com.muyu.javacomplier;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FilterOutputStream;
diff --git a/cloud-etl-server/src/main/java/com/muyu/javacomplier/OssDownload.java b/cloud-etl-server/src/main/java/com/muyu/javacomplier/OssDownload.java
index 89557d3..7f54a9a 100644
--- a/cloud-etl-server/src/main/java/com/muyu/javacomplier/OssDownload.java
+++ b/cloud-etl-server/src/main/java/com/muyu/javacomplier/OssDownload.java
@@ -1,4 +1,4 @@
-package com.muyu.cloud.rule.utils.upload;
+package com.muyu.javacomplier;
 
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.GetObjectRequest;