From dec31fb6ed1cde0f7ea40e0b3313bab66f9a3cd6 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Wed, 10 Apr 2024 16:45:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BB=A3=E7=A0=81=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=BC=95=E6=93=8E=E6=9C=AA=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java | 2 ++
 .../query/handler/engine/impl/JavaEngineExecuteHandler.java   | 2 +-
 .../handler/engine/impl/JavaScriptEngineExecuteHandler.java   | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java
index a66128d..7428279 100644
--- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java
@@ -1,5 +1,6 @@
 package cn.fateverse.query.entity.vo;
 
+import cn.fateverse.common.decrypt.annotation.EncryptField;
 import cn.fateverse.query.entity.DataAdapter;
 import cn.fateverse.common.core.annotaion.Excel;
 import cn.fateverse.query.enums.DataAdapterSource;
@@ -30,6 +31,7 @@ public class DataAdapterVo {
      * 数据适配器id
      */
     @ApiModelProperty("数据适配器id")
+    @EncryptField
     private Long adapterId;
 
     /**
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java
index 783cb03..76f5462 100644
--- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java
@@ -36,7 +36,7 @@ public class JavaEngineExecuteHandler implements EngineExecuteHandler {
 
     @Override
     public Object execute(DataAdapter dataAdapter, Object data, boolean development) {
-        if (dataAdapter.getType() != DataAdapterType.JAVA) {
+        if (!DataAdapterType.JAVA.equals(dataAdapter.getType())){
             return null;
         }
         return javaCodeEngine.execute(dataAdapter.getExecuteCode(), getClassName(dataAdapter),
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java
index 7bb4286..48b4b50 100644
--- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java
@@ -2,6 +2,7 @@ package cn.fateverse.query.handler.engine.impl;
 
 import cn.fateverse.common.code.engine.JavaScriptEngine;
 import cn.fateverse.query.entity.DataAdapter;
+import cn.fateverse.query.enums.DataAdapterType;
 import cn.fateverse.query.handler.engine.EngineExecuteHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -18,6 +19,9 @@ public class JavaScriptEngineExecuteHandler implements EngineExecuteHandler {
 
     @Override
     public Object execute(DataAdapter dataAdapter, Object data, boolean development) {
+        if (!DataAdapterType.JAVA_SCRIPT.equals(dataAdapter.getType())){
+            return null;
+        }
         return JavaScriptEngine.executeScript(dataAdapter.getExecuteCode(), "execute", data);
     }