fix:查询开发环境接口修改

Former-commit-id: fc517e0e406a0d34958657a62eedea39850882a4

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

@@ -1,13 +1,17 @@
 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"
-	"encoding/json"
+	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
+	"io/ioutil"
+	"k8s.io/apimachinery/pkg/util/json"
+	"net/http"
 )
 
 type ListNotebookLogic struct {
@@ -27,36 +31,70 @@ func NewListNotebookLogic(ctx context.Context, svcCtx *svc.ServiceContext) *List
 // notebook task
 func (l *ListNotebookLogic) ListNotebook(in *modelarts.ListNotebookReq) (*modelarts.ListNotebookResp, error) {
 	resp := &modelarts.ListNotebookResp{}
-	getUrl := "https://modelarts.cn-north-4.myhuaweicloud.com/v1/{project_id}/notebooks"
+	//根据智算类型判断走华为智算还是南京智算
+	modelArtsType := in.ModelArtsType
+	if modelArtsType == l.svcCtx.Config.HaweiModelArtsType {
+		modelArtsUrl := l.svcCtx.Config.ModelArtsUrl
+		getUrl := modelArtsUrl + "v1/{project_id}/notebooks"
 
-	token := common.GetToken()
+		token := common.GetToken()
-	queryMap := tool.ConvertStructToMap(in.Param)
+		queryMap := tool.ConvertStructToMap(in.Param)
 
-	req := tool.GetACHttpRequest()
+		req := tool.GetACHttpRequest()
-	res, err := req.
+		res, err := req.
-		SetHeader("x-auth-token", token).
+			SetHeader("x-auth-token", token).
-		SetPathParam("project_id", in.ProjectId).
+			SetPathParam("project_id", in.ProjectId).
-		SetQueryParams(queryMap).
+			SetQueryParams(queryMap).
-		SetResult(resp).
+			SetResult(resp).
-		Get(getUrl)
+			Get(getUrl)
 
-	if err != nil {
-		return nil, err
-	}
-
-	if res.StatusCode() != 200 {
-		resp.Code = int32(res.StatusCode())
-		resp.Msg = "Failure"
-
-		var errMsg common.Error
-		err := json.Unmarshal(res.Body(), &errMsg)
 		if err != nil {
-			errMsg.ErrorMsg = ""
+			return nil, err
 		}
-		resp.ErrorMsg = errMsg.ErrorMsg
+
-	} else {
+		if res.StatusCode() != 200 {
-		resp.Code = int32(res.StatusCode())
+			resp.Code = int32(res.StatusCode())
-		resp.Msg = "Success"
+			resp.Msg = "Failure"
+
+			var errMsg common.Error
+			err := json.Unmarshal(res.Body(), &errMsg)
+			if err != nil {
+				errMsg.ErrorMsg = ""
+			}
+			resp.ErrorMsg = errMsg.ErrorMsg
+		} else {
+			resp.Code = int32(res.StatusCode())
+			resp.Msg = "Success"
+		}
+	} 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",
+			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