From f441d46804f4d4d3955a2cdc1a06f37e888bdca3 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 25 Jun 2021 10:14:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8apache=E7=9A=84?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=E4=BB=A3=E6=9B=BFspring=E6=8F=90?=
 =?UTF-8?q?=E4=BE=9B=E7=9A=84=E5=B7=A5=E5=85=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java | 2 +-
 backend/src/main/java/io/metersphere/service/FileService.java   | 2 +-
 .../io/metersphere/track/service/TestCaseReviewLoadService.java | 2 +-
 .../track/service/TestCaseReviewScenarioCaseService.java        | 2 +-
 .../io/metersphere/track/service/TestPlanLoadCaseService.java   | 2 +-
 .../metersphere/track/service/TestPlanScenarioCaseService.java  | 2 +-
 backend/src/main/java/io/metersphere/xpack                      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java b/backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java
index 4864f26f82..e43b4a2ecc 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/JMeterVars.java
@@ -11,7 +11,7 @@ import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy;
 import org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.apache.jorphan.collections.HashTree;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
 
diff --git a/backend/src/main/java/io/metersphere/service/FileService.java b/backend/src/main/java/io/metersphere/service/FileService.java
index b0f574b6be..7158472c87 100644
--- a/backend/src/main/java/io/metersphere/service/FileService.java
+++ b/backend/src/main/java/io/metersphere/service/FileService.java
@@ -9,7 +9,7 @@ import io.metersphere.commons.exception.MSException;
 import io.metersphere.performance.request.QueryProjectFileRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java
index ff6e712bd9..c83f343964 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewLoadService.java
@@ -19,7 +19,7 @@ import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java
index 0f3b3bdfb0..17e0795411 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewScenarioCaseService.java
@@ -18,7 +18,7 @@ import io.metersphere.track.request.testcase.TestPlanApiCaseBatchRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
index 875f58c834..8cc2ac794d 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanLoadCaseService.java
@@ -28,7 +28,7 @@ import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
index 50b31ee0f9..12ac9b3d75 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
@@ -17,7 +17,7 @@ import io.metersphere.track.request.testcase.TestPlanScenarioCaseBatchRequest;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 77479091f8..f5f9335c42 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 77479091f8c7559b2b0300ef9419de50b9e43ce7
+Subproject commit f5f9335c429ef088c93afcbd52a1f1f26e4d0170