|
@@ -53,7 +53,7 @@ public class GroovyScriptExecutor {
|
|
|
if(script.getIsDelete()||!script.getExeState()){
|
|
|
return Result.error(String.format("groovy script is invalid. api_name=%s", script.getApiName()));
|
|
|
}else {
|
|
|
- return executescriptScript(script);
|
|
|
+ return executeScript(script);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -62,11 +62,11 @@ public class GroovyScriptExecutor {
|
|
|
if (script == null) {
|
|
|
return Result.error(String.format("groovy script not found. api_name=%s", apiName));
|
|
|
}else {
|
|
|
- return executescriptScript(script);
|
|
|
+ return executeScript(script);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private Result<Object> executescriptScript(CtopCheckTaskList taskList){
|
|
|
+ private Result<Object> executeScript(CtopCheckTaskList taskList){
|
|
|
ClearCache();
|
|
|
GroovyCodeSource groovyCodeSource = getGroovyCodeSource(taskList);
|
|
|
Result<Object> response = null;
|
|
@@ -81,9 +81,9 @@ public class GroovyScriptExecutor {
|
|
|
scriptInstance.setCtopCheckTaskList(taskList);
|
|
|
response = scriptInstance.exec();
|
|
|
} else {
|
|
|
- scriptProcessLogExecutor.insertLogExecute(taskList,0L,0L,false,false);
|
|
|
- log.error("script script should extends Abstractscript.");
|
|
|
- response=Result.error("script script should extends Abstractscript.");
|
|
|
+ scriptProcessLogExecutor.insertLogExecute(taskList,start,0L,false,false);
|
|
|
+ log.error("script script should extends AbstractScript.");
|
|
|
+ response=Result.error("script script should extends AbstractScript.");
|
|
|
}
|
|
|
long end=System.currentTimeMillis();
|
|
|
scriptProcessLogExecutor.insertLogExecute(taskList,start,end);
|