diff --git a/.gitignore b/.gitignore index 790d8839..47d6e36c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ PCM # Test binary, built with `go test -c` *.test -# Output of the go coverage tool, specifically when used with LiteIDE +# Output of the go coverage utils, specifically when used with LiteIDE *.out coverage.txt diff --git a/api/internal/handler/core/scheduletaskbyyamlhandler.go b/api/internal/handler/core/scheduletaskbyyamlhandler.go index 27f3607c..8b9f1300 100644 --- a/api/internal/handler/core/scheduletaskbyyamlhandler.go +++ b/api/internal/handler/core/scheduletaskbyyamlhandler.go @@ -1,14 +1,13 @@ package core import ( - "gitlink.org.cn/jcce-pcm/utils/result" - "gitlink.org.cn/jcce-pcm/utils/tool" - "net/http" - "github.com/zeromicro/go-zero/rest/httpx" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/core" "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/utils" + "gitlink.org.cn/jcce-pcm/utils/result" + "net/http" ) func ScheduleTaskByYamlHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { @@ -24,7 +23,7 @@ func ScheduleTaskByYamlHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { result.HttpResult(r, w, nil, err) return } - err = tool.Yaml2struct(fileHeader, &req) + err = utils.Yaml2struct(fileHeader, &req) if err != nil { result.HttpResult(r, w, nil, err) return diff --git a/api/internal/handler/image/chunkhandler.go b/api/internal/handler/image/chunkhandler.go index 999fb828..78eb2c2b 100644 --- a/api/internal/handler/image/chunkhandler.go +++ b/api/internal/handler/image/chunkhandler.go @@ -9,9 +9,9 @@ import ( "github.com/aws/aws-sdk-go/service/s3/s3manager" types2 "github.com/docker/docker/api/types" "github.com/zeromicro/go-zero/core/logx" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - result2 "gitlink.org.cn/jcce-pcm/utils/result" - "gitlink.org.cn/jcce-pcm/utils/tool" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils/fileutils" "io/ioutil" "k8s.io/apimachinery/pkg/util/json" "net/http" @@ -36,10 +36,10 @@ func ChunkHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { dataType := r.PostFormValue("dataType") kind := r.PostFormValue("kind") // 对比合并请求的文件大小和已上传文件夹大小 - toSize, err := tool.GetDirSize(filepath.Join(uploadTempPath, hash)) + toSize, err := fileutils.GetDirSize(filepath.Join(uploadTempPath, hash)) if err != nil { logx.Error(err) - result2.HttpResult(r, w, nil, err) + result.HttpResult(r, w, nil, err) return } if size != toSize { @@ -54,7 +54,7 @@ func ChunkHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { filesSort[nameArr[1]] = f.Name() } saveFile := filepath.Join(uploadPath, name) - if exists, _ := tool.PathExists(saveFile); exists { + if exists, _ := fileutils.PathExists(saveFile); exists { os.Remove(saveFile) } fs, _ := os.OpenFile(saveFile, os.O_CREATE|os.O_RDWR|os.O_APPEND, os.ModeAppend|os.ModePerm) @@ -77,7 +77,7 @@ func ChunkHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { os.RemoveAll(chunksPath) // 保存到数据库表里 - svcCtx.DbEngin.Create(&model.File{ + svcCtx.DbEngin.Create(&models.File{ Name: name, Hash: hash, DataType: dataType, @@ -95,7 +95,7 @@ func ChunkHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { // 删除本地文件 避免占用本地存储资源 defer os.Remove(filepath.Join(uploadPath, name)) defer fs.Close() - result2.HttpResult(r, w, nil, err) + result.HttpResult(r, w, nil, err) } } @@ -121,7 +121,7 @@ func uploadStorage(svcCtx *svc.ServiceContext, hash string, name string) error { return err } // 更新数据状态 - svcCtx.DbEngin.Model(&model.File{}).Where("hash = ?", hash).Update("status", "cloud") + svcCtx.DbEngin.Model(&models.File{}).Where("hash = ?", hash).Update("status", "cloud") return nil } @@ -189,6 +189,6 @@ func pushImage(svcCtx *svc.ServiceContext, hash string, name string) error { return err } // 更新数据状态 - svcCtx.DbEngin.Model(&model.File{}).Where("hash = ?", hash).Update("status", "cloud") + svcCtx.DbEngin.Model(&models.File{}).Where("hash = ?", hash).Update("status", "cloud") return nil } diff --git a/api/internal/handler/image/uploadhandler.go b/api/internal/handler/image/uploadhandler.go index c7c15717..f6c259be 100644 --- a/api/internal/handler/image/uploadhandler.go +++ b/api/internal/handler/image/uploadhandler.go @@ -4,16 +4,15 @@ import ( "bufio" "fmt" "github.com/zeromicro/go-zero/core/logx" - result2 "gitlink.org.cn/jcce-pcm/utils/result" - "gitlink.org.cn/jcce-pcm/utils/tool" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils/fileutils" "io" "net/http" "os" "path/filepath" "strconv" "syscall" - - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" ) type LoadBody struct { @@ -27,7 +26,7 @@ func UploadHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { file, fileHeader, err := r.FormFile("file") if err != nil { logx.Error(err) - result2.HttpResult(r, w, nil, err) + result.HttpResult(r, w, nil, err) return } index := r.PostFormValue("index") @@ -39,27 +38,27 @@ func UploadHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { // 文件路径 filePath := filepath.Join(chunksPath, hash+"-"+index) // 检查临时文件夹是否存在 不存在则创建文件夹 - isPathExists, err := tool.PathExists(chunksPath) + isPathExists, err := fileutils.PathExists(chunksPath) if !isPathExists { err = os.MkdirAll(chunksPath, os.ModePerm) if err != nil { logx.Error(err) - result2.HttpResult(r, w, nil, err) + result.HttpResult(r, w, nil, err) return } } // 检查文件是否存在 - exists, err := tool.PathExists(filePath) + exists, err := fileutils.PathExists(filePath) if err != nil { logx.Error(err) - result2.HttpResult(r, w, nil, err) + result.HttpResult(r, w, nil, err) return } // 文件存在 进行断点续传 if exists { fileInfo, _ := os.Stat(filePath) if fileInfo.Size() == fileHeader.Size { - result2.HttpResult(r, w, nil, err) + result.HttpResult(r, w, nil, err) return } start := strconv.Itoa(int(fileInfo.Size())) @@ -100,6 +99,6 @@ func UploadHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { defer file.Close() defer destFile.Close() } - result2.HttpResult(r, w, nil, err) + result.HttpResult(r, w, nil, err) } } diff --git a/api/internal/logic/ai/createalgorithmlogic.go b/api/internal/logic/ai/createalgorithmlogic.go index ac20a943..0e64b353 100644 --- a/api/internal/logic/ai/createalgorithmlogic.go +++ b/api/internal/logic/ai/createalgorithmlogic.go @@ -6,9 +6,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/utils" "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "gitlink.org.cn/jcce-pcm/utils/result" - "gitlink.org.cn/jcce-pcm/utils/tool" "k8s.io/apimachinery/pkg/util/json" ) @@ -28,7 +28,7 @@ func NewCreateAlgorithmLogic(ctx context.Context, svcCtx *svc.ServiceContext) *C func (l *CreateAlgorithmLogic) CreateAlgorithm(req *types.CreateAlgorithmReq) (resp *types.CreateAlgorithmResp, err error) { modelartsReq := &modelarts.CreateAlgorithmReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) ListAlgorithmsResp, err := l.svcCtx.ModelArtsRpc.CreateAlgorithm(l.ctx, modelartsReq) if err != nil { return nil, result.NewDefaultError(err.Error()) @@ -38,6 +38,6 @@ func (l *CreateAlgorithmLogic) CreateAlgorithm(req *types.CreateAlgorithmReq) (r return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ListAlgorithmsResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ListAlgorithmsResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/createdatasetlogic.go b/api/internal/logic/ai/createdatasetlogic.go index a34b29b8..c0c6facf 100644 --- a/api/internal/logic/ai/createdatasetlogic.go +++ b/api/internal/logic/ai/createdatasetlogic.go @@ -4,8 +4,8 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "gitlink.org.cn/jcce-pcm/utils/tool" "gitlink.org.cn/jcce-pcm/utils/xerr" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" @@ -32,14 +32,14 @@ func (l *CreateDataSetLogic) CreateDataSet(req *types.CreateDataSetReq) (resp *t // todo: add your logic here and delete this line modelartsReq := &modelarts.CreateDataSetReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) CreateDataSetResp, err := l.svcCtx.ModelArtsRpc.CreateDataSet(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) } resp = &types.CreateDataSetResp{} - err = copier.CopyWithOption(&resp, &CreateDataSetResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &CreateDataSetResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/createexporttasklogic.go b/api/internal/logic/ai/createexporttasklogic.go index 64d38f75..390194cb 100644 --- a/api/internal/logic/ai/createexporttasklogic.go +++ b/api/internal/logic/ai/createexporttasklogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + 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" ) @@ -33,16 +32,16 @@ func NewCreateExportTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext) * func (l *CreateExportTaskLogic) CreateExportTask(req *types.CreateExportTaskReq) (resp *types.ExportTaskDataResp, err error) { modelartsReq := &modelarts.ExportTaskReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) CreateExportTaskResp, err := l.svcCtx.ModelArtsRpc.ExportTask(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) } marshal, err := json.Marshal(&CreateExportTaskResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &CreateExportTaskResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &CreateExportTaskResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/createnotebooklogic.go b/api/internal/logic/ai/createnotebooklogic.go index 907ffd72..335471b9 100644 --- a/api/internal/logic/ai/createnotebooklogic.go +++ b/api/internal/logic/ai/createnotebooklogic.go @@ -4,12 +4,11 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "gitlink.org.cn/jcce-pcm/utils/tool" - "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" + "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" ) @@ -30,14 +29,14 @@ func NewCreateNotebookLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Cr func (l *CreateNotebookLogic) CreateNotebook(req *types.CreateNotebookReq) (resp *types.CreateNotebookResp, err error) { modelartsReq := &modelarts.CreateNotebookReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) createNotebookResp, err := l.svcCtx.ModelArtsRpc.CreateNotebook(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to create notebook"), "Failed to create notebook err : %v ,req:%+v", err, req) } resp = &types.CreateNotebookResp{} - err = copier.CopyWithOption(resp, createNotebookResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(resp, createNotebookResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/createprocessortasklogic.go b/api/internal/logic/ai/createprocessortasklogic.go index aab9c5fb..efbcdbcf 100644 --- a/api/internal/logic/ai/createprocessortasklogic.go +++ b/api/internal/logic/ai/createprocessortasklogic.go @@ -4,12 +4,11 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "gitlink.org.cn/jcce-pcm/utils/tool" - "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" + "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" ) @@ -30,14 +29,14 @@ func NewCreateProcessorTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext func (l *CreateProcessorTaskLogic) CreateProcessorTask(req *types.CreateProcessorTaskReq) (resp *types.CreateProcessorTaskResp, err error) { modelartsReq := &modelarts.CreateProcessorTaskReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) CreateProcessorTaskResp, err := l.svcCtx.ModelArtsRpc.CreateProcessorTask(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) } resp = &types.CreateProcessorTaskResp{} - err = copier.CopyWithOption(&resp, &CreateProcessorTaskResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &CreateProcessorTaskResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/createservicelogic.go b/api/internal/logic/ai/createservicelogic.go index da8be4cd..be6c755b 100644 --- a/api/internal/logic/ai/createservicelogic.go +++ b/api/internal/logic/ai/createservicelogic.go @@ -3,13 +3,12 @@ package ai import ( "context" "github.com/jinzhu/copier" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "gitlink.org.cn/jcce-pcm/utils/result" - "gitlink.org.cn/jcce-pcm/utils/tool" - "k8s.io/apimachinery/pkg/util/json" - "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/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" ) @@ -30,7 +29,7 @@ func NewCreateServiceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Cre func (l *CreateServiceLogic) CreateService(req *types.CreateServiceReq) (resp *types.CreateServiceResp, err error) { modelartsReq := &modelarts.CreateServiceReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) CreateServiceResp, err := l.svcCtx.ModelArtsRpc.CreateService(l.ctx, modelartsReq) if err != nil { return nil, result.NewDefaultError(err.Error()) @@ -40,6 +39,6 @@ func (l *CreateServiceLogic) CreateService(req *types.CreateServiceReq) (resp *t return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &CreateServiceResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &CreateServiceResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/createtasklogic.go b/api/internal/logic/ai/createtasklogic.go index f1becca0..82ee41b8 100644 --- a/api/internal/logic/ai/createtasklogic.go +++ b/api/internal/logic/ai/createtasklogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -32,7 +31,7 @@ func NewCreateTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Create func (l *CreateTaskLogic) CreateTask(req *types.ImportTaskDataReq) (resp *types.ImportTaskDataResp, err error) { modelartsReq := &modelarts.ImportTaskDataReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) ImportTaskDataResp, err := l.svcCtx.ModelArtsRpc.CreateTask(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) @@ -42,6 +41,6 @@ func (l *CreateTaskLogic) CreateTask(req *types.ImportTaskDataReq) (resp *types. return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ImportTaskDataResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ImportTaskDataResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/createtrainingjoblogic.go b/api/internal/logic/ai/createtrainingjoblogic.go index faa5376e..152c32ad 100644 --- a/api/internal/logic/ai/createtrainingjoblogic.go +++ b/api/internal/logic/ai/createtrainingjoblogic.go @@ -3,13 +3,12 @@ package ai import ( "context" "github.com/jinzhu/copier" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "gitlink.org.cn/jcce-pcm/utils/result" - "gitlink.org.cn/jcce-pcm/utils/tool" - "k8s.io/apimachinery/pkg/util/json" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + 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" + "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" ) @@ -32,16 +31,16 @@ func (l *CreateTrainingJobLogic) CreateTrainingJob(req *types.CreateTrainingJobR // todo: add your logic here and delete this line //modelartsType := req.ModelartsType modelartsReq := &modelarts.CreateTrainingJobReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) CreateTrainingJobResp, err := l.svcCtx.ModelArtsRpc.CreateTrainingJob(l.ctx, modelartsReq) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } marshal, err := json.Marshal(&CreateTrainingJobResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &CreateTrainingJobResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &CreateTrainingJobResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/deletealgorithmlogic.go b/api/internal/logic/ai/deletealgorithmlogic.go index 86b73cdf..51f43288 100644 --- a/api/internal/logic/ai/deletealgorithmlogic.go +++ b/api/internal/logic/ai/deletealgorithmlogic.go @@ -4,16 +4,15 @@ import ( "context" "github.com/jinzhu/copier" "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/utils" "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "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" "strings" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" - "github.com/zeromicro/go-zero/core/logx" ) @@ -39,7 +38,7 @@ func (l *DeleteAlgorithmLogic) DeleteAlgorithm(req *types.DeleteAlgorithmReq) (r } payload := strings.NewReader(string(reqByte)) println(payload) - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) DeleteAlgorithmResp, err := l.svcCtx.ModelArtsRpc.DeleteAlgorithms(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) @@ -49,6 +48,6 @@ func (l *DeleteAlgorithmLogic) DeleteAlgorithm(req *types.DeleteAlgorithmReq) (r return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &DeleteAlgorithmResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &DeleteAlgorithmResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/deletedatasetlogic.go b/api/internal/logic/ai/deletedatasetlogic.go index 4ed4b5e1..d4dfb59c 100644 --- a/api/internal/logic/ai/deletedatasetlogic.go +++ b/api/internal/logic/ai/deletedatasetlogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewDeleteDataSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Del func (l *DeleteDataSetLogic) DeleteDataSet(req *types.DeleteDataSetReq) (resp *types.DeleteDataSetResp, err error) { // todo: add your logic here and delete this line modelartsReq := &modelarts.DeleteDataSetReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) deleteDataSetResp, err := l.svcCtx.ModelArtsRpc.DeleteDataSet(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) @@ -43,6 +42,6 @@ func (l *DeleteDataSetLogic) DeleteDataSet(req *types.DeleteDataSetReq) (resp *t return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &deleteDataSetResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &deleteDataSetResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/deleteservicelogic.go b/api/internal/logic/ai/deleteservicelogic.go index 32dc393e..0db2589a 100644 --- a/api/internal/logic/ai/deleteservicelogic.go +++ b/api/internal/logic/ai/deleteservicelogic.go @@ -3,9 +3,9 @@ package ai import ( "context" "github.com/jinzhu/copier" + 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/result" - "gitlink.org.cn/jcce-pcm/utils/tool" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" @@ -30,16 +30,16 @@ func NewDeleteServiceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Del func (l *DeleteServiceLogic) DeleteService(req *types.DeleteServiceReq) (resp *types.DeleteServiceResp, err error) { modelartsReq := &modelarts.DeleteServiceReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) deleteServiceResp, err := l.svcCtx.ModelArtsRpc.DeleteService(l.ctx, modelartsReq) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } marshal, err := json.Marshal(&deleteServiceResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &deleteServiceResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &deleteServiceResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/deletetrainingjoblogic.go b/api/internal/logic/ai/deletetrainingjoblogic.go index 61e91506..f7de0caa 100644 --- a/api/internal/logic/ai/deletetrainingjoblogic.go +++ b/api/internal/logic/ai/deletetrainingjoblogic.go @@ -3,13 +3,12 @@ package ai import ( "context" "github.com/jinzhu/copier" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "gitlink.org.cn/jcce-pcm/utils/result" - "gitlink.org.cn/jcce-pcm/utils/tool" - "k8s.io/apimachinery/pkg/util/json" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + 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" + "k8s.io/apimachinery/pkg/util/json" "github.com/zeromicro/go-zero/core/logx" ) @@ -30,16 +29,16 @@ func NewDeleteTrainingJobLogic(ctx context.Context, svcCtx *svc.ServiceContext) func (l *DeleteTrainingJobLogic) DeleteTrainingJob(req *types.DeleteTrainingJobReq) (resp *types.DeleteTrainingJobResp, err error) { modelartsReq := &modelarts.DeleteTrainingJobReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) deleteTrainingJobResp, err := l.svcCtx.ModelArtsRpc.DeleteTrainingJob(l.ctx, modelartsReq) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } marshal, err := json.Marshal(&deleteTrainingJobResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &deleteTrainingJobResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &deleteTrainingJobResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/getexporttasksofdatasetlogic.go b/api/internal/logic/ai/getexporttasksofdatasetlogic.go index c5b8c2be..55e35c54 100644 --- a/api/internal/logic/ai/getexporttasksofdatasetlogic.go +++ b/api/internal/logic/ai/getexporttasksofdatasetlogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -32,7 +31,7 @@ func NewGetExportTasksOfDatasetLogic(ctx context.Context, svcCtx *svc.ServiceCon func (l *GetExportTasksOfDatasetLogic) GetExportTasksOfDataset(req *types.GetExportTasksOfDatasetReq) (resp *types.GetExportTasksOfDatasetResp, err error) { modelartsReq := &modelarts.GetExportTasksOfDatasetReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) GetExportTasksOfDatasetResp, err := l.svcCtx.ModelArtsRpc.GetExportTasksOfDataset(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) @@ -42,6 +41,6 @@ func (l *GetExportTasksOfDatasetLogic) GetExportTasksOfDataset(req *types.GetExp return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &GetExportTasksOfDatasetResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &GetExportTasksOfDatasetResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go b/api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go index 6cf2ab19..9ed4e6c0 100644 --- a/api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go +++ b/api/internal/logic/ai/getexporttaskstatusofdatasetlogic.go @@ -3,9 +3,9 @@ package ai import ( "context" "github.com/jinzhu/copier" + "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/tool" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" @@ -30,7 +30,7 @@ func NewGetExportTaskStatusOfDatasetLogic(ctx context.Context, svcCtx *svc.Servi func (l *GetExportTaskStatusOfDatasetLogic) GetExportTaskStatusOfDataset(req *types.GetExportTaskStatusOfDatasetReq) (resp *types.GetExportTaskStatusOfDatasetResp, err error) { modelartsReq := &modelarts.GetExportTaskStatusOfDatasetReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) GetExportTaskStatusOfDatasetResp, err := l.svcCtx.ModelArtsRpc.GetExportTaskStatusOfDataset(l.ctx, modelartsReq) if err != nil { return nil, result.NewDefaultError(err.Error()) @@ -40,6 +40,6 @@ func (l *GetExportTaskStatusOfDatasetLogic) GetExportTaskStatusOfDataset(req *ty return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &GetExportTaskStatusOfDatasetResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &GetExportTaskStatusOfDatasetResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/getlisttrainingjobslogic.go b/api/internal/logic/ai/getlisttrainingjobslogic.go index 97e3820c..1e54eac2 100644 --- a/api/internal/logic/ai/getlisttrainingjobslogic.go +++ b/api/internal/logic/ai/getlisttrainingjobslogic.go @@ -6,9 +6,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/utils" "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" "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" @@ -31,7 +31,7 @@ func NewGetListTrainingJobsLogic(ctx context.Context, svcCtx *svc.ServiceContext func (l *GetListTrainingJobsLogic) GetListTrainingJobs(req *types.ListTrainingJobsreq) (resp *types.ListTrainingJobsresp, err error) { modelartsReq := &modelarts.ListTrainingJobsreq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) listDataSetResp, err := l.svcCtx.ModelArtsRpc.GetListTrainingJobs(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) @@ -41,13 +41,13 @@ func (l *GetListTrainingJobsLogic) GetListTrainingJobs(req *types.ListTrainingJo return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: utils.Converters}) return resp, nil /* modelartsType := req.ModelartsType switch modelartsType { case "octops": octopusReq := &octopus.GetTrainJobListReq{} - err = copier.CopyWithOption(octopusReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(octopusReq, req, copier.Option{Converters: utils.Converters}) listTrainJobResp, err := l.svcCtx.OctopusRpc.GetTrainJobList(l.ctx, octopusReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db TrainJobs list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) @@ -57,10 +57,10 @@ func (l *GetListTrainingJobsLogic) GetListTrainingJobs(req *types.ListTrainingJo return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &listTrainJobResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &listTrainJobResp, copier.Option{Converters: utils.Converters}) case "cn-north-4.myhuawei": modelartsReq := &modelarts.ListTrainingJobsreq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) listDataSetResp, err := l.svcCtx.ModelArtsRpc.GetListTrainingJobs(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db TrainJobs list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) @@ -70,11 +70,11 @@ func (l *GetListTrainingJobsLogic) GetListTrainingJobs(req *types.ListTrainingJo return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: utils.Converters}) case "cn-east-293.njaci": modelartsReq := &modelarts.ListTrainingJobsreq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) listDataSetResp, err := l.svcCtx.ModelArtsRpc.GetListTrainingJobs(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db TrainJobs list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) @@ -84,7 +84,7 @@ func (l *GetListTrainingJobsLogic) GetListTrainingJobs(req *types.ListTrainingJo return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{Converters: utils.Converters}) }*/ } diff --git a/api/internal/logic/ai/listalgorithmslogic.go b/api/internal/logic/ai/listalgorithmslogic.go index 4f1bacb5..1e51a009 100644 --- a/api/internal/logic/ai/listalgorithmslogic.go +++ b/api/internal/logic/ai/listalgorithmslogic.go @@ -3,9 +3,9 @@ package ai import ( "context" "github.com/jinzhu/copier" + "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/tool" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" @@ -30,7 +30,7 @@ func NewListAlgorithmsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Li func (l *ListAlgorithmsLogic) ListAlgorithms(req *types.ListAlgorithmsReq) (resp *types.ListAlgorithmsResp, err error) { modelartsReq := &modelarts.ListAlgorithmsReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: false, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: false, DeepCopy: true, Converters: utils.Converters}) ListAlgorithmsResp, err := l.svcCtx.ModelArtsRpc.ListAlgorithms(l.ctx, modelartsReq) if err != nil { return nil, result.NewDefaultError(err.Error()) @@ -40,6 +40,6 @@ func (l *ListAlgorithmsLogic) ListAlgorithms(req *types.ListAlgorithmsReq) (resp return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ListAlgorithmsResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ListAlgorithmsResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/listclusterslogic.go b/api/internal/logic/ai/listclusterslogic.go index 60dd0059..1086d308 100644 --- a/api/internal/logic/ai/listclusterslogic.go +++ b/api/internal/logic/ai/listclusterslogic.go @@ -4,8 +4,8 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "gitlink.org.cn/jcce-pcm/utils/tool" "gitlink.org.cn/jcce-pcm/utils/xerr" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" @@ -31,12 +31,12 @@ func NewListClustersLogic(ctx context.Context, svcCtx *svc.ServiceContext) *List func (l *ListClustersLogic) ListClusters(req *types.ListClustersReq) (resp *types.ListClustersResp, err error) { // todo: add your logic here and delete this line modelartsReq := &modelarts.ListClustersReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) ListClustersResp, err := l.svcCtx.ModelArtsRpc.ListClusters(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) } resp = &types.ListClustersResp{} - err = copier.CopyWithOption(&resp, &ListClustersResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ListClustersResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/listdatasetlogic.go b/api/internal/logic/ai/listdatasetlogic.go index 316b0766..361fa270 100644 --- a/api/internal/logic/ai/listdatasetlogic.go +++ b/api/internal/logic/ai/listdatasetlogic.go @@ -4,9 +4,9 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" + 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/result" - "gitlink.org.cn/jcce-pcm/utils/tool" "gitlink.org.cn/jcce-pcm/utils/xerr" "k8s.io/apimachinery/pkg/util/json" @@ -33,17 +33,17 @@ func NewListDataSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListD func (l *ListDataSetLogic) ListDataSet(req *types.DataSetReq) (resp *types.DataSetResp, err error) { // todo: add your logic here and delete this line modelartsReq := &modelarts.DataSetReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) - //err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) + //err = copier.CopyWithOption(modelartsReq, req, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) DataSetResp, err := l.svcCtx.ModelArtsRpc.GetDatasetList(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) } marshal, err := json.Marshal(&DataSetResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &DataSetResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &DataSetResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/listimportlogic.go b/api/internal/logic/ai/listimportlogic.go index e53e5754..ddc0de19 100644 --- a/api/internal/logic/ai/listimportlogic.go +++ b/api/internal/logic/ai/listimportlogic.go @@ -3,13 +3,12 @@ package ai import ( "context" "github.com/jinzhu/copier" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "gitlink.org.cn/jcce-pcm/utils/result" - "gitlink.org.cn/jcce-pcm/utils/tool" - "k8s.io/apimachinery/pkg/util/json" - "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/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" ) @@ -30,13 +29,13 @@ func NewListImportLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListIm func (l *ListImportLogic) ListImport(req *types.ListImportTasksReq) (resp *types.ListImportTasksResp, err error) { modelartsReq := &modelarts.ListImportTasksReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) listDataSetResp, err := l.svcCtx.ModelArtsRpc.GetImportTaskList(l.ctx, modelartsReq) marshal, err := json.Marshal(&listDataSetResp) if err != nil { return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &listDataSetResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/listnotebooklogic.go b/api/internal/logic/ai/listnotebooklogic.go index c3f24583..bdfced74 100644 --- a/api/internal/logic/ai/listnotebooklogic.go +++ b/api/internal/logic/ai/listnotebooklogic.go @@ -4,12 +4,11 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "gitlink.org.cn/jcce-pcm/utils/tool" - "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" + "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" ) @@ -30,7 +29,7 @@ func NewListNotebookLogic(ctx context.Context, svcCtx *svc.ServiceContext) *List func (l *ListNotebookLogic) ListNotebook(req *types.ListNotebookReq) (resp *types.ListNotebookResp, err error) { modelartsReq := &modelarts.ListNotebookReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) listNotebookResp, err := l.svcCtx.ModelArtsRpc.ListNotebook(l.ctx, modelartsReq) if err != nil { @@ -38,7 +37,7 @@ func (l *ListNotebookLogic) ListNotebook(req *types.ListNotebookReq) (resp *type } resp = &types.ListNotebookResp{} - err = copier.CopyWithOption(resp, listNotebookResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(resp, listNotebookResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/listserviceslogic.go b/api/internal/logic/ai/listserviceslogic.go index ac7881ec..19180274 100644 --- a/api/internal/logic/ai/listserviceslogic.go +++ b/api/internal/logic/ai/listserviceslogic.go @@ -3,13 +3,12 @@ package ai import ( "context" "github.com/jinzhu/copier" - "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelarts" - "gitlink.org.cn/jcce-pcm/utils/result" - "gitlink.org.cn/jcce-pcm/utils/tool" - "k8s.io/apimachinery/pkg/util/json" - "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/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" ) @@ -30,7 +29,7 @@ func NewListServicesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *List func (l *ListServicesLogic) ListServices(req *types.ListServicesReq) (resp *types.ListServicesResp, err error) { modelartsReq := &modelarts.ListServicesReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) ListServicesResp, err := l.svcCtx.ModelArtsRpc.ListServices(l.ctx, modelartsReq) if err != nil { return nil, result.NewDefaultError(err.Error()) @@ -40,6 +39,6 @@ func (l *ListServicesLogic) ListServices(req *types.ListServicesReq) (resp *type return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ListServicesResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ListServicesResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/showalgorithmbyuuidlogic.go b/api/internal/logic/ai/showalgorithmbyuuidlogic.go index 41773e0d..de573de0 100644 --- a/api/internal/logic/ai/showalgorithmbyuuidlogic.go +++ b/api/internal/logic/ai/showalgorithmbyuuidlogic.go @@ -4,9 +4,9 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" + "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/tool" "gitlink.org.cn/jcce-pcm/utils/xerr" "k8s.io/apimachinery/pkg/util/json" @@ -33,7 +33,7 @@ func NewShowAlgorithmByUuidLogic(ctx context.Context, svcCtx *svc.ServiceContext func (l *ShowAlgorithmByUuidLogic) ShowAlgorithmByUuid(req *types.ShowAlgorithmByUuidReq) (resp *types.ShowAlgorithmByUuidResp, err error) { modelartsReq := &modelarts.ShowAlgorithmByUuidReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) ShowAlgorithmByUuidResp, err := l.svcCtx.ModelArtsRpc.ShowAlgorithmByUuid(l.ctx, modelartsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db DataSet list"), "Failed to get db DataSet list err : %v ,req:%+v", err, req) @@ -43,6 +43,6 @@ func (l *ShowAlgorithmByUuidLogic) ShowAlgorithmByUuid(req *types.ShowAlgorithmB return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ShowAlgorithmByUuidResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ShowAlgorithmByUuidResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/ai/showservicelogic.go b/api/internal/logic/ai/showservicelogic.go index aafa54a0..0399b83b 100644 --- a/api/internal/logic/ai/showservicelogic.go +++ b/api/internal/logic/ai/showservicelogic.go @@ -3,9 +3,9 @@ package ai import ( "context" "github.com/jinzhu/copier" + "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/tool" "k8s.io/apimachinery/pkg/util/json" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" @@ -30,7 +30,7 @@ func NewShowServiceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ShowS func (l *ShowServiceLogic) ShowService(req *types.ShowServiceReq) (resp *types.ShowServiceResp, err error) { modelartsReq := &modelarts.ShowServiceReq{} - err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(modelartsReq, req, copier.Option{Converters: utils.Converters}) ShowServiceResp, err := l.svcCtx.ModelArtsRpc.ShowService(l.ctx, modelartsReq) if err != nil { return nil, result.NewDefaultError(err.Error()) @@ -40,6 +40,6 @@ func (l *ShowServiceLogic) ShowService(req *types.ShowServiceReq) (resp *types.S return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ShowServiceResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ShowServiceResp, copier.Option{IgnoreEmpty: true, DeepCopy: true, Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/cloud/cloudlistlogic.go b/api/internal/logic/cloud/cloudlistlogic.go index a1d70ac4..a979ff34 100644 --- a/api/internal/logic/cloud/cloudlistlogic.go +++ b/api/internal/logic/cloud/cloudlistlogic.go @@ -2,13 +2,11 @@ package cloud import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" - + "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" - - "github.com/zeromicro/go-zero/core/logx" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" ) type CloudListLogic struct { @@ -27,12 +25,12 @@ func NewCloudListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CloudLi func (l *CloudListLogic) CloudList() (resp *types.CloudListResp, err error) { // 查询数据库中数算任务列表 - var clouds []*model.Cloud + var clouds []*models.Cloud tx := l.svcCtx.DbEngin.Find(&clouds) if tx.Error != nil { return nil, tx.Error } result := types.CloudListResp{} - tool.Convert(clouds, &result.Clouds) + utils.Convert(clouds, &result.Clouds) return &result, nil } diff --git a/api/internal/logic/core/deletetasklogic.go b/api/internal/logic/core/deletetasklogic.go index 2eeac0eb..be096fe3 100644 --- a/api/internal/logic/core/deletetasklogic.go +++ b/api/internal/logic/core/deletetasklogic.go @@ -2,7 +2,7 @@ package core import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" + models2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" @@ -26,12 +26,12 @@ func NewDeleteTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Delete func (l *DeleteTaskLogic) DeleteTask(req *types.DeleteTaskReq) error { // 删除主任务信息 - tx := l.svcCtx.DbEngin.Delete(&model.Task{}, req.Id) + tx := l.svcCtx.DbEngin.Delete(&models2.Task{}, req.Id) if tx.Error != nil { return tx.Error } // 将子任务信息修改为待删除 - tx = l.svcCtx.DbEngin.Model(&model.Cloud{}).Where("task_id", req.Id).Update("status", "WaitDelete") + tx = l.svcCtx.DbEngin.Model(&models2.Cloud{}).Where("task_id", req.Id).Update("status", "WaitDelete") if tx.Error != nil { return tx.Error } diff --git a/api/internal/logic/core/gethashcatlogic.go b/api/internal/logic/core/gethashcatlogic.go index 09a65aaf..f29ae2ee 100644 --- a/api/internal/logic/core/gethashcatlogic.go +++ b/api/internal/logic/core/gethashcatlogic.go @@ -2,13 +2,11 @@ package core import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" - + "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" - - "github.com/zeromicro/go-zero/core/logx" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" ) type GetHashcatLogic struct { @@ -27,12 +25,12 @@ func NewGetHashcatLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetHas func (l *GetHashcatLogic) GetHashcat(req *types.GetHashcatHandlerReq) (resp *types.GetHashcatHandlerResp, err error) { // todo: add your logic here and delete this line - var hashcatList []*model.THashcat + var hashcatList []*models.THashcat tx := l.svcCtx.DbEngin.Where("crack_task_id = ?", req.CrackTaskId).Find(&hashcatList) if tx.Error != nil { return nil, tx.Error } result := types.GetHashcatHandlerResp{} - tool.Convert(hashcatList, &result.HashCatList) + utils.Convert(hashcatList, &result.HashCatList) return &result, nil } diff --git a/api/internal/logic/core/getregionlogic.go b/api/internal/logic/core/getregionlogic.go index 5bbc70e0..e292215f 100644 --- a/api/internal/logic/core/getregionlogic.go +++ b/api/internal/logic/core/getregionlogic.go @@ -2,7 +2,7 @@ package core import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" @@ -26,7 +26,7 @@ func NewGetRegionLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRegi func (l *GetRegionLogic) GetRegion() (resp *types.GetRegionResp, err error) { resp = &types.GetRegionResp{} - var regionSlurmArray []model.RegionSlurm + var regionSlurmArray []models.RegionSlurm regionNameDb := l.svcCtx.DbEngin.Find(®ionSlurmArray).Not("RegionName = ?", "") softStackDb := l.svcCtx.DbEngin.Find(®ionSlurmArray).Not("SoftStack = ?", "") resp = &types.GetRegionResp{ diff --git a/api/internal/logic/core/getresourcepanelconfiglogic.go b/api/internal/logic/core/getresourcepanelconfiglogic.go index d71b7334..f93f1659 100644 --- a/api/internal/logic/core/getresourcepanelconfiglogic.go +++ b/api/internal/logic/core/getresourcepanelconfiglogic.go @@ -2,12 +2,11 @@ package core import ( "context" + "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/model" - "gitlink.org.cn/jcce-pcm/utils/tool" - - "github.com/zeromicro/go-zero/core/logx" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" ) type GetResourcePanelConfigLogic struct { @@ -25,8 +24,8 @@ func NewGetResourcePanelConfigLogic(ctx context.Context, svcCtx *svc.ServiceCont } func (l *GetResourcePanelConfigLogic) GetResourcePanelConfig() (resp *types.ResourcePanelConfigResp, err error) { - rpcModel := model.ResourcePanelConfig{} + rpcModel := models.ResourcePanelConfig{} l.svcCtx.DbEngin.Find(&rpcModel) - tool.Convert(rpcModel, &resp) + utils.Convert(rpcModel, &resp) return resp, nil } diff --git a/api/internal/logic/core/jobtotallogic.go b/api/internal/logic/core/jobtotallogic.go index 3400cf80..a9e89a7e 100644 --- a/api/internal/logic/core/jobtotallogic.go +++ b/api/internal/logic/core/jobtotallogic.go @@ -2,14 +2,13 @@ package core import ( "context" + "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/model" + "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" - "gitlink.org.cn/jcce-pcm/utils/tool" "k8s.io/apimachinery/pkg/util/json" - - "github.com/zeromicro/go-zero/core/logx" ) type JobTotalLogic struct { @@ -44,7 +43,7 @@ func NewJobTotalLogic(ctx context.Context, svcCtx *svc.ServiceContext) *JobTotal func (l *JobTotalLogic) JobTotal() (resp *types.JobTotalResp, err error) { // 获取任务时间信息 resp = &types.JobTotalResp{} - bytes, err := tool.HttpGet("GET", "https://grampus.openi.org.cn/openapi/v1/sharescreen/computepower/alljobinfo") + bytes, err := httputils.HttpGet("GET", "https://grampus.openi.org.cn/openapi/v1/sharescreen/computepower/alljobinfo") if err != nil { return nil, err } @@ -52,7 +51,7 @@ func (l *JobTotalLogic) JobTotal() (resp *types.JobTotalResp, err error) { // 获取其他任务信息 jobs := &Job{} - jobBytes, err := tool.HttpGet("GET", "https://grampus.openi.org.cn/openapi/v1/sharescreen/trainjob?pageIndex=1&pageSize=10") + jobBytes, err := httputils.HttpGet("GET", "https://grampus.openi.org.cn/openapi/v1/sharescreen/trainjob?pageIndex=1&pageSize=10") if err != nil { return nil, err } @@ -71,7 +70,7 @@ func (l *JobTotalLogic) JobTotal() (resp *types.JobTotalResp, err error) { resp.TrainJobs = append(resp.TrainJobs, trainJob) } - var tasks []model.Task + var tasks []models.Task tx := l.svcCtx.DbEngin.Find(&tasks) if tx.Error != nil { logx.Error(err) diff --git a/api/internal/logic/core/listcenterlogic.go b/api/internal/logic/core/listcenterlogic.go index 0fefdb79..212d2717 100644 --- a/api/internal/logic/core/listcenterlogic.go +++ b/api/internal/logic/core/listcenterlogic.go @@ -5,7 +5,7 @@ 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/model" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" ) type ListCenterLogic struct { @@ -24,9 +24,9 @@ func NewListCenterLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListCe func (l *ListCenterLogic) ListCenter() (*types.ListCenterResp, error) { var centers []types.Center - var centersModel *[]model.CenterOverview + var centersModel *[]models.CenterOverview - //var centersModel []model.ComputeCenter + //var centersModel []models.ComputeCenter var resp types.ListCenterResp l.svcCtx.DbEngin.Raw("select cc.*, ac.cluster_num, ac.node_num, ac.cpu_num, ac.gpu_num, ac.managed_flops, ac.unmanaged_flops, ac.managed_storage, ac.unmanaged_storage, hc.cluster_num, c.node_num, hc.cpu_num, hc.gpu_num, hc.managed_flops, hc.unmanaged_flops, hc.managed_storage, hc.unmanaged_storage, c.cluster_num, c.node_num, c.cpu_num, c.gpu_num, c.managed_flops, c.unmanaged_flops, c.managed_storage, c.unmanaged_storage, ct.edwc, ct.ydyl\nfrom compute_center cc\nleft join ai_center ac on cc.id = ac.id\nleft join hpc_center hc on cc.id = hc.id\nleft join cloud_center c on cc.id = c.id\nleft join center_tag ct on cc.id = ct.id").Scan(¢ersModel) diff --git a/api/internal/logic/core/listclusterlogic.go b/api/internal/logic/core/listclusterlogic.go index d41eace0..3559d720 100644 --- a/api/internal/logic/core/listclusterlogic.go +++ b/api/internal/logic/core/listclusterlogic.go @@ -5,7 +5,7 @@ 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/model" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" ) type ListClusterLogic struct { @@ -25,9 +25,9 @@ func NewListClusterLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListC func (l *ListClusterLogic) ListCluster(req *types.ListClusterReq) (*types.ListClusterResp, error) { var clusters []types.ComputeCluster - var clustersModel *[]model.ComputeCluster + var clustersModel *[]models.ComputeCluster - //var centersModel []model.ComputeCenter + //var centersModel []models.ComputeCenter var resp types.ListClusterResp l.svcCtx.DbEngin.Raw("select * from compute_cluster where center_id = ?", req.CenterId).Scan(&clustersModel) diff --git a/api/internal/logic/core/listdomainresourcelogic.go b/api/internal/logic/core/listdomainresourcelogic.go index 773c503d..c35009eb 100644 --- a/api/internal/logic/core/listdomainresourcelogic.go +++ b/api/internal/logic/core/listdomainresourcelogic.go @@ -7,8 +7,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/model" - "gitlink.org.cn/jcce-pcm/utils/tool" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils/httputils" "k8s.io/apimachinery/pkg/util/json" "math" "strconv" @@ -31,15 +32,15 @@ func NewListDomainResourceLogic(ctx context.Context, svcCtx *svc.ServiceContext) func (l *ListDomainResourceLogic) ListDomainResource() (resp *types.DomainResourceResp, err error) { //TODO 域信息查询数算集群监控 resp = &types.DomainResourceResp{} - var domainResourceModel []model.DomainResource + var domainResourceModel []models.DomainResource sqlStr := "select * from `joint_domain`.domain_cluster" l.svcCtx.DbEngin.Raw(sqlStr).Scan(&domainResourceModel) - tool.Convert(domainResourceModel, &resp.DomainResourceList) + utils.Convert(domainResourceModel, &resp.DomainResourceList) metrics := &types.ClusterMetrics{} //获取指定集群监控数据 for i := 0; i < len(resp.DomainResourceList); i++ { url := fmt.Sprintf("%s/api/v1/resource/getClusterMetrics?clusterName=%s", l.svcCtx.Config.JccScheduleUrl, resp.DomainResourceList[i].ClusterName) - bytes, err := tool.HttpGet("GET", url) + bytes, err := httputils.HttpGet("GET", url) if err != nil { logx.WithContext(l.ctx).Errorf("获取云算指定集群监控数据 err: %s", err.Error()) return nil, err diff --git a/api/internal/logic/core/listregionlogic.go b/api/internal/logic/core/listregionlogic.go index d935221b..73103e98 100644 --- a/api/internal/logic/core/listregionlogic.go +++ b/api/internal/logic/core/listregionlogic.go @@ -2,13 +2,11 @@ package core import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" - + "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" - - "github.com/zeromicro/go-zero/core/logx" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" ) type ListRegionLogic struct { @@ -27,12 +25,12 @@ func NewListRegionLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListRe func (l *ListRegionLogic) ListRegion() (resp *types.ListRegionResp, err error) { // todo: add your logic here and delete this line - var regionSlurmArray []model.RegionSlurm + var regionSlurmArray []models.RegionSlurm var regions []types.Region var jobCount int64 var regionResult []types.Region l.svcCtx.DbEngin.Find(®ionSlurmArray) - tool.Convert(regionSlurmArray, ®ions) + utils.Convert(regionSlurmArray, ®ions) // 查询超算上的job todo for _, region := range regions { if region.RegionName == "Changsha HPC Center" { diff --git a/api/internal/logic/core/participantlistlogic.go b/api/internal/logic/core/participantlistlogic.go index c84cd855..f568bacb 100644 --- a/api/internal/logic/core/participantlistlogic.go +++ b/api/internal/logic/core/participantlistlogic.go @@ -5,7 +5,7 @@ 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/utils/tool" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" ) type ParticipantListLogic struct { @@ -30,6 +30,6 @@ func (l *ParticipantListLogic) ParticipantList() (resp *types.ParticipantListRes return nil, tx.Error } result := types.ParticipantListResp{} - tool.Convert(participants, &result.Participants) + utils.Convert(participants, &result.Participants) return &result, nil } diff --git a/api/internal/logic/core/putresourcepanelconfiglogic.go b/api/internal/logic/core/putresourcepanelconfiglogic.go index 5a9d2ccd..23644f68 100644 --- a/api/internal/logic/core/putresourcepanelconfiglogic.go +++ b/api/internal/logic/core/putresourcepanelconfiglogic.go @@ -2,13 +2,12 @@ package core import ( "context" + "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/model" - "gitlink.org.cn/jcce-pcm/utils/tool" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "time" - - "github.com/zeromicro/go-zero/core/logx" ) type PutResourcePanelConfigLogic struct { @@ -26,8 +25,8 @@ func NewPutResourcePanelConfigLogic(ctx context.Context, svcCtx *svc.ServiceCont } func (l *PutResourcePanelConfigLogic) PutResourcePanelConfig(req *types.ResourcePanelConfigReq) error { - rpcModel := model.ResourcePanelConfig{} - tool.Convert(req, &rpcModel) + rpcModel := models.ResourcePanelConfig{} + utils.Convert(req, &rpcModel) rpcModel.UpdateTime = time.Now() update := l.svcCtx.DbEngin.Model(&rpcModel).Updates(rpcModel) diff --git a/api/internal/logic/core/savehashcatlogic.go b/api/internal/logic/core/savehashcatlogic.go index b800c982..96b71a1d 100644 --- a/api/internal/logic/core/savehashcatlogic.go +++ b/api/internal/logic/core/savehashcatlogic.go @@ -2,13 +2,11 @@ package core import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" - + "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" - - "github.com/zeromicro/go-zero/core/logx" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" ) type SaveHashcatLogic struct { @@ -26,9 +24,9 @@ func NewSaveHashcatLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SaveH } func (l *SaveHashcatLogic) SaveHashcat(req *types.SaveHashcatReq) error { - var hashcat model.THashcat - tool.Convert(req, &hashcat) - hashcat.Id = tool.GenSnowflakeID() + var hashcat models.THashcat + utils.Convert(req, &hashcat) + hashcat.Id = utils.GenSnowflakeID() tx := l.svcCtx.DbEngin.Save(hashcat) if tx.Error != nil { return tx.Error diff --git a/api/internal/logic/core/scheduletaskbyyamllogic.go b/api/internal/logic/core/scheduletaskbyyamllogic.go index 15c08250..e083ffcc 100644 --- a/api/internal/logic/core/scheduletaskbyyamllogic.go +++ b/api/internal/logic/core/scheduletaskbyyamllogic.go @@ -2,7 +2,7 @@ package core import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" "k8s.io/apimachinery/pkg/util/json" "time" @@ -33,7 +33,7 @@ func (l *ScheduleTaskByYamlLogic) ScheduleTaskByYaml(req *types.ScheduleTaskByYa return err } // 构建任务结构体 - taskModel := model.Task{ + taskModel := models.Task{ Status: "Saved", Description: req.Description, Name: req.Name, diff --git a/api/internal/logic/core/scheduletasklogic.go b/api/internal/logic/core/scheduletasklogic.go index b104ee34..03ab3b3f 100644 --- a/api/internal/logic/core/scheduletasklogic.go +++ b/api/internal/logic/core/scheduletasklogic.go @@ -6,7 +6,7 @@ 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/model" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" appv1 "k8s.io/api/apps/v1" "time" ) @@ -38,7 +38,7 @@ func (l *ScheduleTaskLogic) ScheduleTask(req *types.ScheduleTaskReq) (err error) return err } // construct task info - taskModel := model.Task{ + taskModel := models.Task{ Status: "Saved", Description: req.Description, Name: req.Name, diff --git a/api/internal/logic/core/submitjoblogic.go b/api/internal/logic/core/submitjoblogic.go index dfd26ff9..d3437328 100644 --- a/api/internal/logic/core/submitjoblogic.go +++ b/api/internal/logic/core/submitjoblogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-participant-ac/hpcAC" - "gitlink.org.cn/jcce-pcm/pcm-participant-slurm/hpcTH" - "gitlink.org.cn/jcce-pcm/utils/tool" - "gitlink.org.cn/jcce-pcm/utils/xerr" - "strconv" - "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/utils" + "gitlink.org.cn/jcce-pcm/pcm-participant-ac/hpcAC" + "gitlink.org.cn/jcce-pcm/pcm-participant-slurm/hpcTH" + "gitlink.org.cn/jcce-pcm/utils/xerr" + "strconv" "github.com/zeromicro/go-zero/core/logx" ) @@ -38,7 +37,7 @@ func (l *SubmitJobLogic) SubmitJob(req *types.SubmitJobReq) (resp *types.SubmitJ switch version { case "ac": acReq := &hpcAC.SubmitJobReq{} - err = copier.CopyWithOption(acReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(acReq, req, copier.Option{Converters: utils.Converters}) acResp, err := l.svcCtx.ACRpc.SubmitJob(l.ctx, acReq) if err != nil { @@ -55,7 +54,7 @@ func (l *SubmitJobLogic) SubmitJob(req *types.SubmitJobReq) (resp *types.SubmitJ case "th": thReq := &hpcTH.SubmitJobReq{} - err = copier.CopyWithOption(thReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(thReq, req, copier.Option{Converters: utils.Converters}) tianheResp, err := l.svcCtx.THRpc.SubmitJob(l.ctx, thReq) if err != nil { diff --git a/api/internal/logic/core/tasklistlogic.go b/api/internal/logic/core/tasklistlogic.go index 2e326419..1eb9424c 100644 --- a/api/internal/logic/core/tasklistlogic.go +++ b/api/internal/logic/core/tasklistlogic.go @@ -4,7 +4,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/pcm-coordinator/model" + models2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" "gitlink.org.cn/jcce-pcm/utils/enum" "github.com/zeromicro/go-zero/core/logx" @@ -28,7 +28,7 @@ func (l *TaskListLogic) TaskList() (resp *types.TaskListResp, err error) { resp = &types.TaskListResp{} // 查询任务数据 - var tasks []model.Task + var tasks []models2.Task tx := l.svcCtx.DbEngin.Find(&tasks) if tx.Error != nil { logx.Error(err) @@ -62,7 +62,7 @@ func (l *TaskListLogic) TaskList() (resp *types.TaskListResp, err error) { return nil, tx.Error } // 运行卡时数 - tx = l.svcCtx.DbEngin.Model(&model.Hpc{}).Select("(CASE WHEN SUM(running_time * card_count)/3600 IS NULL THEN 0 ELSE SUM(running_time * card_count)/3600 END )as cardTime").Find(&resp.CardTime) + tx = l.svcCtx.DbEngin.Model(&models2.Hpc{}).Select("(CASE WHEN SUM(running_time * card_count)/3600 IS NULL THEN 0 ELSE SUM(running_time * card_count)/3600 END )as cardTime").Find(&resp.CardTime) if tx.Error != nil { return nil, tx.Error } diff --git a/api/internal/logic/image/datasetchecklogic.go b/api/internal/logic/image/datasetchecklogic.go index 843d0015..699a7f8c 100644 --- a/api/internal/logic/image/datasetchecklogic.go +++ b/api/internal/logic/image/datasetchecklogic.go @@ -2,7 +2,7 @@ package image import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" @@ -26,7 +26,7 @@ func NewDataSetCheckLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Data func (l *DataSetCheckLogic) DataSetCheck(req *types.CheckReq) (resp *types.CheckResp, err error) { resp = &types.CheckResp{} - var dataSets []model.File + var dataSets []models.File l.svcCtx.DbEngin.Find(&dataSets).Where("md5", req.FileMd5) if len(dataSets) != 0 { resp.Exist = true diff --git a/api/internal/logic/storage/dailypowerscreenlogic.go b/api/internal/logic/storage/dailypowerscreenlogic.go index a45e1535..3d4669ed 100644 --- a/api/internal/logic/storage/dailypowerscreenlogic.go +++ b/api/internal/logic/storage/dailypowerscreenlogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewDailyPowerScreenLogic(ctx context.Context, svcCtx *svc.ServiceContext) * func (l *DailyPowerScreenLogic) DailyPowerScreen(req *types.DailyPowerScreenReq) (resp *types.DailyPowerScreenResp, err error) { // todo: add your logic here and delete this line dailyPowerScreenReq := &ceph.DailyPowerScreenReq{} - err = copier.CopyWithOption(dailyPowerScreenReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(dailyPowerScreenReq, req, copier.Option{Converters: utils.Converters}) DailyPowerScreenResp, err := l.svcCtx.CephRpc.DailyPowerScreen(l.ctx, dailyPowerScreenReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db storage list"), "Failed to get db storage list err : %v ,req:%+v", err, req) @@ -43,7 +42,7 @@ func (l *DailyPowerScreenLogic) DailyPowerScreen(req *types.DailyPowerScreenReq) return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &DailyPowerScreenResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &DailyPowerScreenResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/storage/percentercomputerpowerslogic.go b/api/internal/logic/storage/percentercomputerpowerslogic.go index fcec3420..71c2f3db 100644 --- a/api/internal/logic/storage/percentercomputerpowerslogic.go +++ b/api/internal/logic/storage/percentercomputerpowerslogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewPerCenterComputerPowersLogic(ctx context.Context, svcCtx *svc.ServiceCon func (l *PerCenterComputerPowersLogic) PerCenterComputerPowers(req *types.PerCenterComputerPowersReq) (resp *types.PerCenterComputerPowersResp, err error) { // todo: add your logic here and delete this line perCenterComputerPowersReq := &ceph.PerCenterComputerPowersReq{} - err = copier.CopyWithOption(perCenterComputerPowersReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(perCenterComputerPowersReq, req, copier.Option{Converters: utils.Converters}) PerCenterComputerPowersResp, err := l.svcCtx.CephRpc.PerCenterComputerPowerScreen(l.ctx, perCenterComputerPowersReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db storage list"), "Failed to get db storage list err : %v ,req:%+v", err, req) @@ -43,7 +42,7 @@ func (l *PerCenterComputerPowersLogic) PerCenterComputerPowers(req *types.PerCen return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &PerCenterComputerPowersResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &PerCenterComputerPowersResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/storage/screenstoragelogic.go b/api/internal/logic/storage/screenstoragelogic.go index b9ab8db9..e8a6c95b 100644 --- a/api/internal/logic/storage/screenstoragelogic.go +++ b/api/internal/logic/storage/screenstoragelogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-participant-ceph/ceph" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewScreenStorageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Scr func (l *ScreenStorageLogic) ScreenStorage(req *types.StorageScreenReq) (resp *types.StorageScreenResp, err error) { // todo: add your logic here and delete this line storageScreenReq := &ceph.StorageScreenReq{} - err = copier.CopyWithOption(storageScreenReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(storageScreenReq, req, copier.Option{Converters: utils.Converters}) StorageScreenResp, err := l.svcCtx.CephRpc.StorageScreen(l.ctx, storageScreenReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get db storage list"), "Failed to get db storage list err : %v ,req:%+v", err, req) @@ -43,6 +42,6 @@ func (l *ScreenStorageLogic) ScreenStorage(req *types.StorageScreenReq) (resp *t return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &StorageScreenResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &StorageScreenResp, copier.Option{Converters: utils.Converters}) return resp, nil } diff --git a/api/internal/logic/storelink/deletelinkimagelogic.go b/api/internal/logic/storelink/deletelinkimagelogic.go index 30dd1914..a866554f 100644 --- a/api/internal/logic/storelink/deletelinkimagelogic.go +++ b/api/internal/logic/storelink/deletelinkimagelogic.go @@ -2,8 +2,7 @@ package storelink import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/storeLink" - + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/storeLink" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" diff --git a/api/internal/logic/storelink/deletelinktasklogic.go b/api/internal/logic/storelink/deletelinktasklogic.go index c39eb599..4085b5d5 100644 --- a/api/internal/logic/storelink/deletelinktasklogic.go +++ b/api/internal/logic/storelink/deletelinktasklogic.go @@ -2,8 +2,7 @@ package storelink import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/storeLink" - + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/storeLink" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" diff --git a/api/internal/logic/storelink/getlinkimagelistlogic.go b/api/internal/logic/storelink/getlinkimagelistlogic.go index e6e9825b..3c9e0346 100644 --- a/api/internal/logic/storelink/getlinkimagelistlogic.go +++ b/api/internal/logic/storelink/getlinkimagelistlogic.go @@ -2,11 +2,10 @@ package storelink import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/storeLink" + "github.com/zeromicro/go-zero/core/logx" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/storeLink" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" - - "github.com/zeromicro/go-zero/core/logx" ) type GetLinkImageListLogic struct { diff --git a/api/internal/logic/storelink/getlinktasklogic.go b/api/internal/logic/storelink/getlinktasklogic.go index bcd367dc..c4fae475 100644 --- a/api/internal/logic/storelink/getlinktasklogic.go +++ b/api/internal/logic/storelink/getlinktasklogic.go @@ -2,8 +2,7 @@ package storelink import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/storeLink" - + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/storeLink" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" diff --git a/api/internal/logic/storelink/submitlinktasklogic.go b/api/internal/logic/storelink/submitlinktasklogic.go index 414f5edc..e47b2344 100644 --- a/api/internal/logic/storelink/submitlinktasklogic.go +++ b/api/internal/logic/storelink/submitlinktasklogic.go @@ -2,8 +2,7 @@ package storelink import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/storeLink" - + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/storeLink" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" diff --git a/api/internal/logic/storelink/uploadlinkimagelogic.go b/api/internal/logic/storelink/uploadlinkimagelogic.go index 8b8ac95c..52000e6e 100644 --- a/api/internal/logic/storelink/uploadlinkimagelogic.go +++ b/api/internal/logic/storelink/uploadlinkimagelogic.go @@ -2,8 +2,7 @@ package storelink import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/storeLink" - + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/storeLink" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" diff --git a/api/internal/logic/vm/createimagelogic.go b/api/internal/logic/vm/createimagelogic.go index 91bd8313..8ed8c656 100644 --- a/api/internal/logic/vm/createimagelogic.go +++ b/api/internal/logic/vm/createimagelogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewCreateImageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Creat func (l *CreateImageLogic) CreateImage(req *types.CreateImageReq) (resp *types.CreateImageResp, err error) { // todo: add your logic here and delete this line CreateImageReq := &openstack.CreateImageReq{} - err = copier.CopyWithOption(CreateImageReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(CreateImageReq, req, copier.Option{Converters: utils.Converters}) CreateImageResp, err := l.svcCtx.OpenstackRpc.CreateImage(l.ctx, CreateImageReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("c端创建失败"), "c端创建失败 : %v ,req:%+v", err, req) @@ -43,6 +42,6 @@ func (l *CreateImageLogic) CreateImage(req *types.CreateImageReq) (resp *types.C return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &CreateImageResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &CreateImageResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/createnetworklogic.go b/api/internal/logic/vm/createnetworklogic.go index 5c1e81e0..d75d62b6 100644 --- a/api/internal/logic/vm/createnetworklogic.go +++ b/api/internal/logic/vm/createnetworklogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewCreateNetworkLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Cre func (l *CreateNetworkLogic) CreateNetwork(req *types.CreateNetworkReq) (resp *types.CreateNetworkResp, err error) { // todo: add your logic here and delete this line CreateNetworkReq := &openstack.CreateNetworkReq{} - err = copier.CopyWithOption(CreateNetworkReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(CreateNetworkReq, req, copier.Option{Converters: utils.Converters}) CreateNetworkResp, err := l.svcCtx.OpenstackRpc.CreateNetwork(l.ctx, CreateNetworkReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) @@ -43,6 +42,6 @@ func (l *CreateNetworkLogic) CreateNetwork(req *types.CreateNetworkReq) (resp *t return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &CreateNetworkResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &CreateNetworkResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/createserverlogic.go b/api/internal/logic/vm/createserverlogic.go index 3de4c579..de48a1d7 100644 --- a/api/internal/logic/vm/createserverlogic.go +++ b/api/internal/logic/vm/createserverlogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewCreateServerLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Crea func (l *CreateServerLogic) CreateServer(req *types.CreateServerReq) (resp *types.CreateServerResp, err error) { // todo: add your logic here and delete this line CreateServerReq := &openstack.CreateServerReq{} - err = copier.CopyWithOption(CreateServerReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(CreateServerReq, req, copier.Option{Converters: utils.Converters}) CreateServerResp, err := l.svcCtx.OpenstackRpc.CreateServer(l.ctx, CreateServerReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) @@ -43,6 +42,6 @@ func (l *CreateServerLogic) CreateServer(req *types.CreateServerReq) (resp *type return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &CreateServerResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &CreateServerResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/createsubnetlogic.go b/api/internal/logic/vm/createsubnetlogic.go index 0696cb85..37cc33ea 100644 --- a/api/internal/logic/vm/createsubnetlogic.go +++ b/api/internal/logic/vm/createsubnetlogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewCreateSubnetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Crea func (l *CreateSubnetLogic) CreateSubnet(req *types.CreateSubnetReq) (resp *types.CreateSubnetResp, err error) { // todo: add your logic here and delete this line CreateSubnetReq := &openstack.CreateSubnetReq{} - err = copier.CopyWithOption(CreateSubnetReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(CreateSubnetReq, req, copier.Option{Converters: utils.Converters}) CreateSubnetResp, err := l.svcCtx.OpenstackRpc.CreateSubnet(l.ctx, CreateSubnetReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) @@ -43,6 +42,6 @@ func (l *CreateSubnetLogic) CreateSubnet(req *types.CreateSubnetReq) (resp *type return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &CreateSubnetResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &CreateSubnetResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/createvolumelogic.go b/api/internal/logic/vm/createvolumelogic.go index 45ea3484..8ded1876 100644 --- a/api/internal/logic/vm/createvolumelogic.go +++ b/api/internal/logic/vm/createvolumelogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewCreateVolumeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Crea func (l *CreateVolumeLogic) CreateVolume(req *types.CreateVolumeReq) (resp *types.CreateVolumeResp, err error) { // todo: add your logic here and delete this line CreateVolumeReq := &openstack.CreateVolumeReq{} - err = copier.CopyWithOption(CreateVolumeReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(CreateVolumeReq, req, copier.Option{Converters: utils.Converters}) CreateVolumeResp, err := l.svcCtx.OpenstackRpc.CreateVolume(l.ctx, CreateVolumeReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) @@ -43,6 +42,6 @@ func (l *CreateVolumeLogic) CreateVolume(req *types.CreateVolumeReq) (resp *type return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &CreateVolumeResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &CreateVolumeResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/deleteimagelogic.go b/api/internal/logic/vm/deleteimagelogic.go index 88b52dba..1d487f82 100644 --- a/api/internal/logic/vm/deleteimagelogic.go +++ b/api/internal/logic/vm/deleteimagelogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + 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" ) @@ -33,16 +32,16 @@ func NewDeleteImageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Delet func (l *DeleteImageLogic) DeleteImage(req *types.DeleteImageReq) (resp *types.DeleteImageResp, err error) { // todo: add your logic here and delete this line DeleteImageReq := &openstack.DeleteImageReq{} - err = copier.CopyWithOption(DeleteImageReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(DeleteImageReq, req, copier.Option{Converters: utils.Converters}) DeleteImageResp, err := l.svcCtx.OpenstackRpc.DeleteImage(l.ctx, DeleteImageReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) } marshal, err := json.Marshal(&DeleteImageResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &DeleteImageResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &DeleteImageResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/deletenetworklogic.go b/api/internal/logic/vm/deletenetworklogic.go index d6caef8b..6380d02a 100644 --- a/api/internal/logic/vm/deletenetworklogic.go +++ b/api/internal/logic/vm/deletenetworklogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + 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" ) @@ -33,16 +32,16 @@ func NewDeleteNetworkLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Del func (l *DeleteNetworkLogic) DeleteNetwork(req *types.DeleteNetworkReq) (resp *types.DeleteNetworkResp, err error) { // todo: add your logic here and delete this line DeleteNetworkReq := &openstack.DeleteNetworkReq{} - err = copier.CopyWithOption(DeleteNetworkReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(DeleteNetworkReq, req, copier.Option{Converters: utils.Converters}) DeleteNetworkResp, err := l.svcCtx.OpenstackRpc.DeleteNetwork(l.ctx, DeleteNetworkReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to delete network "), "Failed to delete network err : %v ,req:%+v", err, req) } marshal, err := json.Marshal(&DeleteNetworkResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &DeleteNetworkResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &DeleteNetworkResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/deleteserverlogic.go b/api/internal/logic/vm/deleteserverlogic.go index 643c9d73..cf9a2945 100644 --- a/api/internal/logic/vm/deleteserverlogic.go +++ b/api/internal/logic/vm/deleteserverlogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewDeleteServerLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Dele func (l *DeleteServerLogic) DeleteServer(req *types.DeleteServerReq) (resp *types.DeleteServerResp, err error) { // todo: add your logic here and delete this line DeleteServerReq := &openstack.DeleteServerReq{} - err = copier.CopyWithOption(DeleteServerReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(DeleteServerReq, req, copier.Option{Converters: utils.Converters}) DeleteServerResp, err := l.svcCtx.OpenstackRpc.DeleteServer(l.ctx, DeleteServerReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) @@ -43,6 +42,6 @@ func (l *DeleteServerLogic) DeleteServer(req *types.DeleteServerReq) (resp *type return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &DeleteServerResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &DeleteServerResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/deletevolumelogic.go b/api/internal/logic/vm/deletevolumelogic.go index 064918c3..240ea2ed 100644 --- a/api/internal/logic/vm/deletevolumelogic.go +++ b/api/internal/logic/vm/deletevolumelogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewDeleteVolumeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Dele func (l *DeleteVolumeLogic) DeleteVolume(req *types.DeleteVolumeReq) (resp *types.DeleteVolumeResp, err error) { // todo: add your logic here and delete this line DeleteVolumeReq := &openstack.DeleteVolumeReq{} - err = copier.CopyWithOption(DeleteVolumeReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(DeleteVolumeReq, req, copier.Option{Converters: utils.Converters}) DeleteVolumeResp, err := l.svcCtx.OpenstackRpc.DeleteVolume(l.ctx, DeleteVolumeReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) @@ -43,6 +42,6 @@ func (l *DeleteVolumeLogic) DeleteVolume(req *types.DeleteVolumeReq) (resp *type return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &DeleteVolumeResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &DeleteVolumeResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/getcomputelimitslogic.go b/api/internal/logic/vm/getcomputelimitslogic.go index 281ef050..5ea82bf5 100644 --- a/api/internal/logic/vm/getcomputelimitslogic.go +++ b/api/internal/logic/vm/getcomputelimitslogic.go @@ -5,13 +5,12 @@ import ( "encoding/json" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + 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" ) @@ -32,16 +31,16 @@ func NewGetComputeLimitsLogic(ctx context.Context, svcCtx *svc.ServiceContext) * func (l *GetComputeLimitsLogic) GetComputeLimits(req *types.GetComputeLimitsReq) (resp *types.GetComputeLimitsResp, err error) { GetComputeLimitsReq := &openstack.GetComputeLimitsReq{} - err = copier.CopyWithOption(GetComputeLimitsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(GetComputeLimitsReq, req, copier.Option{Converters: utils.Converters}) GetComputeLimitsResp, err := l.svcCtx.OpenstackRpc.GetComputeLimits(l.ctx, GetComputeLimitsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) } marshal, err := json.Marshal(&GetComputeLimitsResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &GetComputeLimitsResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &GetComputeLimitsResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/getvolumelimitslogic.go b/api/internal/logic/vm/getvolumelimitslogic.go index f54d523a..8a14f58b 100644 --- a/api/internal/logic/vm/getvolumelimitslogic.go +++ b/api/internal/logic/vm/getvolumelimitslogic.go @@ -5,13 +5,12 @@ import ( "encoding/json" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" - "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/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" ) @@ -32,7 +31,7 @@ func NewGetVolumeLimitsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *G func (l *GetVolumeLimitsLogic) GetVolumeLimits(req *types.GetVolumeLimitsReq) (resp *types.GetVolumeLimitsResp, err error) { GetVolumeLimitsReq := &openstack.GetVolumeLimitsReq{} - err = copier.CopyWithOption(GetVolumeLimitsReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(GetVolumeLimitsReq, req, copier.Option{Converters: utils.Converters}) GetVolumeLimitsResp, err := l.svcCtx.OpenstackRpc.GetVolumeLimits(l.ctx, GetVolumeLimitsReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) @@ -42,6 +41,6 @@ func (l *GetVolumeLimitsLogic) GetVolumeLimits(req *types.GetVolumeLimitsReq) (r return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &GetVolumeLimitsResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &GetVolumeLimitsResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/listflavorsdetaillogic.go b/api/internal/logic/vm/listflavorsdetaillogic.go index 55c3cf27..24b39ced 100644 --- a/api/internal/logic/vm/listflavorsdetaillogic.go +++ b/api/internal/logic/vm/listflavorsdetaillogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + 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" ) @@ -33,16 +32,16 @@ func NewListFlavorsDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) func (l *ListFlavorsDetailLogic) ListFlavorsDetail(req *types.ListFlavorsDetailReq) (resp *types.ListFlavorsDetailResp, err error) { // todo: add your logic here and delete this line ListFlavorsDetailReq := &openstack.ListFlavorsDetailReq{} - err = copier.CopyWithOption(ListFlavorsDetailReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(ListFlavorsDetailReq, req, copier.Option{Converters: utils.Converters}) ListFlavorsDetailResp, err := l.svcCtx.OpenstackRpc.ListFlavorsDetail(l.ctx, ListFlavorsDetailReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) } marshal, err := json.Marshal(&ListFlavorsDetailResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ListFlavorsDetailResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ListFlavorsDetailResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/listimageslogic.go b/api/internal/logic/vm/listimageslogic.go index 3a3242b5..99087387 100644 --- a/api/internal/logic/vm/listimageslogic.go +++ b/api/internal/logic/vm/listimageslogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewListImagesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListIm func (l *ListImagesLogic) ListImages(req *types.ListImagesReq) (resp *types.ListImagesResp, err error) { // todo: add your logic here and delete this line ListImagesReq := &openstack.ListImagesReq{} - err = copier.CopyWithOption(ListImagesReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(ListImagesReq, req, copier.Option{Converters: utils.Converters}) ListImagesResp, err := l.svcCtx.OpenstackRpc.LisImages(l.ctx, ListImagesReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) @@ -43,6 +42,6 @@ func (l *ListImagesLogic) ListImages(req *types.ListImagesReq) (resp *types.List return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ListImagesResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ListImagesResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/listnetworkslogic.go b/api/internal/logic/vm/listnetworkslogic.go index 146ee3bd..b0864daf 100644 --- a/api/internal/logic/vm/listnetworkslogic.go +++ b/api/internal/logic/vm/listnetworkslogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "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" ) @@ -33,7 +32,7 @@ func NewListNetworksLogic(ctx context.Context, svcCtx *svc.ServiceContext) *List func (l *ListNetworksLogic) ListNetworks(req *types.ListNetworksReq) (resp *types.ListNetworksResp, err error) { // todo: add your logic here and delete this line ListNetworksReq := &openstack.ListNetworksReq{} - err = copier.CopyWithOption(ListNetworksReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(ListNetworksReq, req, copier.Option{Converters: utils.Converters}) ListNetworksResp, err := l.svcCtx.OpenstackRpc.ListNetworks(l.ctx, ListNetworksReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) @@ -43,6 +42,6 @@ func (l *ListNetworksLogic) ListNetworks(req *types.ListNetworksReq) (resp *type return nil, result.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ListNetworksResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ListNetworksResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/listserverlogic.go b/api/internal/logic/vm/listserverlogic.go index 380b7bff..98dea63d 100644 --- a/api/internal/logic/vm/listserverlogic.go +++ b/api/internal/logic/vm/listserverlogic.go @@ -4,15 +4,14 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" + "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" + 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/result" - "gitlink.org.cn/jcce-pcm/utils/tool" "gitlink.org.cn/jcce-pcm/utils/xerr" "k8s.io/apimachinery/pkg/util/json" - - "github.com/zeromicro/go-zero/core/logx" ) type ListServerLogic struct { @@ -32,16 +31,16 @@ func NewListServerLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListSe func (l *ListServerLogic) ListServer(req *types.ListServersReq) (resp *types.ListServersResp, err error) { // todo: add your logic here and delete this line ListServersReq := &openstack.ListServersReq{} - err = copier.CopyWithOption(ListServersReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(ListServersReq, req, copier.Option{Converters: utils.Converters}) ListServersResp, err := l.svcCtx.OpenstackRpc.ListServers(l.ctx, ListServersReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) } marshal, err := json.Marshal(&ListServersResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ListServersResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ListServersResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/listserversdetailedlogic.go b/api/internal/logic/vm/listserversdetailedlogic.go index 7551e52b..35f2a520 100644 --- a/api/internal/logic/vm/listserversdetailedlogic.go +++ b/api/internal/logic/vm/listserversdetailedlogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + 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" ) @@ -33,17 +32,17 @@ func NewListServersDetailedLogic(ctx context.Context, svcCtx *svc.ServiceContext func (l *ListServersDetailedLogic) ListServersDetailed(req *types.ListServersDetailedReq) (resp *types.ListServersDetailedResp, err error) { // todo: add your logic here and delete this line ListServersDetailedReq := &openstack.ListServersDetailedReq{} - err = copier.CopyWithOption(ListServersDetailedReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(ListServersDetailedReq, req, copier.Option{Converters: utils.Converters}) ListServersDetailedResp, err := l.svcCtx.OpenstackRpc.ListServersDetailed(l.ctx, ListServersDetailedReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Servers list"), "Failed to get db Servers list err : %v ,req:%+v", err, req) } marshal, err := json.Marshal(&ListServersDetailedResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ListServersDetailedResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ListServersDetailedResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/listvolumesdetaillogic.go b/api/internal/logic/vm/listvolumesdetaillogic.go index ef195beb..ca62f376 100644 --- a/api/internal/logic/vm/listvolumesdetaillogic.go +++ b/api/internal/logic/vm/listvolumesdetaillogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + 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" ) @@ -33,17 +32,17 @@ func NewListVolumesDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) func (l *ListVolumesDetailLogic) ListVolumesDetail(req *types.ListVolumesDetailReq) (resp *types.ListVolumesDetailResp, err error) { // todo: add your logic here and delete this line ListVolumesDetailReq := &openstack.ListVolumesDetailReq{} - err = copier.CopyWithOption(ListVolumesDetailReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(ListVolumesDetailReq, req, copier.Option{Converters: utils.Converters}) ListVolumesDetailResp, err := l.svcCtx.OpenstackRpc.ListVolumesDetail(l.ctx, ListVolumesDetailReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Volumes list"), "Failed to get db Volumes list err : %v ,req:%+v", err, req) } marshal, err := json.Marshal(&ListVolumesDetailResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ListVolumesDetailResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ListVolumesDetailResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/listvolumetypeslogic.go b/api/internal/logic/vm/listvolumetypeslogic.go index e38b4da8..2073bfdf 100644 --- a/api/internal/logic/vm/listvolumetypeslogic.go +++ b/api/internal/logic/vm/listvolumetypeslogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + 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" ) @@ -33,16 +32,16 @@ func NewListVolumeTypesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *L func (l *ListVolumeTypesLogic) ListVolumeTypes(req *types.ListVolumeTypesReq) (resp *types.ListVolumeTypesResp, err error) { // todo: add your logic here and delete this line ListVolumeTypesReq := &openstack.ListVolumeTypesReq{} - err = copier.CopyWithOption(ListVolumeTypesReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(ListVolumeTypesReq, req, copier.Option{Converters: utils.Converters}) ListVolumeTypesResp, err := l.svcCtx.OpenstackRpc.ListVolumeTypes(l.ctx, ListVolumeTypesReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("Failed to get Volumes list"), "Failed to get db Volumes list err : %v ,req:%+v", err, req) } marshal, err := json.Marshal(&ListVolumeTypesResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &ListVolumeTypesResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &ListVolumeTypesResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/logic/vm/uploadimagelogic.go b/api/internal/logic/vm/uploadimagelogic.go index f3114739..ef0b34fc 100644 --- a/api/internal/logic/vm/uploadimagelogic.go +++ b/api/internal/logic/vm/uploadimagelogic.go @@ -4,14 +4,13 @@ import ( "context" "github.com/jinzhu/copier" "github.com/pkg/errors" - "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" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + 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" ) @@ -33,16 +32,16 @@ func NewUploadImageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Uploa func (l *UploadImageLogic) UploadImage(req *types.UploadOsImageReq) (resp *types.UploadOsImageResp, err error) { // todo: add your logic here and delete this line UploadOsImageReq := &openstack.UploadOsImageReq{} - err = copier.CopyWithOption(UploadOsImageReq, req, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(UploadOsImageReq, req, copier.Option{Converters: utils.Converters}) CreateImageResp, err := l.svcCtx.OpenstackRpc.UploadImage(l.ctx, UploadOsImageReq) if err != nil { return nil, errors.Wrapf(xerr.NewErrMsg("c端创建失败"), "c端创建失败 : %v ,req:%+v", err, req) } marshal, err := json.Marshal(&CreateImageResp) if err != nil { - return nil, result.NewDefaultError(err.Error()) + return nil, error2.NewDefaultError(err.Error()) } json.Unmarshal(marshal, &resp) - err = copier.CopyWithOption(&resp, &CreateImageResp, copier.Option{Converters: tool.Converters}) + err = copier.CopyWithOption(&resp, &CreateImageResp, copier.Option{Converters: utils.Converters}) return resp, err } diff --git a/api/internal/mqs/kq/ScheduleAi.go b/api/internal/mqs/kq/ScheduleAi.go index 67584084..fa01a01f 100644 --- a/api/internal/mqs/kq/ScheduleAi.go +++ b/api/internal/mqs/kq/ScheduleAi.go @@ -2,8 +2,8 @@ package kq import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/scheduler" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" + scheduler2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/scheduler" ) /* @@ -24,8 +24,8 @@ func NewScheduleAiMq(ctx context.Context, svcCtx *svc.ServiceContext) *ScheduleA func (l *ScheduleAiMq) Consume(_, val string) error { // 接受消息, 根据标签筛选过滤 - aiSchdl := scheduler.NewAiScheduler(val) - schdl, err := scheduler.NewScheduler(aiSchdl, val, l.svcCtx.DbEngin) + aiSchdl := scheduler2.NewAiScheduler(val) + schdl, err := scheduler2.NewScheduler(aiSchdl, val, l.svcCtx.DbEngin) if err != nil { return err } diff --git a/api/internal/mqs/kq/ScheduleCloud.go b/api/internal/mqs/kq/ScheduleCloud.go index 9f24d5e6..2c080d6c 100644 --- a/api/internal/mqs/kq/ScheduleCloud.go +++ b/api/internal/mqs/kq/ScheduleCloud.go @@ -2,8 +2,8 @@ package kq import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/scheduler" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" + scheduler2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/scheduler" ) /* @@ -24,8 +24,8 @@ func NewScheduleCloudMq(ctx context.Context, svcCtx *svc.ServiceContext) *Schedu func (l *ScheduleCloudMq) Consume(_, val string) error { // 接受消息, 根据标签筛选过滤 - cloudScheduler := scheduler.NewCloudScheduler() - schdl, err := scheduler.NewScheduler(cloudScheduler, val, l.svcCtx.DbEngin) + cloudScheduler := scheduler2.NewCloudScheduler() + schdl, err := scheduler2.NewScheduler(cloudScheduler, val, l.svcCtx.DbEngin) if err != nil { return err } diff --git a/api/internal/mqs/kq/ScheduleHpc.go b/api/internal/mqs/kq/ScheduleHpc.go index 9660e0e5..825b03af 100644 --- a/api/internal/mqs/kq/ScheduleHpc.go +++ b/api/internal/mqs/kq/ScheduleHpc.go @@ -2,8 +2,8 @@ package kq import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/pkg/scheduler" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" + scheduler2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/scheduler" ) /* @@ -24,8 +24,8 @@ func NewScheduleHpcMq(ctx context.Context, svcCtx *svc.ServiceContext) *Schedule func (l *ScheduleHpcMq) Consume(_, val string) error { // 接受消息, 根据标签筛选过滤 - hpcSchdl := scheduler.NewHpcScheduler(val) - schdl, err := scheduler.NewScheduler(hpcSchdl, val, l.svcCtx.DbEngin) + hpcSchdl := scheduler2.NewHpcScheduler(val) + schdl, err := scheduler2.NewScheduler(hpcSchdl, val, l.svcCtx.DbEngin) if err != nil { return err } diff --git a/api/internal/pkg/storeLink/octopus.go b/api/internal/storeLink/octopus.go similarity index 96% rename from api/internal/pkg/storeLink/octopus.go rename to api/internal/storeLink/octopus.go index 34eb2664..733b7b25 100644 --- a/api/internal/pkg/storeLink/octopus.go +++ b/api/internal/storeLink/octopus.go @@ -28,8 +28,8 @@ func (o *OctopusLink) UploadImage(path string) (interface{}, error) { Platform: o.platform, CreateImage: &octopus.CreateImage{ SourceType: 1, - //ImageName: IMG_NAME_PREFIX + tool.RandomString(5), - //ImageVersion: IMG_VERSION_PREFIX + tool.RandomString(7), + //ImageName: IMG_NAME_PREFIX + utils.RandomString(5), + //ImageVersion: IMG_VERSION_PREFIX + utils.RandomString(7), }, } createResp, err := o.svcCtx.OctopusRpc.CreateImage(o.ctx, createReq) diff --git a/api/internal/pkg/storeLink/storeLink.go b/api/internal/storeLink/storeLink.go similarity index 100% rename from api/internal/pkg/storeLink/storeLink.go rename to api/internal/storeLink/storeLink.go diff --git a/api/internal/svc/servicecontext.go b/api/internal/svc/servicecontext.go index 2167e5ce..b0e03c0d 100644 --- a/api/internal/svc/servicecontext.go +++ b/api/internal/svc/servicecontext.go @@ -12,13 +12,13 @@ import ( "github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/zrpc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/config" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gitlink.org.cn/jcce-pcm/pcm-participant-ac/hpcacclient" "gitlink.org.cn/jcce-pcm/pcm-participant-ceph/cephclient" "gitlink.org.cn/jcce-pcm/pcm-participant-modelarts/modelartsclient" "gitlink.org.cn/jcce-pcm/pcm-participant-octopus/octopusclient" "gitlink.org.cn/jcce-pcm/pcm-participant-openstack/openstackclient" "gitlink.org.cn/jcce-pcm/pcm-participant-slurm/hpcthclient" - "gitlink.org.cn/jcce-pcm/utils/tool" "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/schema" @@ -53,7 +53,7 @@ func NewServiceContext(c config.Config) *ServiceContext { S3ForcePathStyle: aws.Bool(true), //使用路径样式而非虚拟主机样式,区别请参考:https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html }) //添加snowflake支持 - err := tool.InitSnowflake(c.SnowflakeConf.MachineId) + err := utils.InitSnowflake(c.SnowflakeConf.MachineId) if err != nil { logx.Errorf("InitSnowflake err: ", err) panic("InitSnowflake err") diff --git a/api/pcm.go b/api/pcm.go index ef4ea299..374817d5 100644 --- a/api/pcm.go +++ b/api/pcm.go @@ -10,7 +10,7 @@ import ( "github.com/zeromicro/go-zero/rest" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/config" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/handler" - kqMq "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/mqs/kq" + kq3 "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/mqs/kq" "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" commonConfig "gitlink.org.cn/jcce-pcm/utils/nacos" ) @@ -55,9 +55,9 @@ func main() { serviceGroup.Add(server) services := []service.Service{ //Listening for changes in consumption flow status - kq.MustNewQueue(c.HpcConsumerConf, kqMq.NewScheduleHpcMq(context.Background(), ctx)), - kq.MustNewQueue(c.CloudConsumerConf, kqMq.NewScheduleCloudMq(context.Background(), ctx)), - kq.MustNewQueue(c.AiConsumerConf, kqMq.NewScheduleAiMq(context.Background(), ctx)), + kq.MustNewQueue(c.HpcConsumerConf, kq3.NewScheduleHpcMq(context.Background(), ctx)), + kq.MustNewQueue(c.CloudConsumerConf, kq3.NewScheduleCloudMq(context.Background(), ctx)), + kq.MustNewQueue(c.AiConsumerConf, kq3.NewScheduleAiMq(context.Background(), ctx)), //..... } diff --git a/api/pkg/response/Task.go b/api/pkg/response/Task.go new file mode 100644 index 00000000..ca8ed165 --- /dev/null +++ b/api/pkg/response/Task.go @@ -0,0 +1,9 @@ +package response + +type TaskInfo struct { + TaskId int64 `json:"taskId,optional"` + TaskType string `json:"taskType,optional"` + MatchLabels map[string]string `json:"matchLabels"` + ParticipantId int64 `json:"participantId"` + Metadata interface{} `json:"metadata"` +} diff --git a/go.mod b/go.mod index d6967ce5..a30bd18e 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,18 @@ module gitlink.org.cn/jcce-pcm/pcm-coordinator go 1.20 require ( + github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos v0.0.0-20230419021610-13bbc83fbc3c github.com/Masterminds/squirrel v1.5.4 + github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704 github.com/aws/aws-sdk-go v1.44.325 + github.com/bwmarrin/snowflake v0.3.0 github.com/docker/docker v24.0.5+incompatible github.com/go-redis/redis v6.15.9+incompatible github.com/go-redis/redis/v8 v8.11.5 + github.com/go-resty/resty/v2 v2.7.0 github.com/go-sql-driver/mysql v1.7.1 github.com/jinzhu/copier v0.3.5 + github.com/nacos-group/nacos-sdk-go/v2 v2.2.3 github.com/pkg/errors v0.9.1 github.com/robfig/cron/v3 v3.0.1 github.com/shopspring/decimal v1.3.1 @@ -22,6 +27,7 @@ require ( gitlink.org.cn/jcce-pcm/pcm-participant-openstack v0.0.0-20230904093908-860f0b2b4eb4 gitlink.org.cn/jcce-pcm/pcm-participant-slurm v0.0.0-20230714030125-a52fa198ddf4 gitlink.org.cn/jcce-pcm/utils v0.0.2 + go.opentelemetry.io/otel/trace v1.14.0 gonum.org/v1/gonum v0.11.0 google.golang.org/grpc v1.57.0 google.golang.org/protobuf v1.31.0 @@ -29,6 +35,8 @@ require ( gorm.io/gorm v1.25.3 k8s.io/api v0.26.3 k8s.io/apimachinery v0.27.3 + k8s.io/client-go v0.26.3 + sigs.k8s.io/yaml v1.3.0 ) //replace gitlink.org.cn/jcce-pcm/utils v0.0.2 => gitlink.org.cn/jcce-pcm/utils v0.0.0-20230914022307-7d2bc2c3a28f @@ -36,12 +44,9 @@ require ( replace github.com/zeromicro/go-zero v1.5.5 => github.com/zeromicro/go-zero v1.5.3 require ( - github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos v0.0.0-20230419021610-13bbc83fbc3c // indirect github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/buger/jsonparser v1.1.1 // indirect - github.com/bwmarrin/snowflake v0.3.0 // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect @@ -58,7 +63,6 @@ require ( github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.1 // indirect github.com/go-openapi/swag v0.22.3 // indirect - github.com/go-resty/resty/v2 v2.7.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/golang/mock v1.6.0 // indirect @@ -85,7 +89,6 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/morikuni/aec v1.0.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/nacos-group/nacos-sdk-go/v2 v2.2.3 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/openzipkin/zipkin-go v0.4.1 // indirect @@ -109,7 +112,6 @@ require ( go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0 // indirect go.opentelemetry.io/otel/exporters/zipkin v1.14.0 // indirect go.opentelemetry.io/otel/sdk v1.14.0 // indirect - go.opentelemetry.io/otel/trace v1.14.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/automaxprocs v1.5.3 // indirect @@ -134,11 +136,9 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.5.0 // indirect - k8s.io/client-go v0.26.3 // indirect k8s.io/klog/v2 v2.90.1 // indirect k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/pkg/constants/task.go b/pkg/constants/task.go new file mode 100644 index 00000000..7b62eece --- /dev/null +++ b/pkg/constants/task.go @@ -0,0 +1,18 @@ +package constants + +// 任务类型 +const ( + TASK_TYPE_CLOUD = 1 + TASK_TYPE_HPC = 2 + TASK_TYPE_AI = 3 +) + +// 任务状态 +const ( + TASK_STATUS_SAVED = 1 + TASK_STATUS_INIT = 2 + TASK_STATUS_RUNNING = 3 + TASK_STATUS_FAILED = 4 + TASK_STATUS_END = 5 + TASK_STATUS_UNKNOW = 6 +) diff --git a/pkg/enum/acEnum.go b/pkg/enum/acEnum.go new file mode 100644 index 00000000..51744256 --- /dev/null +++ b/pkg/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 "" + } +} diff --git a/pkg/enum/externalStatusEnum.go b/pkg/enum/externalStatusEnum.go new file mode 100644 index 00000000..6325fdb3 --- /dev/null +++ b/pkg/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 "" + } +} diff --git a/pkg/enum/partnerEnum.go b/pkg/enum/partnerEnum.go new file mode 100644 index 00000000..db5560da --- /dev/null +++ b/pkg/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 "" + } +} diff --git a/pkg/enum/synergyStatusEnum.go b/pkg/enum/synergyStatusEnum.go new file mode 100644 index 00000000..85417e3e --- /dev/null +++ b/pkg/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 "" + } +} diff --git a/pkg/enum/tianheEnum.go b/pkg/enum/tianheEnum.go new file mode 100644 index 00000000..832990c1 --- /dev/null +++ b/pkg/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 "" + } +} diff --git a/pkg/helper/interceptor/rpcserver/loggerInterceptor.go b/pkg/helper/interceptor/rpcserver/loggerInterceptor.go new file mode 100644 index 00000000..b1419b97 --- /dev/null +++ b/pkg/helper/interceptor/rpcserver/loggerInterceptor.go @@ -0,0 +1,33 @@ +package rpcserver + +import ( + "context" + + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr" + + "github.com/pkg/errors" + "github.com/zeromicro/go-zero/core/logx" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +// LoggerInterceptor rpc service logger interceptor +func LoggerInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp interface{}, err error) { + + resp, err = handler(ctx, req) + if err != nil { + causeErr := errors.Cause(err) // err类型 + if e, ok := causeErr.(*xerr.CodeError); ok { //自定义错误类型 + logx.WithContext(ctx).Errorf("【RPC-SRV-ERR】 %+v", err) + + //转成grpc err + err = status.Error(codes.Code(e.GetErrCode()), e.GetErrMsg()) + } else { + logx.WithContext(ctx).Errorf("【RPC-SRV-ERR】 %+v", err) + } + + } + + return resp, err +} diff --git a/pkg/helper/nacos/nacos.go b/pkg/helper/nacos/nacos.go new file mode 100644 index 00000000..e1946db4 --- /dev/null +++ b/pkg/helper/nacos/nacos.go @@ -0,0 +1,227 @@ +package nacos + +import ( + "context" + "encoding/json" + "fmt" + "github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos" + "github.com/nacos-group/nacos-sdk-go/v2/clients" + "github.com/nacos-group/nacos-sdk-go/v2/clients/nacos_client" + "github.com/nacos-group/nacos-sdk-go/v2/clients/naming_client/naming_cache" + "github.com/nacos-group/nacos-sdk-go/v2/clients/naming_client/naming_proxy" + "github.com/nacos-group/nacos-sdk-go/v2/common/constant" + "github.com/nacos-group/nacos-sdk-go/v2/common/http_agent" + "github.com/nacos-group/nacos-sdk-go/v2/common/nacos_server" + "github.com/nacos-group/nacos-sdk-go/v2/common/security" + "github.com/nacos-group/nacos-sdk-go/v2/vo" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest" + "github.com/zeromicro/go-zero/zrpc" + nacosVo "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/nacos/vo" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" + "net/http" + "sync" +) + +type ( + BootstrapConfig struct { + NacosConfig NacosConfig + } + + ListenConfig func(data string) + + NacosServerConfig struct { + IpAddr string + Port uint64 + } + + NacosClientConfig struct { + NamespaceId string + TimeoutMs uint64 + NotLoadCacheAtStart bool + LogDir string + CacheDir string + LogLevel string + } + + NacosConfig struct { + ServerConfigs []NacosServerConfig + ClientConfig NacosClientConfig + DataId string + Group string + } +) + +// NamingClient ... +type NamingClient struct { + nacos_client.INacosClient + ctx context.Context + cancel context.CancelFunc + serviceProxy naming_proxy.INamingProxy + serviceInfoHolder *naming_cache.ServiceInfoHolder + clientConfig constant.ClientConfig +} + +func (n *NacosConfig) Discovery(c *zrpc.RpcServerConf) { + sc, cc := n.buildConfig() + opts := nacos.NewNacosConfig(c.Name, c.ListenOn, sc, &cc) + opts.Group = n.Group + err := nacos.RegisterService(opts) + if err != nil { + panic(err) + } +} + +func (n *NacosConfig) DiscoveryRest(c *rest.RestConf) { + sc, cc := n.buildConfig() + opts := nacos.NewNacosConfig(c.Name, fmt.Sprintf("%s:%d", c.Host, c.Port), sc, &cc) + err := nacos.RegisterService(opts) + if err != nil { + panic(err) + } +} + +func (n *NacosConfig) InitConfig(listenConfigCallback ListenConfig) string { + //nacos server + sc, cc := n.buildConfig() + + pa := vo.NacosClientParam{ + ClientConfig: &cc, + ServerConfigs: sc, + } + configClient, err := clients.NewConfigClient(pa) + if err != nil { + panic(err) + } + //获取配置中心内容 + content, err := configClient.GetConfig(vo.ConfigParam{ + DataId: n.DataId, + Group: n.Group, + }) + if err != nil { + panic(err) + } + //设置配置监听 + if err = configClient.ListenConfig(vo.ConfigParam{ + DataId: n.DataId, + Group: n.Group, + OnChange: func(namespace, group, dataId, data string) { + //配置文件产生变化就会触发 + if len(data) == 0 { + logx.Errorf("listen nacos data nil error , namespace : %s，group : %s , dataId : %s , data : %s", namespace, group, dataId, data) + return + } + listenConfigCallback(data) + }, + }); err != nil { + panic(err) + } + + if len(content) == 0 { + panic("read nacos nacos content err , content is nil") + } + + return content +} + +func (n *NacosConfig) buildConfig() ([]constant.ServerConfig, constant.ClientConfig) { + var sc []constant.ServerConfig + if len(n.ServerConfigs) == 0 { + panic("nacos server no set") + } + for _, serveConfig := range n.ServerConfigs { + sc = append(sc, constant.ServerConfig{ + Port: serveConfig.Port, + IpAddr: serveConfig.IpAddr, + }, + ) + } + + //nacos client + cc := constant.ClientConfig{ + NamespaceId: n.ClientConfig.NamespaceId, + TimeoutMs: n.ClientConfig.TimeoutMs, + NotLoadCacheAtStart: n.ClientConfig.NotLoadCacheAtStart, + LogDir: n.ClientConfig.LogDir, + CacheDir: n.ClientConfig.CacheDir, + LogLevel: n.ClientConfig.LogLevel, + } + return sc, cc +} + +type NacosServer struct { + sync.RWMutex + securityLogin security.AuthClient + serverList []constant.ServerConfig + httpAgent http_agent.IHttpAgent + timeoutMs uint64 + endpoint string + lastSrvRefTime int64 + vipSrvRefInterMills int64 + contextPath string + currentIndex int32 + ServerSrcChangeSignal chan struct{} +} + +// GetAllServicesInfo Get all Services +func (n *NacosConfig) GetAllServicesInfo() (nacosVo.NacosServiceList, error) { + nacosServiceList := nacosVo.NacosServiceList{} + api := constant.SERVICE_BASE_PATH + "/catalog/services" + nacosServer, err := nacos_server.NewNacosServer(context.Background(), + []constant.ServerConfig{*constant.NewServerConfig(n.ServerConfigs[0].IpAddr, n.ServerConfigs[0].Port)}, + constant.ClientConfig{}, + &http_agent.HttpAgent{}, + 1000, + "") + if err != nil { + return nacosServiceList, err + } + params := map[string]string{} + params["namespaceId"] = n.ClientConfig.NamespaceId + params["groupName"] = "" + params["pageNo"] = "1" + params["pageSize"] = "10000" + result, err := nacosServer.ReqApi(api, params, http.MethodGet, constant.ClientConfig{}) + if err != nil { + logx.Errorf("Failed to get all services ,error: <%+v>, namespace : <%s> ", err, n.ClientConfig.NamespaceId) + return nacosServiceList, err + } + err1 := json.Unmarshal([]byte(result), &nacosServiceList) + if err1 != nil { + logx.Errorf("Conversion failed ,error: %+v, str: %s", err1, result) + return nacosServiceList, err + } + return nacosServiceList, err +} + +// GetAllGroupName Get all GroupName +func (n *NacosConfig) GetAllGroupName() (nacosGroupList nacosVo.NacosGroupList, err error) { + nacosServiceList := nacosVo.NacosServiceList{} + api := constant.SERVICE_BASE_PATH + "/catalog/services" + nacosServer, err := nacos_server.NewNacosServer(context.Background(), + []constant.ServerConfig{*constant.NewServerConfig(n.ServerConfigs[0].IpAddr, n.ServerConfigs[0].Port)}, + constant.ClientConfig{}, + &http_agent.HttpAgent{}, + 1000, + "") + if err != nil { + return nacosGroupList, err + } + params := map[string]string{} + params["namespaceId"] = "test" + params["groupName"] = "" + params["pageNo"] = "1" + params["pageSize"] = "10000" + result, err := nacosServer.ReqApi(api, params, http.MethodGet, constant.ClientConfig{}) + err1 := json.Unmarshal([]byte(result), &nacosServiceList) + if err1 != nil { + logx.Errorf("Conversion failed ,error: %+v, str: %s", err1, result) + return nacosGroupList, err1 + } + for _, v := range nacosServiceList.ServiceList { + nacosGroupList.GroupName = append(nacosGroupList.GroupName, v.GroupName) + } + nacosGroupList.GroupName = utils.RemoveDuplication_map(nacosGroupList.GroupName) + + return nacosGroupList, err +} diff --git a/pkg/helper/nacos/vo/nacos_group.go b/pkg/helper/nacos/vo/nacos_group.go new file mode 100644 index 00000000..cb1099cf --- /dev/null +++ b/pkg/helper/nacos/vo/nacos_group.go @@ -0,0 +1,5 @@ +package vo + +type NacosGroupList struct { + GroupName []string `json:"groupName"` +} diff --git a/pkg/helper/nacos/vo/nacos_service.go b/pkg/helper/nacos/vo/nacos_service.go new file mode 100644 index 00000000..405b9163 --- /dev/null +++ b/pkg/helper/nacos/vo/nacos_service.go @@ -0,0 +1,8 @@ +package vo + +import "github.com/aliyun/alibaba-cloud-sdk-go/services/mse" + +type NacosServiceList struct { + Count int `json:"count"` + ServiceList []mse.SimpleNacosAnsService `json:"serviceList"` +} diff --git a/pkg/helper/xerr/errCode.go b/pkg/helper/xerr/errCode.go new file mode 100644 index 00000000..46cd2c36 --- /dev/null +++ b/pkg/helper/xerr/errCode.go @@ -0,0 +1,16 @@ +package xerr + +// 成功返回 +const OK uint32 = 200 + +/**(前3位代表业务,后三位代表具体功能)**/ + +// 全局错误码 +const SERVER_COMMON_ERROR uint32 = 100001 +const REUQEST_PARAM_ERROR uint32 = 100002 +const TOKEN_EXPIRE_ERROR uint32 = 100003 +const TOKEN_GENERATE_ERROR uint32 = 100004 +const DB_ERROR uint32 = 100005 +const DB_UPDATE_AFFECTED_ZERO_ERROR uint32 = 100006 + +//用户模块 diff --git a/pkg/helper/xerr/errMsg.go b/pkg/helper/xerr/errMsg.go new file mode 100644 index 00000000..ece91101 --- /dev/null +++ b/pkg/helper/xerr/errMsg.go @@ -0,0 +1,30 @@ +package xerr + +var message map[uint32]string + +func init() { + message = make(map[uint32]string) + message[OK] = "SUCCESS" + message[SERVER_COMMON_ERROR] = "服务器开小差啦,稍后再来试一试" + message[REUQEST_PARAM_ERROR] = "参数错误" + message[TOKEN_EXPIRE_ERROR] = "token失效，请重新登陆" + message[TOKEN_GENERATE_ERROR] = "生成token失败" + message[DB_ERROR] = "数据库繁忙,请稍后再试" + message[DB_UPDATE_AFFECTED_ZERO_ERROR] = "更新数据影响行数为0" +} + +func MapErrMsg(errcode uint32) string { + if msg, ok := message[errcode]; ok { + return msg + } else { + return "服务器开小差啦,稍后再来试一试" + } +} + +func IsCodeErr(errcode uint32) bool { + if _, ok := message[errcode]; ok { + return true + } else { + return false + } +} diff --git a/pkg/helper/xerr/errors.go b/pkg/helper/xerr/errors.go new file mode 100644 index 00000000..c6ecf4bf --- /dev/null +++ b/pkg/helper/xerr/errors.go @@ -0,0 +1,39 @@ +package xerr + +import ( + "fmt" +) + +/** +常用通用固定错误 +*/ + +type CodeError struct { + errCode uint32 + errMsg string +} + +// 返回给前端的错误码 +func (e *CodeError) GetErrCode() uint32 { + return e.errCode +} + +// 返回给前端显示端错误信息 +func (e *CodeError) GetErrMsg() string { + return e.errMsg +} + +func (e *CodeError) Error() string { + return fmt.Sprintf("ErrCode:%d，ErrMsg:%s", e.errCode, e.errMsg) +} + +func NewErrCodeMsg(errCode uint32, errMsg string) *CodeError { + return &CodeError{errCode: errCode, errMsg: errMsg} +} +func NewErrCode(errCode uint32) *CodeError { + return &CodeError{errCode: errCode, errMsg: MapErrMsg(errCode)} +} + +func NewErrMsg(errMsg string) *CodeError { + return &CodeError{errCode: SERVER_COMMON_ERROR, errMsg: errMsg} +} diff --git a/model/aiCenterModel.go b/pkg/models/aiCenterModel.go similarity index 88% rename from model/aiCenterModel.go rename to pkg/models/aiCenterModel.go index c70e3c36..2174a8e3 100644 --- a/model/aiCenterModel.go +++ b/pkg/models/aiCenterModel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewAiCenterModel returns a model for the database table. +// NewAiCenterModel returns a models for the database table. func NewAiCenterModel(conn sqlx.SqlConn, c cache.CacheConf) AiCenterModel { return &customAiCenterModel{ defaultAiCenterModel: newAiCenterModel(conn, c), diff --git a/model/aiCenterModel_gen.go b/pkg/models/aiCenterModel_gen.go similarity index 99% rename from model/aiCenterModel_gen.go rename to pkg/models/aiCenterModel_gen.go index 362f9318..eb551a4c 100644 --- a/model/aiCenterModel_gen.go +++ b/pkg/models/aiCenterModel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/aimodel.go b/pkg/models/aimodel.go similarity index 93% rename from model/aimodel.go rename to pkg/models/aimodel.go index 05a6cae0..522f15db 100644 --- a/model/aimodel.go +++ b/pkg/models/aimodel.go @@ -1,4 +1,4 @@ -package model +package models type ( // AiModel is an interface to be customized, add more methods here, diff --git a/model/aimodel_gen.go b/pkg/models/aimodel_gen.go similarity index 99% rename from model/aimodel_gen.go rename to pkg/models/aimodel_gen.go index 71c04124..160c56fc 100644 --- a/model/aimodel_gen.go +++ b/pkg/models/aimodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/centerOverViewModel.go b/pkg/models/centerOverViewModel.go similarity index 88% rename from model/centerOverViewModel.go rename to pkg/models/centerOverViewModel.go index 7c10bea6..fac3675b 100644 --- a/model/centerOverViewModel.go +++ b/pkg/models/centerOverViewModel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewCenterOverviewModel returns a model for the database table. +// NewCenterOverviewModel returns a models for the database table. func NewCenterOverviewModel(conn sqlx.SqlConn, c cache.CacheConf) CenterOverviewModel { return &customCenterOverviewModel{ defaultCenterOverviewModel: newCenterOverviewModel(conn, c), diff --git a/model/centerOverviewModel_gen.go b/pkg/models/centerOverviewModel_gen.go similarity index 99% rename from model/centerOverviewModel_gen.go rename to pkg/models/centerOverviewModel_gen.go index 3ce5d226..1b949740 100644 --- a/model/centerOverviewModel_gen.go +++ b/pkg/models/centerOverviewModel_gen.go @@ -1,4 +1,4 @@ -package model +package models import ( "context" diff --git a/model/centerTagModel.go b/pkg/models/centerTagModel.go similarity index 88% rename from model/centerTagModel.go rename to pkg/models/centerTagModel.go index a7a0cd6a..6c562275 100644 --- a/model/centerTagModel.go +++ b/pkg/models/centerTagModel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewCenterTagModel returns a model for the database table. +// NewCenterTagModel returns a models for the database table. func NewCenterTagModel(conn sqlx.SqlConn, c cache.CacheConf) CenterTagModel { return &customCenterTagModel{ defaultCenterTagModel: newCenterTagModel(conn, c), diff --git a/model/centerTagModel_gen.go b/pkg/models/centerTagModel_gen.go similarity index 99% rename from model/centerTagModel_gen.go rename to pkg/models/centerTagModel_gen.go index f7f4b4dc..f5f08b3b 100644 --- a/model/centerTagModel_gen.go +++ b/pkg/models/centerTagModel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/cloudCenterModel.go b/pkg/models/cloudCenterModel.go similarity index 88% rename from model/cloudCenterModel.go rename to pkg/models/cloudCenterModel.go index 6e9e3cee..06710c7c 100644 --- a/model/cloudCenterModel.go +++ b/pkg/models/cloudCenterModel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewCloudCenterModel returns a model for the database table. +// NewCloudCenterModel returns a models for the database table. func NewCloudCenterModel(conn sqlx.SqlConn, c cache.CacheConf) CloudCenterModel { return &customCloudCenterModel{ defaultCloudCenterModel: newCloudCenterModel(conn, c), diff --git a/model/cloudCenterModel_gen.go b/pkg/models/cloudCenterModel_gen.go similarity index 99% rename from model/cloudCenterModel_gen.go rename to pkg/models/cloudCenterModel_gen.go index 8f1af866..94c1fcc4 100644 --- a/model/cloudCenterModel_gen.go +++ b/pkg/models/cloudCenterModel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/cloudmodel_gen.go b/pkg/models/cloudmodel_gen.go similarity index 99% rename from model/cloudmodel_gen.go rename to pkg/models/cloudmodel_gen.go index 03122ed6..17191649 100644 --- a/model/cloudmodel_gen.go +++ b/pkg/models/cloudmodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/computeCenterModel.go b/pkg/models/computeCenterModel.go similarity index 88% rename from model/computeCenterModel.go rename to pkg/models/computeCenterModel.go index 8125c962..ea2a9f40 100644 --- a/model/computeCenterModel.go +++ b/pkg/models/computeCenterModel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewComputeCenterModel returns a model for the database table. +// NewComputeCenterModel returns a models for the database table. func NewComputeCenterModel(conn sqlx.SqlConn, c cache.CacheConf) ComputeCenterModel { return &customComputeCenterModel{ defaultComputeCenterModel: newComputeCenterModel(conn, c), diff --git a/model/computeCenterModel_gen.go b/pkg/models/computeCenterModel_gen.go similarity index 99% rename from model/computeCenterModel_gen.go rename to pkg/models/computeCenterModel_gen.go index 69b0fdb2..9b465de1 100644 --- a/model/computeCenterModel_gen.go +++ b/pkg/models/computeCenterModel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/computeclustermodel.go b/pkg/models/computeclustermodel.go similarity index 87% rename from model/computeclustermodel.go rename to pkg/models/computeclustermodel.go index 552ccb7b..76af1d41 100644 --- a/model/computeclustermodel.go +++ b/pkg/models/computeclustermodel.go @@ -1,4 +1,4 @@ -package model +package models import "github.com/zeromicro/go-zero/core/stores/sqlx" @@ -16,7 +16,7 @@ type ( } ) -// NewComputeClusterModel returns a model for the database table. +// NewComputeClusterModel returns a models for the database table. func NewComputeClusterModel(conn sqlx.SqlConn) ComputeClusterModel { return &customComputeClusterModel{ defaultComputeClusterModel: newComputeClusterModel(conn), diff --git a/model/computeclustermodel_gen.go b/pkg/models/computeclustermodel_gen.go similarity index 99% rename from model/computeclustermodel_gen.go rename to pkg/models/computeclustermodel_gen.go index 413b22a7..7cb41f35 100644 --- a/model/computeclustermodel_gen.go +++ b/pkg/models/computeclustermodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/dictmodel.go b/pkg/models/dictmodel.go similarity index 87% rename from model/dictmodel.go rename to pkg/models/dictmodel.go index b65256ca..f146a827 100644 --- a/model/dictmodel.go +++ b/pkg/models/dictmodel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewDictModel returns a model for the database table. +// NewDictModel returns a models for the database table. func NewDictModel(conn sqlx.SqlConn, c cache.CacheConf) DictModel { return &customDictModel{ defaultDictModel: newDictModel(conn, c), diff --git a/model/dictmodel_gen.go b/pkg/models/dictmodel_gen.go similarity index 99% rename from model/dictmodel_gen.go rename to pkg/models/dictmodel_gen.go index 64da983f..6007fe46 100644 --- a/model/dictmodel_gen.go +++ b/pkg/models/dictmodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/domainresourcemodel.go b/pkg/models/domainresourcemodel.go similarity index 89% rename from model/domainresourcemodel.go rename to pkg/models/domainresourcemodel.go index a766584b..b6f493b5 100644 --- a/model/domainresourcemodel.go +++ b/pkg/models/domainresourcemodel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewDomainResourceModel returns a model for the database table. +// NewDomainResourceModel returns a models for the database table. func NewDomainResourceModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) DomainResourceModel { return &customDomainResourceModel{ defaultDomainResourceModel: newDomainResourceModel(conn, c, opts...), diff --git a/model/domainresourcemodel_gen.go b/pkg/models/domainresourcemodel_gen.go similarity index 99% rename from model/domainresourcemodel_gen.go rename to pkg/models/domainresourcemodel_gen.go index 1d56b45f..b42e75ea 100644 --- a/model/domainresourcemodel_gen.go +++ b/pkg/models/domainresourcemodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/file.go b/pkg/models/file.go similarity index 99% rename from model/file.go rename to pkg/models/file.go index e878452b..6229ae1a 100644 --- a/model/file.go +++ b/pkg/models/file.go @@ -1,4 +1,4 @@ -package model +package models import "time" diff --git a/model/hpcCenterModel.go b/pkg/models/hpcCenterModel.go similarity index 88% rename from model/hpcCenterModel.go rename to pkg/models/hpcCenterModel.go index 7ee5ee36..9d72b815 100644 --- a/model/hpcCenterModel.go +++ b/pkg/models/hpcCenterModel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewHpcCenterModel returns a model for the database table. +// NewHpcCenterModel returns a models for the database table. func NewHpcCenterModel(conn sqlx.SqlConn, c cache.CacheConf) HpcCenterModel { return &customHpcCenterModel{ defaultHpcCenterModel: newHpcCenterModel(conn, c), diff --git a/model/hpcCenterModel_gen.go b/pkg/models/hpcCenterModel_gen.go similarity index 99% rename from model/hpcCenterModel_gen.go rename to pkg/models/hpcCenterModel_gen.go index 4d2faa13..3a74b442 100644 --- a/model/hpcCenterModel_gen.go +++ b/pkg/models/hpcCenterModel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/hpcmodel.go b/pkg/models/hpcmodel.go similarity index 93% rename from model/hpcmodel.go rename to pkg/models/hpcmodel.go index 460263b7..724f78f4 100644 --- a/model/hpcmodel.go +++ b/pkg/models/hpcmodel.go @@ -1,4 +1,4 @@ -package model +package models type ( // HpcModel is an interface to be customized, add more methods here, diff --git a/model/hpcmodel_gen.go b/pkg/models/hpcmodel_gen.go similarity index 99% rename from model/hpcmodel_gen.go rename to pkg/models/hpcmodel_gen.go index d9407624..9503299e 100644 --- a/model/hpcmodel_gen.go +++ b/pkg/models/hpcmodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/regionslurmmodel.go b/pkg/models/regionslurmmodel.go similarity index 87% rename from model/regionslurmmodel.go rename to pkg/models/regionslurmmodel.go index a0b566a8..a4e4fedb 100644 --- a/model/regionslurmmodel.go +++ b/pkg/models/regionslurmmodel.go @@ -1,4 +1,4 @@ -package model +package models import "github.com/zeromicro/go-zero/core/stores/sqlx" @@ -16,7 +16,7 @@ type ( } ) -// NewRegionSlurmModel returns a model for the database table. +// NewRegionSlurmModel returns a models for the database table. func NewRegionSlurmModel(conn sqlx.SqlConn) RegionSlurmModel { return &customRegionSlurmModel{ defaultRegionSlurmModel: newRegionSlurmModel(conn), diff --git a/model/regionslurmmodel_gen.go b/pkg/models/regionslurmmodel_gen.go similarity index 99% rename from model/regionslurmmodel_gen.go rename to pkg/models/regionslurmmodel_gen.go index 68f8d23c..620af1f2 100644 --- a/model/regionslurmmodel_gen.go +++ b/pkg/models/regionslurmmodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/resourcepanelconfigmodel.go b/pkg/models/resourcepanelconfigmodel.go similarity index 89% rename from model/resourcepanelconfigmodel.go rename to pkg/models/resourcepanelconfigmodel.go index 3bb1bce8..d47e6a5a 100644 --- a/model/resourcepanelconfigmodel.go +++ b/pkg/models/resourcepanelconfigmodel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewResourcePanelConfigModel returns a model for the database table. +// NewResourcePanelConfigModel returns a models for the database table. func NewResourcePanelConfigModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) ResourcePanelConfigModel { return &customResourcePanelConfigModel{ defaultResourcePanelConfigModel: newResourcePanelConfigModel(conn, c, opts...), diff --git a/model/resourcepanelconfigmodel_gen.go b/pkg/models/resourcepanelconfigmodel_gen.go similarity index 99% rename from model/resourcepanelconfigmodel_gen.go rename to pkg/models/resourcepanelconfigmodel_gen.go index 4c464703..4bd4377f 100644 --- a/model/resourcepanelconfigmodel_gen.go +++ b/pkg/models/resourcepanelconfigmodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/scnodeavailinfomodel_gen.go b/pkg/models/scnodeavailinfomodel_gen.go old mode 100755 new mode 100644 similarity index 98% rename from model/scnodeavailinfomodel_gen.go rename to pkg/models/scnodeavailinfomodel_gen.go index ab2657d6..5aedd0b7 --- a/model/scnodeavailinfomodel_gen.go +++ b/pkg/models/scnodeavailinfomodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "database/sql" diff --git a/model/scnodephyinfomodel.go b/pkg/models/scnodephyinfomodel.go old mode 100755 new mode 100644 similarity index 89% rename from model/scnodephyinfomodel.go rename to pkg/models/scnodephyinfomodel.go index 97628778..efda23dd --- a/model/scnodephyinfomodel.go +++ b/pkg/models/scnodephyinfomodel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewScNodePhyInfoModel returns a model for the database table. +// NewScNodePhyInfoModel returns a models for the database table. func NewScNodePhyInfoModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) ScNodePhyInfoModel { return &customScNodePhyInfoModel{ defaultScNodePhyInfoModel: newScNodePhyInfoModel(conn, c, opts...), diff --git a/model/scnodephyinfomodel_gen.go b/pkg/models/scnodephyinfomodel_gen.go old mode 100755 new mode 100644 similarity index 99% rename from model/scnodephyinfomodel_gen.go rename to pkg/models/scnodephyinfomodel_gen.go index 83285c07..684367da --- a/model/scnodephyinfomodel_gen.go +++ b/pkg/models/scnodephyinfomodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/scparticipantavailinfomodel.go b/pkg/models/scparticipantavailinfomodel.go old mode 100755 new mode 100644 similarity index 89% rename from model/scparticipantavailinfomodel.go rename to pkg/models/scparticipantavailinfomodel.go index ea5b994f..b7a5ebb1 --- a/model/scparticipantavailinfomodel.go +++ b/pkg/models/scparticipantavailinfomodel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewScParticipantAvailInfoModel returns a model for the database table. +// NewScParticipantAvailInfoModel returns a models for the database table. func NewScParticipantAvailInfoModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) ScParticipantAvailInfoModel { return &customScParticipantAvailInfoModel{ defaultScParticipantAvailInfoModel: newScParticipantAvailInfoModel(conn, c, opts...), diff --git a/model/scparticipantavailinfomodel_gen.go b/pkg/models/scparticipantavailinfomodel_gen.go old mode 100755 new mode 100644 similarity index 99% rename from model/scparticipantavailinfomodel_gen.go rename to pkg/models/scparticipantavailinfomodel_gen.go index f55b9893..50625708 --- a/model/scparticipantavailinfomodel_gen.go +++ b/pkg/models/scparticipantavailinfomodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/scparticipantlabelinfomodel.go b/pkg/models/scparticipantlabelinfomodel.go old mode 100755 new mode 100644 similarity index 89% rename from model/scparticipantlabelinfomodel.go rename to pkg/models/scparticipantlabelinfomodel.go index d5dd99bc..7fe065e8 --- a/model/scparticipantlabelinfomodel.go +++ b/pkg/models/scparticipantlabelinfomodel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewScParticipantLabelInfoModel returns a model for the database table. +// NewScParticipantLabelInfoModel returns a models for the database table. func NewScParticipantLabelInfoModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) ScParticipantLabelInfoModel { return &customScParticipantLabelInfoModel{ defaultScParticipantLabelInfoModel: newScParticipantLabelInfoModel(conn, c, opts...), diff --git a/model/scparticipantlabelinfomodel_gen.go b/pkg/models/scparticipantlabelinfomodel_gen.go old mode 100755 new mode 100644 similarity index 99% rename from model/scparticipantlabelinfomodel_gen.go rename to pkg/models/scparticipantlabelinfomodel_gen.go index 75868cfa..8a971990 --- a/model/scparticipantlabelinfomodel_gen.go +++ b/pkg/models/scparticipantlabelinfomodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/scparticipantphyinfomodel.go b/pkg/models/scparticipantphyinfomodel.go old mode 100755 new mode 100644 similarity index 94% rename from model/scparticipantphyinfomodel.go rename to pkg/models/scparticipantphyinfomodel.go index 27e3326d..35df9d10 --- a/model/scparticipantphyinfomodel.go +++ b/pkg/models/scparticipantphyinfomodel.go @@ -1,4 +1,4 @@ -package model +package models type ( // ScParticipantPhyInfoModel is an interface to be customized, add more methods here, diff --git a/model/scparticipantphyinfomodel_gen.go b/pkg/models/scparticipantphyinfomodel_gen.go old mode 100755 new mode 100644 similarity index 99% rename from model/scparticipantphyinfomodel_gen.go rename to pkg/models/scparticipantphyinfomodel_gen.go index 902ccd23..8e76e455 --- a/model/scparticipantphyinfomodel_gen.go +++ b/pkg/models/scparticipantphyinfomodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/scqueuephyinfomodel.go b/pkg/models/scqueuephyinfomodel.go old mode 100755 new mode 100644 similarity index 89% rename from model/scqueuephyinfomodel.go rename to pkg/models/scqueuephyinfomodel.go index 87160a60..6e6633fc --- a/model/scqueuephyinfomodel.go +++ b/pkg/models/scqueuephyinfomodel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewScQueuePhyInfoModel returns a model for the database table. +// NewScQueuePhyInfoModel returns a models for the database table. func NewScQueuePhyInfoModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) ScQueuePhyInfoModel { return &customScQueuePhyInfoModel{ defaultScQueuePhyInfoModel: newScQueuePhyInfoModel(conn, c, opts...), diff --git a/model/scqueuephyinfomodel_gen.go b/pkg/models/scqueuephyinfomodel_gen.go old mode 100755 new mode 100644 similarity index 99% rename from model/scqueuephyinfomodel_gen.go rename to pkg/models/scqueuephyinfomodel_gen.go index 61b529fd..8ae4a988 --- a/model/scqueuephyinfomodel_gen.go +++ b/pkg/models/scqueuephyinfomodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/sctenantinfomodel.go b/pkg/models/sctenantinfomodel.go old mode 100755 new mode 100644 similarity index 89% rename from model/sctenantinfomodel.go rename to pkg/models/sctenantinfomodel.go index 0872193d..69f9e172 --- a/model/sctenantinfomodel.go +++ b/pkg/models/sctenantinfomodel.go @@ -1,4 +1,4 @@ -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/cache" @@ -19,7 +19,7 @@ type ( } ) -// NewScTenantInfoModel returns a model for the database table. +// NewScTenantInfoModel returns a models for the database table. func NewScTenantInfoModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) ScTenantInfoModel { return &customScTenantInfoModel{ defaultScTenantInfoModel: newScTenantInfoModel(conn, c, opts...), diff --git a/model/sctenantinfomodel_gen.go b/pkg/models/sctenantinfomodel_gen.go old mode 100755 new mode 100644 similarity index 99% rename from model/sctenantinfomodel_gen.go rename to pkg/models/sctenantinfomodel_gen.go index ca7047c8..31fde3a4 --- a/model/sctenantinfomodel_gen.go +++ b/pkg/models/sctenantinfomodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/taskmodel.go b/pkg/models/taskmodel.go similarity index 93% rename from model/taskmodel.go rename to pkg/models/taskmodel.go index 7f1aee2d..8cbfd230 100644 --- a/model/taskmodel.go +++ b/pkg/models/taskmodel.go @@ -1,4 +1,4 @@ -package model +package models type ( // TaskModel is an interface to be customized, add more methods here, diff --git a/model/taskmodel_gen.go b/pkg/models/taskmodel_gen.go similarity index 99% rename from model/taskmodel_gen.go rename to pkg/models/taskmodel_gen.go index 0dfa04f6..4af94a56 100644 --- a/model/taskmodel_gen.go +++ b/pkg/models/taskmodel_gen.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "context" diff --git a/model/thashcat.go b/pkg/models/thashcat.go similarity index 98% rename from model/thashcat.go rename to pkg/models/thashcat.go index 2af0ef49..016af7ad 100644 --- a/model/thashcat.go +++ b/pkg/models/thashcat.go @@ -1,6 +1,6 @@ // Code generated by goctl. DO NOT EDIT. -package model +package models import ( "github.com/zeromicro/go-zero/core/stores/sqlx" diff --git a/model/vars.go b/pkg/models/vars.go similarity index 85% rename from model/vars.go rename to pkg/models/vars.go index 69ca814e..8d22180c 100644 --- a/model/vars.go +++ b/pkg/models/vars.go @@ -1,4 +1,4 @@ -package model +package models import "github.com/zeromicro/go-zero/core/stores/sqlx" diff --git a/pkg/repository/error/baseerror.go b/pkg/repository/error/baseerror.go new file mode 100644 index 00000000..885f1635 --- /dev/null +++ b/pkg/repository/error/baseerror.go @@ -0,0 +1,32 @@ +package error + +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, + } +} diff --git a/pkg/repository/result/httpResult.go b/pkg/repository/result/httpResult.go new file mode 100644 index 00000000..e0af446a --- /dev/null +++ b/pkg/repository/result/httpResult.go @@ -0,0 +1,112 @@ +package result + +import ( + "context" + "fmt" + "github.com/pkg/errors" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" + "go.opentelemetry.io/otel/trace" + "google.golang.org/grpc/status" + "net/http" +) + +type Body struct { + Code int `json:"code"` + Msg string `json:"msg"` + Data interface{} `json:"data,omitempty"` + TraceID string `json:"traceId,omitempty"` +} + +// http返回 +func HttpResult(r *http.Request, w http.ResponseWriter, resp interface{}, err error) { + if err == nil { + //成功返回 + body := Body{} + utils.Convert(resp, &body) + if body.Msg == "" && body.Code == 0 { + body.Code = 200 + body.Msg = "success" + body.TraceID = traceIDFromContext(r.Context()) + body.Data = resp + httpx.OkJson(w, body) + return + } else { + body.TraceID = traceIDFromContext(r.Context()) + httpx.OkJson(w, body) + } + } else { + //错误返回 + errcode := xerr.SERVER_COMMON_ERROR + errmsg := "服务器开小差啦，稍后再来试一试" + + causeErr := errors.Cause(err) // err类型 + if e, ok := causeErr.(*xerr.CodeError); ok { //自定义错误类型 + //自定义CodeError + errcode = e.GetErrCode() + errmsg = e.GetErrMsg() + } else { + if gstatus, ok := status.FromError(causeErr); ok { // grpc err错误 + grpcCode := uint32(gstatus.Code()) + if xerr.IsCodeErr(grpcCode) { //区分自定义错误跟系统底层、db等错误，底层、db错误不能返回给前端 + errcode = grpcCode + errmsg = gstatus.Message() + } + } + } + + logx.WithContext(r.Context()).Errorf("【API-ERR】 : %+v ", err) + + httpx.WriteJson(w, http.StatusBadRequest, Error(errcode, errmsg, r.Context())) + } +} + +// 授权的http方法 +func AuthHttpResult(r *http.Request, w http.ResponseWriter, resp interface{}, err error) { + + if err == nil { + //成功返回 + r := Success(resp, r.Context()) + httpx.WriteJson(w, http.StatusOK, r) + } else { + //错误返回 + errcode := xerr.SERVER_COMMON_ERROR + errmsg := "服务器开小差啦，稍后再来试一试" + + causeErr := errors.Cause(err) // err类型 + if e, ok := causeErr.(*xerr.CodeError); ok { //自定义错误类型 + //自定义CodeError + errcode = e.GetErrCode() + errmsg = e.GetErrMsg() + } else { + if gstatus, ok := status.FromError(causeErr); ok { // grpc err错误 + grpcCode := uint32(gstatus.Code()) + if xerr.IsCodeErr(grpcCode) { //区分自定义错误跟系统底层、db等错误，底层、db错误不能返回给前端 + errcode = grpcCode + errmsg = gstatus.Message() + } + } + } + + logx.WithContext(r.Context()).Errorf("【GATEWAY-ERR】 : %+v ", err) + + httpx.WriteJson(w, http.StatusUnauthorized, Error(errcode, errmsg, r.Context())) + } +} + +// http 参数错误返回 +func ParamErrorResult(r *http.Request, w http.ResponseWriter, err error) { + errMsg := fmt.Sprintf("%s ,%s", xerr.MapErrMsg(xerr.REUQEST_PARAM_ERROR), err.Error()) + httpx.WriteJson(w, http.StatusBadRequest, Error(xerr.REUQEST_PARAM_ERROR, errMsg, r.Context())) +} + +func traceIDFromContext(ctx context.Context) string { + spanCtx := trace.SpanContextFromContext(ctx) + if spanCtx.HasTraceID() { + return spanCtx.TraceID().String() + } + + return "" +} diff --git a/pkg/repository/result/jobResult.go b/pkg/repository/result/jobResult.go new file mode 100644 index 00000000..4f417e3e --- /dev/null +++ b/pkg/repository/result/jobResult.go @@ -0,0 +1,44 @@ +package result + +import ( + "context" + + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/helper/xerr" + + "github.com/pkg/errors" + "github.com/zeromicro/go-zero/core/logx" + "google.golang.org/grpc/status" +) + +// job返回 +func JobResult(ctx context.Context, resp interface{}, err error) { + if err == nil { + // 成功返回 ,只有dev环境下才会打印info，线上不显示 + if resp != nil { + logx.Infof("resp: %+v", resp) + } + return + } else { + errCode := xerr.SERVER_COMMON_ERROR + errMsg := "服务器开小差啦，稍后再来试一试" + + // 错误返回 + causeErr := errors.Cause(err) // err类型 + if e, ok := causeErr.(*xerr.CodeError); ok { // 自定义错误类型 + // 自定义CodeError + errCode = e.GetErrCode() + errMsg = e.GetErrMsg() + } else { + if gstatus, ok := status.FromError(causeErr); ok { // grpc err错误 + grpcCode := uint32(gstatus.Code()) + if xerr.IsCodeErr(grpcCode) { // 区分自定义错误跟系统底层、db等错误，底层、db错误不能返回给前端 + errCode = grpcCode + errMsg = gstatus.Message() + } + } + } + + logx.WithContext(ctx).Errorf("【JOB-ERR】 : %+v ,errCode:%d , errMsg:%s ", err, errCode, errMsg) + return + } +} diff --git a/pkg/repository/result/responseBean.go b/pkg/repository/result/responseBean.go new file mode 100644 index 00000000..3460d961 --- /dev/null +++ b/pkg/repository/result/responseBean.go @@ -0,0 +1,32 @@ +package result + +import ( + "context" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" +) + +type ResponseSuccessBean struct { + Code uint32 `json:"code"` + Msg string `json:"msg"` + Data interface{} `json:"data"` + TraceID string `json:"traceId,omitempty"` +} +type NullJson struct{} + +func Success(data interface{}, ctx context.Context) *ResponseSuccessBean { + resp := ResponseSuccessBean{} + utils.Convert(data, resp) + traceID := traceIDFromContext(ctx) + return &ResponseSuccessBean{200, "OK", data, traceID} +} + +type ResponseErrorBean struct { + Code uint32 `json:"code"` + Msg string `json:"msg"` + TraceID string `json:"traceId,omitempty"` +} + +func Error(errCode uint32, errMsg string, ctx context.Context) *ResponseErrorBean { + traceID := traceIDFromContext(ctx) + return &ResponseErrorBean{errCode, errMsg, traceID} +} diff --git a/api/internal/pkg/scheduler/aiScheduler.go b/pkg/scheduler/aiScheduler.go similarity index 69% rename from api/internal/pkg/scheduler/aiScheduler.go rename to pkg/scheduler/aiScheduler.go index e83543e1..dbbbe185 100644 --- a/api/internal/pkg/scheduler/aiScheduler.go +++ b/pkg/scheduler/aiScheduler.go @@ -1,10 +1,10 @@ package scheduler import ( - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/algo" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/pkg/response" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/scheduler/algo" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gorm.io/gorm" ) @@ -16,14 +16,14 @@ func NewAiScheduler(val string) *aiScheduler { return &aiScheduler{yamlString: val} } -func (as *aiScheduler) getNewStructForDb(task *types.TaskInfo, participantId int64) (interface{}, error) { - ai := model.Ai{ +func (as *aiScheduler) getNewStructForDb(task *response.TaskInfo, participantId int64) (interface{}, error) { + ai := models.Ai{ ParticipantId: participantId, TaskId: task.TaskId, Status: "Saved", YamlString: as.yamlString, } - tool.Convert(task.Metadata, &ai) + utils.Convert(task.Metadata, &ai) return ai, nil } @@ -31,7 +31,7 @@ func (as *aiScheduler) pickOptimalStrategy(task *algo.Task, providers ...*algo.P return nil, nil } -func (as *aiScheduler) genTaskAndProviders(task *types.TaskInfo, dbEngin *gorm.DB) (*algo.Task, []*algo.Provider) { +func (as *aiScheduler) genTaskAndProviders(task *response.TaskInfo, dbEngin *gorm.DB) (*algo.Task, []*algo.Provider) { var proParams []providerParams sqlstr := "SELECT SUM(a.disk_avail) as disk_avail,SUM(a.mem_avail) as mem_avail,SUM(a.cpu_total * a.cpu_usable) as cpu_avail,participant_id from (SELECT * from sc_node_avail_info where created_time in (SELECT MAX(created_time) as time from sc_node_avail_info where deleted_flag = 0 GROUP BY participant_id,node_name)) a GROUP BY a.participant_id" dbEngin.Raw(sqlstr).Scan(&proParams) diff --git a/api/internal/algo/k8sStrategy.go b/pkg/scheduler/algo/k8sStrategy.go similarity index 100% rename from api/internal/algo/k8sStrategy.go rename to pkg/scheduler/algo/k8sStrategy.go diff --git a/api/internal/algo/provider.go b/pkg/scheduler/algo/provider.go similarity index 100% rename from api/internal/algo/provider.go rename to pkg/scheduler/algo/provider.go diff --git a/api/internal/algo/strategy.go b/pkg/scheduler/algo/strategy.go similarity index 100% rename from api/internal/algo/strategy.go rename to pkg/scheduler/algo/strategy.go diff --git a/api/internal/algo/strategyService.go b/pkg/scheduler/algo/strategyService.go similarity index 100% rename from api/internal/algo/strategyService.go rename to pkg/scheduler/algo/strategyService.go diff --git a/api/internal/algo/task.go b/pkg/scheduler/algo/task.go similarity index 100% rename from api/internal/algo/task.go rename to pkg/scheduler/algo/task.go diff --git a/api/internal/pkg/scheduler/cloudScheduler.go b/pkg/scheduler/cloudScheduler.go similarity index 82% rename from api/internal/pkg/scheduler/cloudScheduler.go rename to pkg/scheduler/cloudScheduler.go index 2d9190ef..adcf72ef 100644 --- a/api/internal/pkg/scheduler/cloudScheduler.go +++ b/pkg/scheduler/cloudScheduler.go @@ -3,10 +3,10 @@ package scheduler import ( "bytes" "encoding/json" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/algo" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/pkg/response" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/scheduler/algo" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gorm.io/gorm" "io" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -37,20 +37,20 @@ func (cs *cloudScheduler) pickOptimalStrategy(task *algo.Task, providers ...*alg return taskResult, nil } -func (cs *cloudScheduler) getNewStructForDb(task *types.TaskInfo, participantId int64) (interface{}, error) { +func (cs *cloudScheduler) getNewStructForDb(task *response.TaskInfo, participantId int64) (interface{}, error) { bytes, err := json.Marshal(task.Metadata) if err != nil { return nil, err } cloud := cs.UnMarshalK8sStruct(string(bytes), task.TaskId) - cloud.Id = tool.GenSnowflakeID() + cloud.Id = utils.GenSnowflakeID() cloud.YamlString = string(bytes) cloud.ParticipantId = participantId return cloud, nil } -func (cs *cloudScheduler) UnMarshalK8sStruct(yamlString string, taskId int64) model.Cloud { - var cloud model.Cloud +func (cs *cloudScheduler) UnMarshalK8sStruct(yamlString string, taskId int64) models.Cloud { + var cloud models.Cloud d := kyaml.NewYAMLOrJSONDecoder(bytes.NewBufferString(yamlString), 4096) var err error for { @@ -71,7 +71,7 @@ func (cs *cloudScheduler) UnMarshalK8sStruct(yamlString string, taskId int64) mo } unstructureObj := &unstructured.Unstructured{Object: unstructuredMap} - cloud = model.Cloud{ + cloud = models.Cloud{ TaskId: taskId, ApiVersion: unstructureObj.GetAPIVersion(), Name: unstructureObj.GetName(), @@ -87,7 +87,7 @@ func (cs *cloudScheduler) UnMarshalK8sStruct(yamlString string, taskId int64) mo return cloud } -func (cs *cloudScheduler) genTaskAndProviders(task *types.TaskInfo, dbEngin *gorm.DB) (*algo.Task, []*algo.Provider) { +func (cs *cloudScheduler) genTaskAndProviders(task *response.TaskInfo, dbEngin *gorm.DB) (*algo.Task, []*algo.Provider) { var proParams []providerParams sqlstr := "SELECT SUM(a.disk_avail) as disk_avail,SUM(a.mem_avail) as mem_avail,SUM(a.cpu_total * a.cpu_usable) as cpu_avail,participant_id from (SELECT * from sc_node_avail_info where created_time in (SELECT MAX(created_time) as time from sc_node_avail_info where deleted_flag = 0 GROUP BY participant_id,node_name)) a GROUP BY a.participant_id" dbEngin.Raw(sqlstr).Scan(&proParams) diff --git a/api/internal/pkg/scheduler/commonScheduler.go b/pkg/scheduler/commonScheduler.go similarity index 77% rename from api/internal/pkg/scheduler/commonScheduler.go rename to pkg/scheduler/commonScheduler.go index 4eef99e0..b621eb63 100644 --- a/api/internal/pkg/scheduler/commonScheduler.go +++ b/pkg/scheduler/commonScheduler.go @@ -1,17 +1,17 @@ package scheduler import ( - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/algo" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/pkg/response" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/scheduler/algo" "gorm.io/gorm" "math/rand" "time" ) type scheduleService interface { - getNewStructForDb(task *types.TaskInfo, participantId int64) (interface{}, error) + getNewStructForDb(task *response.TaskInfo, participantId int64) (interface{}, error) pickOptimalStrategy(task *algo.Task, providers ...*algo.Provider) (*algo.Task, error) - genTaskAndProviders(task *types.TaskInfo, dbEngin *gorm.DB) (*algo.Task, []*algo.Provider) + genTaskAndProviders(task *response.TaskInfo, dbEngin *gorm.DB) (*algo.Task, []*algo.Provider) } type providerParams struct { diff --git a/api/internal/pkg/scheduler/hpcScheduler.go b/pkg/scheduler/hpcScheduler.go similarity index 68% rename from api/internal/pkg/scheduler/hpcScheduler.go rename to pkg/scheduler/hpcScheduler.go index 2176e3d4..9cb17483 100644 --- a/api/internal/pkg/scheduler/hpcScheduler.go +++ b/pkg/scheduler/hpcScheduler.go @@ -1,10 +1,10 @@ package scheduler import ( - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/algo" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/pkg/response" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/scheduler/algo" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gorm.io/gorm" ) @@ -16,15 +16,15 @@ func NewHpcScheduler(val string) *hpcScheduler { return &hpcScheduler{yamlString: val} } -func (h *hpcScheduler) getNewStructForDb(task *types.TaskInfo, participantId int64) (interface{}, error) { - hpc := model.Hpc{ - Id: tool.GenSnowflakeID(), +func (h *hpcScheduler) getNewStructForDb(task *response.TaskInfo, participantId int64) (interface{}, error) { + hpc := models.Hpc{ + Id: utils.GenSnowflakeID(), TaskId: task.TaskId, Status: "Saved", ParticipantId: participantId, YamlString: h.yamlString, } - tool.Convert(task.Metadata, &hpc) + utils.Convert(task.Metadata, &hpc) return hpc, nil } @@ -32,7 +32,7 @@ func (h *hpcScheduler) pickOptimalStrategy(task *algo.Task, providers ...*algo.P return nil, nil } -func (h *hpcScheduler) genTaskAndProviders(task *types.TaskInfo, dbEngin *gorm.DB) (*algo.Task, []*algo.Provider) { +func (h *hpcScheduler) genTaskAndProviders(task *response.TaskInfo, dbEngin *gorm.DB) (*algo.Task, []*algo.Provider) { var proParams []providerParams sqlstr := "SELECT SUM(a.disk_avail) as disk_avail,SUM(a.mem_avail) as mem_avail,SUM(a.cpu_total * a.cpu_usable) as cpu_avail,participant_id from (SELECT * from sc_node_avail_info where created_time in (SELECT MAX(created_time) as time from sc_node_avail_info where deleted_flag = 0 GROUP BY participant_id,node_name)) a GROUP BY a.participant_id" dbEngin.Raw(sqlstr).Scan(&proParams) diff --git a/api/internal/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go similarity index 93% rename from api/internal/pkg/scheduler/scheduler.go rename to pkg/scheduler/scheduler.go index c677ea4e..e19866f6 100644 --- a/api/internal/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -4,20 +4,20 @@ import ( "encoding/json" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/logx" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/algo" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/pkg/response" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/scheduler/algo" "gorm.io/gorm" ) type scheduler struct { - task *types.TaskInfo + task *response.TaskInfo participantIds []int64 scheduleService scheduleService dbEngin *gorm.DB } func NewScheduler(scheduleService scheduleService, val string, dbEngin *gorm.DB) (*scheduler, error) { - var task *types.TaskInfo + var task *response.TaskInfo err := json.Unmarshal([]byte(val), &task) if err != nil { return nil, errors.New("create scheduler failed : " + err.Error()) diff --git a/pkg/utils/cloud.go b/pkg/utils/cloud.go new file mode 100644 index 00000000..3786e8fd --- /dev/null +++ b/pkg/utils/cloud.go @@ -0,0 +1,80 @@ +package utils + +import ( + "bufio" + "fmt" + "io" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/restmapper" + "os" + "sigs.k8s.io/yaml" + "strings" +) + +type PConfig struct { + ParticipantId int64 +} + +// GetGVR 获取GVR +func GetGVR(clientSet *kubernetes.Clientset, gvk schema.GroupVersionKind) (schema.GroupVersionResource, error) { + gr, err := restmapper.GetAPIGroupResources(clientSet) + if err != nil { + return schema.GroupVersionResource{}, err + } + + mapper := restmapper.NewDiscoveryRESTMapper(gr) + + mapping, err := mapper.RESTMapping(gvk.GroupKind(), gvk.Version) + if err != nil { + return schema.GroupVersionResource{}, err + } + + return mapping.Resource, nil +} + +// UpdateParticipantId 更新本地配置文件ParticipantId +func UpdateParticipantId(filePath string, value string) error { + file, err := os.OpenFile(filePath, os.O_RDWR, 0) + if err != nil { + return err + } + reader := bufio.NewReader(file) + pos := int64(0) + for { + //读取每一行内容 + line, err := reader.ReadString('\n') + if err != nil && err != io.EOF { + fmt.Println("Read file error!", err) + return err + } + //根据关键词覆盖当前行 + if strings.Contains(line, "ParticipantId") { + bytes := []byte("ParticipantId: " + value) + file.WriteAt(bytes, pos) + } + //每一行读取完后记录位置 + pos += int64(len(line)) + //读到末尾 + if err != nil && err == io.EOF { + fmt.Println("File read ok!") + break + } + } + return nil +} + +// GetParticipantId 获取本地配置文件中的ParticipantId +func GetParticipantId(filePath string) (int64, error) { + pConfig := PConfig{} + file, err := os.OpenFile(filePath, os.O_RDONLY, 0) + if err != nil { + return 0, err + } + bytes, err := io.ReadAll(file) + if err != nil { + return 0, err + } + yaml.Unmarshal(bytes, &pConfig) + return pConfig.ParticipantId, nil +} diff --git a/pkg/utils/convert.go b/pkg/utils/convert.go new file mode 100644 index 00000000..2e60041d --- /dev/null +++ b/pkg/utils/convert.go @@ -0,0 +1,103 @@ +package utils + +import ( + "encoding/json" + "fmt" + "github.com/robfig/cron/v3" + "io" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "k8s.io/apimachinery/pkg/runtime" + "mime/multipart" + "sigs.k8s.io/yaml" + "strconv" + "strings" +) + +// Convert 通过JSON赋值 +func Convert(source interface{}, target interface{}) { + jsonByte, _ := json.Marshal(source) + json.Unmarshal(jsonByte, &target) +} + +// Int64ToString int64转string +func Int64ToString(value int64) string { + return strconv.FormatInt(value, 10) +} + +// EntryIdToString EntryID转string +func EntryIdToString(id cron.EntryID) string { + return strconv.Itoa(int(id)) +} + +func StringToInt(value string) int { + intValue, _ := strconv.Atoi(value) + return intValue +} +func StringToInt64(value string) int64 { + intValue, _ := strconv.ParseInt(value, 10, 64) + return intValue +} + +func StringToFloat64(value string) float64 { + floatValue, _ := strconv.ParseFloat(value, 64) + return floatValue +} + +func RunTimeToSeconds(runTime string) int { + time := strings.Split(runTime, ":") + day, _ := strconv.Atoi(time[0]) + hour, _ := strconv.Atoi(time[1]) + seconds, _ := strconv.Atoi(time[2]) + return day*3600 + hour*60 + seconds +} + +func Yaml2struct(fileHeader *multipart.FileHeader, req interface{}) error { + file, err := fileHeader.Open() + if err != nil { + return err + } + fileByte, err := io.ReadAll(file) + if err != nil { + return err + } + err = yaml.Unmarshal(fileByte, &req) + if err != nil { + return err + } + return nil +} + +func K8sUnstructured(dataString string, target interface{}) { + unstructuredList := unstructured.UnstructuredList{} + json.Unmarshal([]byte(dataString), &unstructuredList) + runtime.DefaultUnstructuredConverter.FromUnstructured(unstructuredList.UnstructuredContent(), target) +} + +// removeDuplication_map 去重数组 +func RemoveDuplication_map(arr []string) []string { + set := make(map[string]struct{}, len(arr)) + j := 0 + for _, v := range arr { + _, ok := set[v] + if ok { + continue + } + set[v] = struct{}{} + arr[j] = v + j++ + } + return arr[:j] +} + +func ConvertStructToMap(in interface{}) map[string]string { + out := make(map[string]string) + + b, _ := json.Marshal(&in) + var m map[string]interface{} + _ = json.Unmarshal(b, &m) + + for k, v := range m { + out[k] = fmt.Sprintf("%v", v) + } + return out +} diff --git a/pkg/utils/copier.go b/pkg/utils/copier.go new file mode 100644 index 00000000..201c3a9a --- /dev/null +++ b/pkg/utils/copier.go @@ -0,0 +1,50 @@ +package utils + +import ( + "github.com/jinzhu/copier" + "github.com/pkg/errors" + "strconv" + "time" +) + +var Converters = []copier.TypeConverter{ + { + SrcType: time.Time{}, + DstType: copier.String, + Fn: func(src interface{}) (interface{}, error) { + s, ok := src.(time.Time) + + if !ok { + return nil, errors.New("src type not matching") + } + + return s.Format(time.RFC3339), nil + }, + }, + { + SrcType: copier.String, + DstType: copier.Int, + Fn: func(src interface{}) (interface{}, error) { + s, ok := src.(string) + + if !ok { + return nil, errors.New("src type not matching") + } + + return strconv.Atoi(s) + }, + }, + { + SrcType: copier.String, + DstType: copier.Bool, + Fn: func(src interface{}) (interface{}, error) { + s, ok := src.(string) + + if !ok { + return nil, errors.New("src type not matching") + } + + return strconv.ParseBool(s) + }, + }, +} diff --git a/pkg/utils/decimal.go b/pkg/utils/decimal.go new file mode 100644 index 00000000..731ab9b7 --- /dev/null +++ b/pkg/utils/decimal.go @@ -0,0 +1,11 @@ +package utils + +import ( + "fmt" + "strconv" +) + +func FloatConv(num float64) float64 { + num, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", num), 64) + return num +} diff --git a/pkg/utils/fileutils/file.go b/pkg/utils/fileutils/file.go new file mode 100644 index 00000000..fdcec3c2 --- /dev/null +++ b/pkg/utils/fileutils/file.go @@ -0,0 +1,30 @@ +package fileutils + +import ( + "os" + "path/filepath" +) + +// DirSize 获取整体文件夹大小 +func GetDirSize(path string) (int64, error) { + var size int64 + err := filepath.Walk(path, func(_ string, info os.FileInfo, err error) error { + if !info.IsDir() { + size += info.Size() + } + return err + }) + return size, err +} + +// PathExists 判断文件夹是否存在 +func PathExists(path string) (bool, error) { + _, err := os.Stat(path) + if err == nil { + return true, nil + } + if os.IsNotExist(err) { + return false, nil + } + return false, err +} diff --git a/pkg/utils/httputils/http.go b/pkg/utils/httputils/http.go new file mode 100644 index 00000000..c654cd7f --- /dev/null +++ b/pkg/utils/httputils/http.go @@ -0,0 +1,205 @@ +package httputils + +import ( + "bytes" + "crypto/tls" + "encoding/json" + "github.com/go-resty/resty/v2" + "io" + "io/ioutil" + "log" + "net/http" + "reflect" + "strconv" + "time" +) + +const ( + GET = "GET" + PUT = "PUT" + POST = "POST" + DELETE = "DELETE" +) +const ( + ContentType = "Content-Type" + ApplicationJson = "application/json" + ApplicationFromUrlencoded = "application/x-www-from-urlencoded" +) + +var httpClient *resty.Client = nil +var httpsClient *resty.Client = nil + +func NewHttpsClient() *resty.Client { + if httpsClient != nil { + return httpsClient + } + + c := resty.New() + c.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true}) + c.SetTimeout(5 * time.Second) + c.SetRetryCount(3) + + //debug := nacos.GetConfig("httpclient.debug") + debug := "true" + if len(debug) > 0 && debug == "ON" { + c.SetDebug(true) + } + + httpsClient = c + return c +} + +func GetACHttpRequest() *resty.Request { + + client := resty.New() + request := client.R() + return request +} + +func HttpClient(method string, url string, payload io.Reader, token string) ([]byte, error) { + request, err := http.NewRequest(method, url, payload) + request.Header.Add("Content-Type", "application/json") + request.Header.Add("User-Agent", "API Explorer") + request.Header.Add("x-auth-token", token) + client := &http.Client{} + res, err := client.Do(request) + if err != nil { + log.Fatal(err) + } + defer res.Body.Close() + body, err := io.ReadAll(res.Body) + if err != nil { + log.Fatal(err) + } + + return body, err +} + +func HttpGet(method string, url string) ([]byte, error) { + request, err := http.NewRequest(method, url, nil) + client := &http.Client{} + res, err := client.Do(request) + if err != nil { + log.Fatal(err) + } + defer res.Body.Close() + body, err := io.ReadAll(res.Body) + if err != nil { + log.Fatal(err) + } + + return body, err +} + +// 发送POST请求 +// url:请求地址，data:POST请求提交的数据,contentType:请求体格式，如：application/json +// content:请求放回的内容 +func HttpPost(url string, data interface{}) (content string, err error) { + jsonStr, _ := json.Marshal(data) + req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr)) + req.Header.Add("content-type", "application/json") + if err != nil { + return + } + defer req.Body.Close() + + client := &http.Client{Timeout: 5 * time.Second} + resp, err := client.Do(req) + if err != nil { + return + } + defer resp.Body.Close() + + result, _ := ioutil.ReadAll(resp.Body) + content = string(result) + return +} + +func HttpClientStatusCode(method string, url string, payload io.Reader, token string) (int, error) { + request, err := http.NewRequest(method, url, payload) + request.Header.Add("Content-Type", "application/json") + request.Header.Add("User-Agent", "API Explorer") + request.Header.Add("x-auth-token", token) + + client := &http.Client{} + res, err := client.Do(request) + if err != nil { + log.Fatal(err) + } + + return res.StatusCode, err +} + +func HttpClientWithQueries[T any](method string, url string, payload io.Reader, token string, param T) ([]byte, error) { + request, err := http.NewRequest(method, url, payload) + request.Header.Add("Content-Type", "application/json") + request.Header.Add("User-Agent", "API Explorer") + request.Header.Add("x-auth-token", token) + + convertStructToQueryUrl(request, param) + + client := &http.Client{} + res, err := client.Do(request) + if err != nil { + log.Fatal(err) + } + defer res.Body.Close() + body, err := io.ReadAll(res.Body) + if err != nil { + log.Fatal(err) + } + + return body, err +} + +func convertStructToQueryUrl[T any](request *http.Request, param T) { + + query := request.URL.Query() + values := reflect.ValueOf(param) + + types := values.Type() + for i := 0; i < values.NumField(); i++ { + if !values.Field(i).IsZero() { + if values.Field(i).CanInt() { + query.Add(types.Field(i).Name, strconv.FormatInt(values.Field(i).Int(), 10)) + } else if values.Field(i).Kind() == reflect.Bool { + query.Add(types.Field(i).Name, strconv.FormatBool(values.Field(i).Bool())) + } else { + query.Add(types.Field(i).Name, values.Field(i).String()) + } + } + } + + request.URL.RawQuery = query.Encode() +} + +func HttpClientWithBodyAndCode(method string, url string, payload io.Reader, token string) (int, []byte, error) { + request, err := http.NewRequest(method, url, payload) + request.Header.Add("Content-Type", "application/json") + request.Header.Add("User-Agent", "API Explorer") + request.Header.Add("x-auth-token", token) + + client := &http.Client{} + res, err := client.Do(request) + if err != nil { + log.Fatal(err) + } + defer res.Body.Close() + body, err := io.ReadAll(res.Body) + + return res.StatusCode, body, err +} + +func HttpClientWithScreen(method string, url string, payload io.Reader) (int, []byte, error) { + request, err := http.NewRequest(method, url, payload) + + client := &http.Client{} + res, err := client.Do(request) + if err != nil { + log.Fatal(err) + } + defer res.Body.Close() + body, err := io.ReadAll(res.Body) + + return res.StatusCode, body, err +} diff --git a/pkg/utils/snowflake.go b/pkg/utils/snowflake.go new file mode 100644 index 00000000..908d146e --- /dev/null +++ b/pkg/utils/snowflake.go @@ -0,0 +1,24 @@ +package utils + +import ( + "github.com/bwmarrin/snowflake" + "github.com/nacos-group/nacos-sdk-go/v2/common/logger" +) + +var node *snowflake.Node + +func InitSnowflake(machineID int64) (err error) { + node, err = snowflake.NewNode(machineID) + if err != nil { + logger.Errorf("snowflake Init error : s%", err) + return + } + + return +} + +// GenSnowflakeID 生成雪花算法id +// machineId 工作id +func GenSnowflakeID() int64 { + return node.Generate().Int64() +} diff --git a/pkg/utils/string.go b/pkg/utils/string.go new file mode 100644 index 00000000..2eb71312 --- /dev/null +++ b/pkg/utils/string.go @@ -0,0 +1,17 @@ +package utils + +import ( + "math/rand" + "strings" +) + +const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + +func RandomString(n int) string { + sb := strings.Builder{} + sb.Grow(n) + for i := 0; i < n; i++ { + sb.WriteByte(charset[rand.Intn(len(charset))]) + } + return sb.String() +} diff --git a/pkg/utils/timeutils/time.go b/pkg/utils/timeutils/time.go new file mode 100644 index 00000000..09b4d2c3 --- /dev/null +++ b/pkg/utils/timeutils/time.go @@ -0,0 +1,49 @@ +package timeutils + +import ( + "time" +) + +var timeTemplates = []string{ + "2006-01-02 15:04:05", //常规类型 + "2006/01/02 15:04:05", + "2006-01-02", + "2006/01/02", + "15:04:05", +} + +func GetTimeDurationString(startTime string, endTime string) string { + end, _ := time.Parse("2006-01-02 15:04:05", endTime) + start, _ := time.Parse("2006-01-02 15:04:05", startTime) + difference := end.Sub(start) + return difference.Truncate(time.Second).String() +} + +func DurationToDateTime(timeData uint64) time.Time { + timeString := time.Unix(int64(timeData), 0).Format("2006-01-02 15:04:05") + return TimeStringToGoTime(timeString) +} + +// TimeStringToGoTime 时间格式字符串转换 +func TimeStringToGoTime(tm string) time.Time { + for i := range timeTemplates { + t, err := time.ParseInLocation(timeTemplates[i], tm, time.Local) + if nil == err && !t.IsZero() { + return t + } + } + return time.Time{} +} + +func TimeStringRemoveZone(tm string) string { + timeZone, _ := time.Parse("2006-01-02 15:04:05 -0700 MST", tm) + return timeZone.Format("2006-01-02 15:04:05") +} + +func TimeRemoveZone(tm time.Time) time.Time { + parse, err := time.Parse("2006-01-02 15:04:05", tm.Format("2006-01-02 15:04:05")) + if err != nil { + return time.Time{} + } + return parse +} diff --git a/rpc/internal/logic/cronlogic.go b/rpc/internal/cron/cronlogic.go similarity index 90% rename from rpc/internal/logic/cronlogic.go rename to rpc/internal/cron/cronlogic.go index 70acd60b..83ac915c 100644 --- a/rpc/internal/logic/cronlogic.go +++ b/rpc/internal/cron/cronlogic.go @@ -1,8 +1,8 @@ -package logic +package cron import ( "github.com/zeromicro/go-zero/core/logx" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/svc" "gorm.io/gorm" "strings" @@ -12,7 +12,7 @@ func InitCron(svc *svc.ServiceContext) { svc.Cron.Start() svc.Cron.AddFunc("*/5 * * * * ?", func() { - var tasks []model.Task + var tasks []models.Task svc.DbEngin.Not("status = ?", "Completed").Find(&tasks) for _, task := range tasks { var allStatus string @@ -39,7 +39,7 @@ func InitCron(svc *svc.ServiceContext) { }) } -func updateTask(dbEngin *gorm.DB, task *model.Task, status string) { +func updateTask(dbEngin *gorm.DB, task *models.Task, status string) { if task.Status != status { task.Status = status dbEngin.Updates(&task) diff --git a/rpc/internal/logic/participantservice/listphyavailablelogic.go b/rpc/internal/logic/participantservice/listphyavailablelogic.go index a290f567..3275bc3e 100644 --- a/rpc/internal/logic/participantservice/listphyavailablelogic.go +++ b/rpc/internal/logic/participantservice/listphyavailablelogic.go @@ -2,13 +2,11 @@ package participantservicelogic import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" - + "github.com/zeromicro/go-zero/core/logx" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/pcmCore" - - "github.com/zeromicro/go-zero/core/logx" ) type ListPhyAvailableLogic struct { @@ -29,9 +27,9 @@ func NewListPhyAvailableLogic(ctx context.Context, svcCtx *svc.ServiceContext) * func (l *ListPhyAvailableLogic) ListPhyAvailable(in *pcmCore.ParticipantTenant) (*pcmCore.ListParticipantAvailResp, error) { // todo: add your logic here and delete this line resp := &pcmCore.ListParticipantAvailResp{} - var scParticipantPhyInfoS []model.ScParticipantAvailInfo + var scParticipantPhyInfoS []models.ScParticipantAvailInfo //查询集群静态信息列表 l.svcCtx.DbEngin.Find(&scParticipantPhyInfoS) - tool.Convert(scParticipantPhyInfoS, &resp.ParticipantAvails) + utils.Convert(scParticipantPhyInfoS, &resp.ParticipantAvails) return resp, nil } diff --git a/rpc/internal/logic/participantservice/listphyinformationlogic.go b/rpc/internal/logic/participantservice/listphyinformationlogic.go index 9a99982b..2243f1ad 100644 --- a/rpc/internal/logic/participantservice/listphyinformationlogic.go +++ b/rpc/internal/logic/participantservice/listphyinformationlogic.go @@ -2,9 +2,8 @@ package participantservicelogic import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" - + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/pcmCore" @@ -29,9 +28,9 @@ func NewListPhyInformationLogic(ctx context.Context, svcCtx *svc.ServiceContext) func (l *ListPhyInformationLogic) ListPhyInformation(in *pcmCore.ParticipantTenant) (*pcmCore.ListParticipantPhyResp, error) { // todo: add your logic here and delete this line resp := &pcmCore.ListParticipantPhyResp{} - var scParticipantPhyInfoS []model.ScParticipantPhyInfo + var scParticipantPhyInfoS []models.ScParticipantPhyInfo //查询集群静态信息列表 l.svcCtx.DbEngin.Find(&scParticipantPhyInfoS) - tool.Convert(scParticipantPhyInfoS, &resp.ParticipantPhys) + utils.Convert(scParticipantPhyInfoS, &resp.ParticipantPhys) return resp, nil } diff --git a/rpc/internal/logic/participantservice/listtenantlogic.go b/rpc/internal/logic/participantservice/listtenantlogic.go index dc6ff5a3..6adb7188 100644 --- a/rpc/internal/logic/participantservice/listtenantlogic.go +++ b/rpc/internal/logic/participantservice/listtenantlogic.go @@ -2,9 +2,8 @@ package participantservicelogic import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" - + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/pcmCore" @@ -28,10 +27,10 @@ func NewListTenantLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListTe // listTenant 租户列表信息 func (l *ListTenantLogic) ListTenant(in *pcmCore.TenantInfo) (*pcmCore.ListTenantResp, error) { resp := &pcmCore.ListTenantResp{} - var scTenantInfos []model.ScTenantInfo + var scTenantInfos []models.ScTenantInfo //查询集群静态信息列表 l.svcCtx.DbEngin.Find(&scTenantInfos) - tool.Convert(scTenantInfos, &resp.TenantInfos) + utils.Convert(scTenantInfos, &resp.TenantInfos) resp.Code = 200 resp.Msg = "success" return resp, nil diff --git a/rpc/internal/logic/participantservice/registerparticipantlogic.go b/rpc/internal/logic/participantservice/registerparticipantlogic.go index c7cd066c..4b560efb 100644 --- a/rpc/internal/logic/participantservice/registerparticipantlogic.go +++ b/rpc/internal/logic/participantservice/registerparticipantlogic.go @@ -3,8 +3,8 @@ package participantservicelogic import ( "context" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" + models2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gorm.io/gorm" "time" @@ -45,56 +45,56 @@ func (l *RegisterParticipantLogic) RegisterParticipant(in *pcmCore.ParticipantPh logx.Info("commit success") } }() - participantInfo := &model.ScParticipantPhyInfo{} - tool.Convert(in, participantInfo) + participantInfo := &models2.ScParticipantPhyInfo{} + utils.Convert(in, participantInfo) if in.ParticipantId == 0 { - participantInfo.Id = tool.GenSnowflakeID() + participantInfo.Id = utils.GenSnowflakeID() } else { participantInfo.Id = in.ParticipantId } //保存participant静态信息 result := db.Save(&participantInfo) //保存节点信息 - nodeList := make([]*model.ScNodePhyInfo, 0) + nodeList := make([]*models2.ScNodePhyInfo, 0) for _, info := range in.NodeInfo { - nodeInfo := &model.ScNodePhyInfo{} - tool.Convert(info, nodeInfo) + nodeInfo := &models2.ScNodePhyInfo{} + utils.Convert(info, nodeInfo) nodeInfo.CreatedTime = time.Now() nodeInfo.ParticipantId = participantInfo.Id //查询节点name与ParticipantId是否存在 - nodeErr := db.Where(&model.ScNodePhyInfo{NodeName: nodeInfo.NodeName, ParticipantId: in.ParticipantId}).Take(nodeInfo) + nodeErr := db.Where(&models2.ScNodePhyInfo{NodeName: nodeInfo.NodeName, ParticipantId: in.ParticipantId}).Take(nodeInfo) if errors.Is(nodeErr.Error, gorm.ErrRecordNotFound) { - nodeInfo.Id = tool.GenSnowflakeID() + nodeInfo.Id = utils.GenSnowflakeID() } nodeList = append(nodeList, nodeInfo) } result = db.Save(&nodeList) //保存队列信息 - queueList := make([]*model.ScQueuePhyInfo, 0) + queueList := make([]*models2.ScQueuePhyInfo, 0) for _, info := range in.QueueInfo { - queueInfo := &model.ScQueuePhyInfo{} - tool.Convert(info, queueInfo) + queueInfo := &models2.ScQueuePhyInfo{} + utils.Convert(info, queueInfo) queueInfo.CreatedTime = time.Now() queueInfo.ParticipantId = participantInfo.Id //查询队列name与ParticipantId是否存在 - queueErr := db.Where(&model.ScQueuePhyInfo{QueueName: queueInfo.QueueName, ParticipantId: in.ParticipantId}).Take(queueInfo) + queueErr := db.Where(&models2.ScQueuePhyInfo{QueueName: queueInfo.QueueName, ParticipantId: in.ParticipantId}).Take(queueInfo) if errors.Is(queueErr.Error, gorm.ErrRecordNotFound) { - queueInfo.Id = tool.GenSnowflakeID() + queueInfo.Id = utils.GenSnowflakeID() } queueList = append(queueList, queueInfo) } result = db.Save(&queueList) //保存标签信息 - labelList := make([]*model.ScParticipantLabelInfo, 0) + labelList := make([]*models2.ScParticipantLabelInfo, 0) for _, label := range in.LabelInfo { - labelInfo := &model.ScParticipantLabelInfo{} - tool.Convert(label, labelInfo) + labelInfo := &models2.ScParticipantLabelInfo{} + utils.Convert(label, labelInfo) labelInfo.CreatedTime = time.Now() labelInfo.ParticipantId = participantInfo.Id //查询标签key value与ParticipantId是否存在 - labelErr := db.Where(&model.ScParticipantLabelInfo{Key: labelInfo.Key, Value: labelInfo.Value, ParticipantId: in.ParticipantId}).Take(labelInfo) + labelErr := db.Where(&models2.ScParticipantLabelInfo{Key: labelInfo.Key, Value: labelInfo.Value, ParticipantId: in.ParticipantId}).Take(labelInfo) if errors.Is(labelErr.Error, gorm.ErrRecordNotFound) { - labelInfo.Id = tool.GenSnowflakeID() + labelInfo.Id = utils.GenSnowflakeID() } labelList = append(labelList, labelInfo) } diff --git a/rpc/internal/logic/participantservice/registertenantlogic.go b/rpc/internal/logic/participantservice/registertenantlogic.go index 79fb3370..f89c1f96 100644 --- a/rpc/internal/logic/participantservice/registertenantlogic.go +++ b/rpc/internal/logic/participantservice/registertenantlogic.go @@ -2,12 +2,11 @@ package participantservicelogic import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" - "time" - + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/pcmCore" + "time" "github.com/zeromicro/go-zero/core/logx" ) @@ -29,9 +28,9 @@ func NewRegisterTenantLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Re // registerTenant 注册租户信息 func (l *RegisterTenantLogic) RegisterTenant(in *pcmCore.TenantInfo) (*pcmCore.TenantResp, error) { // todo: add your logic here and delete this line - tenantInfo := &model.ScTenantInfo{} - tool.Convert(in, tenantInfo) - tenantInfo.Id = tool.GenSnowflakeID() + tenantInfo := &models.ScTenantInfo{} + utils.Convert(in, tenantInfo) + tenantInfo.Id = utils.GenSnowflakeID() tenantInfo.CreatedTime = time.Now() tx := l.svcCtx.DbEngin.Save(&tenantInfo) if tx.Error != nil { diff --git a/rpc/internal/logic/participantservice/reportavailablelogic.go b/rpc/internal/logic/participantservice/reportavailablelogic.go index dcf1a947..cf3b3b1c 100644 --- a/rpc/internal/logic/participantservice/reportavailablelogic.go +++ b/rpc/internal/logic/participantservice/reportavailablelogic.go @@ -4,13 +4,12 @@ import ( "context" "fmt" "github.com/pkg/errors" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "gitlink.org.cn/jcce-pcm/utils/tool" - "gorm.io/gorm" - "time" - + models2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/svc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/pcmCore" + "gorm.io/gorm" + "time" "github.com/zeromicro/go-zero/core/logx" ) @@ -46,7 +45,7 @@ func (l *ReportAvailableLogic) ReportAvailable(in *pcmCore.ParticipantAvailReq) } }() //判断Participant静态信息是否存在 - participantPhyInfo := &model.ScParticipantPhyInfo{} + participantPhyInfo := &models2.ScParticipantPhyInfo{} participantPhyInfo.Id = in.ParticipantId if in.ParticipantId == 0 { return &pcmCore.ParticipantResp{ @@ -61,23 +60,23 @@ func (l *ReportAvailableLogic) ReportAvailable(in *pcmCore.ParticipantAvailReq) }, nil } - participantAvailInfo := &model.ScParticipantAvailInfo{} - tool.Convert(in, participantAvailInfo) + participantAvailInfo := &models2.ScParticipantAvailInfo{} + utils.Convert(in, participantAvailInfo) if in.Id == 0 { - participantAvailInfo.Id = tool.GenSnowflakeID() + participantAvailInfo.Id = utils.GenSnowflakeID() } participantAvailInfo.CreatedTime = time.Now() //保存participant动态信息 result := db.Save(&participantAvailInfo) //保存节点信息 - nodeList := make([]*model.ScNodeAvailInfo, 0) + nodeList := make([]*models2.ScNodeAvailInfo, 0) for _, info := range in.NodeAvailInfo { - nodeInfo := &model.ScNodeAvailInfo{} - tool.Convert(info, nodeInfo) + nodeInfo := &models2.ScNodeAvailInfo{} + utils.Convert(info, nodeInfo) nodeInfo.CreatedTime = time.Now() nodeInfo.ParticipantId = participantAvailInfo.ParticipantId if nodeInfo.Id == 0 { - nodeInfo.Id = tool.GenSnowflakeID() + nodeInfo.Id = utils.GenSnowflakeID() } nodeList = append(nodeList, nodeInfo) } diff --git a/rpc/internal/logic/pcmcore/infolistlogic.go b/rpc/internal/logic/pcmcore/infolistlogic.go index 26acabbe..c8379f85 100644 --- a/rpc/internal/logic/pcmcore/infolistlogic.go +++ b/rpc/internal/logic/pcmcore/infolistlogic.go @@ -2,12 +2,11 @@ package pcmcorelogic import ( "context" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/model" - "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/tool" - "github.com/zeromicro/go-zero/core/logx" + models2 "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/client/pcmcore" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/svc" ) type InfoListLogic struct { @@ -25,36 +24,36 @@ func NewInfoListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *InfoList } // InfoList -func (l *InfoListLogic) InfoList(in *pcmCore.InfoListReq) (*pcmCore.InfoListResp, error) { - result := pcmCore.InfoListResp{} +func (l *InfoListLogic) InfoList(in *pcmcore.InfoListReq) (*pcmcore.InfoListResp, error) { + result := pcmcore.InfoListResp{} // 查询云智超中的数据列表 switch in.Kind { case "hpc": - var hpcModelList []model.Hpc + var hpcModelList []models2.Hpc tx := l.svcCtx.DbEngin.Where("participant_id = ? AND status NOT IN ?", in.ParticipantId, []string{"Deleted", "Succeed", "Completed"}).Find(&hpcModelList) if tx.Error != nil { return nil, tx.Error } - var hpcInfoList []*pcmCore.HpcInfo - tool.Convert(hpcModelList, &hpcInfoList) + var hpcInfoList []*pcmcore.HpcInfo + utils.Convert(hpcModelList, &hpcInfoList) result.HpcInfoList = hpcInfoList case "cloud": - var cloudModelList []model.Cloud + var cloudModelList []models2.Cloud tx := l.svcCtx.DbEngin.Where("participant_id = ? AND status NOT IN ?", in.ParticipantId, []string{"Deleted", "Succeed", "Completed"}).Find(&cloudModelList) if tx.Error != nil { return nil, tx.Error } - var cloudInfoList []*pcmCore.CloudInfo - tool.Convert(cloudModelList, &cloudInfoList) + var cloudInfoList []*pcmcore.CloudInfo + utils.Convert(cloudModelList, &cloudInfoList) result.CloudInfoList = cloudInfoList case "ai": - var aiModelList []model.Ai + var aiModelList []models2.Ai tx := l.svcCtx.DbEngin.Where("participant_id = ? AND status NOT IN ?", in.ParticipantId, []string{"Deleted", "Succeed", "Completed"}).Find(&aiModelList) if tx.Error != nil { return nil, tx.Error } - var aiInfoList []*pcmCore.AiInfo - tool.Convert(aiModelList, &aiInfoList) + var aiInfoList []*pcmcore.AiInfo + utils.Convert(aiModelList, &aiInfoList) result.AiInfoList = aiInfoList } return &result, nil diff --git a/rpc/internal/svc/servicecontext.go b/rpc/internal/svc/servicecontext.go index 25d8e72b..b0399d65 100644 --- a/rpc/internal/svc/servicecontext.go +++ b/rpc/internal/svc/servicecontext.go @@ -5,8 +5,8 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/robfig/cron/v3" "github.com/zeromicro/go-zero/core/logx" + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/config" - "gitlink.org.cn/jcce-pcm/utils/tool" "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/logger" @@ -29,7 +29,7 @@ func NewServiceContext(c config.Config) *ServiceContext { Logger: logger.Default.LogMode(logger.Warn), }) //添加snowflake支持 - err := tool.InitSnowflake(c.SnowflakeConf.MachineId) + err := utils.InitSnowflake(c.SnowflakeConf.MachineId) if err != nil { logx.Errorf("InitSnowflake err: ", err) panic("InitSnowflake err") diff --git a/rpc/pcmcore.go b/rpc/pcmcore.go index 021a5ee3..3efb9a93 100644 --- a/rpc/pcmcore.go +++ b/rpc/pcmcore.go @@ -7,7 +7,7 @@ import ( "github.com/zeromicro/go-zero/core/service" "github.com/zeromicro/go-zero/zrpc" "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/config" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/rpc/internal/logic" + "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" @@ -61,7 +61,7 @@ func main() { defer s.Stop() // 初始化定时任务 - logic.InitCron(ctx) + cron.InitCron(ctx) logx.Infof("Starting rpc server at %s...\n", c.ListenOn) s.Start() }