|
@@ -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)
|
|
|
|