update common

common/common.py

@@ -6,9 +6,10 @@
 """
 from aliyun.log import LogClient, PutLogsRequest, LogItem
 from datetime import date, timedelta
+from datetime import datetime
 from loguru import logger
 from hashlib import md5
-import datetime
+# import datetime
 import os
 import json
 import time
@@ -21,7 +22,7 @@ proxies = {"http": None, "https": None}
 
 class Common:
     # 统一获取当前时间 <class 'datetime.datetime'>  2022-04-14 20:13:51.244472
-    now = datetime.datetime.now()
+    now = datetime.now()
     # 昨天 <class 'str'>  2022-04-13
     yesterday = (date.today() + timedelta(days=-1)).strftime("%Y/%m/%d")
     # 今天 <class 'datetime.date'>  2022-04-14
@@ -44,7 +45,7 @@ class Common:
         # 日志文件名
         # log_name = time.strftime("%Y-%m-%d", time.localtime(time.time())) + f'-{crawler}-{log_type}.log'
         # log_name = datetime.datetime.now().strftime('%Y-%m-%d') + f'-{crawler}-{log_type}.log'
-        log_name = f"{date.today()}-{crawler}-{log_type}.log"
+        log_name = f"{date.today():%Y-%m-%d}-{crawler}-{log_type}.log"
 
         # 日志不打印到控制台
         logger.remove(handler_id=None)
@@ -54,7 +55,8 @@ class Common:
         # rotation="1 week"，每周创建一个文件
         # retention="10 days"，每隔10天之后就会清理旧的日志
         # 初始化日志
-        logger.add(f"{log_dir}{log_name}", level="INFO", rotation=datetime.time(hour=0, minute=0), retention="10 days", enqueue=True)
+        # logger.add(f"{log_dir}{log_name}", level="INFO", rotation="00:00", retention="10 days", enqueue=True)
+        logger.add(os.path.join(log_dir, log_name), level="INFO", rotation="00:00", retention="10 days", enqueue=True)
 
         return logger
 
@@ -473,9 +475,13 @@ class Common:
         # # 使用隧道域名发送请求
         # response = requests.get(target_url, proxies=proxies)
         # print(response.text)
-        return tunnel_proxies
+
+        return tunnel_proxies  # {'http': 'http://t17772369458618:5zqcjkmy@q796.kdltps.com:15818/', 'https': 'http://t17772369458618:5zqcjkmy@q796.kdltps.com:15818/'}
 
 
 if __name__ == "__main__":
-    print(datetime.time(hour=0, minute=0))
+    # print(datetime.time(hour=0, minute=0))
+    # print(f'{date.today():%Y-%m-%d}')
+    print(Common.today)
     pass
+