fix:显示详情接口修改

Former-commit-id: 43d22446412e76abe4e4a4443845ee27b140b380
This commit is contained in:
qiwang 2023-05-18 17:10:27 +08:00
parent cbcf7f53e4
commit 38cc3765e3
1 changed files with 47 additions and 12 deletions

View File

@ -1,10 +1,14 @@
package logic package logic
import ( import (
"APIGW-go-sdk/core"
"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
"PCM/common/tool" "PCM/common/tool"
"context" "context"
"encoding/json" "encoding/json"
"fmt"
"io/ioutil"
"net/http"
"strings" "strings"
"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
@ -29,13 +33,13 @@ func NewGetNotebookStorageLogic(ctx context.Context, svcCtx *svc.ServiceContext)
func (l *GetNotebookStorageLogic) GetNotebookStorage(in *modelarts.GetNotebookStorageReq) (*modelarts.GetNotebookStorageResp, error) { func (l *GetNotebookStorageLogic) GetNotebookStorage(in *modelarts.GetNotebookStorageReq) (*modelarts.GetNotebookStorageResp, error) {
var resp modelarts.GetNotebookStorageResp var resp modelarts.GetNotebookStorageResp
getObsUrl := "https://modelarts.cn-east-3.myhuaweicloud.com/v1/{project_id}/notebooks/{instance_id}/storage" 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, "{project_id}", in.ProjectId, -1)
getObsUrl = strings.Replace(getObsUrl, "{instance_id}", in.InstanceId, -1) getObsUrl = strings.Replace(getObsUrl, "{instance_id}", in.InstanceId, -1)
token := common.GetToken() token := common.GetToken()
//empty struct
var e struct{} var e struct{}
body, err := tool.HttpClientWithQueries(tool.GET, getObsUrl, nil, token, e) body, err := tool.HttpClientWithQueries(tool.GET, getObsUrl, nil, token, e)
@ -43,5 +47,36 @@ func (l *GetNotebookStorageLogic) GetNotebookStorage(in *modelarts.GetNotebookSt
return nil, err return nil, err
} }
json.Unmarshal(body, &resp) 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)
}
return &resp, nil return &resp, nil
} }