From 935ad0f4f098827743da5a9df244df0b3799adc8 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 22 Oct 2020 09:43:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AF=E5=88=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/metersphere/listener/AppStartListener.java | 2 ++
 backend/src/main/java/io/metersphere/xpack                      | 2 +-
 backend/src/main/java/org/apache/jmeter/NewDriver.java          | 1 -
 frontend/src/business/components/xpack                          | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/listener/AppStartListener.java b/backend/src/main/java/io/metersphere/listener/AppStartListener.java
index 515672d36e..0b55a6cd91 100644
--- a/backend/src/main/java/io/metersphere/listener/AppStartListener.java
+++ b/backend/src/main/java/io/metersphere/listener/AppStartListener.java
@@ -33,6 +33,8 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
 
         System.out.println("================= 应用启动 =================");
 
+        System.setProperty("jmeter.home", jmeterHome);
+
         loadJars();
 
         initPythonEnv();
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index ee74568be0..cf6b065263 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit ee74568be0beba46da19616f5832e83f9164c688
+Subproject commit cf6b06526324326a563d933e07118fac014a63b4
diff --git a/backend/src/main/java/org/apache/jmeter/NewDriver.java b/backend/src/main/java/org/apache/jmeter/NewDriver.java
index fa1c7a0942..3ec3df97f8 100644
--- a/backend/src/main/java/org/apache/jmeter/NewDriver.java
+++ b/backend/src/main/java/org/apache/jmeter/NewDriver.java
@@ -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;
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index cc38137a69..06d935cd1d 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9
+Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1