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

Merge remote-tracking branch 'origin/v1.4' into v1.4

This commit is contained in:
Captain.B 2020-10-22 09:54:46 +08:00
parent a9394eacb3 935ad0f4f0
commit c51329433a
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/listener/AppStartListener.java
View File

@ -33,6 +33,8 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
System.out.println("================= 应用启动 =================");
System.setProperty("jmeter.home", jmeterHome);
loadJars();
initPythonEnv();

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit ee74568be0beba46da19616f5832e83f9164c688
Subproject commit cf6b06526324326a563d933e07118fac014a63b4

1
backend/src/main/java/org/apache/jmeter/NewDriver.java
View File

@ -92,7 +92,6 @@ public final class NewDriver {
if (tmpDir.length() == 0) {
File userDir = new File(System.getProperty("user.dir"));// $NON-NLS-1$
tmpDir = userDir.getAbsoluteFile().getParent();
System.out.println(tmpDir + "333");
}
// }
JMETER_INSTALLATION_DIRECTORY=tmpDir;

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9
Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1