fix:显示详情接口修改

Former-commit-id: 67d4c266a3b0e58186f1fa26298269e925d8c6b7

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/describeprocessortasklogic.go

@@ -6,12 +6,16 @@ package logic
 */
 
 import (
+	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"context"
+	"fmt"
+	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
+	"net/http"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -33,12 +37,46 @@ func NewDescribeProcessorTaskLogic(ctx context.Context, svcCtx *svc.ServiceConte
 func (l *DescribeProcessorTaskLogic) DescribeProcessorTask(in *modelarts.DescribeProcessorTaskReq) (*modelarts.DescribeProcessorTaskResp, error) {
 	// todo: add your logic here and delete this line
 	var resp modelarts.DescribeProcessorTaskResp
-	url := "https://modelarts.cn-north-4.myhuaweicloud.com/v2/" + in.ProjectId + "/processor-tasks/" + in.TaskId
+	//根据智算类型判断走华为智算还是南京智算
-	token := common.GetToken()
+	modelArtsType := in.ModelArtsType
-	body, err := tool.HttpClient(tool.GET, url, nil, token)
+	if modelArtsType == l.svcCtx.Config.HaweiModelArtsType {
-	if err != nil {
+		modelArtsUrl := l.svcCtx.Config.ModelArtsUrl
-		return nil, err
+		url := modelArtsUrl + "v2/" + in.ProjectId + "/processor-tasks/" + in.TaskId
+		token := common.GetToken()
+		body, err := tool.HttpClient(tool.GET, url, nil, token)
+		if err != nil {
+			return nil, err
+		}
+		json.Unmarshal(body, &resp)
+	} else if modelArtsType == l.svcCtx.Config.NanjingModelArtsType {
+		AK := l.svcCtx.Config.AK
+		SK := l.svcCtx.Config.SK
+		NanjingModelArtsUrl := l.svcCtx.Config.NanjingModelArtsUrl
+		XProjectId := l.svcCtx.Config.XProjectId
+		s := core.Signer{
+			Key:    AK,
+			Secret: SK,
+		}
+		r, err := http.NewRequest("GET", NanjingModelArtsUrl+"v2/"+in.ProjectId+"/processor-tasks/"+in.TaskId,
+			nil)
+		if err != nil {
+			fmt.Println(err)
+		}
+		r.Header.Add("content-type", "application/json;charset=UTF-8")
+		r.Header.Add("X-Project-Id", XProjectId)
+		r.Header.Add("x-stage", "RELEASE")
+		s.Sign(r)
+		client := http.DefaultClient
+		res, err := client.Do(r)
+		if err != nil {
+			fmt.Println(err)
+		}
+		defer res.Body.Close()
+		body, err := ioutil.ReadAll(res.Body)
+		if err != nil {
+			fmt.Println(err)
+		}
+		json.Unmarshal(body, &resp)
 	}
-	json.Unmarshal(body, &resp)
 	return &resp, nil
 }

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/exporttasklogic.go

@@ -6,12 +6,17 @@ package logic
 */
 
 import (
+	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	_ "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
+	"bytes"
 	"context"
+	"fmt"
+	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
+	"net/http"
 	"strings"
 
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
@@ -35,25 +40,60 @@ func NewExportTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Export
 // ExportTask for modelarts
 func (l *ExportTaskLogic) ExportTask(in *modelarts.ExportTaskReq) (*modelarts.ExportTaskDataResp, error) {
 	var resp modelarts.ExportTaskDataResp
-	url := "https://modelarts.cn-north-4.myhuaweicloud.com/v2/" + in.ProjectId + "/datasets/" + in.DatasetId + "/export-tasks"
+	//根据智算类型判断走华为智算还是南京智算
-	reqByte, err := json.Marshal(in)
+	modelArtsType := in.ModelArtsType
-	if err != nil {
+	if modelArtsType == "huawei" {
-		return nil, err
+		modelArtsUrl := l.svcCtx.Config.ModelArtsUrl
-	}
+		url := modelArtsUrl + "v2/" + in.ProjectId + "/datasets/" + in.DatasetId + "/export-tasks"
-	payload := strings.NewReader(string(reqByte))
+		reqByte, err := json.Marshal(in)
-	token := common.GetToken()
+		if err != nil {
-	statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.POST, url, payload, token)
+			return nil, err
-	if err != nil {
+		}
-		return nil, err
+		payload := strings.NewReader(string(reqByte))
-	}
+		token := common.GetToken()
-	if statusCode == 200 {
+		statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.POST, url, payload, token)
+		if err != nil {
+			return nil, err
+		}
+		if statusCode == 200 {
+			json.Unmarshal(body, &resp)
+			resp.Code = 200
+			resp.Msg = "Success"
+		} else if statusCode != 200 {
+			json.Unmarshal(body, &resp)
+			resp.Code = 400
+			resp.Msg = "Failure"
+		}
+	} else if modelArtsType == "nanjing" {
+		AK := l.svcCtx.Config.AK
+		SK := l.svcCtx.Config.SK
+		NanjingModelArtsUrl := l.svcCtx.Config.NanjingModelArtsUrl
+		XProjectId := l.svcCtx.Config.XProjectId
+		s := core.Signer{
+			Key:    AK,
+			Secret: SK,
+		}
+		reqByte, err := json.Marshal(in)
+		r, err := http.NewRequest("POST", NanjingModelArtsUrl+"v2/"+in.ProjectId+"/datasets/"+in.DatasetId+"/export-tasks",
+			bytes.NewBuffer(reqByte))
+		if err != nil {
+			fmt.Println(err)
+		}
+		r.Header.Add("content-type", "application/json;charset=UTF-8")
+		r.Header.Add("X-Project-Id", XProjectId)
+		r.Header.Add("x-stage", "RELEASE")
+		s.Sign(r)
+		client := http.DefaultClient
+		res, err := client.Do(r)
+		if err != nil {
+			fmt.Println(err)
+		}
+		defer res.Body.Close()
+		body, err := ioutil.ReadAll(res.Body)
+		if err != nil {
+			fmt.Println(err)
+		}
 		json.Unmarshal(body, &resp)
-		resp.Code = 200
-		resp.Msg = "Success"
-	} else if statusCode != 200 {
-		json.Unmarshal(body, &resp)
-		resp.Code = 400
-		resp.Msg = "Failure"
 	}
 	return &resp, nil
 }