ezKit 1.12.40__tar.gz → 1.12.42__tar.gz

{ezkit-1.12.40/ezKit.egg-info → ezkit-1.12.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ezKit
-Version: 1.12.40
+Version: 1.12.42
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

ezkit-1.12.42/ezKit/auth.py

@@ -0,0 +1,15 @@
+import bcrypt
+
+
+def hash_password(password: str) -> str:
+    try:
+        return bcrypt.hashpw(password.encode(), bcrypt.gensalt()).decode()
+    except Exception as _:
+        return ""
+
+
+def verify_password(plain_password: str, hashed_password: str) -> bool:
+    try:
+        return bcrypt.checkpw(plain_password.encode(), hashed_password.encode())
+    except Exception as _:
+        return False

{ezkit-1.12.40 → ezkit-1.12.42}/ezKit/database.py

@@ -25,7 +25,7 @@ from .errors import database_error, sqlalchemy_error
 
 # --------------------------------------------------------------------------------------------------
 
-Base = declarative_base()
+Base: DeclarativeBase = declarative_base()
 
 # --------------------------------------------------------------------------------------------------
 
@@ -79,11 +79,19 @@ def orm_object_to_dict(obj, include: list | None = None) -> dict | None:
     data = {}
 
     for column in obj.__table__.columns:
+
         key = column.name
+
         if include and key not in include:
             continue
+
         value = getattr(obj, key)
-        if isinstance(value, (datetime, date)):
+
+        if isinstance(value, str):
+            # 移除字符串前后的空白字符, 包括空格、\n、\t 等
+            data[key] = str(value).strip()
+        elif isinstance(value, (datetime, date)):
+            # 日期时间转换为可读的字符串
             # data[key] = value.isoformat()
             data[key] = value.strftime("%Y-%m-%d %H:%M:%S")
         else:

{ezkit-1.12.40 → ezkit-1.12.42/ezKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ezKit
-Version: 1.12.40
+Version: 1.12.42
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezkit-1.12.40 → ezkit-1.12.42}/ezKit.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ README.md
 setup.py
 ezKit/__init__.py
 ezKit/_file.py
+ezKit/auth.py
 ezKit/bottle.py
 ezKit/bottle_extensions.py
 ezKit/cipher.py

{ezkit-1.12.40 → ezkit-1.12.42}/setup.py

@@ -4,7 +4,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="ezKit",
-    version="1.12.40",
+    version="1.12.42",
     author="septvean",
     author_email="septvean@gmail.com",
     description="Easy Kit",