|
@@ -251,7 +251,7 @@ class VideoStitching():
|
|
|
data = response.json()
|
|
data = response.json()
|
|
|
try:
|
|
try:
|
|
|
code = data["code"]
|
|
code = data["code"]
|
|
|
- if code == 10:
|
|
|
|
|
|
|
+ if code != 0:
|
|
|
Common.logger().info(
|
|
Common.logger().info(
|
|
|
f"未登录，请更换cookie，{data}")
|
|
f"未登录，请更换cookie，{data}")
|
|
|
Feishu.bot('recommend', '管理后台', '管理后台cookie失效，请及时更换～')
|
|
Feishu.bot('recommend', '管理后台', '管理后台cookie失效，请及时更换～')
|
|
@@ -270,18 +270,18 @@ class VideoStitching():
|
|
|
def video_stitching(cls, cookie):
|
|
def video_stitching(cls, cookie):
|
|
|
count = 0
|
|
count = 0
|
|
|
# 获取音频
|
|
# 获取音频
|
|
|
- audio = Material.get_audio()
|
|
|
|
|
|
|
+ audio_id = Material.get_audio()
|
|
|
while True:
|
|
while True:
|
|
|
# 获取已入库的用户id
|
|
# 获取已入库的用户id
|
|
|
account_id = cls.get_account_id()
|
|
account_id = cls.get_account_id()
|
|
|
- audio = random.choice(audio)
|
|
|
|
|
|
|
+ audio_id = random.choice(audio_id)
|
|
|
for j in account_id:
|
|
for j in account_id:
|
|
|
account = j[0].replace('(', '').replace(')', '').replace(',', '')
|
|
account = j[0].replace('(', '').replace(')', '').replace(',', '')
|
|
|
Common.logger().info(f"获取用户ID：{account}")
|
|
Common.logger().info(f"获取用户ID：{account}")
|
|
|
# 获取 未使用的视频链接
|
|
# 获取 未使用的视频链接
|
|
|
- url_list = cls.get_url_list(audio, account)
|
|
|
|
|
|
|
+ url_list = cls.get_url_list(audio_id, account)
|
|
|
# 获取音频url
|
|
# 获取音频url
|
|
|
- audio = cls.get_audio_url(audio, cookie)
|
|
|
|
|
|
|
+ audio = cls.get_audio_url(audio_id, cookie)
|
|
|
if audio == "":
|
|
if audio == "":
|
|
|
continue
|
|
continue
|
|
|
Common.logger().info(f"获取音频地址：{audio}")
|
|
Common.logger().info(f"获取音频地址：{audio}")
|
|
@@ -289,7 +289,7 @@ class VideoStitching():
|
|
|
videos = Oss.get_oss_url(videos)
|
|
videos = Oss.get_oss_url(videos)
|
|
|
# 视频截取
|
|
# 视频截取
|
|
|
try:
|
|
try:
|
|
|
- audio_url = cls.concatenate_videos(videos, str(audio))
|
|
|
|
|
|
|
+ audio_url = cls.concatenate_videos(videos, str(audio), audio_id)
|
|
|
if len(audio_url) == 0:
|
|
if len(audio_url) == 0:
|
|
|
Common.logger().info(f"视频生成失败")
|
|
Common.logger().info(f"视频生成失败")
|
|
|
continue
|
|
continue
|
