diff --git a/adaptor/gateway/api/internal/handler/scheduletaskhandler.go b/adaptor/PCM-CORE/api/internal/handler/scheduletaskhandler.go similarity index 68% rename from adaptor/gateway/api/internal/handler/scheduletaskhandler.go rename to adaptor/PCM-CORE/api/internal/handler/scheduletaskhandler.go index 173e63a2..49a2de2c 100644 --- a/adaptor/gateway/api/internal/handler/scheduletaskhandler.go +++ b/adaptor/PCM-CORE/api/internal/handler/scheduletaskhandler.go @@ -1,12 +1,11 @@ package handler import ( - "PCM/common/tool" "net/http" - "PCM/adaptor/gateway/api/internal/logic" - "PCM/adaptor/gateway/api/internal/svc" - "PCM/adaptor/gateway/api/internal/types" + "PCM/adaptor/PCM-CORE/api/internal/logic" + "PCM/adaptor/PCM-CORE/api/internal/svc" + "PCM/adaptor/PCM-CORE/api/internal/types" "github.com/zeromicro/go-zero/rest/httpx" ) @@ -17,10 +16,8 @@ func scheduleTaskHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { httpx.ErrorCtx(r.Context(), w, err) return } + l := logic.NewScheduleTaskLogic(r.Context(), svcCtx) - // 解析yaml文件 - _, fileHeader, err := r.FormFile("file") - err = tool.Yaml2struct(fileHeader, &req) resp, err := l.ScheduleTask(&req) if err != nil { httpx.ErrorCtx(r.Context(), w, err) diff --git a/adaptor/slurm/slurmShuguang/rpc/internal/svc/servicecontext.go b/adaptor/PCM-HPC/PCM-AC/rpc/internal/svc/servicecontext.go similarity index 73% rename from adaptor/slurm/slurmShuguang/rpc/internal/svc/servicecontext.go rename to adaptor/PCM-HPC/PCM-AC/rpc/internal/svc/servicecontext.go index 9f4afa7e..bb855452 100644 --- a/adaptor/slurm/slurmShuguang/rpc/internal/svc/servicecontext.go +++ b/adaptor/PCM-HPC/PCM-AC/rpc/internal/svc/servicecontext.go @@ -1,6 +1,8 @@ package svc -import "PCM/adaptor/slurm/slurmShuguang/rpc/internal/config" +import ( + "PCM/adaptor/PCM-HPC/PCM-AC/rpc/internal/config" +) type ServiceContext struct { Config config.Config diff --git a/adaptor/slurm/slurmCore/api/slurmcore.go b/adaptor/PCM-HPC/PCM-HPC-CORE/api/slurmcore.go similarity index 57% rename from adaptor/slurm/slurmCore/api/slurmcore.go rename to adaptor/PCM-HPC/PCM-HPC-CORE/api/slurmcore.go index dd3d8260..aa30dd0d 100644 --- a/adaptor/slurm/slurmCore/api/slurmcore.go +++ b/adaptor/PCM-HPC/PCM-HPC-CORE/api/slurmcore.go @@ -1,18 +1,17 @@ package main import ( + "PCM/adaptor/PCM-HPC/PCM-HPC-CORE/api/internal/config" + "PCM/adaptor/PCM-HPC/PCM-HPC-CORE/api/internal/handler" + "PCM/adaptor/PCM-HPC/PCM-HPC-CORE/api/internal/svc" "flag" "fmt" - "PCM/adaptor/slurm/slurmCore/api/internal/config" - "PCM/adaptor/slurm/slurmCore/api/internal/handler" - "PCM/adaptor/slurm/slurmCore/api/internal/svc" - "github.com/zeromicro/go-zero/core/conf" "github.com/zeromicro/go-zero/rest" ) -var configFile = flag.String("f", "C:\\Users\\Administrator\\GolandProjects\\PCM\\adaptor\\slurm\\slurmCore\\api\\etc\\gateway-api.yaml", "the config file") +var configFile = flag.String("f", "adaptor/PCM-HPC/PCM-HPC-CORE/api/etc/slurmcore-api.yaml", "the config file") func main() { flag.Parse() diff --git a/adaptor/slurm/slurmTianhe/rpc/internal/svc/servicecontext.go b/adaptor/PCM-HPC/PCM-TH/rpc/internal/svc/servicecontext.go similarity index 73% rename from adaptor/slurm/slurmTianhe/rpc/internal/svc/servicecontext.go rename to adaptor/PCM-HPC/PCM-TH/rpc/internal/svc/servicecontext.go index 63be61a8..1bc428c8 100644 --- a/adaptor/slurm/slurmTianhe/rpc/internal/svc/servicecontext.go +++ b/adaptor/PCM-HPC/PCM-TH/rpc/internal/svc/servicecontext.go @@ -1,6 +1,8 @@ package svc -import "PCM/adaptor/slurm/slurmTianhe/rpc/internal/config" +import ( + "PCM/adaptor/PCM-HPC/PCM-TH/rpc/internal/config" +) type ServiceContext struct { Config config.Config