test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(接口测试，性能测试): 修改js engine

This commit is contained in:
Captain.B 2021-04-09 17:44:56 +08:00 committed by 刘瑞斌
parent f32939922e
commit ead167f573
7 changed files with 18 additions and 7062 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
backend/pom.xml
View File

@ -20,7 +20,6 @@
<jmeter.version>5.4.1</jmeter.version>
<nacos.version>1.1.3</nacos.version>
<dubbo.version>2.7.8</dubbo.version>
<graalvm.version>20.1.0</graalvm.version>
</properties>
<dependencies>
@ -298,34 +297,9 @@
<!-- 执行 js 代码依赖 -->
<dependency>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
<version>${graalvm.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
<version>${graalvm.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js-scriptengine</artifactId>
<version>${graalvm.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.graalvm.tools</groupId>
<artifactId>profiler</artifactId>
<version>${graalvm.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.graalvm.tools</groupId>
<artifactId>chromeinspector</artifactId>
<version>${graalvm.version}</version>
<scope>runtime</scope>
<groupId>org.mozilla</groupId>
<artifactId>rhino-engine</artifactId>
<version>1.7.13</version>
</dependency>
<dependency>

2
backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
View File

@ -53,7 +53,7 @@ public class MsJSR223Processor extends MsTestElement {
if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("nashornScript")) {
processor.setProperty("scriptLanguage", "nashorn");
}
if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("graalVMScript")) {
if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("rhinoScript")) {
processor.setProperty("scriptLanguage", "javascript");
}
processor.setProperty("script", this.getScript());

2
backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java
View File

@ -47,7 +47,7 @@ public class MsJSR223PostProcessor extends MsTestElement {
if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("nashornScript")) {
processor.setProperty("scriptLanguage", "nashorn");
}
if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("graalVMScript")) {
if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("rhinoScript")) {
processor.setProperty("scriptLanguage", "javascript");
}
processor.setProperty("script", this.getScript());

4
backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java
View File

@ -12,7 +12,6 @@ import org.apache.jmeter.modifiers.JSR223PreProcessor;
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jorphan.collections.HashTree;
import org.graalvm.polyglot.Context;
import java.util.List;
@ -43,7 +42,6 @@ public class MsJSR223PreProcessor extends MsTestElement {
}
public JSR223PreProcessor getJSR223PreProcessor() {
Context.newBuilder().allowNativeAccess(true).build();
JSR223PreProcessor processor = new JSR223PreProcessor();
processor.setEnabled(this.isEnable());
@ -59,7 +57,7 @@ public class MsJSR223PreProcessor extends MsTestElement {
if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("nashornScript")) {
processor.setProperty("scriptLanguage", "nashorn");
}
if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("graalVMScript")) {
if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("rhinoScript")) {
processor.setProperty("scriptLanguage", "javascript");
}

2
backend/src/main/java/io/metersphere/commons/utils/ScriptEngineUtils.java
View File

@ -8,7 +8,7 @@ import javax.script.ScriptException;
import java.nio.charset.StandardCharsets;
public class ScriptEngineUtils {
private static final String ENGINE_NAME = "graal.js";
private static final String ENGINE_NAME = "rhino";
private static ScriptEngine engine;
static {

7034
backend/src/main/resources/javascript/func.js
View File

File diff suppressed because one or more lines are too long

4
frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
View File

@ -96,14 +96,14 @@
],
isCodeEditAlive: true,
languages: [
'beanshell', "python", "groovy", "nashornScript","graalVMScript"
'beanshell', "python", "groovy", "nashornScript", "rhinoScript"
],
codeEditModeMap: {
beanshell: 'java',
python: 'python',
groovy: 'java',
nashornScript: 'javascript',
graalVMScript: 'javascript',
rhinoScript: 'javascript',
}
}
},