From 66386f40c10bba960a3dd1c471fb64b1aa90f6c5 Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Thu, 5 Sep 2024 16:38:25 +0800
Subject: [PATCH] Changes

---
 Dockerfile                                                | 2 +-
 .../src/main/java/rule/util/GenerateConstant.java         | 8 +++++---
 .../src/main/java/com/muyu/rule/test/OSSFileDownload.java | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4f1dfbb..dfabdff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ VOLUME ["/home/logs/muyu-rule"]
 #拷贝 执行 jar 包文件
 COPY ./muyu-rule-server/target/muyu-rule.jar /home/app.jar
 
-COPY ./muyu-rule-server/target/classes/com/muyu /home/lib
+COPY ./muyu-rule-common/target/classes/rule/ /home/lib/rule/
 
 
 
diff --git a/muyu-rule-common/src/main/java/rule/util/GenerateConstant.java b/muyu-rule-common/src/main/java/rule/util/GenerateConstant.java
index b300ec0..149fbdc 100644
--- a/muyu-rule-common/src/main/java/rule/util/GenerateConstant.java
+++ b/muyu-rule-common/src/main/java/rule/util/GenerateConstant.java
@@ -1,6 +1,7 @@
 package rule.util;
 
 import org.springframework.stereotype.Component;
+
 import rule.domain.Rule;
 import rule.domain.RuleEdition;
 
@@ -14,9 +15,9 @@ public class GenerateConstant {
     public static final String DATA_FIELD = "DataEngineValueActuator";
     public static final String DATA_RECORD = "DataEngineRecordActuator";
     public static final String DATA_SET = "DataEngineSetActuator";
-    public static final String ACTION_IMPORT = "import com.muyu.rule.engine.action.ActionDiscard;\n";
+//    public static final String ACTION_IMPORT = "import com.muyu.rule.engine.action.ActionDiscard;\n";
     public static final String SCOPE_IMPORT = "import com.muyu.rule.engine.scope.DataModelEngine";
-    public static final String PACKAGE_PATH = "package rule.util;";
+    public static final String PACKAGE_PATH = "package com.muyu.rule.generate;";
 
     public static String getClassName(String versionCode) {
         String[] splits = versionCode.split("_");
@@ -32,8 +33,9 @@ public class GenerateConstant {
         String format = simpleDateFormat.format(new Date());
 //        String level = selectType(rule.getRuleType());
         return
-//                PACKAGE_PATH + "\n" +
+                PACKAGE_PATH + "\n" +
 //                ACTION_IMPORT + "\n" +
+                "import rule.data.engine.basic.abstracts.DataEngineValueActuator" +
 //                SCOPE_IMPORT + level + ";\n" +
 //                "\n" +
                         "/**\n" +
diff --git a/muyu-rule-server/src/main/java/com/muyu/rule/test/OSSFileDownload.java b/muyu-rule-server/src/main/java/com/muyu/rule/test/OSSFileDownload.java
index ab87376..6317eb6 100644
--- a/muyu-rule-server/src/main/java/com/muyu/rule/test/OSSFileDownload.java
+++ b/muyu-rule-server/src/main/java/com/muyu/rule/test/OSSFileDownload.java
@@ -50,7 +50,7 @@ public class OSSFileDownload {
 
     public static Result<Object> compile(String fileName) {
         JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
-        String[] strings = {"-classpath", "/home/lib", "-verbose", "-d", "/home/lib", fileName};
+        String[] strings = {"-classpath", "/home/lib", "-verbose", "-d", "/home/lib", fileName+".java"};
         //编译任务
         int result = compiler.run(null, null, null, strings);
         //检查编译结果