From 5995160e9737bf07ea021c5f680d62a2d632f0d8 Mon Sep 17 00:00:00 2001
From: liangdaliang <liangdaliang@wondersoft.cn>
Date: Thu, 13 Mar 2025 10:49:28 +0800
Subject: [PATCH] =?UTF-8?q?gson=E5=BC=82=E5=B8=B8=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/test/common/utils/JMeterUtil.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/test-common/src/main/java/com/test/common/utils/JMeterUtil.java b/test-common/src/main/java/com/test/common/utils/JMeterUtil.java
index 964413d..a5f6f4d 100644
--- a/test-common/src/main/java/com/test/common/utils/JMeterUtil.java
+++ b/test-common/src/main/java/com/test/common/utils/JMeterUtil.java
@@ -29,6 +29,8 @@ import org.apache.jmeter.threads.ThreadGroup;
 import org.apache.jmeter.threads.gui.ThreadGroupGui;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.HashTree;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -55,6 +57,8 @@ import java.util.Map;
  */
 public class JMeterUtil {
 
+    private static final Logger logger = LoggerFactory.getLogger(JMeterUtil.class);
+
     /**
      * 生成jmeter测试执行计划并获取执行结果
      * @param jmeterRequest
@@ -269,7 +273,13 @@ public class JMeterUtil {
         Type listType = new TypeToken<List<Map<String, String>>>(){}.getType();
 
         // 将JSON字符串转换为List<Map<String, String>>
-        List<Map<String, String>> keyValuePairs = gson.fromJson(jsonString, listType);
+        List<Map<String, String>> keyValuePairs = null;
+        try {
+            keyValuePairs = gson.fromJson(jsonString, listType);
+        } catch (Exception e) {
+            logger.error("gson.fromJson发生异常！jsonString：" + jsonString, e);
+            return null;
+        }
 
         // 创建一个新的Map<String, String>用于存储结果
         Map<String, String> resultMap = new HashMap<>();