Commit f8693228 authored by 黎博's avatar 黎博

请求头和请求参数新增支持

parent da4b8ff0
...@@ -12,7 +12,7 @@ public interface AutoUtilsService { ...@@ -12,7 +12,7 @@ public interface AutoUtilsService {
Map<String, String> replaceVariables(String parameters, UUID uuid); Map<String, String> replaceVariables(String parameters, UUID uuid);
Map<String, String> replaceVariablesNew(String parameters, Map<String, Object> globalMap); Map<String, String> replaceVariablesNew(String namespace, String parameters, Map<String, Object> globalMap);
boolean assertResponse(String response, List<Map> validateList); boolean assertResponse(String response, List<Map> validateList);
......
...@@ -53,11 +53,16 @@ public class AutoUtilsServiceImpl implements AutoUtilsService { ...@@ -53,11 +53,16 @@ public class AutoUtilsServiceImpl implements AutoUtilsService {
* @return * @return
*/ */
@Override @Override
public Map<String, String> replaceVariablesNew(String parameters, Map<String, Object> globalMap) { public Map<String, String> replaceVariablesNew(String namespace, String parameters, Map<String, Object> globalMap) {
Map<String, String> parameterMap = JSON.parseObject(parameters, Map.class); Map<String, String> parameterMap = JSON.parseObject(parameters, Map.class);
log.info("替换之前的参数:{}", parameterMap); log.info("替换之前的参数:{}", parameterMap);
for (String key: parameterMap.keySet()) { for (String key: parameterMap.keySet()) {
String value = parameterMap.get(key); String value = parameterMap.get(key);
// 新增${NAMESPACE}判断
if (value.contains("${NAMESPACE}")) {
value = value.replace("${NAMESPACE}", namespace);
parameterMap.put(key, value);
}
if (value.startsWith("$")) { if (value.startsWith("$")) {
parameterMap.put(key, globalMap.get(value.substring(1)).toString()); parameterMap.put(key, globalMap.get(value.substring(1)).toString());
} }
......
...@@ -118,11 +118,11 @@ public class SceneTestcaseServiceImpl extends ServiceImpl<SceneTestcaseMapper, S ...@@ -118,11 +118,11 @@ public class SceneTestcaseServiceImpl extends ServiceImpl<SceneTestcaseMapper, S
Map<String, String> headersMap = JSON.parseObject(headers, Map.class); Map<String, String> headersMap = JSON.parseObject(headers, Map.class);
if (headers != null && !headers.isEmpty()) { if (headers != null && !headers.isEmpty()) {
// headersMap = autoUtilsService.replaceVariables(headers, uuid); // headersMap = autoUtilsService.replaceVariables(headers, uuid);
headersMap = autoUtilsService.replaceVariablesNew(headers, globalMap); headersMap = autoUtilsService.replaceVariablesNew(namespace, headers, globalMap);
} }
if (parameters != null && !parameters.isEmpty()) { if (parameters != null && !parameters.isEmpty()) {
// parameterMap = autoUtilsService.replaceVariables(parameters, uuid); // parameterMap = autoUtilsService.replaceVariables(parameters, uuid);
parameterMap = autoUtilsService.replaceVariablesNew(parameters, globalMap); parameterMap = autoUtilsService.replaceVariablesNew(namespace, parameters, globalMap);
} }
// 创建断言列表 // 创建断言列表
List<Map> validateList = new ArrayList<>(); List<Map> validateList = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment