lazyad 0.0.10__tar.gz → 0.0.12__tar.gz

{lazyad-0.0.10 → lazyad-0.0.12}/PKG-INFO

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

{lazyad-0.0.10 → lazyad-0.0.12}/lazyad/open/qq.py

@@ -1,7 +1,8 @@
-import time
+from lazysdk import lazyrequests
 import random
+import time
 import json
-from lazysdk import lazyrequests
+
 
 """
 2024-04-11 全面升级至3.0版本 https://developers.e.qq.com/v3.0/docs/api
@@ -63,10 +64,10 @@ def oauth_token2(
 
 
 def oauth_token3(
-        access_token,
         app_id,
         app_secret,
         redirect_uri=None,
+        access_token=None,
         grant_type='authorization_code',
         auth_code=None,
         refresh_token=None,
@@ -83,16 +84,20 @@ def oauth_token3(
     :param redirect_uri: 回调地址
     :return:
     """
-    url = 'https://api.e.qq.com/v3.0/oauth/token'
+    # url = 'https://api.e.qq.com/v3.0/oauth/token'
     params = {
-        'access_token': access_token,
-        'timestamp': int(time.time()),
-        'nonce': make_nonce,
-
         'client_id': app_id,
         'client_secret': app_secret,
         'grant_type': grant_type
     }
+    if access_token:
+        # OAuth 相关接口无需提供 access_token、timestamp、nonce 等通用请求参数。
+        params['access_token'] = access_token
+        params['timestamp'] = int(time.time())
+        params['nonce'] = make_nonce()
+        url = 'https://api.e.qq.com/v3.0/oauth/token'
+    else:
+        url = 'https://api.e.qq.com/oauth/token'
     if auth_code:
         params['authorization_code'] = auth_code
     if refresh_token:
@@ -101,10 +106,6 @@ def oauth_token3(
         redirect_uri = f'{redirect_uri}?app_id={app_id}'
         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,

{lazyad-0.0.10 → lazyad-0.0.12}/lazyad.egg-info/PKG-INFO

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

{lazyad-0.0.10 → lazyad-0.0.12}/setup.py

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