Commit 2b6d8c1c authored by 李光宇's avatar 李光宇
Browse files

Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6
parents e7e2bda7 58586362
...@@ -34,8 +34,11 @@ request_body = commonFuc().get_business_data(module, "payload1") ...@@ -34,8 +34,11 @@ request_body = commonFuc().get_business_data(module, "payload1")
# 发送请求 # 发送请求
result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict2") check_dict = commonFuc().get_business_data(module, "checkDict2")
# print(check_dict) # print(check_dict)
......
...@@ -55,8 +55,11 @@ request_body = commonFuc().get_business_data(module, "payload3", demand_id) ...@@ -55,8 +55,11 @@ request_body = commonFuc().get_business_data(module, "payload3", demand_id)
# 发送请求 # 发送请求
result = requests.get(url, params=request_body, headers=headers) result = requests.get(url, params=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict4") check_dict = commonFuc().get_business_data(module, "checkDict4")
# print(check_dict) # print(check_dict)
......
...@@ -49,8 +49,11 @@ request_body = commonFuc().get_business_data(module, "payload2", demand_id) ...@@ -49,8 +49,11 @@ request_body = commonFuc().get_business_data(module, "payload2", demand_id)
""" """
# 发送请求 # 发送请求
result = requests.get(url, params=request_body, headers=headers) result = requests.get(url, params=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict3") check_dict = commonFuc().get_business_data(module, "checkDict3")
# print(check_dict) # print(check_dict)
......
...@@ -28,8 +28,11 @@ request_body = commonFuc().get_business_data(module, "payload") ...@@ -28,8 +28,11 @@ request_body = commonFuc().get_business_data(module, "payload")
# 发送请求 # 发送请求
result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict1") check_dict = commonFuc().get_business_data(module, "checkDict1")
# print(check_dict) # print(check_dict)
......
...@@ -34,8 +34,10 @@ request_body = commonFuc().get_business_data(module, "payload1") ...@@ -34,8 +34,10 @@ request_body = commonFuc().get_business_data(module, "payload1")
# 发送请求 # 发送请求
result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict1") check_dict = commonFuc().get_business_data(module, "checkDict1")
# print(check_dict) # print(check_dict)
......
...@@ -42,8 +42,10 @@ request_body = commonFuc().get_business_data(module, "payload5", demand_parent_i ...@@ -42,8 +42,10 @@ request_body = commonFuc().get_business_data(module, "payload5", demand_parent_i
""" """
# 发送请求 # 发送请求
result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict5") check_dict = commonFuc().get_business_data(module, "checkDict5")
# print(check_dict) # print(check_dict)
......
...@@ -42,8 +42,10 @@ request_body = commonFuc().get_business_data(module, "payload4", demand_parent_i ...@@ -42,8 +42,10 @@ request_body = commonFuc().get_business_data(module, "payload4", demand_parent_i
""" """
# 发送请求 # 发送请求
result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict4") check_dict = commonFuc().get_business_data(module, "checkDict4")
# print(check_dict) # print(check_dict)
......
...@@ -48,7 +48,10 @@ request_body = commonFuc().get_business_data(module, "payload3", demand_parent_i ...@@ -48,7 +48,10 @@ request_body = commonFuc().get_business_data(module, "payload3", demand_parent_i
""" """
# 发送请求 # 发送请求
result = requests.get(url, params=request_body, headers=headers) result = requests.get(url, params=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict3") check_dict = commonFuc().get_business_data(module, "checkDict3")
......
...@@ -41,8 +41,11 @@ request_body = commonFuc().get_business_data(module, "payload2", demand_code) ...@@ -41,8 +41,11 @@ request_body = commonFuc().get_business_data(module, "payload2", demand_code)
""" """
# 发送请求 # 发送请求
result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict2") check_dict = commonFuc().get_business_data(module, "checkDict2")
# print(check_dict) # print(check_dict)
......
...@@ -42,7 +42,10 @@ files = {"file": file} ...@@ -42,7 +42,10 @@ files = {"file": file}
# 发送请求 # 发送请求
result = requests.post(url, files=files, headers=headers) result = requests.post(url, files=files, headers=headers)
# 获取接口响应时间
api_time = float(result.elapsed.total_seconds())
result = json.loads(result.content) result = json.loads(result.content)
result["api_time"] = api_time
# print(result) # print(result)
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict34") check_dict = commonFuc().get_business_data(module, "checkDict34")
......
...@@ -43,10 +43,13 @@ request_body = commonFuc().get_business_data(module, "payload39") ...@@ -43,10 +43,13 @@ request_body = commonFuc().get_business_data(module, "payload39")
# 发送请求 # 发送请求
result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) # print(result)
# 获取message # 获取message
result = {"errMessage": result["data"][0]["errMessage"]} result = {"errMessage": result["data"][0]["errMessage"]}
result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict39") check_dict = commonFuc().get_business_data(module, "checkDict39")
# print(check_dict) # print(check_dict)
......
...@@ -51,8 +51,11 @@ request_body = commonFuc().get_business_data(module, "payload35", file_aliyun) ...@@ -51,8 +51,11 @@ request_body = commonFuc().get_business_data(module, "payload35", file_aliyun)
""" """
# 发送请求 # 发送请求
result = result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
result["api_time"] = api_time
# print(result) # print(result)
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict35") check_dict = commonFuc().get_business_data(module, "checkDict35")
......
...@@ -34,10 +34,13 @@ request_body = commonFuc().get_business_data(module, "payload3") ...@@ -34,10 +34,13 @@ request_body = commonFuc().get_business_data(module, "payload3")
# 发送请求 # 发送请求
result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) # print(result)
# 获取查询结果中是否审核变动标识 # 获取查询结果中是否审核变动标识
result = {"changeSign": result["data"]["list"][0]["changeSign"]} result = {"changeSign": result["data"]["list"][0]["changeSign"]}
result["api_time"] = api_time
# print(result) # print(result)
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict3") check_dict = commonFuc().get_business_data(module, "checkDict3")
......
...@@ -34,10 +34,13 @@ request_body = commonFuc().get_business_data(module, "payload4") ...@@ -34,10 +34,13 @@ request_body = commonFuc().get_business_data(module, "payload4")
# 发送请求 # 发送请求
result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) # print(result)
# 获取查询结果中是否审核变动标识 # 获取查询结果中是否审核变动标识
result = {"orderStatus": result["data"]["list"][0]["orderStatus"]} result = {"orderStatus": result["data"]["list"][0]["orderStatus"]}
result["api_time"] = api_time
# print(result) # print(result)
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict4") check_dict = commonFuc().get_business_data(module, "checkDict4")
......
...@@ -65,10 +65,13 @@ request_body = commonFuc().get_business_data(module, "payload2", seller_company_ ...@@ -65,10 +65,13 @@ request_body = commonFuc().get_business_data(module, "payload2", seller_company_
# 发送请求 # 发送请求
result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) # print(result)
# 获取查询结果中订单编号 # 获取查询结果中订单编号
result = {"orderNum": result["data"]["list"][0]["demandCode"]} result = {"orderNum": result["data"]["list"][0]["demandCode"]}
result["api_time"] = api_time
# print(result) # print(result)
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict2", order_num) check_dict = commonFuc().get_business_data(module, "checkDict2", order_num)
......
...@@ -34,11 +34,14 @@ request_body = commonFuc().get_business_data(module, "payload33") ...@@ -34,11 +34,14 @@ request_body = commonFuc().get_business_data(module, "payload33")
# 发送请求 # 发送请求
result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) # print(result)
# 获取账号数量 # 获取账号数量
result = {"total": result["data"]["total"]} result = {"total": result["data"]["total"]}
result["api_time"] = api_time
# 数据库操作 # 数据库操作
mysql_handle = mySql() mysql_handle = mySql()
# 获取conf.ini文件中配置的数据库信息 # 获取conf.ini文件中配置的数据库信息
......
...@@ -34,8 +34,10 @@ request_body = commonFuc().get_business_data(module, "payload30") ...@@ -34,8 +34,10 @@ request_body = commonFuc().get_business_data(module, "payload30")
# 发送请求 # 发送请求
result = requests.get(url, params=request_body, headers=headers) result = requests.get(url, params=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
print(result) result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict30") check_dict = commonFuc().get_business_data(module, "checkDict30")
# print(check_dict) # print(check_dict)
......
...@@ -48,8 +48,10 @@ request_body = commonFuc().get_business_data(module, "payload32", demand_id) ...@@ -48,8 +48,10 @@ request_body = commonFuc().get_business_data(module, "payload32", demand_id)
# 发送请求 # 发送请求
result = requests.get(url, params=request_body, headers=headers) result = requests.get(url, params=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
print(result) result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict32") check_dict = commonFuc().get_business_data(module, "checkDict32")
......
...@@ -35,11 +35,14 @@ request_body = commonFuc().get_business_data(module, "payload7", manufacturer) ...@@ -35,11 +35,14 @@ request_body = commonFuc().get_business_data(module, "payload7", manufacturer)
# 发送请求 # 发送请求
result = requests.post(url, json=request_body, headers=headers) result = requests.post(url, json=request_body, headers=headers)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) result["api_time"] = api_time
if result["data"]: if result["data"]:
# 获取查询结果中厂家信息 # 获取查询结果中厂家信息
result = {"data": result["data"][0][0]} result = {"data": result["data"][0][0]}
result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict7", manufacturer) check_dict = commonFuc().get_business_data(module, "checkDict7", manufacturer)
# print(check_dict) # print(check_dict)
......
...@@ -23,8 +23,10 @@ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url5") ...@@ -23,8 +23,10 @@ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url5")
# 发送请求 # 发送请求
result = requests.get(url) result = requests.get(url)
# 获取接口响应时间
api_time = result.elapsed.total_seconds()
result = json.loads(result.content) result = json.loads(result.content)
# print(result) result["api_time"] = api_time
# 获取预期结果 # 获取预期结果
check_dict = commonFuc().get_business_data(module, "checkDict5") check_dict = commonFuc().get_business_data(module, "checkDict5")
# print(check_dict) # print(check_dict)
......
Supports Markdown
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