Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator

# Conflicts:
#	api/desc/core/pcm-core.api


Former-commit-id: e6ab78097d94be6b3454fdd06ee3539c0eb92e98

api/desc/core/pcm-core.api

@@ -92,6 +92,7 @@ type (
 		Id    int         `json:"id"`
 		PublicNetworkName    string         `json:"public_netWork_name"`
 	}
+
 )
 
 type remoteResp {
@@ -175,6 +176,7 @@ type (
 		AdapterName string `json:"adapterName"`
 		PodName string  `json:"podName"`
 		stream  bool `json:"stream"`
+	
 	}
 )
 
@@ -514,32 +516,6 @@ type (
 	}
 )
 
-type ScreenChartResp {
-    ComputingPower []int `json:"computingPower"`
-    CpuAvg []int `json:"cpuAvg"`
-    CpuLoad []int `json:"cpuLoad"`
-    MemoryLoad []int `json:"memoryLoad"`
-    MemoryAvg []int `json:"memoryAvg"`
-    CenterName string `json:"centerName"`
-}
-
-
-
-type ScreenInfoResp {
-    StorageTotal float64 `json:"storageTotal"`
-    StorageAvail float64 `json:"storageAvail"`
-    ApiDelay string `json:"apiDelay"`
-    SchedulerTimes int `json:"schedulerTimes"`
-    SchedulerErr int `json:"schedulerErr"`
-    ApiTimes string `json:"apiTimes"`
-    CenterCount int `json:"centerCount"`
-    ComputingPower float64 `json:"computingPower"`
-    ClusterCount int `json:"clusterCount"`
-    RunningCount int `json:"runningCount"`
-    CardCount int `json:"cardCount"`
-    RunningTime int `json:"runningTime"`
-}
-
 type (
 	DomainResourceResp {
 		TotalCount         int              `json:"totalCount"`
@@ -1209,8 +1185,7 @@ type (
 		TaskName    string `json:"taskName"`
 		Incident    string `json:"incident"`
 	}
-    ListNoticeReq struct {
-    }
+	ListNoticeReq struct{}
 
 	ListNoticeResp {
 		Code int64        `json:"code"`
@@ -1269,6 +1244,8 @@ type (
 		SynergyStatus int64 `json:"synergyStatus"`
 		ClusterInfos []*ClusterInfo `json:"clusterInfos"`
 		SubTaskInfos []*SubTaskInfo `json:"subTaskInfos"`
+	    TaskTypeDict string `json:"taskTypeDict"`
+		AdapterTypeDict string `json:"adapterTypeDict"`
 	}
 
 	SubTaskInfo{

api/internal/storeLink/shuguangai.go

@@ -745,7 +745,7 @@ func (s *ShuguangAi) GetImageInferUrl(ctx context.Context, option *option.InferO
 	}
 	imageUrl := &collector.ImageInferUrl{
 		Url:  urlResp.Url,
-		Card: option.ComputeCard,
+		Card: "dcu",
 	}
 	imageUrls = append(imageUrls, imageUrl)
 

api/internal/types/types.go

@@ -1191,6 +1191,8 @@ type TaskDetailsResp struct {
 	SynergyStatus   int64          `json:"synergyStatus"`
 	ClusterInfos    []*ClusterInfo `json:"clusterInfos"`
 	SubTaskInfos    []*SubTaskInfo `json:"subTaskInfos"`
+	TaskTypeDict    string         `json:"taskTypeDict"`
+	AdapterTypeDict string         `json:"adapterTypeDict"`
 }
 
 type SubTaskInfo struct {