From 8c2231794773ddafaee23a938d4d40b8c3a1197d Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 21 Oct 2020 19:47:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=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          | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/listener/AppStartListener.java b/backend/src/main/java/io/metersphere/listener/AppStartListener.java
index 0b55a6cd91..515672d36e 100644
--- a/backend/src/main/java/io/metersphere/listener/AppStartListener.java
+++ b/backend/src/main/java/io/metersphere/listener/AppStartListener.java
@@ -33,8 +33,6 @@ 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 04ce9a5937..fa1c7a0942 100644
--- a/backend/src/main/java/org/apache/jmeter/NewDriver.java
+++ b/backend/src/main/java/org/apache/jmeter/NewDriver.java
@@ -89,8 +89,6 @@ public final class NewDriver {
 
             //只从 jmeter.home 加载
             tmpDir = System.getProperty("jmeter.home","");// Allow override $NON-NLS-1$ $NON-NLS-2$
-            System.out.println(System.getProperty("jmeter.home",""));
-            System.out.println(tmpDir + "222");
             if (tmpDir.length() == 0) {
                 File userDir = new File(System.getProperty("user.dir"));// $NON-NLS-1$
                 tmpDir = userDir.getAbsoluteFile().getParent();