wangkun 2 年 前
コミット
52d44014f5
3 ファイル変更20 行追加2 行削除
  1. 2 2
      main/demo.py
  2. 2 0
      main/xigua_follow.py
  3. 16 0
      xigua.sh

+ 2 - 2
main/demo.py

@@ -186,10 +186,10 @@ class Demo:
 if __name__ == '__main__':
 if __name__ == '__main__':
     # Demo.base64_decode()
     # Demo.base64_decode()
     # Demo.ffmpeg()
     # Demo.ffmpeg()
-    # Demo.sheet('xigua')
+    Demo.sheet('xigua')
     # Demo.get_video_info('7133153239867851295')
     # Demo.get_video_info('7133153239867851295')
     # Demo.get_signature()
     # Demo.get_signature()
     # Demo.get_logs()
     # Demo.get_logs()
-    Demo.download_video()
+    # Demo.download_video()
 
 
     pass
     pass

+ 2 - 0
main/xigua_follow.py

@@ -354,6 +354,8 @@ class Follow:
                 Common.logger(log_type).info('视频已下载\n')
                 Common.logger(log_type).info('视频已下载\n')
             elif str(video_dict['video_id']) in [x for y in Feishu.get_values_batch(log_type, 'xigua', '3Ul6wZ') for x in y]:
             elif str(video_dict['video_id']) in [x for y in Feishu.get_values_batch(log_type, 'xigua', '3Ul6wZ') for x in y]:
                 Common.logger(log_type).info('视频已下载\n')
                 Common.logger(log_type).info('视频已下载\n')
+            elif str(video_dict['video_id']) in [x for y in Feishu.get_values_batch(log_type, 'xigua', 'QOWqMo') for x in y]:
+                Common.logger(log_type).info('视频已下载\n')
             elif str(video_dict['video_id']) in [x for y in Feishu.get_values_batch(log_type, 'xigua', 'wjhpDs') for x in y]:
             elif str(video_dict['video_id']) in [x for y in Feishu.get_values_batch(log_type, 'xigua', 'wjhpDs') for x in y]:
                 Common.logger(log_type).info('视频已存在\n')
                 Common.logger(log_type).info('视频已存在\n')
             else:
             else:

+ 16 - 0
xigua.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+echo "开始"
+echo "$(date "+%Y-%m-%d %H:%M:%S") 正在杀进程..."
+# shellcheck disable=SC2009
+# ps aux | grep run_xigua
+ps aux | grep run_xigua_follow.py | grep -v grep | awk '{print $2}' | xargs kill -9
+echo "$(date "+%Y-%m-%d %H:%M:%S") 进程已杀死!"
+
+echo "$(date "+%Y-%m-%d %H:%M:%S") 正在更新代码..."
+cd /data5/wangkun/crawler_xigua/ && git pull origin master --force
+echo "$(date "+%Y-%m-%d %H:%M:%S") 代码更新完成!"
+source /etc/profile
+echo "$(date "+%Y-%m-%d %H:%M:%S") 正在重启服务..."
+nohup python3 -u main/run_xigua_follow.py >>./nohup.log 2>&1 &
+echo "$(date "+%Y-%m-%d %H:%M:%S") 服务重启完毕!"
+exit 0