fix:删除接口修改

Former-commit-id: 5a6ed32c20fd75dee8731956ec448849ef802949

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

@@ -69,7 +69,6 @@ func (l *DeleteModelLogic) DeleteModel(in *modelarts.DeleteModelReq) (*modelarts
 		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,
@@ -78,11 +77,9 @@ func (l *DeleteModelLogic) DeleteModel(in *modelarts.DeleteModelReq) (*modelarts
 			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

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

@@ -6,12 +6,16 @@ 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"
+	"fmt"
+	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
+	"net/http"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -32,7 +36,11 @@ func NewDeleteServiceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Del
 
 func (l *DeleteServiceLogic) DeleteService(in *modelarts.DeleteServiceReq) (*modelarts.DeleteServiceResp, error) {
 	var resp modelarts.DeleteServiceResp
-	url := "https://modelarts.cn-north-4.myhuaweicloud.com/v1/" + in.ProjectId + "/services/" + in.ServiceId
+	//根据智算类型判断走华为智算还是南京智算
+	modelArtsType := in.ModelArtsType
+	if modelArtsType == l.svcCtx.Config.HaweiModelArtsType {
+		modelArtsUrl := l.svcCtx.Config.ModelArtsUrl
+		url := modelArtsUrl + "v1/" + in.ProjectId + "/services/" + in.ServiceId
 		token := common.GetToken()
 		statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.DELETE, url, nil, token)
 		if err != nil {
@@ -47,5 +55,43 @@ func (l *DeleteServiceLogic) DeleteService(in *modelarts.DeleteServiceReq) (*mod
 			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("DELETE", NanjingModelArtsUrl+in.ProjectId+"/services/"+in.ServiceId,
+			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-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)
+		statusCode := res.StatusCode
+		if statusCode == 202 {
+			json.Unmarshal(body, &resp)
+			resp.Code = 200
+			resp.Msg = "Success"
+		} else if statusCode != 202 {
+			json.Unmarshal(body, &resp)
+			resp.Code = 400
+			resp.Msg = "Failure"
+		}
+	}
+
 	return &resp, nil
 }

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

@@ -1,12 +1,16 @@
 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"
+	"fmt"
+	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
+	"net/http"
 	"strings"
 
 	"github.com/zeromicro/go-zero/core/logx"
@@ -29,15 +33,61 @@ func NewDeleteTrainingJobConfigLogic(ctx context.Context, svcCtx *svc.ServiceCon
 // DeleteTrainingJobConfig 删除训练作业参数
 func (l *DeleteTrainingJobConfigLogic) DeleteTrainingJobConfig(in *modelarts.DeleteTrainingJobConfigReq) (*modelarts.DeleteTrainingJobConfigResp, error) {
 	var resp modelarts.DeleteTrainingJobConfigResp
-	url := "https://modelarts.cn-north-4.myhuaweicloud.com/v1/" + in.ProjectId + "/training-job-configs/" + in.ConfigName
+	//根据智算类型判断走华为智算还是南京智算
+	modelArtsType := in.ModelArtsType
+	if modelArtsType == l.svcCtx.Config.HaweiModelArtsType {
+		modelArtsUrl := l.svcCtx.Config.ModelArtsUrl
+		url := modelArtsUrl + "v1/" + in.ProjectId + "/training-job-configs/" + in.ConfigName
 		token := common.GetToken()
-	body, err := tool.HttpClient(tool.DELETE, url, strings.NewReader(``), token)
+		statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.DELETE, url, strings.NewReader(``), token)
 		if err != nil {
 			return nil, err
 		}
+		if statusCode == 200 {
 			json.Unmarshal(body, &resp)
-	if &resp == nil {
+			resp.Code = 200
-		return nil, err
+			resp.Msg = "Success"
+		} else if statusCode != 200 {
+			json.Unmarshal(body, &resp)
+			resp.Code = 400
+			resp.Msg = "Failure"
 		}
+	} else if modelArtsType == l.svcCtx.Config.HaweiModelArtsType {
+		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("DELETE", NanjingModelArtsUrl+"v1/"+in.ProjectId+"/training-job-configs/"+in.ConfigName,
+			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)
+		statusCode := res.StatusCode
+		if statusCode == 202 {
+			json.Unmarshal(body, &resp)
+			resp.Code = 200
+			resp.Msg = "Success"
+		} else if statusCode != 202 {
+			json.Unmarshal(body, &resp)
+			resp.Code = 400
+			resp.Msg = "Failure"
+		}
+	}
+
 	return &resp, nil
 }