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