🎃更新调用XB方法

#445
Johnserf-Seed · Jun 9, 2023 · bb6b1b6 · bb6b1b6
1 parent 54bd258
commit bb6b1b6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 17 deletions.
diff --git a/TikTokDownload.py b/TikTokDownload.py
@@ -113,8 +113,8 @@ def video_download(url, music, name, headers):
     # 此ies domian暂时不需要xg参数
     # 单作品接口 'aweme_detail'
     # 主页作品 'aweme_list'
-    jx_url = Util.Urls().POST_DETAIL + Util.XBogus(
-        f'aweme_id={key}&aid=6383&cookie_enabled=true&platform=PC&downlink=10').params
+    jx_url = Util.Urls().POST_DETAIL + Util.XBogus().getXBogus(
+        f'aweme_id={key}&aid=6383&cookie_enabled=true&platform=PC&downlink=10')[0]
 
     js = Util.requests.get(
         url=jx_url, headers=headers).text

diff --git a/TikTokPic.py b/TikTokPic.py
@@ -152,8 +152,7 @@ def pic_download(urlarg, headers):
     # 此ies domian暂时不需要xg参数
     # 单作品接口 'aweme_detail'
     # 主页作品 'aweme_list'
-    jx_url = Urls().POST_DETAIL + XBogus(
-        f'aweme_id={key}&aid=6383&cookie_enabled=true&platform=PC&downlink=10').params
+    jx_url = Urls().POST_DETAIL + XBogus().getXBogus(f'aweme_id={key}&aid=6383&cookie_enabled=true&platform=PC&downlink=10')[0]
 
     js = requests.get(
         url=jx_url, headers=headers).text

diff --git a/Util/Download.py b/Util/Download.py
@@ -22,6 +22,8 @@ class Download():
 
     def __init__(self):
         self.urls = Util.Urls()
+        # XB
+        self.XB = Util.XBogus()
 
     def VideoDownload(self, profileData):
         self.headers = profileData.headers
@@ -67,8 +69,8 @@ def VideoDownload(self, profileData):
                         # 单作品接口 'aweme_detail'
                         # 主页作品 'aweme_list'
                         # 23/02/09 更新xg参数
-                        jx_url = Util.Urls().POST_DETAIL + Util.XBogus(
-                            f'aweme_id={self.aweme_id[i]}&aid=6383&cookie_enabled=true&platform=PC&downlink=10').params
+                        jx_url = Util.Urls().POST_DETAIL + self.XB.getXBogus(
+                            f'aweme_id={self.aweme_id[i]}&aid=6383&cookie_enabled=true&platform=PC&downlink=10')[0]
                         js = Util.requests.get(
                             url=jx_url, headers=self.headers).text
                         # 防止接口多次返回空

diff --git a/Util/Images.py b/Util/Images.py
@@ -39,13 +39,15 @@ def __init__(self, headers):
         self.images = []
         # headers
         self.headers = headers
+        # XB
+        self.XB = Util.XBogus()
 
 
     def get_all_images(self, aweme_id):
         datas = []
         for id in aweme_id:
-            jx_url = Util.Urls().POST_DETAIL + Util.XBogus(
-                    f'aweme_id={id}&aid=6383&cookie_enabled=true&platform=PC&downlink=10').params
+            jx_url = Util.Urls().POST_DETAIL + self.XB.getXBogus(
+                    f'aweme_id={id}&aid=6383&cookie_enabled=true&platform=PC&downlink=10')[0]
 
             r = Util.requests.get(url=jx_url, headers=self.headers).text
             # 防止接口多次返回空

diff --git a/Util/Lives.py b/Util/Lives.py
@@ -23,7 +23,7 @@ def get_Live(live_url:str):
         web_rid = live_url.replace('https://live.douyin.com/','')
         # 2023/02/06 https://live.douyin.com/webcast/room/web/enter/
 
-        live_api = Util.Urls().LIVE + Util.XBogus('aid=6383&device_platform=web&web_rid=%s' % (web_rid)).params
+        live_api = Util.Urls().LIVE + Util.XBogus().getXBogus('aid=6383&device_platform=web&web_rid=%s' % (web_rid))[0]
         # 获取命令行参数
         cmd = Util.Command()
         # 获取headers

diff --git a/Util/Profile.py b/Util/Profile.py
@@ -37,6 +37,8 @@ def __init__(self, headers):
         Util.log.info(Util.platform.system())
         # 接口
         self.urls = Util.Urls()
+        # XB
+        self.XB = Util.XBogus()
 
     def getProfile(self, param):
         """判断个人主页api链接
@@ -81,10 +83,10 @@ def getProfile(self, param):
         # datas 为元组 (params, xb)
         # 23/04/20
         # 接口参数更新，旧的拿不到1080p了
-        datas = Util.XBogus('aid=6383&sec_user_id=%s&count=35&max_cursor=0&cookie_enabled=true&platform=PC&downlink=10' % (
+        datas = self.XB.getXBogus('aid=6383&sec_user_id=%s&count=35&max_cursor=0&cookie_enabled=true&platform=PC&downlink=10' % (
             self.sec))
         response = Util.requests.get(
-            url=self.urls.USER_POST + datas.params, headers=self.headers, timeout=3)
+            url=self.urls.USER_POST + datas[0], headers=self.headers, timeout=3)
 
         if response.text == '':
             input('[  提示  ]:获取用户数据失败，请从web端获取新ttwid填入配置文件\r')
@@ -111,12 +113,12 @@ def getProfile(self, param):
             exit()
 
         # 构造第一次访问链接
-        datas = Util.XBogus('aid=6383&sec_user_id=%s&count=35&max_cursor=0&cookie_enabled=true&platform=PC&downlink=10' % (
+        datas = self.XB.getXBogus('aid=6383&sec_user_id=%s&count=35&max_cursor=0&cookie_enabled=true&platform=PC&downlink=10' % (
             self.sec))
         if self.mode == 'post':
-            self.api_post_url = self.urls.USER_POST + datas.params
+            self.api_post_url = self.urls.USER_POST + datas[0]
         else:
-            self.api_post_url = self.urls.USER_FAVORITE_A + datas.params
+            self.api_post_url = self.urls.USER_FAVORITE_A + datas[0]
 
         # 创建用户文件夹
         self.path = "." + self.sprit + "Download" + self.sprit + \
@@ -190,13 +192,13 @@ def getData(self, api_post_url):
     def getNextData(self):
         """获取下一页api数据
         """
-        datas = Util.XBogus('aid=6383&sec_user_id=%s&count=35&max_cursor=%s&cookie_enabled=true&platform=PC&downlink=10' % (
+        datas = self.XB.getXBogus('aid=6383&sec_user_id=%s&count=35&max_cursor=%s&cookie_enabled=true&platform=PC&downlink=10' % (
             self.sec, self.max_cursor))
         # 构造下一次访问链接
         if self.mode == 'post':
-            api_naxt_post_url = self.urls.USER_POST + datas.params
+            api_naxt_post_url = self.urls.USER_POST + datas[0]
         else:
-            api_naxt_post_url = self.urls.USER_FAVORITE_A + datas.params
+            api_naxt_post_url = self.urls.USER_FAVORITE_A + datas[0]
 
         index = 0
         result = []