clay/fateverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix : 代码执行引擎未区分' (#56) from clay into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/fateverse/pulls/56
This commit is contained in:
clay
2024-04-10 08:46:14 +00:00
parent 6e0eca39d5 dec31fb6ed
commit 866d5f9170
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java
View File

@@ -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;
/**

2
custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java
View File

@@ -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),

4
custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java
View File

@@ -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);
}