From 49f31a380762aa0f8d3ddcd4df8e733545c74a31 Mon Sep 17 00:00:00 2001 From: veehou Date: Thu, 30 Dec 2021 15:30:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0http=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E7=9A=84ua=E5=A4=B4=20(#1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: veehou --- .pre-commit-config.yaml | 2 +- examples/config.yaml | 4 ++++ qqbot/core/network/http.py | 25 ++++++++++++++++++++----- 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 examples/config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8529d39..d277506 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/ambv/black - rev: stable + rev: 21.12b0 hooks: - id: black - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/examples/config.yaml b/examples/config.yaml new file mode 100644 index 0000000..4e68e6e --- /dev/null +++ b/examples/config.yaml @@ -0,0 +1,4 @@ +# test yaml 用于设置test相关的参数,开源版本需要去掉参数 +token: + appid: "101981207" + token: "Ugqr4v71Xwd4uacrYjjHeYPVOxWSQKCy" \ No newline at end of file diff --git a/qqbot/core/network/http.py b/qqbot/core/network/http.py index c00c99a..b8a2cab 100644 --- a/qqbot/core/network/http.py +++ b/qqbot/core/network/http.py @@ -68,7 +68,10 @@ def __init__(self, time_out, token, type): self.scheme = type def get(self, api_url, params=None): - headers = {"Authorization": self.scheme + " " + self.token} + headers = { + "Authorization": self.scheme + " " + self.token, + "User-Agent": "botpy", + } logger.debug("http get headers: %s, api_url: %s" % (headers, api_url)) response = requests.get( url=api_url, params=params, timeout=self.timeout, headers=headers @@ -77,7 +80,10 @@ def get(self, api_url, params=None): return response def post(self, api_url, request=None, params=None): - headers = {"Authorization": self.scheme + " " + self.token} + headers = { + "Authorization": self.scheme + " " + self.token, + "User-Agent": "botpy", + } logger.debug( "http post headers: %s, api_url: %s, request: %s" % (headers, api_url, request) @@ -93,7 +99,10 @@ def post(self, api_url, request=None, params=None): return response def delete(self, api_url, request=None, params=None): - headers = {"Authorization": self.scheme + " " + self.token} + headers = { + "Authorization": self.scheme + " " + self.token, + "User-Agent": "botpy", + } logger.debug("http delete headers: %s, api_url: %s" % (headers, api_url)) response = requests.delete( url=api_url, @@ -106,7 +115,10 @@ def delete(self, api_url, request=None, params=None): return response def put(self, api_url, request=None, params=None): - headers = {"Authorization": self.scheme + " " + self.token} + headers = { + "Authorization": self.scheme + " " + self.token, + "User-Agent": "botpy", + } logger.debug( "http put headers: %s, api_url: %s, request: %s" % (headers, api_url, request) @@ -122,7 +134,10 @@ def put(self, api_url, request=None, params=None): return response def patch(self, api_url, request=None, params=None): - headers = {"Authorization": self.scheme + " " + self.token} + headers = { + "Authorization": self.scheme + " " + self.token, + "User-Agent": "botpy", + } logger.debug( "http patch headers: %s, api_url: %s, request: %s" % (headers, api_url, request)