[fix]修复get请求下全局变量替换参数

backend/testframe/interfaceTest/tester.py

@@ -9,6 +9,7 @@ from bson import ObjectId
 from threading import Thread
 
 import ssl
+
 ssl._create_default_https_context = ssl._create_unverified_context
 
 
@@ -140,20 +141,11 @@ class tester:
                 common.resolve_global_var(pre_resolve_var=test_case['route'], global_var_dic=self.global_vars) \
                     if isinstance(test_case['route'], str) else test_case['route']
             url = '%s://%s%s' % (test_case['requestProtocol'].lower(), domain, test_case['route'])
+
         if 'requestMethod' in test_case:
             method = test_case['requestMethod']
-        if 'requestMethod' in test_case and 'presendParams' in test_case \
-            and test_case['requestMethod'].lower() == 'get':
-            url += '?'
-            for key, value in test_case['presendParams'].items():
-                if value is not None:
-                    get_method_params_value = common.resolve_global_var(pre_resolve_var=value,
-                                                                        global_var_dic=self.global_vars) \
-                        if isinstance(value, str) else value
-                    url += '%s=%s&' % (key, get_method_params_value)
-            url = url[0:(len(url) - 1)]
-        elif 'presendParams' in test_case and isinstance(test_case['presendParams'], dict):
 
+        if 'presendParams' in test_case and isinstance(test_case['presendParams'], dict):
             # dict 先转 str，方便全局变量替换
             test_case['presendParams'] = str(test_case['presendParams'])
 
@@ -171,7 +163,7 @@ class tester:
                 for header in test_case['headers']:
                     if not header['name'].strip() == '':
                         headers[header['name']] = \
-                            common.resolve_global_var(pre_resolve_var=header['value'], global_var_dic=self.global_vars)\
+                            common.resolve_global_var(pre_resolve_var=header['value'], global_var_dic=self.global_vars) \
                                 if isinstance(header['value'], str) else headers[header['name']]
             else:
                 raise TypeError('headers must be list!')
@@ -193,7 +185,11 @@ class tester:
             use_json_data = len(list(filter(lambda x: str(x).lower() == 'content-type' and 'json'
                                                       in headers[x], headers.keys() if headers else {}))) > 0
 
-            response = session.request(url=url, method=method, json=json_data, headers=headers, verify=False) if use_json_data\
+            if test_case['requestMethod'].lower() == 'get':
+                response = session.request(url=url, method=method, params=json_data, headers=headers, verify=False)
+            else:
+                response = session.request(url=url, method=method, json=json_data, headers=headers,
+                                           verify=False) if use_json_data \
                     else session.request(url=url, method=method, data=json_data, headers=headers, verify=False)
 
         except BaseException as e:
@@ -229,13 +225,13 @@ class tester:
                                                        % (check_http_code, response_status_code))
                 return returned_data
 
-            is_check_res_data_valid = isinstance(test_case.get('checkResponseData'), list) and\
+            is_check_res_data_valid = isinstance(test_case.get('checkResponseData'), list) and \
                                       len(list(filter(lambda x: str(x.get('regex')).strip() == '',
                                                       test_case.get('checkResponseData')))) < 1
-            is_check_res_similarity_valid = isinstance(test_case.get('checkResponseSimilarity'), list) and\
+            is_check_res_similarity_valid = isinstance(test_case.get('checkResponseSimilarity'), list) and \
                                             len(list(filter(lambda x: isinstance(x.get('targetSimilarity'), type(None)),
                                                             test_case.get('checkResponseSimilarity')))) < 1
-            is_check_res_number_valid = isinstance(test_case.get('checkResponseNumber'), list) and\
+            is_check_res_number_valid = isinstance(test_case.get('checkResponseNumber'), list) and \
                                         len(list(filter(lambda x: str(x.get('expressions').get('expectResult')).strip()
                                                                   == '', test_case.get('checkResponseNumber')))) < 1
             # TODO 目前默认当 is_check_res_similarity_valid 和  is_check_res_number_valid 为真时，返回格式必须可转 json ，可优化
@@ -245,7 +241,8 @@ class tester:
 
             returned_data["testConclusion"].append('服务器返回格式不是json, 错误信息: %s, 服务器返回为: %s '
                                                    % (e, response.text)) if returned_data.get('status') and \
-                                                                    returned_data.get('status') == 'failed' else None
+                                                                            returned_data.get(
+                                                                                'status') == 'failed' else None
             if returned_data['status'] == 'ok':
                 returned_data["testConclusion"].append('测试通过')
 
@@ -377,7 +374,8 @@ class tester:
                         returned_data["status"] = 'failed'
                         returned_data["testConclusion"].append('相似度校验未达标！已对比字符串: 「%s」、「%s」, 实际相似度: 「%s」 '
                                                                '预期相似度: 「%s」。\t ' % (base_text, compaired_text,
-                                                                              actual_similarity, target_similarity))
+                                                                                    actual_similarity,
+                                                                                    target_similarity))
             except BaseException as e:
                 returned_data["status"] = 'failed'
                 returned_data["testConclusion"].append('判断相似度时报错, 模型服务器可能已宕机/断网。具体错误信息: <%s>。\t' % e)