diff --git a/api/desc/core/pcm-core.api b/api/desc/core/pcm-core.api index 2800066b..1ad1f9df 100644 --- a/api/desc/core/pcm-core.api +++ b/api/desc/core/pcm-core.api @@ -470,6 +470,8 @@ type SaveHashcatReq { CrackEstimatedTime string `json:"crackEstimatedTime"` // 预计时间 CrackProgress string `json:"crackProgress"` // 进度 CrackResult string `json:"crackResult"` // 结果 + Started string `json:"started"` // 开始时间 + Stoped string `json:"stoped"` // 结束时间 } type getHashcatHandlerReq { @@ -488,6 +490,8 @@ type HashCat { CrackEstimatedTime string `json:"crackEstimatedTime"` // 预计时间 CrackProgress string `json:"crackProgress"` // 进度 CrackResult string `json:"crackResult"` // 结果 + Started string `json:"started"` // 开始时间 + Stoped string `json:"stoped"` // 结束时间 } type participantListResp { diff --git a/api/desc/pcm.api b/api/desc/pcm.api index d531dbc4..f4c4430a 100644 --- a/api/desc/pcm.api +++ b/api/desc/pcm.api @@ -26,61 +26,61 @@ info( service pcm { @handler participantListHandler get /core/participantList returns (participantListResp) - + @handler scheduleTaskByYamlHandler post /core/scheduleTaskByYaml (scheduleTaskByYamlReq) - + @handler deleteTaskHandler delete /core/deleteTask/:id (deleteTaskReq) - + @handler scheduleTaskHandler post /core/scheduleTask (scheduleTaskReq) - + @handler TaskListHandler get /core/taskList returns (taskListResp) - + @handler JobTotalHandler get /core/jobTotal returns (jobTotalResp) - + @handler listCenterHandler get /core/listCenter returns (listCenterResp) - + @handler listClusterHandler get /core/listCluster/:centerId (listClusterReq) returns (listClusterResp) - + @handler submitJobHandler post /core/submitJob (submitJobReq) returns (submitJobResp) - + @handler getRegionHandler get /core/getRegion returns (getRegionResp) - + @handler listRegionHandler get /core/listRegion returns (listRegionResp) - + @handler getComputingPowerHandler get /core/getComputingPower returns (cpResp) - + @handler getGeneralInfoHandler get /core/getGeneralInfo returns (GiResp) - + @handler listDomainResourceHandler get /core/listDomainResource returns (DomainResourceResp) - + @handler getResourcePanelConfigHandler get /core/getResourcePanelConfigHandler returns (ResourcePanelConfigResp) - + @handler putResourcePanelConfigHandler put /core/resourcePanelConfigHandler (ResourcePanelConfigReq) - + @handler getComputilityStatisticsHandler get /core/getComputilityStatistics returns (ComputilityStatisticsResp) - + @handler nodeAssetsHandler get /core/assets returns (NodeAssetsResp) - + @handler saveHashcatHandler post /core/saveHashcat (SaveHashcatReq) - + @handler getHashcatHandler get /core/getHashcat/:crackTaskId (getHashcatHandlerReq) returns (getHashcatHandlerResp) } @@ -93,10 +93,10 @@ service pcm { service pcm { @handler listJobHandler get /hpc/listJob (listJobReq) returns (listJobResp) - + @handler listHistoryJobHandler get /hpc/listHistoryJob (listHistoryJobReq) returns (listHistoryJobResp) - + @handler queueAssetsHandler get /queue/assets returns (QueueAssetsResp) } @@ -109,7 +109,7 @@ service pcm { service pcm { @handler cloudListHandler get /task/list returns (cloudListResp) - + @handler deleteYamlHandler get /cloud/DeleteYaml (ApplyReq) returns (DeleteResp) } @@ -122,10 +122,10 @@ service pcm { service pcm { @handler listDataSetHandler get /ai/listDataSet/:projectId (DataSetReq) returns (DataSetResp) - + @handler CreateDataSetHandler post /ai/createDataSet/:projectId (CreateDataSetReq) returns (CreateDataSetResp) - + @handler DeleteDataSetHandler delete /ai/deleteDataSet/:projectId/:datasetId (DeleteDataSetReq) returns (DeleteDataSetResp) // creat task 创建导入任务 @@ -156,7 +156,7 @@ service pcm { // ShowAlgorithmByUuid 展示算法详情 @handler ShowAlgorithmByUuid get /ai/ShowAlgorithmByUuid/:projectId/:algorithmId (ShowAlgorithmByUuidReq) returns (ShowAlgorithmByUuidResp) - + // creat export task 创建导出任务 @handler CreateExportTaskHandler post /ai/CreateExportTask/:projectId/:datasetId (CreateExportTaskReq) returns (ExportTaskDataResp) @@ -164,11 +164,11 @@ service pcm { get /ai/GetExportTasksOfDataset/:projectId/:datasetId (GetExportTasksOfDatasetReq) returns (GetExportTasksOfDatasetResp) @handler GetExportTaskStatusOfDatasetHandler get /ai/GetExportTaskStatusOfDataset/:projectId/:resourceId/:taskId (GetExportTaskStatusOfDatasetReq) returns (GetExportTaskStatusOfDatasetResp) - + // create processor task 创建处理任务 @handler CreateProcessorTaskHandler post /ai/CreateProcessorTask (CreateProcessorTaskReq) returns (CreateProcessorTaskResp) - + // create service 创建服务 @handler CreateServiceHandler post /ai/CreateService/:projectId (CreateServiceReq) returns (CreateServiceResp) @@ -184,7 +184,7 @@ service pcm { // ListClusters查询专属资源池列表 @handler ListClustersHandler get /ai/ListClusters (ListClustersReq) returns (ListClustersResp) - + /******************Notebook Method start*************************/ @handler listNotebookHandler get /ai/listNotebook (ListNotebookReq) returns (ListNotebookResp) @@ -199,7 +199,7 @@ service pcm { @handler mountNotebookStorageHandler post /ai/mountNotebookStorage (MountNotebookStorageReq) returns (MountNotebookStorageResp) /******************Notebook Method end*************************/ - + /******************Visualization Job Method start*************************/ @handler getVisualizationJobHandler get /ai/getVisualizationJob (GetVisualizationJobReq) returns (GetVisualizationJobResp) @@ -230,16 +230,16 @@ service pcm { service pcm { @handler uploadHandler post /upload - + @handler chunkHandler post /chunk - + @handler imageListHandler get /image/list returns (imageListResp) - + @handler dataSetCheckHandler get /dataSet/check/:fileMd5 (checkReq) returns (checkResp) - + @handler uploadDataSetHandler post /dataSet/upload } @@ -335,25 +335,25 @@ service pcm { service pcm { @handler UploadLinkImageHandler post /storelink/uploadImage (UploadLinkImageReq) returns (UploadLinkImageResp) - + @handler GetLinkImageListHandler get /storelink/getImageList (GetLinkImageListReq) returns (GetLinkImageListResp) - + @handler DeleteLinkImageHandler delete /storelink/deleteImage (DeleteLinkImageReq) returns (DeleteLinkImageResp) - + @handler SubmitLinkTaskHandler post /storelink/submitTask (SubmitLinkTaskReq) returns (SubmitLinkTaskResp) - + @handler GetLinkTaskHandler get /storelink/getTask (GetLinkTaskReq) returns (GetLinkTaskResp) - + @handler DeleteLinkTaskHandler delete /storelink/deleteTask (DeleteLinkTaskReq) returns (DeleteLinkTaskResp) - + @handler GetParticipantsHandler get /storelink/getParticipants (GetParticipantsReq) returns (GetParticipantsResp) - + @handler GetAISpecsHandler get /storelink/getResourceSpecs (GetResourceSpecsReq) returns (GetResourceSpecsResp) } \ No newline at end of file diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 80ed42ee..274d69a3 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -439,6 +439,8 @@ type SaveHashcatReq struct { CrackEstimatedTime string `json:"crackEstimatedTime"` // 预计时间 CrackProgress string `json:"crackProgress"` // 进度 CrackResult string `json:"crackResult"` // 结果 + Started string `json:"started"` // 开始时间 + Stoped string `json:"stoped"` // 结束时间 } type GetHashcatHandlerReq struct { @@ -457,6 +459,8 @@ type HashCat struct { CrackEstimatedTime string `json:"crackEstimatedTime"` // 预计时间 CrackProgress string `json:"crackProgress"` // 进度 CrackResult string `json:"crackResult"` // 结果 + Started string `json:"started"` // 开始时间 + Stoped string `json:"stoped"` // 结束时间 } type ParticipantListResp struct { @@ -842,7 +846,7 @@ type ImportTasks struct { TotalFileCount uint32 `json:"totalFileCount,omitempty"` CreateTime uint32 `json:"createTime,omitempty"` ElapsedTime uint32 `json:"elapsedTime,omitempty"` - AnnotationFormatConfig []interface{} `json:"annotationFormatConfig，omitempty"` + AnnotationFormatConfig []interface{} `json:"annotationFormatConfig,omitempty"` } type Annotations struct { diff --git a/pkg/models/thashcat.go b/pkg/models/thashcat.go index 016af7ad..2f993f66 100644 --- a/pkg/models/thashcat.go +++ b/pkg/models/thashcat.go @@ -21,6 +21,8 @@ type ( CrackEstimatedTime string `db:"crack_estimated_time"` // 预计时间 CrackProgress string `db:"crack_progress"` // 进度 CrackResult string `db:"crack_result"` // 结果 + Started string `db:"started"` // 开始时间 + Stoped string `db:"started"` // 结束时间 CreatedBy int64 `db:"created_by"` // 创建人 UpdatedBy int64 `db:"updated_by"` // 更新人 DeletedFlag int64 `db:"deleted_flag"` // 是否删除（0-否，1-是）