浏览代码

Merge branch 'master' of http://gogsb.soaringnova.com/sxwl_DL/datax-admin

Zhang Li 2 年之前
父节点
当前提交
72d01712fe
共有 3 个文件被更改,包括 1 次插入7 次删除
  1. 0 1
      app/crud/project.py
  2. 0 6
      app/schemas/jm_job_info.py
  3. 1 0
      app/services/job_info.py

+ 0 - 1
app/crud/project.py

@@ -35,7 +35,6 @@ def create_project(db: Session, item: schemas.ProjectCreate):
         'name': item.name,
         'code': project_code,
         'type': 1,
-        'user_id': g.user_id,
         'create_time': int(time.time())
     })
     db.add(db_item)

+ 0 - 6
app/schemas/jm_job_info.py

@@ -110,12 +110,6 @@ class JmJobInfoUpdate(JmJobInfoBase):
 class JmJobInfoStatusUpdate(BaseModel):
     id: int
     status: int
-    # 用户id
-    user_id: str
-    # 用户名称
-    user_name: str
-    # 项目id
-    project_id: str
     class Config:
         schema_extra = {
             "example": {

+ 1 - 0
app/services/job_info.py

@@ -36,6 +36,7 @@ def create_job_info_services(db: Session, item: schemas.JobInfoCreate):
         'partition_info': partition_info_str,
     })
     db_item = models.JobInfo(**item_dict, **{
+        'user_id': g.user_id,
         'project_id': g.project_id,
         'trigger_status': 0,
         'create_time': create_time,