新增正则表达式以及SceneTestcase和SceneTestcase里新增字段

src/main/java/cn/qg/holmes/entity/auto/SceneTestcase.java

@@ -20,6 +20,7 @@ public class SceneTestcase {
     private Integer id;
     private Integer sceneId;
     private Integer interfaceId;
+    private String name;
     private String preAction;
     private String postAction;
     private String headers;

src/main/java/cn/qg/holmes/entity/auto/SceneTestcaseReport.java

@@ -21,6 +21,7 @@ public class SceneTestcaseReport {
     private Integer sceneTestcaseId;
     private String interfaceUrl;
     private String interfaceName;
+    private String testcaseName;
     private String url;
     private String headers;
     private String parameters;

src/main/java/cn/qg/holmes/service/auto/impl/AutoUtilsServiceImpl.java

@@ -11,6 +11,8 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @author libo
@@ -94,7 +96,20 @@ public class AutoUtilsServiceImpl implements AutoUtilsService {
             for (String key: extractMap.keySet()) {
                 String value = extractMap.get(key);
                 String redisKey = uuid + "_" + key;
-                redisUtils.set(redisKey, JsonPath.read(response, value));
+                String redisValue = "";
+                if (value.startsWith("$")) {
+                    redisValue = JsonPath.read(response, value);
+                } else {
+                    Pattern pattern = Pattern.compile(value);
+                    Matcher matcher = pattern.matcher(response);
+                    if (matcher.find()) {
+                        redisValue = matcher.group(1);
+                    } else {
+                        return false;
+                    }
+                }
+//                redisUtils.set(redisKey, JsonPath.read(response, value));
+                redisUtils.set(redisKey, redisValue);
                 redisUtils.expire(redisKey, 120);
             }
         } catch (Exception e) {

src/main/java/cn/qg/holmes/service/auto/impl/SceneTestcaseServiceImpl.java

@@ -56,7 +56,7 @@ public class SceneTestcaseServiceImpl extends ServiceImpl<SceneTestcaseMapper, S
         List<SceneTestcase> sceneTestcaseList =  sceneTestcaseMapper.selectList(queryWrapper);
         List<Map<String, Object>> resultList = new ArrayList<>();
         for (SceneTestcase sceneTestcase: sceneTestcaseList) {
-            resultList.add(JSON.parseObject(sceneTestcaseExecution(namespace, sceneId, sceneTestcase.getInterfaceId(), uuid, batch), Map.class));
+            resultList.add(JSON.parseObject(sceneTestcaseExecution(namespace, sceneId, sceneTestcase.getInterfaceId(), sceneTestcase.getSequence(), uuid, batch), Map.class));
         }
         return JSON.toJSONString(resultList);
     }
@@ -71,10 +71,11 @@ public class SceneTestcaseServiceImpl extends ServiceImpl<SceneTestcaseMapper, S
         return sceneTestcaseMapper.getSceneTestcaseListBySceneId(sceneId);
     }
 
-    public String sceneTestcaseExecution(String namespace, Integer sceneId, Integer interfaceId, UUID uuid, String batch) {
-        QueryWrapper queryWrapper = new QueryWrapper();
+    public String sceneTestcaseExecution(String namespace, Integer sceneId, Integer interfaceId, Integer sequence, UUID uuid, String batch) {
+        QueryWrapper<SceneTestcase> queryWrapper = new QueryWrapper();
         queryWrapper.eq("scene_id", sceneId);
         queryWrapper.eq("interface_id", interfaceId);
+        queryWrapper.eq("sequence", sequence);
         SceneTestcase sceneTestcase = sceneTestcaseMapper.selectOne(queryWrapper);
         Interface anInterface = interfaceService.getById(interfaceId);
         AutoModule autoModule = autoModuleService.getById(anInterface.getModuleId());
@@ -155,6 +156,7 @@ public class SceneTestcaseServiceImpl extends ServiceImpl<SceneTestcaseMapper, S
         sceneTestcaseReport.setSequence(sceneTestcase.getSequence());
         sceneTestcaseReport.setInterfaceUrl(anInterface.getUrl());
         sceneTestcaseReport.setInterfaceName(anInterface.getName());
+        sceneTestcaseReport.setTestcaseName(sceneTestcase.getName());
         sceneTestcaseReport.setUrl(url);
         sceneTestcaseReport.setHeaders(JSON.toJSONString(headersMap));
         sceneTestcaseReport.setParameters(JSON.toJSONString(parameterMap));