fix:显示详情接口修改

Former-commit-id: 43d22446412e76abe4e4a4443845ee27b140b380

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"
+	modelArtsType := in.ModelArtsType
-	getObsUrl = strings.Replace(getObsUrl, "{project_id}", in.ProjectId, -1)
+	if modelArtsType == l.svcCtx.Config.HaweiModelArtsType {
-	getObsUrl = strings.Replace(getObsUrl, "{instance_id}", in.InstanceId, -1)
+		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()
+		body, err := tool.HttpClientWithQueries(tool.GET, getObsUrl, nil, token, e)
-
+		if err != nil {
-	//empty struct
+			return nil, err
-	var e struct{}
+		}
-
+		json.Unmarshal(body, &resp)
-	body, err := tool.HttpClientWithQueries(tool.GET, getObsUrl, nil, token, e)
+	} else if modelArtsType == l.svcCtx.Config.NanjingModelArtsType {
-	if err != nil {
+		AK := l.svcCtx.Config.AK
-		return nil, err
+		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
 }