lazyad 0.0.7__tar.gz → 0.0.9__tar.gz

{lazyad-0.0.7 → lazyad-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazyad
-Version: 0.0.7
+Version: 0.0.9
 Summary: 基于Python的懒人包-适用于广告投放模块
 Home-page: https://gitee.com/ZeroSeeker/lazyad
 Author: ZeroSeeker

{lazyad-0.0.7 → lazyad-0.0.9}/lazyad/open/qq.py

@@ -16,14 +16,60 @@ def make_nonce():
     return str(time.time()) + str(random.randint(0, 999999))
 
 
-def oauth_token(
+def oauth_token2(
+        app_id,
+        app_secret,
+        redirect_uri,
+        grant_type='authorization_code',
+        auth_code=None,
+        refresh_token=None,
+):
+    """
+    OAuth 2.0 授权
+    获取/刷新token
+    相关文档：https://developers.e.qq.com/docs/start/authorization
+    :param auth_code:
+    :param app_id:
+    :param app_secret:
+    :param grant_type: 请求的类型，可选值：authorization_code（授权码方式获取 token）、refresh_token（刷新 token）
+    :param refresh_token:
+    :param redirect_uri:
+    :return:
+    """
+    redirect_uri = f'{redirect_uri}?app_id={app_id}'
+
+    url = 'https://api.e.qq.com/oauth/token'
+    params = {
+        'client_id': app_id,
+        'client_secret': app_secret,
+        'grant_type': grant_type
+    }
+    if auth_code:
+        params['authorization_code'] = auth_code
+    if refresh_token:
+        params['refresh_token'] = refresh_token
+    if redirect_uri:
+        params['redirect_uri'] = redirect_uri
+
+    for k in params:
+        if type(params[k]) is not str:
+            params[k] = json.dumps(params[k])
+
+    return lazyrequests.lazy_requests(
+        method="GET",
+        url=url,
+        params=params
+    )
+
+
+def oauth_token3(
         access_token,
         app_id,
         app_secret,
+        redirect_uri=None,
         grant_type='authorization_code',
         auth_code=None,
         refresh_token=None,
-        redirect_uri=None
 ):
     """
     获取/刷新token
@@ -34,12 +80,9 @@ def oauth_token(
     :param app_secret:
     :param grant_type: 请求的类型，可选值：authorization_code（授权码方式获取 token）、refresh_token（刷新 token）
     :param refresh_token:
-    :param redirect_uri:
+    :param redirect_uri: 回调地址
     :return:
     """
-    if grant_type and not redirect_uri:
-        redirect_uri = f'https://open.fanshang888.com/api/cache/receive/open_api/ad/ad_developer/qq/callback?app_id={app_id}'
-
     url = 'https://api.e.qq.com/v3.0/oauth/token'
     params = {
         'access_token': access_token,
@@ -55,6 +98,7 @@ def oauth_token(
     if refresh_token:
         params['refresh_token'] = refresh_token
     if redirect_uri:
+        redirect_uri = f'{redirect_uri}?app_id={app_id}'
         params['redirect_uri'] = redirect_uri
 
     for k in params:

{lazyad-0.0.7 → lazyad-0.0.9}/lazyad.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazyad
-Version: 0.0.7
+Version: 0.0.9
 Summary: 基于Python的懒人包-适用于广告投放模块
 Home-page: https://gitee.com/ZeroSeeker/lazyad
 Author: ZeroSeeker

{lazyad-0.0.7 → lazyad-0.0.9}/setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
 
 setuptools.setup(
     name="lazyad",
-    version="0.0.7",
+    version="0.0.9",
     description="基于Python的懒人包-适用于广告投放模块",
     long_description=long_description,
     long_description_content_type="text/markdown",