From 6290495df464189b03f535ee9cc826aae13f6b5f Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Thu, 19 Sep 2024 05:08:45 +0800
Subject: [PATCH] =?UTF-8?q?feat=20:=20=E6=A8=A1=E6=8B=9F=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/code/engine/JavaCodeEngine.java    |  5 ++--
 .../common/code/engine/JavaScriptEngine.java  |  1 -
 .../src/main/resources/bootstrap-dev.yml      | 26 +++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 custom-query/custom-query-biz/src/main/resources/bootstrap-dev.yml

diff --git a/common/common-code/src/main/java/cn/fateverse/common/code/engine/JavaCodeEngine.java b/common/common-code/src/main/java/cn/fateverse/common/code/engine/JavaCodeEngine.java
index abeff1c..51baa52 100644
--- a/common/common-code/src/main/java/cn/fateverse/common/code/engine/JavaCodeEngine.java
+++ b/common/common-code/src/main/java/cn/fateverse/common/code/engine/JavaCodeEngine.java
@@ -100,7 +100,8 @@ public class JavaCodeEngine {
             // 设置安全检查器
             System.setSecurityManager(securityManager);
             // 执行方法并返回结果
-            return ConsoleCapture.capture(() -> method.invoke(null, args));
+            return new EngineResult(method.invoke(null, args), null);
+//            return ConsoleCapture.capture(() -> method.invoke(null, args));
         } catch (CustomException e) {
             EngineResult result = new EngineResult();
             result.setSuccess(Boolean.FALSE);
@@ -279,7 +280,7 @@ public class JavaCodeEngine {
         }
 
 
-        public void remove(){
+        public void remove() {
             clazz = null;
             classLoader = null;
         }
diff --git a/common/common-code/src/main/java/cn/fateverse/common/code/engine/JavaScriptEngine.java b/common/common-code/src/main/java/cn/fateverse/common/code/engine/JavaScriptEngine.java
index dd0542b..47fc9d2 100644
--- a/common/common-code/src/main/java/cn/fateverse/common/code/engine/JavaScriptEngine.java
+++ b/common/common-code/src/main/java/cn/fateverse/common/code/engine/JavaScriptEngine.java
@@ -4,7 +4,6 @@ import cn.fateverse.common.code.console.ConsoleCapture;
 import cn.fateverse.common.code.lock.SegmentLock;
 import cn.fateverse.common.code.model.EngineResult;
 import cn.fateverse.common.core.exception.CustomException;
-import com.alibaba.fastjson2.JSON;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Value;
 
diff --git a/custom-query/custom-query-biz/src/main/resources/bootstrap-dev.yml b/custom-query/custom-query-biz/src/main/resources/bootstrap-dev.yml
new file mode 100644
index 0000000..3e65651
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/resources/bootstrap-dev.yml
@@ -0,0 +1,26 @@
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 162.14.111.170:8848
+        namespace: clay
+dubbo:
+  registry:
+    parameters:
+      namespace: dubbo-clay
+code:
+  java:
+    class-path: E:\home\clay\code\
+seata:
+  service:
+    grouplist:
+      seata-server: 192.168.31.102:8091
+  registry:
+    nacos:
+      namespace: clay
+  config:
+    apollo:
+      namespace: clay
+