code update 201909121529

common/Http.py

@@ -28,14 +28,35 @@ class Http():
         self.value = {}
         self.header = {}
 
-    def Addheader(self,header):
+    def Parameter(self, parames):
+        '''相同参数'''
+        parameter = json.loads(parames)
+        for k in parameter.keys():
+            self.value[k] = parameter[k]
+        return parameter
+
+    def Addheader(self,header='', str=''):
         """添加头部信息"""
-        headers = json.loads(header)
-        # 循环取headers中value，存放至self.header中
-        for key in headers.keys():
-            self.header[key] = headers[key]
+        if header !='':
+            headers = json.loads(header)
+            # 循环取headers中value，存放至self.header中
+            for key in headers.keys():
+                self.header[key] = headers[key]
+        if str != '':
+            headers = json.loads(str)
+            for k in headers.keys():
+                if k in self.value.keys():
+                    self.header[k] = self.value[k]
         return self.header
 
+    # def Addheader(self,header):
+    #     """添加头部信息"""
+    #     headers = json.loads(header)
+    #     # 循环取headers中value，存放至self.header中
+    #     for key in headers.keys():
+    #         self.header[key] = headers[key]
+    #     return self.header
+
     def addcookies(self):
         self.session.cookies = self.savecookies()
         return self.session.cookies
@@ -83,10 +104,10 @@ class Http():
         param = self.addparam(default, variable)
         #print(param)
         if self.header != {}:
-            if 'application/json' in self.header["Content-Type"]:
+            if 'application/json' in self.header["Content-Type"] or 'token' in self.header.keys():
                 param = json.dumps(param)
             self.result = self.session.post(self.url + api, headers=self.header, data=param)
-            self.header.clear()
+            # self.header.clear()
         else:
             # 进行post请求，获取返回信息
             self.result = self.session.post(self.url + api, data=param)
@@ -100,11 +121,22 @@ class Http():
         param = self.addparam(default, variable)
         #print(param)
         paramts = urlencode(param)
-        # 进行get请求，获取返回信息
-        self.result = self.session.get(self.url + api + paramts)
+        if self.header !={}:
+            self.result = self.session.get(self.url + api + paramts,headers=self.header)
+        else:
+            self.result = self.session.get(self.url + api + paramts)
         # self.cookies = self.result.cookies
         self.jsons = json.loads(self.result.text)
         arr = self.assertquals(check, expected)
+
+        # param = self.addparam(default, variable)
+        # #print(param)
+        # paramts = urlencode(param)
+        # # 进行get请求，获取返回信息
+        # self.result = self.session.get(self.url + api + paramts)
+        # # self.cookies = self.result.cookies
+        # self.jsons = json.loads(self.result.text)
+        # arr = self.assertquals(check, expected)
         return self.jsons, arr
     def Time(self,n):
         """定时休眠"""
@@ -299,11 +331,11 @@ class InterFace():
                 results = response.json()
             result = results
         elif object["method"] == "get":
-            #print(object["params"])
+            # print(object["params"])
             dic = json.loads(object["params"])
             params1 = urlencode(dic)
             response = slef.session.get(object["url"]+params1)
-            #print(response)
+            # print(response)
             #response = requests.get(object["url"], params1)
             #result = json.loads(response.text)
             result = response.json()
@@ -357,4 +389,10 @@ class InterFace():
             arr.append(object["expected_code"])
             arr.append(object["code"])
             arr.append(object["path"])
-        return result, arr
+        return result, arr
\ No newline at end of file
+
+
+    if __name__ == '__main__':
+        hp = Http()
+        hp.Addheader('{"token":""}',"dfasdfasdf")
+        print(hp.header)
\ No newline at end of file