diff --git a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listserviceslogic.go b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listserviceslogic.go index 44570dcb..14e0c666 100644 --- a/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listserviceslogic.go +++ b/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listserviceslogic.go @@ -6,13 +6,18 @@ 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" + "bytes" "context" + "fmt" "github.com/zeromicro/go-zero/core/logx" + "io/ioutil" "k8s.io/apimachinery/pkg/util/json" + "net/http" "strconv" ) @@ -32,22 +37,63 @@ func NewListServicesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *List func (l *ListServicesLogic) ListServices(in *modelarts.ListServicesReq) (*modelarts.ListServicesResp, error) { var resp modelarts.ListServicesResp - limit := strconv.Itoa(int(in.Limit)) + judgeLimit := strconv.Itoa(int(in.Limit)) offset := strconv.Itoa(int(in.OffSet)) - url := "https://modelarts.cn-north-4.myhuaweicloud.com/v1/" + in.ProjectId + "/services?limit=" + limit + "&offset=" + offset - token := common.GetToken() - statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.GET, url, nil, token) - if err != nil { - return nil, err + var limit string + if judgeLimit != "0" { + limit = strconv.Itoa(int(in.Limit)) + } else { + limit = "10" } - if statusCode == 200 { + //根据智算类型判断走华为智算还是南京智算 + modelArtsType := in.ModelArtsType + if modelArtsType == l.svcCtx.Config.HaweiModelArtsType { + modelArtsUrl := l.svcCtx.Config.ModelArtsUrl + url := modelArtsUrl + "v1/" + in.ProjectId + "/services?limit=" + limit + "&offset=" + offset + token := common.GetToken() + statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.GET, url, nil, token) + if err != nil { + return nil, err + } + if statusCode == 200 { + json.Unmarshal(body, &resp) + resp.Code = 200 + resp.Msg = "Success" + } else if statusCode != 200 { + json.Unmarshal(body, &resp) + resp.Code = 400 + resp.Msg = "Failure" + } + } 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+"/services?offset="+offset+"&"+"limit="+limit, + bytes.NewBuffer([]byte("foo=bar"))) + 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-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) - resp.Code = 200 - resp.Msg = "Success" - } else if statusCode != 200 { - json.Unmarshal(body, &resp) - resp.Code = 400 - resp.Msg = "Failure" } return &resp, nil }