From 6c6a4ad6a8522023dc54a4fc7ae88b4720bfdd40 Mon Sep 17 00:00:00 2001
From: qiwang <1364512070@qq.com>
Date: Wed, 17 May 2023 17:17:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E5=88=97=E8=A1=A8=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: 876fc522810473bd4ff8deacb06a665f367aec71
---
 .../rpc/internal/logic/getdatasetlistlogic.go         | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getdatasetlistlogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getdatasetlistlogic.go
index 3fa32511..7d9c50a4 100644
--- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getdatasetlistlogic.go
+++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getdatasetlistlogic.go
@@ -6,7 +6,6 @@ import (
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
-	"bytes"
 	"context"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
@@ -45,7 +44,7 @@ func (l *GetDatasetListLogic) GetDatasetList(in *modelarts.DataSetReq) (*modelar
 	}
 	//根据智算类型判断走华为智算还是南京智算
 	modelArtsType := in.ModelArtsType
-	if modelArtsType == "huawei" {
+	if modelArtsType == l.svcCtx.Config.HaweiModelArtsType {
 		modelArtsUrl := l.svcCtx.Config.ModelArtsUrl
 		token := common.GetToken()
 		statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.GET, modelArtsUrl+"v2/"+projectId+"/datasets?offset="+offset+"&"+"limit="+limit, strings.NewReader(``), token)
@@ -61,25 +60,23 @@ func (l *GetDatasetListLogic) GetDatasetList(in *modelarts.DataSetReq) (*modelar
 			resp.Code = 400
 			resp.Msg = "Failure"
 		}
-	} else if modelArtsType == "nanjing" {
+	} 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+in.ProjectId+"/datasets?offset="+offset+"&"+"limit="+limit,
-			bytes.NewBuffer([]byte("foo=bar")))
+		r, err := http.NewRequest("GET", NanjingModelArtsUrl+"v2/"+in.ProjectId+"/datasets?offset="+offset+"&"+"limit="+limit,
+			nil)
 		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