zhangyong 4 months ago
parent
commit
4f6857bdd7
4 changed files with 43 additions and 10 deletions
  1. 1 1
      common/piaoquan.py
  2. 29 0
      docker-compose.yml
  3. 2 1
      pq_video/pq_video.py
  4. 11 8
      pq_video_reids.py

+ 1 - 1
common/piaoquan.py

@@ -9,7 +9,7 @@ class PQ:
 
     @classmethod
     def install_tj_pq(cls, video_id, new_video_path, new_title, n_id, cover_path):
-        url = "https://videopre.piaoquantv.com/longvideoapi/crawler/video/send?muid=999"
+        url = "https://longvideoapi.piaoquantv.com/longvideoapi/crawler/video/send?muid=999"
         payload = {
             'loginUid': n_id,
             'oldVideoReRecommendVideoId': video_id,

+ 29 - 0
docker-compose.yml

@@ -234,6 +234,35 @@ services:
     networks:
       - carry_net
     entrypoint: "./entrypoint.sh"
+  worker19:
+    depends_on:
+      - worker1
+    image: pq
+    container_name: pq_worker19
+    restart: unless-stopped
+    environment:
+      - ENV=prod
+      - FS_SHEET=E873Ck
+      - TASK_TYPE=redis
+      - NAME=王媛
+      - REDIS_NAME=task:pq_redis_wy
+    networks:
+      - carry_net
+    entrypoint: "./entrypoint.sh"
+  worker20:
+    depends_on:
+      - worker1
+    image: pq
+    container_name: pq_worker20
+    restart: unless-stopped
+    environment:
+      - ENV=prod
+      - FS_SHEET=E873Ck
+      - TASK_TYPE=redis
+      - NAME=王媛
+      - REDIS_NAME=task:pq_redis_wy
+    networks:
+      - carry_net
 networks:
   carry_net:
     name: carry_net

+ 2 - 1
pq_video/pq_video.py

@@ -87,7 +87,8 @@ class PqViode:
                     "刘诗雨": "OVfeDx",
                     "周仙琴": "3zQn2q",
                     "王雪珂": "qR49hQ",
-                    "信欣": "G3i38u"
+                    "信欣": "G3i38u",
+                    "王媛": "XuwyeI"
                 }
                 name = re.sub(r"\s+", "", data.get("name", ""))
                 sheet = name_to_sheet.get(name)

+ 11 - 8
pq_video_reids.py

@@ -12,14 +12,17 @@ NAME = os.getenv('NAME')
 REDIS_NAME = os.getenv('REDIS_NAME')
 
 def bot_carry_data():
-    try:
-        dt = int(datetime.datetime.now().strftime('%Y%m%d%H'))
-        logger.info(f"[+] 开始获取{NAME},时区为{dt}")
-        count = insert_carry_data(dt, REDIS_NAME,FS_SHEET, NAME)
-        logger.info(f"[+] {NAME},时区为{dt}共获取{count}条")
-
-    except Exception as e:
-        logger.error(f"[+] 获取{NAME},时区为{dt}失败,失败信息{e}")
+    for i in range(3):
+        try:
+            dt = int(datetime.datetime.now().strftime('%Y%m%d%H'))
+            logger.info(f"[+] 开始获取{NAME},时区为{dt}")
+            count = insert_carry_data(dt, REDIS_NAME,FS_SHEET, NAME)
+            logger.info(f"[+] {NAME},时区为{dt}共获取{count}条")
+            return
+
+        except Exception as e:
+            logger.error(f"[+] 获取{NAME},时区为{dt}失败,失败信息{e}")
+            continue
 
 def schedule_tasks():
     schedule.every().hour.at(":05").do(bot_carry_data)