From e3417dd9d94860e3630b49e976cd0e87ec175637 Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Thu, 19 Sep 2024 14:01:30 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=88=97=E8=A1=A8=E5=8F=98=E9=87=8F=E6=8C=89?=
 =?UTF-8?q?=E9=80=97=E5=8F=B7=E5=88=86=E9=9A=94=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E9=80=97=E5=8F=B7=E8=BD=AC=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1045007 --user=陈建星 github #32177 支持用户在","前加"\"以区分分隔符 https://www.tapd.cn/55049933/s/1580890
---
 .../api/parser/jmeter/JmeterTestElementParserHelper.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/JmeterTestElementParserHelper.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/JmeterTestElementParserHelper.java
index d161254ff7..51fdde2d5f 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/JmeterTestElementParserHelper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/JmeterTestElementParserHelper.java
@@ -49,7 +49,8 @@ public class JmeterTestElementParserHelper {
     public static UserParameters getUserParameters(List<CommonVariables> constantVariables, List<CommonVariables> listVariables) {
         List<CommonVariables> variableResults = new ArrayList<>();
         listVariables.forEach(listVariable -> {
-            String[] arrays = listVariable.getValue().replaceAll("[\r\n]", "").split(",");
+            // 按 ',' 分割，但是支持 \, 转义
+            String[] arrays = listVariable.getValue().replaceAll("[\r\n]", "").split("(?<!\\\\),");
             for (int i = 0; i < arrays.length; i++) {
                 CommonVariables commonVariables = BeanUtils.copyBean(new CommonVariables(), listVariable);
                 commonVariables.setKey(listVariable.getKey() + "_" + (i + 1));