kyfx
/
SensoroApiAutoTest
mirror of https://github.com/wangjie-jason/SensoroApiAutoTest.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

规范与修改BaseApi中的请求方法名，避免与第三方库方法名重复产生未知问题

This commit is contained in:
wangjie 2024-12-24 11:58:13 +08:00
parent f1a4965885
commit 833d00d3a2
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
common/base_api.py
View File

@ -102,7 +102,8 @@ class BaseApi:
return files return files
@staticmethod @staticmethod
def request(method, address, headers=None, params=None, data=None, json_data=None, files=None) -> requests.Response: def _request(method, address, headers=None, params=None, data=None, json_data=None,
files=None) -> requests.Response:
"""发送http请求，返回response对象""" """发送http请求，返回response对象"""
# 处理请求参数 # 处理请求参数
url = BaseApi._make_url(address) url = BaseApi._make_url(address)
@ -160,29 +161,29 @@ class BaseApi:
raise e raise e
@staticmethod @staticmethod
def get(address, params=None, headers=None) -> requests.Response: def send_get_request(address, params=None, headers=None) -> requests.Response:
"""发送get请求，返回response对象""" """发送get请求，返回response对象"""
# get请求会默认带上查询范围的参数 # get请求会默认带上查询范围的参数
params = BaseApi._make_params(params) params = BaseApi._make_params(params)
return BaseApi.request(method='get', address=address, params=params, headers=headers) return BaseApi._request(method='get', address=address, params=params, headers=headers)
@staticmethod @staticmethod
def post(address, data=None, json_data=None, headers=None, files=None) -> requests.Response: def send_post_request(address, data=None, json_data=None, headers=None, files=None) -> requests.Response:
"""发送post请求，返回response对象""" """发送post请求，返回response对象"""
return BaseApi.request(method='post', address=address, data=data, json_data=json_data, headers=headers, return BaseApi._request(method='post', address=address, data=data, json_data=json_data, headers=headers,
files=files) files=files)
@staticmethod @staticmethod
def delete(address, data=None, json=None, headers=None, files=None) -> requests.Response: def send_delete_request(address, data=None, json=None, headers=None, files=None) -> requests.Response:
"""发送delete请求，返回response对象""" """发送delete请求，返回response对象"""
return BaseApi.request(method='delete', address=address, data=data, json_data=json, headers=headers, return BaseApi._request(method='delete', address=address, data=data, json_data=json, headers=headers,
files=files) files=files)
@staticmethod @staticmethod
def put(address, data=None, json_data=None, headers=None, files=None) -> requests.Response: def send_put_request(address, data=None, json_data=None, headers=None, files=None) -> requests.Response:
"""发送put请求，返回response对象""" """发送put请求，返回response对象"""
return BaseApi.request(method='put', address=address, data=data, json_data=json_data, headers=headers, return BaseApi._request(method='put', address=address, data=data, json_data=json_data, headers=headers,
files=files) files=files)
@staticmethod @staticmethod
def get_json(response: requests.Response) -> Union[Dict[str, Any], str]: def get_json(response: requests.Response) -> Union[Dict[str, Any], str]:
@ -270,5 +271,5 @@ if __name__ == '__main__':
params = { params = {
'mobile': '13800000000', 'mobile': '13800000000',
'region': 'CN'} 'region': 'CN'}
r = BaseApi.get(address, params=params) r = BaseApi.send_get_request(address, params=params)
print(BaseApi.get_request_info(r)) print(BaseApi.get_request_info(r))

2
pageApi/login.py
View File

@ -15,7 +15,7 @@ class Login(BaseApi):
'password': password 'password': password
} }
return self.post(address, json_data=json) return self.send_post_request(address, json_data=json)
if __name__ == '__main__': if __name__ == '__main__':