فهرست منبع

更新uuid生成的数据流水编号

dongzhaorui 1 سال پیش
والد
کامیت
4f12f869e8
2فایلهای تغییر یافته به همراه3 افزوده شده و 11 حذف شده
  1. 1 1
      FworkSpider/feapder/network/item.py
  2. 2 10
      FworkSpider/feapder/utils/tools.py

+ 1 - 1
FworkSpider/feapder/network/item.py

@@ -149,7 +149,7 @@ class BaseItem(Item):
     """数据采集基础类"""
 
     def __init__(self, business_id=None, save=True, **kwargs):
-        business_id = business_id or tools.get_uuid5()  # 数据流水编号
+        business_id = business_id or tools.get_uuid().replace('-', '')  # 数据流水编号
         super(BaseItem, self).__init__(
             save=save,
             business_id=business_id,

+ 2 - 10
FworkSpider/feapder/utils/tools.py

@@ -1790,23 +1790,15 @@ def get_uuid(key1="", key2=""):
     @result:
     """
 
-    uuid_object = ""
-
     if not key1 and not key2:
         uuid_object = uuid.uuid1()
     else:
-        hash = md5(bytes(key1, "utf-8") + bytes(key2, "utf-8")).digest()
-        uuid_object = uuid.UUID(bytes=hash[:16], version=3)
+        hash_ = md5(bytes(key1, "utf-8") + bytes(key2, "utf-8")).digest()
+        uuid_object = uuid.UUID(bytes=hash_[:16], version=3)
 
     return str(uuid_object)
 
 
-def get_uuid5():
-    namespace = uuid.NAMESPACE_OID
-    name = str(int(time.time() * 1000000000))
-    return str(uuid.uuid5(namespace, name)).replace('-', '')
-
-
 def get_hash(text):
     return hash(text)