调整base_request代码

in_common/base_request.py

@@ -11,9 +11,7 @@ import path_setting
 
 
 class BaseRequest:
-
     params = {}
-    data = {}
 
     @classmethod
     def format(cls, r):
@@ -34,35 +32,10 @@ class BaseRequest:
         if r is None:
             r = self.r.json()
         return jsonpath(r, path)
-    '''
-    def get_cookie(self, req: dict):
-
-        host = self.api_load(path_setting.HOSTYAML_CONFIG)
-        print(host)
-        r = requests.request(
-            req['method'],
-            url=host['develop_host']['url'] + req['url'],
-            params=req['params'],
-            headers=req['headers'],
-            data=req['data'],
-            json=req['json']
-        )
-        dict = {}
-        for i in r.cookies:
-            dict[i.name] = i.value
-        headers = '_gtid={};sessionid={}'.format(dict["_gtid"], dict["sessionid"])
-        return headers
-
-    def read_header(self):
-        with open("../in_common/get_cookie.txt", 'r', encoding='utf-8') as f:
-            cookies = f.read()
-        headers = {"cookie": cookies}
-        return headers
-    '''
 
     def api_send(self, req: dict):
         host = self.api_load(path_setting.HOSTYAML_CONFIG)
-        url_host = ""
+
         # 获取调用该方法的路径
         import inspect
         ins_file = inspect.stack()[1].filename
@@ -89,10 +62,6 @@ class BaseRequest:
             s = LoginFunction().get_session()
 
         # 调用具体case的url
-        print(req['method'])
-        print(url_host + req['url'])
-        print(req.get('params'))
-        print(req.get('data'))
         r = s.request(
             req['method'],
             url=url_host + req['url'],
@@ -109,8 +78,33 @@ class BaseRequest:
     def trace_id(self):
         return ''.join(random.sample(string.ascii_lowercase + string.digits, 32))
 
+    '''
+       def get_cookie(self, req: dict):
+
+           host = self.api_load(path_setting.HOSTYAML_CONFIG)
+           print(host)
+           r = requests.request(
+               req['method'],
+               url=host['develop_host']['url'] + req['url'],
+               params=req['params'],
+               headers=req['headers'],
+               data=req['data'],
+               json=req['json']
+           )
+           dict = {}
+           for i in r.cookies:
+               dict[i.name] = i.value
+           headers = '_gtid={};sessionid={}'.format(dict["_gtid"], dict["sessionid"])
+           return headers
+
+       def read_header(self):
+           with open("../in_common/get_cookie.txt", 'r', encoding='utf-8') as f:
+               cookies = f.read()
+           headers = {"cookie": cookies}
+           return headers
+       '''
+
 if __name__ == '__main__':
     # BaseRequest().api_load("../api/api.yaml")
-    # print(BaseApi().trace_id())
-    BaseRequest().a()
+    print(BaseRequest().trace_id())