feat:重构request请求模块
This commit is contained in:
49
message/request_message.py
Normal file
49
message/request_message.py
Normal file
@@ -0,0 +1,49 @@
|
||||
import requests
|
||||
from typing import Optional, Dict, Any, Union
|
||||
|
||||
def send_request(
|
||||
url: str,
|
||||
method: str,
|
||||
params: Optional[Dict[str, Any]] = None,
|
||||
data: Optional[Union[Dict[str, Any], str, bytes]] = None,
|
||||
json: Optional[Dict[str, Any]] = None,
|
||||
headers: Optional[Dict[str, str]] = None,
|
||||
timeout: Union[int, tuple] = 10,
|
||||
**kwargs
|
||||
) -> requests.Response:
|
||||
"""
|
||||
发送 HTTP 请求的通用函数
|
||||
|
||||
Args:
|
||||
url: 请求的 URL
|
||||
method: HTTP 方法(GET/POST/PUT/DELETE等)
|
||||
params: URL 查询参数(?key=value)
|
||||
data: 表单数据(application/x-www-form-urlencoded)
|
||||
json: JSON 数据(application/json)
|
||||
headers: 请求头
|
||||
timeout: 超时时间(秒),默认10秒
|
||||
**kwargs: 其他 requests 支持的参数(如 auth, cookies 等)
|
||||
|
||||
Returns:
|
||||
requests.Response: 响应对象
|
||||
|
||||
Raises:
|
||||
requests.exceptions.RequestException: 请求异常
|
||||
"""
|
||||
try:
|
||||
response = requests.request(
|
||||
method=method.upper(),
|
||||
url=url,
|
||||
params=params,
|
||||
data=data,
|
||||
json=json,
|
||||
headers=headers,
|
||||
timeout=timeout,
|
||||
**kwargs
|
||||
)
|
||||
response.raise_for_status() # 自动检查HTTP状态码(非2xx会抛异常)
|
||||
return response
|
||||
except requests.exceptions.Timeout:
|
||||
raise Exception(f"请求超时({timeout}秒未响应)")
|
||||
except requests.exceptions.RequestException as e:
|
||||
raise Exception(f"请求失败: {str(e)}")
|
||||
@@ -1,8 +1,9 @@
|
||||
from enum import Enum
|
||||
|
||||
import requests
|
||||
import json
|
||||
|
||||
from message.request_message import send_request
|
||||
|
||||
webhook_url = 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send'
|
||||
webhook_key_estun = 'f09eb098-f709-4fc6-83b5-4a08a8431b8f'
|
||||
webhook_key_sweet_hut = '5ccae111-43a1-4672-a94f-0d34713259c0'
|
||||
@@ -24,17 +25,21 @@ def send_wechat_message(message_type: MessageEnum, message: str, has_sweet_hut=F
|
||||
case MessageEnum.MARKDOWN2:
|
||||
wechat_message = {"msgtype": "markdown_v2", "markdown_v2": {"content": message}}
|
||||
|
||||
requests.post(
|
||||
webhook_url,
|
||||
send_request(
|
||||
url=webhook_url,
|
||||
method="POST",
|
||||
headers={"Content-Type": "application/json"},
|
||||
params={'key': webhook_key_estun},
|
||||
data=json.dumps(wechat_message, ensure_ascii=False).encode('utf-8')
|
||||
data=json.dumps(wechat_message, ensure_ascii=False).encode('utf-8'),
|
||||
timeout=5
|
||||
)
|
||||
|
||||
if has_sweet_hut:
|
||||
requests.post(
|
||||
webhook_url,
|
||||
send_request(
|
||||
url=webhook_url,
|
||||
method="POST",
|
||||
headers={"Content-Type": "application/json"},
|
||||
params={'key': webhook_key_sweet_hut},
|
||||
data=json.dumps(wechat_message, ensure_ascii=False).encode('utf-8')
|
||||
data=json.dumps(wechat_message, ensure_ascii=False).encode('utf-8'),
|
||||
timeout=5
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user