修复el表达式不能匹配多个变量的问题，修复StringParser问题

zixingkong · Jul 11, 2021 · 85a2cc1 · 85a2cc1
1 parent 1191dcf
commit 85a2cc1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/utils/executor.py b/app/utils/executor.py
@@ -13,7 +13,7 @@
 
 class Executor(object):
     log = Log("Executor")
-    el_exp = r"\$\{(.+)\}"
+    el_exp = r"\$\{(.+?)\}"
     pattern = re.compile(el_exp)
     # 需要替换全局变量的字段
     fields = ['body', 'url', 'request_header']

diff --git a/app/utils/gconfig_parser.py b/app/utils/gconfig_parser.py
@@ -55,7 +55,8 @@ def parse(value, jsonpath):
 
 class StringGConfigParser(GConfigParser):
 
-    def parse(self, value, jsonpath):
+    @staticmethod
+    def parse(value, jsonpath):
         return value