Commit 24846c7e by zhangchunyao

code update

parent c9adf357
......@@ -153,7 +153,7 @@ def xlsx_request(object):
response = requests.post(object["url"], params1)
result = response.json()
elif object["headers"]=="" and object["cookies"]!="":
print("这行有cookie")
#print("这行有cookie")
cookie=object["cookies"]
cookies = {i.split("=")[0]:i.split("=")[1] for i in cookie.split(";")}
response = requests.post(object["url"], params1,cookies=cookies)
......@@ -161,7 +161,7 @@ def xlsx_request(object):
elif object["headers"]!="" and object["cookies"]=="":
if'application/json' in object["hearders"]:
params1 = json.dumps(dic)
print("这行是有headers")
#print("这行是有headers")
head=object["headers"]
header=json.loads(head)
response = requests.post(object["url"], params1,headers=header)
......@@ -169,7 +169,7 @@ def xlsx_request(object):
elif object["headers"]!="" and object["cookies"] !="":
if 'application/json' in object["headers"]:
params1 = json.dumps(dic)
print("这行是有headers,有cookie")
#print("这行是有headers,有cookie")
cookie=object["cookies"]
cookies = {i.split("=")[0]:i.split("=")[1] for i in cookie.split(";")}
head=object["headers"]
......@@ -184,7 +184,7 @@ def xlsx_request(object):
response = requests.get(object["url"], params1)
result = response.json()
elif object["headers"]=="" and object["cookies"]!="":
print("这行有cookie")
#print("这行有cookie")
cookie=object["cookies"]
cookies = {i.split("=")[0]:i.split("=")[1] for i in cookie.split(";")}
response = requests.get(object["url"], params1,cookies=cookies)
......@@ -192,7 +192,7 @@ def xlsx_request(object):
elif object["headers"]!="" and object["cookies"]=="":
if 'application/json' in object["headers"]:
params1 = json.dumps(dic)
print("这行是有headers")
#print("这行是有headers")
head=object["headers"]
header=json.loads(head)
response = requests.get(object["url"], params1,headers=header)
......@@ -200,7 +200,7 @@ def xlsx_request(object):
elif object["headers"]!="" and object["cookies"] !="":
if 'application/json' in object["headers"]:
params1 = json.dumps(dic)
print("这行是有headers,有cookie")
#print("这行是有headers,有cookie")
cookie=object["cookies"]
cookies = {i.split("=")[0]:i.split("=")[1] for i in cookie.split(";")}
head=object["headers"]
......@@ -245,7 +245,7 @@ def dosheet(brd,bwt,sheetIndex):
object = xlsx_getRow(brd_sheet,i)
result = xlsx_request(object)
if result==0:
print("此行是接口说明,跳过不执行")
#print("此行是接口说明,跳过不执行")
elif type(object["expected_code"])==type(1.0):
if result.get(object["code"]) == object["expected_code"]:
xlsx_set(bwt_sheet, i, 10, "pass", False)
......
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