Browse Source

搬运改造增加账号

张良 1 month ago
parent
commit
8c0b62d3d2
5 changed files with 13 additions and 3 deletions
  1. 2 2
      docker-compose.yml
  2. 3 0
      product.env
  3. 2 0
      utils/dy_ks_get_url.py
  4. 5 1
      workers/consumption_work.py
  5. 1 0
      workers/select_work.py

+ 2 - 2
docker-compose.yml

@@ -21,7 +21,7 @@ services:
     networks:
       - tool_net
     deploy:
-      replicas: 10
+      replicas: 13
     entrypoint: sh /app/sh/select.sh
 #  select_studio:
 #    image: tool_job
@@ -55,7 +55,7 @@ services:
     networks:
       - tool_net
     deploy:
-      replicas: 10
+      replicas: 13
     entrypoint: sh /app/sh/consumption.sh
 networks:
   tool_net:

+ 3 - 0
product.env

@@ -10,3 +10,6 @@ FS_DATA_7=周仙琴,2WIcBU,task:carry_data_redis_zxq,AIzaSyD46rphXd-Ie51sQiQ61lr
 FS_DATA_8=信欣,v0fFCb,task:carry_data_redis_xx,AIzaSyB16JcJHwoz-YcvEUO96Dm1n0zf89GOdms
 FS_DATA_9=邓锋,DEpi6V,task:carry_data_redis_df,AIzaSyCWilmMZyG4xW_pujpRGflaa7SIBjLQHiI
 FS_DATA_10=王知微,jrpuyW,task:carry_data_redis_wzw,AIzaSyCx3hy5ef8wOVPNjvK1MIAwyZZCdYuRh-U
+FS_DATA_11=刘兆恒,QWiSU6,task:carry_data_redis_lzh,AIzaSyCx3hy5ef8wOVPNjvK1MIAwyZZCdYuRh-U
+FS_DATA_12=张博,skuX5v,task:carry_data_redis_zb,AIzaSyCx3hy5ef8wOVPNjvK1MIAwyZZCdYuRh-U
+FS_DATA_13=林子涵,TtkGny,task:carry_data_redis_zh,AIzaSyCx3hy5ef8wOVPNjvK1MIAwyZZCdYuRh-U

+ 2 - 0
utils/dy_ks_get_url.py

@@ -41,6 +41,7 @@ class Dy_KS:
                                       'Chrome/127.0.0.0 Safari/537.36',
                     }
                     response = requests.request(url=url, method='GET', headers=headers, allow_redirects=False, timeout=30)
+           
                     location = response.headers.get('Location', None)
                     video_id = re.search(r'/video/(\d+)/?', location.split('?')[0] if location else url).group(1)
                 url = "http://8.217.192.46:8889/crawler/dou_yin/detail"
@@ -132,6 +133,7 @@ class Dy_KS:
                 tag_transport_channel = "抖音"
                 logger.info(f"[+] {url}开始获取抖音视频链接")
                 url, original_title, video_id = cls.get_text_dy_video(url=url)
+
             elif host in ['v.kuaishou.com', 'www.kuaishou.com', 'v.m.chenzhongtech.com', 'creater.eozatvmq.com']:
                 tag_transport_channel = "快手"
                 logger.info(f"[+] {url}开始获取快手视频链接")

+ 5 - 1
workers/consumption_work.py

@@ -115,7 +115,10 @@ class ConsumptionRecommend(object):
                     "王雪珂": "xN1KrU",
                     "信欣": "PtoeGT",
                     "邓锋": "dgV2Af",
-                    "王知微":"QDyCg6"
+                    "王知微": "QDyCg6",
+                    "林子涵": "tCw56r",
+                    "刘兆恒": "vtRMGX",
+                    "张博": "LEZMRr"
                 }
                 name = re.sub(r"\s+", "", data.get("name", ""))
                 sheet = name_to_sheet.get(name)
@@ -488,6 +491,7 @@ class ConsumptionRecommend(object):
             return
         data, dt = orjson.loads(data[0][0]), int(data[0][1])
         try:
+
             cls.data_handle(data, dt, file_path, redis_name,studio_key)
             for filename in os.listdir(CACHE_DIR):
                 # 检查文件名是否包含关键字

+ 1 - 0
workers/select_work.py

@@ -20,6 +20,7 @@ class StartGetRecommend(object):
         fs_sheet = fs_data_list[1]
         redis_name = fs_data_list[2]
         logger.info(f"[FS] 开始获取{name},时区为{dt}")
+
         data = Material.get_carry_data(dt, fs_sheet, name)
         if not data:
             logger.info(f"[FS] {name},时区为{dt}没有获取到数据")