From 38cc3765e3dd128f948216e870ee91467486e3f8 Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Thu, 18 May 2023 17:10:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=98=BE=E7=A4=BA=E8=AF=A6=E6=83=85?= =?UTF-8?q?=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: 43d22446412e76abe4e4a4443845ee27b140b380 --- .../internal/logic/getnotebookstoragelogic.go | 59 +++++++++++++++---- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getnotebookstoragelogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getnotebookstoragelogic.go index 964e82e7..12b8bfe3 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getnotebookstoragelogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getnotebookstoragelogic.go @@ -1,10 +1,14 @@ package logic import ( + "APIGW-go-sdk/core" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common" "PCM/common/tool" "context" "encoding/json" + "fmt" + "io/ioutil" + "net/http" "strings" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc" @@ -29,19 +33,50 @@ func NewGetNotebookStorageLogic(ctx context.Context, svcCtx *svc.ServiceContext) func (l *GetNotebookStorageLogic) GetNotebookStorage(in *modelarts.GetNotebookStorageReq) (*modelarts.GetNotebookStorageResp, error) { var resp modelarts.GetNotebookStorageResp - getObsUrl := "https://modelarts.cn-east-3.myhuaweicloud.com/v1/{project_id}/notebooks/{instance_id}/storage" - getObsUrl = strings.Replace(getObsUrl, "{project_id}", in.ProjectId, -1) - getObsUrl = strings.Replace(getObsUrl, "{instance_id}", in.InstanceId, -1) + modelArtsType := in.ModelArtsType + if modelArtsType == l.svcCtx.Config.HaweiModelArtsType { + modelArtsUrl := l.svcCtx.Config.ModelArtsUrl + getObsUrl := modelArtsUrl + "v1/{project_id}/notebooks/{instance_id}/storage" + getObsUrl = strings.Replace(getObsUrl, "{project_id}", in.ProjectId, -1) + getObsUrl = strings.Replace(getObsUrl, "{instance_id}", in.InstanceId, -1) + token := common.GetToken() + var e struct{} - token := common.GetToken() - - //empty struct - var e struct{} - - body, err := tool.HttpClientWithQueries(tool.GET, getObsUrl, nil, token, e) - if err != nil { - return nil, err + body, err := tool.HttpClientWithQueries(tool.GET, getObsUrl, nil, token, e) + 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+"v1/"+in.ProjectId+"/notebooks"+in.InstanceId+"/storage", + 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 }