用户优化，公共方法封装

app/api/users/crud.py

@@ -3,7 +3,7 @@ from datetime import datetime
 from sqlalchemy.orm import Session
 
 from app.api.users import schemas
-from libs.functions import md5
+from libs.functions import md5, uuid
 from models import users as models
 
 
@@ -21,7 +21,8 @@ def get_users(db: Session, skip: int = 0, limit: int = 100):
 
 def create_user(db: Session, user: schemas.UserCreate):
     db_user = models.User(username=user.username, description=user.description, unique=user.unique,
-                          config_key=user.config_key, hashed_password=md5(user.password), create_time=datetime.now())
+                          config_key=user.config_key, uuid=uuid(), hashed_password=md5("123456"),
+                          create_time=datetime.now())
     db.add(db_user)
     db.commit()
     db.refresh(db_user)

app/api/users/schemas.py

@@ -6,7 +6,6 @@ class UserBase(BaseModel):
 
 
 class UserCreate(UserBase):
-    password: str
     unique: str
     description: str
     config_key: str

libs/functions.py

 import hashlib
+import uuid as u
 
 
 def md5(s):
@@ -6,3 +7,8 @@ def md5(s):
     sign_str = hashlib.md5()
     sign_str.update(s.encode('utf-8'))
     return sign_str.hexdigest()
+
+
+def uuid():
+    """生成uuid"""
+    return str(u.uuid4())

main.py

@@ -10,7 +10,7 @@ from core.storage.db import Base, engine
 app = FastAPI()
 
 origins = ['*']  # 可以设置为'*'，即为所有。
-    # 设置跨域传参
+# 设置跨域传参
 app.add_middleware(
     CORSMiddleware,
     allow_origins=origins,  # 设置允许的origins来源
@@ -18,8 +18,8 @@ app.add_middleware(
     allow_methods=['*'],  # 设置允许跨域的http方法，比如 get、post、put等。
     allow_headers=['*'])  # 允许跨域的headers，可以用来鉴别来源等作用。
 
-app.include_router(api_router, prefix="/api")
-Base.metadata.create_all(bind=engine)
+app.include_router(api_router, prefix="/api")  # 路由
+Base.metadata.create_all(bind=engine)  # 映射模型类
 
 if __name__ == '__main__':
     uvicorn.run(app=app, host="127.0.0.1", port=8001)

models/users.py

@@ -16,8 +16,8 @@ class User(Base):
     uuid = Column(String(50))
     authority = Column(Integer)
     remaining_sum = Column(Float)
-    entry_account = ARRAY(Column(Integer))
-    out_account = ARRAY(Column(Integer))
+    entry_account = Column(String(255))
+    out_account = Column(String(255))
     create_time = Column(DateTime)
     update_time = Column(DateTime)
 
@@ -26,6 +26,7 @@ class Authority(Base):
     __tablename__ = "authority"
 
     id = Column(Integer, primary_key=True, index=True)
-    name = Column(String(50), unique=True, index=True)
+    name = Column(String(50), index=True)
+    up_one_level = Column(Integer, index=True)
     create_time = Column(DateTime)