去除user_name

app/common/security/auth.py

@@ -19,6 +19,7 @@ async def verify_super_admin(token: str = Depends(reuseable_oauth)) -> schemas.T
     if token_data.role_id != 1:
         raise Exception("暂无权限")
     g.user_id = token_data.user_id
+    g.user_name = token_data.user_name
     g.project_id = token_data.project_id
     return token_data
 
@@ -30,6 +31,7 @@ async def verify_special(token: str = Depends(reuseable_oauth)) -> schemas.Token
     if not token_data.role_id in [1,3]:
         raise Exception("暂无权限")
     g.user_id = token_data.user_id
+    g.user_name = token_data.user_name
     g.project_id = token_data.project_id
     return token_data
 
@@ -39,5 +41,6 @@ async def verify_users(token: str = Depends(reuseable_oauth)) -> schemas.TokenDa
     token_data_dict = json.loads(token_data_str)
     token_data = schemas.TokenData(**token_data_dict)
     g.user_id = token_data.user_id
+    g.user_name = token_data.user_name
     g.project_id = token_data.project_id
     return token_data

app/crud/data_management.py

@@ -11,7 +11,7 @@ def create_data_management(db: Session, item: schemas.DataManagementCreate, tabl
         'name': item.name,
         'table_name': table_name,
         'create_time': create_time,
-        'user_name': item.user_name,
+        'user_name': g.user_name,
         'user_id': g.user_id,
         'project_id': g.project_id,
         'af_run_id': af_run_id,

app/crud/programme.py

@@ -30,7 +30,7 @@ def create_programme(db: Session, item: schemas.ProgrammeCreate):
         'release_name': f"aihub-dag-jpt-{g.project_id}",
         'status': 0,
         'user_id': g.user_id,
-        'user_name': item.user_name,
+        'user_name': g.user_name,
         'project_id': g.project_id,
         'create_time': int(time.time())
     })

app/routers/auth.py

@@ -32,7 +32,7 @@ def switch_project(switch: schemas.SwitchProject):
 @router.post("/login",response_model=schemas.Token)
 async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends()):
     user_id, project_id = form_data.username, form_data.password
-    token_data = {"user_id": user_id,"project_id": project_id, "role_id": 1}
+    token_data = {"user_id": user_id,"user_name":"admin","project_id": project_id, "role_id": 1}
     token_data_str =json.dumps(token_data)
     access_token = encode_base64(token_data_str).replace('\n','')
     return {"access_token": access_token, "token_type": "bearer"}

app/schemas/auth.py

@@ -13,4 +13,5 @@ class TokenData(BaseModel):
 class SwitchProject(BaseModel):
     project_id: str
     user_id: str
+    user_name: str
     role_ids: List[str] = []

app/schemas/data_management.py

@@ -5,8 +5,6 @@ from pydantic import BaseModel
 class DataManagementBase(BaseModel):
     # 数据名称
     name: str
-    # 创建人名称
-    user_name: str
 
 class DataManagementCreate(DataManagementBase):
     dag_uuid: str
@@ -16,7 +14,6 @@ class DataManagementCreate(DataManagementBase):
         schema_extra = {
             "example": {
                 "name": "test",
-                "user_name": "test",
                 "dag_uuid": "test",
                 "node_id": "test",
                 "out_pin": "0",
@@ -31,6 +28,8 @@ class DataManagement(DataManagementBase):
     create_time: int
     # 创建人编号
     user_id: str
+    # 创建人名称
+    user_name: str
     # 项目编号
     project_id: str
     class Config:

app/schemas/programme.py

@@ -9,15 +9,12 @@ class ProgrammeBase(BaseModel):
 class ProgrammeCreate(ProgrammeBase):
     # 密码
     password: str
-    # 创建用户
-    user_name: str
 
     class Config:
         schema_extra = {
             "example": {
                 "name": "test",
                 "password": "test",
-                "user_name": "test",
             }
         }