依赖升级

Signed-off-by: devad <cossjie@foxmail.com>

Former-commit-id: 1657ca7305596676c9782facb1d3e584446dbecb

api/internal/handler/cloud/cloudlisthandler.go

@@ -15,11 +15,10 @@
 package cloud
 
 import (
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"net/http"
-
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/cloud"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	"net/http"
 )
 
 func CloudListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

api/internal/handler/cloud/listcloudclusterhandler.go

@@ -5,7 +5,7 @@ import (
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/cloud"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"net/http"
 )
 

api/internal/handler/cloud/noticetenanthandler.go

@@ -3,7 +3,7 @@ package cloud
 import (
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/cloud"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"net/http"
 )
 

api/internal/handler/cloud/registerclusterhandler.go

@@ -5,7 +5,7 @@ import (
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/cloud"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"net/http"
 )
 

api/internal/handler/core/deletetaskhandler.go

@@ -15,7 +15,7 @@
 package core
 
 import (
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"

api/internal/handler/core/gethashcathandler.go

@@ -15,7 +15,7 @@
 package core
 
 import (
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"

api/internal/handler/core/getresourcepanelconfighandler.go

@@ -17,7 +17,7 @@ package core
 import (
 	"net/http"
 
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/core"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/handler/core/jobtotalhandler.go

@@ -15,7 +15,7 @@
 package core
 
 import (
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"net/http"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/core"

api/internal/handler/core/listdomainresourcehandler.go

@@ -17,7 +17,7 @@ package core
 import (
 	"net/http"
 
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/core"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/handler/core/nodeassetshandler.go

@@ -15,7 +15,7 @@
 package core
 
 import (
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"net/http"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/core"

api/internal/handler/core/participantlisthandler.go

@@ -15,7 +15,7 @@
 package core
 
 import (
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"net/http"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/core"

api/internal/handler/core/putresourcepanelconfighandler.go

@@ -17,7 +17,7 @@ package core
 import (
 	"net/http"
 
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/core"

api/internal/handler/core/savehashcathandler.go

@@ -15,7 +15,7 @@
 package core
 
 import (
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"

api/internal/handler/hpc/queueassetshandler.go

@@ -15,7 +15,7 @@
 package hpc
 
 import (
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"net/http"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/hpc"

api/internal/handler/image/datasetcheckhandler.go

@@ -15,7 +15,7 @@
 package image
 
 import (
-	result2 "gitlink.org.cn/jcce-pcm/utils/result"
+	result2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"

api/internal/handler/image/imagelisthandler.go

@@ -15,7 +15,7 @@
 package image
 
 import (
-	"gitlink.org.cn/jcce-pcm/utils/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"net/http"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/image"

api/internal/logic/ai/createalgorithmlogic.go

@@ -20,9 +20,9 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
 	"k8s.io/apimachinery/pkg/util/json"
 )
 

api/internal/logic/ai/createdatasetlogic.go

@@ -18,9 +18,9 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"

api/internal/logic/ai/createexporttasklogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/ai/createnotebooklogic.go

@@ -20,9 +20,9 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

api/internal/logic/ai/createprocessortasklogic.go

@@ -20,9 +20,9 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

api/internal/logic/ai/createservicelogic.go

@@ -19,9 +19,9 @@ import (
 	"github.com/jinzhu/copier"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/ai/createtasklogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/ai/deletealgorithmlogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 	"strings"
 

api/internal/logic/ai/deletedatasetlogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/ai/getexporttasksofdatasetlogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go

@@ -17,9 +17,9 @@ package ai
 import (
 	"context"
 	"github.com/jinzhu/copier"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/ai/getlisttrainingjobslogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/ai/listalgorithmslogic.go

@@ -17,9 +17,9 @@ package ai
 import (
 	"context"
 	"github.com/jinzhu/copier"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/ai/listclusterslogic.go

@@ -18,9 +18,9 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"

api/internal/logic/ai/listdatasetlogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/ai/listimportlogic.go

@@ -19,9 +19,9 @@ import (
 	"github.com/jinzhu/copier"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/ai/listnotebooklogic.go

@@ -20,9 +20,9 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

api/internal/logic/ai/listserviceslogic.go

@@ -19,9 +19,9 @@ import (
 	"github.com/jinzhu/copier"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/ai/showalgorithmbyuuidlogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/ai/showservicelogic.go

@@ -17,9 +17,9 @@ package ai
 import (
 	"context"
 	"github.com/jinzhu/copier"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts"
-	"gitlink.org.cn/jcce-pcm/utils/result"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/apps/appdetaillogic.go

@@ -25,15 +25,18 @@ func NewAppDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AppDeta
 }
 
 func (l *AppDetailLogic) AppDetail(req *types.AppDetailReq) (resp *kubernetes.AppDetailResp, err error) {
-	//调用p端接口
+	resp = &kubernetes.AppDetailResp{}
+	//调用p端接口查询应用详情
 	appDetail, err := l.svcCtx.K8sRpc[1727670068428410880].GetAppDetail(context.Background(), &kubernetes.AppDetailReq{
 		Namespace: req.NsID,
 		Name:      req.Name,
 	})
 	if err != nil {
-		appDetail.Code = "500"
+		logx.Errorf("调用p端接口查询应用详情失败，err:%v", err)
-		appDetail.Msg = err.Error()
+		resp.Code = "500"
+		resp.Msg = err.Error()
+		return resp, err
 	}
-	appDetail.Code = "200"
+	resp.Code = "200"
 	return appDetail, err
 }

api/internal/logic/core/commithpctasklogic.go

@@ -5,7 +5,7 @@ import (
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/pkg/response"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/constants"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"k8s.io/apimachinery/pkg/util/json"
 	"time"
 

api/internal/logic/core/jobtotallogic.go

@@ -19,9 +19,9 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/enum"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils/httputils"
-	"gitlink.org.cn/jcce-pcm/utils/enum"
 	"k8s.io/apimachinery/pkg/util/json"
 )
 

api/internal/logic/hpc/listhistoryjoblogic.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
-	"gitlink.org.cn/jcce-pcm/utils/enum"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/enum"
 	"strings"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/hpc/listjoblogic.go

@@ -16,7 +16,7 @@ package hpc
 
 import (
 	"context"
-	"gitlink.org.cn/jcce-pcm/utils/enum"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/enum"
 	"strings"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/storage/dailypowerscreenlogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/storage/percentercomputerpowerslogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/storage/screenstoragelogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/bulkcreatenetworkslogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/createimagelogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/createnetworklogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/createnodelogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/createserverlogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/createsubnetlogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/createvolumelogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/createvolumetypeslogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/deleteimagelogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/deletenetworklogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/deletenodelogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/deleteserverlogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/deletevolumelogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/deletevolumetypelogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/getcomputelimitslogic.go

@@ -21,10 +21,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

api/internal/logic/vm/getserversdetailedbyidlogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/getvolumedetailedbyidlogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/getvolumelimitslogic.go

@@ -21,10 +21,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

api/internal/logic/vm/listflavorsdetaillogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/listimageslogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/listnetworkslogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/listnodeslogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/listserverlogic.go

@@ -21,10 +21,10 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 )
 

api/internal/logic/vm/listserversdetailedlogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/listvolumesdetaillogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/listvolumeslogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/listvolumetypeslogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/internal/logic/vm/pauseserverlogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/rebootserverlogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/shownetworkdetailslogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/startserverlogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/stopserverlogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/updatenetworklogic.go

@@ -18,10 +18,11 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
@@ -47,7 +48,7 @@ func NewUpdateNetworkLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Upd
 func (l *UpdateNetworkLogic) UpdateNetwork(req *types.UpdateNetworkReq) (resp *types.UpdateNetworkResp, err error) {
 	// todo: add your logic here and delete this line
 	UpdateNetworkReq := &openstack.UpdateNetworkReq{}
-	err = copier.CopyWithOption(UpdateNetworkReq, req, copier.Option{Converters: tool.Converters})
+	err = copier.CopyWithOption(UpdateNetworkReq, req, copier.Option{Converters: utils.Converters})
 	UpdateNetworkResp, err := l.svcCtx.OpenstackRpc.UpdateNetwork(l.ctx, UpdateNetworkReq)
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrMsg("c端更新失败"), "c端创建失败 : %v ,req:%+v", err, req)

api/internal/logic/vm/updateserverlogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/updatevolumelogic.go

@@ -18,10 +18,10 @@ import (
 	"context"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result"
+	tool "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/result"
-	"gitlink.org.cn/jcce-pcm/utils/tool"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"

api/internal/logic/vm/uploadimagelogic.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr"
 	error2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/error"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstack"
-	"gitlink.org.cn/jcce-pcm/utils/xerr"
 	"k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/zeromicro/go-zero/core/logx"

api/pcm.go

@@ -26,7 +26,7 @@ import (
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/handler"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/mqs"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
-	commonConfig "gitlink.org.cn/jcce-pcm/utils/nacos"
+	commonConfig "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/nacos"
 )
 
 var configFile = flag.String("f", "api/etc/pcm.yaml", "the config file")

go.mod

@@ -30,7 +30,6 @@ require (
 	gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20231101091522-38307e241dfd
 	gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20231102023739-81a3d353c10d
 	gitlink.org.cn/jcce-pcm/pcm-slurm v0.0.0-20231107115628-f74106c47dfa
-	gitlink.org.cn/jcce-pcm/utils v0.0.2
 	go.opentelemetry.io/otel/trace v1.21.0
 	gonum.org/v1/gonum v0.11.0
 	google.golang.org/grpc v1.59.0
@@ -38,6 +37,7 @@ require (
 	gorm.io/datatypes v1.2.0
 	gorm.io/driver/mysql v1.5.2
 	gorm.io/gorm v1.25.5
+	k8s.io/api v0.28.4
 	k8s.io/apimachinery v0.28.4
 	k8s.io/client-go v0.28.4
 	sigs.k8s.io/yaml v1.4.0
@@ -97,7 +97,6 @@ require (
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.10 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
@@ -135,7 +134,6 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.28.4 // indirect
 	k8s.io/klog/v2 v2.110.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
 	k8s.io/utils v0.0.0-20231121161247-cf03d44ff3cf // indirect

go.sum

@@ -454,7 +454,6 @@ github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -568,7 +567,6 @@ github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
 github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-resty/resty/v2 v2.10.0 h1:Qla4W/+TMmv0fOeeRqzEpXPLfTUnR5HZ1+lGs+CkiCo=
@@ -704,7 +702,6 @@ github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/z
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
@@ -815,7 +812,6 @@ github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOj
 github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
 github.com/microsoft/go-mssqldb v0.17.0 h1:Fto83dMZPnYv1Zwx5vHHxpNraeEaUlQ/hhHLgZiaenE=
@@ -954,8 +950,6 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -1006,8 +1000,6 @@ gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20231108025612-8f0044dd7a95 h1:63M79RcLdA1
 gitlink.org.cn/jcce-pcm/pcm-ac v0.0.0-20231108025612-8f0044dd7a95/go.mod h1:ySZHK8NpHn4gjbLoOtJbSEUDiYZVwjbnFAcG71gXPgg=
 gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d h1:DHjl/rLuH2gKYtY0MKMGNQDHFT12APg25RlMUQo+tHk=
 gitlink.org.cn/jcce-pcm/pcm-participant-ceph v0.0.0-20230904090036-24fc730ec87d/go.mod h1:r/KLzUpupCV5jdxSfgDhc2pVjP0fBi3VhAWRttsBn30=
-gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231124085049-bb522cd6610c h1:rcWG9evDWS/PbkLVOhJqC8LhhUUz8eWlP2kZkEYmCKE=
-gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231124085049-bb522cd6610c/go.mod h1:nto0MrfeackGWkbwgkRW45+RIRvwHHqvNqs9Yz+O9j0=
 gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231125040801-4f7a37d36a73 h1:VcLuvcNZwiujgngTNnQH3rFDclT2hfquxnBMQac8xX4=
 gitlink.org.cn/jcce-pcm/pcm-participant-kubernetes v0.0.0-20231125040801-4f7a37d36a73/go.mod h1:nto0MrfeackGWkbwgkRW45+RIRvwHHqvNqs9Yz+O9j0=
 gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20231101085149-724c7c4cc090 h1:jztlHo72bcWM1jUwvG3Hfk2K+AJL0RvlsdIqlktH/MI=
@@ -1018,8 +1010,6 @@ gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20231102023739-81a3d353
 gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20231102023739-81a3d353c10d/go.mod h1:m75SVNfNa1TUBlQtBfR0CeETQ0ez2RIUqlSCn1Mb/js=
 gitlink.org.cn/jcce-pcm/pcm-slurm v0.0.0-20231107115628-f74106c47dfa h1:U0YV9ju5OPpUe8iUk4OEUtYJlINgpI0vgLC1IfZ2JUY=
 gitlink.org.cn/jcce-pcm/pcm-slurm v0.0.0-20231107115628-f74106c47dfa/go.mod h1:tqj8GWoM2P21agWvJyUwN1U37CqfALwZTkRs9Ekgrbw=
-gitlink.org.cn/jcce-pcm/utils v0.0.2 h1:Stif8W9C9TOCS2hw4g+OlOywDrsVYNrkiyKfBrWkT0w=
-gitlink.org.cn/jcce-pcm/utils v0.0.2/go.mod h1:u8PTlBpzUyOlbQJgfSiutq91q/JtrJIQiPNDe4S/pGs=
 go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA=
 go.etcd.io/etcd/api/v3 v3.5.10 h1:szRajuUUbLyppkhs9K6BRtjY37l66XQQmw7oZRANE4k=
 go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI=
@@ -1359,7 +1349,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

pkg/helper/enum/acEnum.go

@@ -0,0 +1,23 @@
+package enum
+
+type AcStatus string
+
+const (
+	statR AcStatus = "statR"
+	statC AcStatus = "statC"
+	statQ AcStatus = "statQ"
+	statW AcStatus = "statW"
+)
+
+func (s AcStatus) String() string {
+	switch s {
+	case statR:
+		return "Running"
+	case statC:
+		return "Completed"
+	case statQ, statW:
+		return "Pending"
+	default:
+		return ""
+	}
+}

pkg/helper/enum/externalStatusEnum.go

@@ -0,0 +1,28 @@
+package enum
+
+type ExternalStatus string
+
+const (
+	EXTERNAL_RUNNING   ExternalStatus = "running"
+	EXTERNAL_COMPLETED ExternalStatus = "completed"
+	EXTERNAL_PENDING   ExternalStatus = "pending"
+	EXTERNAL_SUCCEEDED ExternalStatus = "succeeded"
+	EXTERNAL_FAILED    ExternalStatus = "failed"
+)
+
+func (s ExternalStatus) String() string {
+	switch s {
+	case EXTERNAL_RUNNING:
+		return "Running"
+	case EXTERNAL_COMPLETED:
+		return "Completed"
+	case EXTERNAL_PENDING:
+		return "Pending"
+	case EXTERNAL_SUCCEEDED:
+		return "Succeeded"
+	case EXTERNAL_FAILED:
+		return "Failed"
+	default:
+		return ""
+	}
+}

pkg/helper/enum/partnerEnum.go

@@ -0,0 +1,25 @@
+package enum
+
+type Partner string
+
+const (
+	AC         Partner = "ac"
+	TH         Partner = "th"
+	KubeNative Partner = "kubeNative"
+	ModelArts  Partner = "modelArts"
+)
+
+func (p Partner) String() string {
+	switch p {
+	case AC:
+		return "曙光超算"
+	case KubeNative:
+		return "长沙云算"
+	case ModelArts:
+		return "南京智算"
+	case TH:
+		return "天河超算"
+	default:
+		return ""
+	}
+}

pkg/helper/enum/synergyStatusEnum.go

@@ -0,0 +1,19 @@
+package enum
+
+type SynergyStatus int64
+
+const (
+	SYNERGIZED     SynergyStatus = 0
+	NOT_SYNERGIZED SynergyStatus = 1
+)
+
+func (s SynergyStatus) String() string {
+	switch s {
+	case SYNERGIZED:
+		return "已协同"
+	case NOT_SYNERGIZED:
+		return "未协同"
+	default:
+		return ""
+	}
+}

pkg/helper/enum/tianheEnum.go

@@ -0,0 +1,25 @@
+package enum
+
+type State uint32
+
+const (
+	pending   State = 0
+	running   State = 1
+	suspended State = 2
+	completed State = 3
+)
+
+func (s State) String() string {
+	switch s {
+	case pending:
+		return "Pending"
+	case running:
+		return "Running"
+	case suspended:
+		return "Suspended"
+	case completed:
+		return "Completed"
+	default:
+		return ""
+	}
+}

pkg/repository/result/baseerror.go

@@ -0,0 +1,46 @@
+/*
+
+ Copyright (c) [2023] [pcm]
+ [pcm-coordinator] is licensed under Mulan PSL v2.
+ You can use this software according to the terms and conditions of the Mulan PSL v2.
+ You may obtain a copy of Mulan PSL v2 at:
+          http://license.coscl.org.cn/MulanPSL2
+ THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ EITHER EXPaRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ See the Mulan PSL v2 for more details.
+
+*/
+
+package result
+
+const defaultCode = 1001
+
+type CodeError struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+}
+
+type CodeErrorResponse struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+}
+
+func NewCodeError(code int, msg string) error {
+	return &CodeError{Code: code, Msg: msg}
+}
+
+func NewDefaultError(msg string) error {
+	return NewCodeError(defaultCode, msg)
+}
+
+func (e *CodeError) Error() string {
+	return e.Msg
+}
+
+func (e *CodeError) Data() *CodeErrorResponse {
+	return &CodeErrorResponse{
+		Code: e.Code,
+		Msg:  e.Msg,
+	}
+}

rpc/pcmcore.go

@@ -20,14 +20,14 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/service"
 	"github.com/zeromicro/go-zero/zrpc"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/interceptor/rpcserver"
+	commonConfig "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/nacos"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/config"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/cron"
 	participantserviceServer "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/server/participantservice"
 	pcmcoreServer "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/server/pcmcore"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/pcmCore"
-	"gitlink.org.cn/jcce-pcm/utils/interceptor/rpcserver"
-	commonConfig "gitlink.org.cn/jcce-pcm/utils/nacos"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 )