From 763df099e8939412c89b2205110c7d74a31c3779 Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Wed, 17 May 2023 15:25:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9F=A5=E8=AF=A2=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 2c03b013c124bdaa585d7a7cd4030a8bc991b4a5 --- .../logic/showalgorithmbyuuidlogic.go | 69 +++++++++++++++---- 1 file changed, 56 insertions(+), 13 deletions(-) diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/showalgorithmbyuuidlogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/showalgorithmbyuuidlogic.go index 6f04799a..d091766d 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/showalgorithmbyuuidlogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/showalgorithmbyuuidlogic.go @@ -1,10 +1,15 @@ package logic import ( + "APIGW-go-sdk/core" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common" "PCM/common/tool" + "bytes" "context" + "fmt" + "io/ioutil" "k8s.io/apimachinery/pkg/util/json" + "net/http" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts" @@ -29,20 +34,58 @@ func NewShowAlgorithmByUuidLogic(ctx context.Context, svcCtx *svc.ServiceContext // ShowAlgorithmByUuid 展示算法详情 func (l *ShowAlgorithmByUuidLogic) ShowAlgorithmByUuid(in *modelarts.ShowAlgorithmByUuidReq) (*modelarts.ShowAlgorithmByUuidResp, error) { var resp modelarts.ShowAlgorithmByUuidResp - url := "https://modelarts.cn-north-4.myhuaweicloud.com/v2/" + in.ProjectId + "/algorithms/" + in.AlgorithmId - token := common.GetToken() - statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.GET, url, nil, token) - if err != nil { - return nil, err - } - if statusCode == 200 { + //根据智算类型判断走华为智算还是南京智算 + modelArtsType := in.ModelArtsType + if modelArtsType == l.svcCtx.Config.HaweiModelArtsType { + modelArtsUrl := l.svcCtx.Config.ModelArtsUrl + url := modelArtsUrl + "v2/" + in.ProjectId + "/algorithms/" + in.AlgorithmId + token := common.GetToken() + statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.GET, url, nil, 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 == l.svcCtx.Config.NanjingModelArtsType { + AK := l.svcCtx.Config.AK + SK := l.svcCtx.Config.SK + NanjingModelArtsUrl := l.svcCtx.Config.NanjingModelArtsUrl + XProjectId := l.svcCtx.Config.XProjectId + XDomainId := l.svcCtx.Config.XDomainId + s := core.Signer{ + Key: AK, + Secret: SK, + } + r, err := http.NewRequest("GET", NanjingModelArtsUrl+"v2/"+in.ProjectId+"/algorithms/"+in.AlgorithmId, + bytes.NewBuffer([]byte("foo=bar"))) + if err != nil { + fmt.Println(err) + //return + } + r.Header.Add("content-type", "application/json;charset=UTF-8") + r.Header.Add("X-Project-Id", XProjectId) + r.Header.Add("X-Domain-Id", XDomainId) + 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 }