From c3cf9946c9e7aa3347381c07b78825a843ba94f1 Mon Sep 17 00:00:00 2001 From: tzwang Date: Mon, 10 Jul 2023 10:28:37 +0800 Subject: [PATCH] =?UTF-8?q?octopus=E4=BF=AE=E6=94=B9tokenservice=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: c6fb5065a61bf84a0a083a3b22cc098ac59320a4 --- .../rpc/internal/common/tokenService.go | 16 ++++-- .../rpc/internal/logic/createdatasetlogic.go | 6 ++ .../logic/createdatasetversionlogic.go | 6 ++ .../rpc/internal/logic/createimagelogic.go | 6 ++ .../internal/logic/createmodeldeploylogic.go | 6 ++ .../internal/logic/createmyalgorithmlogic.go | 6 ++ .../rpc/internal/logic/createnotebooklogic.go | 6 ++ .../rpc/internal/logic/createtrainjoblogic.go | 6 ++ .../rpc/internal/logic/deletedatasetlogic.go | 6 ++ .../logic/deletedatasetversionlogic.go | 6 ++ .../rpc/internal/logic/deleteimagelogic.go | 6 ++ .../internal/logic/deletemodeldeploylogic.go | 6 ++ .../internal/logic/deletemodelversionlogic.go | 6 ++ .../internal/logic/deletemyalgorithmlogic.go | 6 ++ .../rpc/internal/logic/deletemymodellogic.go | 6 ++ .../rpc/internal/logic/deletenotebooklogic.go | 6 ++ .../rpc/internal/logic/deletetrainjoblogic.go | 7 +++ .../internal/logic/downloadalgorithmlogic.go | 6 ++ .../logic/downloadmodelversionlogic.go | 6 ++ .../logic/getalgorithmapplylistlogic.go | 6 ++ .../logic/getalgorithmframeworklistlogic.go | 6 ++ .../internal/logic/getalgorithmlistlogic.go | 6 ++ .../rpc/internal/logic/getalgorithmlogic.go | 6 ++ .../internal/logic/getcomputingpowerlogic.go | 3 + .../logic/getdatasetapplylistlogic.go | 6 ++ .../internal/logic/getdatasettypelistlogic.go | 6 ++ .../logic/getdatasetversionlistlogic.go | 6 ++ .../rpc/internal/logic/getgeneralinfologic.go | 3 + .../logic/getmodeldeployeventlogic.go | 6 ++ .../internal/logic/getmodeldeploylistlogic.go | 6 ++ .../rpc/internal/logic/getmodeldeploylogic.go | 6 ++ .../logic/getmodelversionlistlogic.go | 6 ++ .../internal/logic/getmyalgorithmlistlogic.go | 6 ++ .../internal/logic/getmydatasetlistlogic.go | 6 ++ .../rpc/internal/logic/getmymodellistlogic.go | 6 ++ .../internal/logic/getnotebooklistlogic.go | 6 ++ .../rpc/internal/logic/getnotebooklogic.go | 6 ++ .../internal/logic/gettrainjobeventlogic.go | 6 ++ .../internal/logic/gettrainjoblistlogic.go | 6 ++ .../rpc/internal/logic/gettrainjoblogic.go | 6 ++ .../internal/logic/gettrainjobmetriclogic.go | 6 ++ .../internal/logic/getuserimagelistlogic.go | 6 ++ .../internal/logic/infermodeldeploylogic.go | 6 ++ .../rpc/internal/logic/startnotebooklogic.go | 6 ++ .../internal/logic/stopmodeldeploylogic.go | 6 ++ .../rpc/internal/logic/stopnotebooklogic.go | 6 ++ .../rpc/internal/logic/stoptrainjoblogic.go | 6 ++ .../logic/uploadalgorithmconfirmlogic.go | 6 ++ .../internal/logic/uploadalgorithmlogic.go | 6 ++ .../logic/uploaddatasetconfirmlogic.go | 6 ++ .../rpc/internal/logic/uploaddatasetlogic.go | 6 ++ .../internal/logic/uploadimageconfirmlogic.go | 6 ++ .../rpc/internal/logic/uploadimagelogic.go | 6 ++ .../logic/core/getcomputingpowerlogic.go | 57 +++++++++++++++++-- 54 files changed, 369 insertions(+), 11 deletions(-) diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common/tokenService.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common/tokenService.go index f71622f9..b2a1d38e 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common/tokenService.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common/tokenService.go @@ -40,6 +40,9 @@ func generateTokenMap() map[string]TokenTimePair { } for k, v := range urlMap { token, expiredAt := generateToken(jsonStr, v) + if token == "" { + continue + } tokenTimePair := TokenTimePair{ Token: token, ExpiredAt: expiredAt, @@ -67,18 +70,21 @@ func generateToken(jsonStr []byte, tokenUrl string) (string, time.Time) { func GetToken(kForToken string) string { if tokenMap[kForToken].Token == "" { - tokenMap = generateTokenMap() + return "" } tokenTimePair := tokenMap[kForToken] - if tokenTimePair.Token == "" { - return "" - } - if time.Now().After(tokenTimePair.ExpiredAt) { tokenMap = generateTokenMap() + + if tokenMap[kForToken].Token == "" { + return "" + } else { + return tokenMap[kForToken].Token + } } + return tokenTimePair.Token } diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createdatasetlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createdatasetlogic.go index 4c0b0ebf..a71c8653 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createdatasetlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createdatasetlogic.go @@ -6,7 +6,9 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" "PCM/common/tool" "context" + "errors" "github.com/zeromicro/go-zero/core/logx" + "log" ) type CreateDataSetLogic struct { @@ -30,6 +32,10 @@ func (l *CreateDataSetLogic) CreateDataSet(in *octopus.CreateDataSetReq) (*octop var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateDataSet token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createdatasetversionlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createdatasetversionlogic.go index 3764ade8..cab68be7 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createdatasetversionlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createdatasetversionlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *CreateDataSetVersionLogic) CreateDataSetVersion(in *octopus.CreateDataS var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateDataSetVersion token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createimagelogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createimagelogic.go index 4c7b0c07..91caf1bd 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createimagelogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createimagelogic.go @@ -6,6 +6,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" "PCM/common/tool" "context" + "errors" + "log" "github.com/zeromicro/go-zero/core/logx" ) @@ -31,6 +33,10 @@ func (l *CreateImageLogic) CreateImage(in *octopus.CreateImageReq) (*octopus.Cre var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateImage token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createmodeldeploylogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createmodeldeploylogic.go index 192e41fc..fd503ad0 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createmodeldeploylogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createmodeldeploylogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -33,6 +35,10 @@ func (l *CreateModelDeployLogic) CreateModelDeploy(in *octopus.CreateModelDeploy var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateModelDeploy token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createmyalgorithmlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createmyalgorithmlogic.go index 3afb5863..08237334 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createmyalgorithmlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createmyalgorithmlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *CreateMyAlgorithmLogic) CreateMyAlgorithm(in *octopus.CreateMyAlgorithm var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateMyAlgorithm token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createnotebooklogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createnotebooklogic.go index 585f307e..b172dca2 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createnotebooklogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createnotebooklogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *CreateNotebookLogic) CreateNotebook(in *octopus.CreateNotebookReq) (*oc var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateNotebook token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createtrainjoblogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createtrainjoblogic.go index 316c2590..7f7657a1 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createtrainjoblogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createtrainjoblogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -33,6 +35,10 @@ func (l *CreateTrainJobLogic) CreateTrainJob(in *octopus.CreateTrainJobReq) (*oc var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateTrainJob token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletedatasetlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletedatasetlogic.go index c8d135cb..ee947cb8 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletedatasetlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletedatasetlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *DeleteDataSetLogic) DeleteDataSet(in *octopus.DeleteDataSetReq) (*octop var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteDataSet token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletedatasetversionlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletedatasetversionlogic.go index 07202690..b8c1acd6 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletedatasetversionlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletedatasetversionlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *DeleteDataSetVersionLogic) DeleteDataSetVersion(in *octopus.DeleteDataS var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteDataSetVersion token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deleteimagelogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deleteimagelogic.go index 5c56ae0a..7069e275 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deleteimagelogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deleteimagelogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *DeleteImageLogic) DeleteImage(in *octopus.DeleteImageReq) (*octopus.Del var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteImage token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemodeldeploylogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemodeldeploylogic.go index f4f8cffc..e9b93e2d 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemodeldeploylogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemodeldeploylogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *DeleteModelDeployLogic) DeleteModelDeploy(in *octopus.DeleteModelDeploy var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteModelDeploy token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } var queryStr string for _, s := range in.GetJobIds() { diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemodelversionlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemodelversionlogic.go index 884dbfd7..76b15e76 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemodelversionlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemodelversionlogic.go @@ -6,6 +6,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" "PCM/common/tool" "context" + "errors" + "log" "github.com/zeromicro/go-zero/core/logx" ) @@ -31,6 +33,10 @@ func (l *DeleteModelVersionLogic) DeleteModelVersion(in *octopus.DeleteModelVers var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteModelVersion token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemyalgorithmlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemyalgorithmlogic.go index 5b528960..b658a7b9 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemyalgorithmlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemyalgorithmlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *DeleteMyAlgorithmLogic) DeleteMyAlgorithm(in *octopus.DeleteMyAlgorithm var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteMyAlgorithm token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemymodellogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemymodellogic.go index a9ea4a9c..67ade2e1 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemymodellogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletemymodellogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *DeleteMyModelLogic) DeleteMyModel(in *octopus.DeleteMyModelReq) (*octop var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteMyModel token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletenotebooklogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletenotebooklogic.go index 61696497..355ca4bc 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletenotebooklogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletenotebooklogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *DeleteNotebookLogic) DeleteNotebook(in *octopus.DeleteNotebookReq) (*oc var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteNotebook token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletetrainjoblogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletetrainjoblogic.go index 48367b66..36b87b41 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletetrainjoblogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/deletetrainjoblogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,11 @@ func (l *DeleteTrainJobLogic) DeleteTrainJob(in *octopus.DeleteTrainJobReq) (*oc var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DeleteTrainJob token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } + req := tool.GetACHttpRequest() var queryStr string diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/downloadalgorithmlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/downloadalgorithmlogic.go index 183d3aea..9ea620ea 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/downloadalgorithmlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/downloadalgorithmlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *DownloadAlgorithmLogic) DownloadAlgorithm(in *octopus.DownloadAlgorithm var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DownloadAlgorithm token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/downloadmodelversionlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/downloadmodelversionlogic.go index 579ac430..557b2956 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/downloadmodelversionlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/downloadmodelversionlogic.go @@ -6,6 +6,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" "PCM/common/tool" "context" + "errors" + "log" "github.com/zeromicro/go-zero/core/logx" ) @@ -31,6 +33,10 @@ func (l *DownloadModelVersionLogic) DownloadModelVersion(in *octopus.DownloadMod var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.DownloadModelVersion token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmapplylistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmapplylistlogic.go index 14e99329..8ff0c98a 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmapplylistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmapplylistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -33,6 +35,10 @@ func (l *GetAlgorithmApplyListLogic) GetAlgorithmApplyList(in *octopus.GetAlgori var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetAlgorithmApplyList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmframeworklistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmframeworklistlogic.go index 0b661edb..9323f8b3 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmframeworklistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmframeworklistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -33,6 +35,10 @@ func (l *GetAlgorithmFrameworkListLogic) GetAlgorithmFrameworkList(in *octopus.G var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetAlgorithmFrameworkList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmlistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmlistlogic.go index b78c6561..82359f23 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmlistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmlistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -33,6 +35,10 @@ func (l *GetAlgorithmListLogic) GetAlgorithmList(in *octopus.GetAlgorithmListReq var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetAlgorithmList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmlogic.go index 3da691fe..e70af2a2 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *GetAlgorithmLogic) GetAlgorithm(in *octopus.GetAlgorithmReq) (*octopus. var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetAlgorithm token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getcomputingpowerlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getcomputingpowerlogic.go index a861d518..db94c999 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getcomputingpowerlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getcomputingpowerlogic.go @@ -70,6 +70,9 @@ func getCPFromOctopus() float32 { var computingPowerInTops int32 for k, v := range urlMap { token := common.GetToken(k) + if token == "" { + continue + } body, err := common.OctopusHttpClient("GET", v, nil, token) if err != nil { continue diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasetapplylistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasetapplylistlogic.go index ae57156c..832ffd79 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasetapplylistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasetapplylistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -33,6 +35,10 @@ func (l *GetDatasetApplyListLogic) GetDatasetApplyList(in *octopus.GetDatasetApp var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetDatasetApplyList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasettypelistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasettypelistlogic.go index 5dcb148d..27a9333c 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasettypelistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasettypelistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -33,6 +35,10 @@ func (l *GetDatasetTypeListLogic) GetDatasetTypeList(in *octopus.GetDatasetTypeL var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetDatasetTypeList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasetversionlistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasetversionlistlogic.go index c953802e..18c05e87 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasetversionlistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasetversionlistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -33,6 +35,10 @@ func (l *GetDatasetVersionListLogic) GetDatasetVersionList(in *octopus.GetDatase var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetDatasetVersionList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getgeneralinfologic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getgeneralinfologic.go index 1e02bc4d..9b85bd6c 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getgeneralinfologic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getgeneralinfologic.go @@ -89,6 +89,9 @@ func getGeneralInfoFromOctopus() (int32, int32) { var memoryInGib int32 for k, v := range urlMap { token := common.GetToken(k) + if token == "" { + continue + } body, err := common.OctopusHttpClient("GET", v, nil, token) if err != nil { continue diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodeldeployeventlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodeldeployeventlogic.go index 78fc6877..95b24444 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodeldeployeventlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodeldeployeventlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -33,6 +35,10 @@ func (l *GetModelDeployEventLogic) GetModelDeployEvent(in *octopus.GetModelDeplo var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetModelDeployEvent token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodeldeploylistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodeldeploylistlogic.go index a93e6e31..6f594bc1 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodeldeploylistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodeldeploylistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -33,6 +35,10 @@ func (l *GetModelDeployListLogic) GetModelDeployList(in *octopus.GetModelDeployL var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetModelDeployList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodeldeploylogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodeldeploylogic.go index 8e33c949..70fe0cdb 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodeldeploylogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodeldeploylogic.go @@ -6,6 +6,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" "PCM/common/tool" "context" + "errors" + "log" "github.com/zeromicro/go-zero/core/logx" ) @@ -31,6 +33,10 @@ func (l *GetModelDeployLogic) GetModelDeploy(in *octopus.GetModelDeployReq) (*oc var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetModelDeploy token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodelversionlistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodelversionlistlogic.go index 5f5d9a06..6c6e331e 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodelversionlistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmodelversionlistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -33,6 +35,10 @@ func (l *GetModelVersionListLogic) GetModelVersionList(in *octopus.GetModelVersi var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetModelVersionList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmyalgorithmlistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmyalgorithmlistlogic.go index ad71dd68..2fbf5e48 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmyalgorithmlistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmyalgorithmlistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -34,6 +36,10 @@ func (l *GetMyAlgorithmListLogic) GetMyAlgorithmList(in *octopus.GetMyAlgorithmL var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetMyAlgorithmList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmydatasetlistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmydatasetlistlogic.go index 1bed0603..84a783c7 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmydatasetlistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmydatasetlistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -34,6 +36,10 @@ func (l *GetMyDatasetListLogic) GetMyDatasetList(in *octopus.GetMyDatasetListReq var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetMydatasetList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmymodellistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmymodellistlogic.go index ec807e0d..1b61ff8f 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmymodellistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getmymodellistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -34,6 +36,10 @@ func (l *GetMyModelListLogic) GetMyModelList(in *octopus.GetMyModelListReq) (*oc var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetMyModelList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getnotebooklistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getnotebooklistlogic.go index 47aa355c..fa569699 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getnotebooklistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getnotebooklistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -34,6 +36,10 @@ func (l *GetNotebookListLogic) GetNotebookList(in *octopus.GetNotebookListReq) ( var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetNotebookList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getnotebooklogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getnotebooklogic.go index 3e893d8f..798f9ba7 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getnotebooklogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getnotebooklogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *GetNotebookLogic) GetNotebook(in *octopus.GetNotebookReq) (*octopus.Get var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetNotebook token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjobeventlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjobeventlogic.go index c68ac202..feb8b1ae 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjobeventlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjobeventlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -33,6 +35,10 @@ func (l *GetTrainJobEventLogic) GetTrainJobEvent(in *octopus.GetTrainJobEventReq var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetTrainJobEvent token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjoblistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjoblistlogic.go index 84661f82..bd6e6bcb 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjoblistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjoblistlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -33,6 +35,10 @@ func (l *GetTrainJobListLogic) GetTrainJobList(in *octopus.GetTrainJobListReq) ( var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetTrainJobList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjoblogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjoblogic.go index c60cbae6..4ee7653e 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjoblogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjoblogic.go @@ -6,6 +6,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" "PCM/common/tool" "context" + "errors" + "log" "github.com/zeromicro/go-zero/core/logx" ) @@ -31,6 +33,10 @@ func (l *GetTrainJobLogic) GetTrainJob(in *octopus.GetTrainJobReq) (*octopus.Get var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetTrainJob token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjobmetriclogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjobmetriclogic.go index aa5c4fe9..16576d19 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjobmetriclogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/gettrainjobmetriclogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "strconv" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" @@ -33,6 +35,10 @@ func (l *GetTrainJobMetricLogic) GetTrainJobMetric(in *octopus.GetTrainJobMetric var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetTrainJobMetric token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getuserimagelistlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getuserimagelistlogic.go index 1a79eedf..55f0a698 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getuserimagelistlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getuserimagelistlogic.go @@ -6,6 +6,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" "PCM/common/tool" "context" + "errors" + "log" "strconv" "github.com/zeromicro/go-zero/core/logx" @@ -33,6 +35,10 @@ func (l *GetUserImageListLogic) GetUserImageList(in *octopus.GetUserImageListReq var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetUserImageList token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/infermodeldeploylogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/infermodeldeploylogic.go index f4cdb58a..5fcd6ab7 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/infermodeldeploylogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/infermodeldeploylogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *InferModelDeployLogic) InferModelDeploy(in *octopus.InferModelDeployReq var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.InferModelDeploy token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/startnotebooklogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/startnotebooklogic.go index cb179912..a69aef5e 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/startnotebooklogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/startnotebooklogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *StartNotebookLogic) StartNotebook(in *octopus.StartNotebookReq) (*octop var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.StartNotebook token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stopmodeldeploylogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stopmodeldeploylogic.go index 59135fe9..f0a2359e 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stopmodeldeploylogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stopmodeldeploylogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *StopModelDeployLogic) StopModelDeploy(in *octopus.StopModelDeployReq) ( var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.StopModelDeploy token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stopnotebooklogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stopnotebooklogic.go index 4d6646fa..35812a88 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stopnotebooklogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stopnotebooklogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *StopNotebookLogic) StopNotebook(in *octopus.StopNotebookReq) (*octopus. var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.StopNotebook token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stoptrainjoblogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stoptrainjoblogic.go index e63c9d22..2d96b562 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stoptrainjoblogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stoptrainjoblogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *StopTrainJobLogic) StopTrainJob(in *octopus.StopTrainJobReq) (*octopus. var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.StopTrainJob token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadalgorithmconfirmlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadalgorithmconfirmlogic.go index f648062d..23804f44 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadalgorithmconfirmlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadalgorithmconfirmlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *UploadAlgorithmConfirmLogic) UploadAlgorithmConfirm(in *octopus.UploadA var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadAlgorithmConfirm token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadalgorithmlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadalgorithmlogic.go index 186011d2..fe68a0e8 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadalgorithmlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadalgorithmlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *UploadAlgorithmLogic) UploadAlgorithm(in *octopus.UploadAlgorithmReq) ( var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadAlgorithm token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploaddatasetconfirmlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploaddatasetconfirmlogic.go index 1173f2f2..6bb11b71 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploaddatasetconfirmlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploaddatasetconfirmlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *UploadDataSetConfirmLogic) UploadDataSetConfirm(in *octopus.UploadDataS var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadDataSetConfirm token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploaddatasetlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploaddatasetlogic.go index 4dea8b20..a592ac9f 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploaddatasetlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploaddatasetlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *UploadDataSetLogic) UploadDataSet(in *octopus.UploadDataSetReq) (*octop var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadDataSet token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadimageconfirmlogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadimageconfirmlogic.go index 18cd099f..0c1ba6d4 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadimageconfirmlogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadimageconfirmlogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *UploadImageConfirmLogic) UploadImageConfirm(in *octopus.UploadImageConf var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadImageConfirm token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadimagelogic.go b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadimagelogic.go index 1340962e..32527fe9 100644 --- a/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadimagelogic.go +++ b/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadimagelogic.go @@ -4,6 +4,8 @@ import ( "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common" "PCM/common/tool" "context" + "errors" + "log" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc" "PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus" @@ -32,6 +34,10 @@ func (l *UploadImageLogic) UploadImage(in *octopus.UploadImageReq) (*octopus.Upl var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadImage token := common.GetToken(in.Platform) + if token == "" { + log.Println("获取token失败, platform : ", in.Platform) + return nil, errors.New("获取token失败") + } req := tool.GetACHttpRequest() _, err := req. diff --git a/adaptor/PCM-CORE/api/internal/logic/core/getcomputingpowerlogic.go b/adaptor/PCM-CORE/api/internal/logic/core/getcomputingpowerlogic.go index c199760e..0c85b8aa 100644 --- a/adaptor/PCM-CORE/api/internal/logic/core/getcomputingpowerlogic.go +++ b/adaptor/PCM-CORE/api/internal/logic/core/getcomputingpowerlogic.go @@ -25,25 +25,70 @@ func NewGetComputingPowerLogic(ctx context.Context, svcCtx *svc.ServiceContext) } } -func (l *GetComputingPowerLogic) GetComputingPower() (resp *types.CpResp, err error) { +type client struct { +} - apiResp := types.CpResp{} +func (c *client) getComputingPower(cp computingPower, l *GetComputingPowerLogic) float32 { + return cp.GetComputing(l) +} - //启智章鱼资源算力 +type OctopusComputingPower struct { +} + +type AcComputingPower struct { +} + +type computingPower interface { + GetComputing(l *GetComputingPowerLogic) float32 +} + +// 启智章鱼资源算力 +func (cp OctopusComputingPower) GetComputing(l *GetComputingPowerLogic) float32 { octopusCpReq := &octopus.ResourceReq{} octopusCpResp, err := l.svcCtx.OctopusRpc.GetComputingPower(l.ctx, octopusCpReq) if err != nil { log.Println("OctopusRpc 算力请求失败", err) } + return octopusCpResp.POpsAtFp16 +} - //曙光账号算力 +// 曙光账号算力 +func (cp AcComputingPower) GetComputing(l *GetComputingPowerLogic) float32 { acCpReq := &hpcAC.ResourceReq{} acCpResp, err := l.svcCtx.ACRpc.GetComputingPower(l.ctx, acCpReq) if err != nil { log.Println("ACRpc 算力请求失败", err) } + return acCpResp.POpsAtFp16 +} + +func (l *GetComputingPowerLogic) GetComputingPower() (resp *types.CpResp, err error) { + + apiResp := types.CpResp{} + + c := client{} + ot := OctopusComputingPower{} + ac := AcComputingPower{} + a := c.getComputingPower(ot, l) + b := c.getComputingPower(ac, l) + + apiResp.POpsAtFp16 = a + b + ////启智章鱼资源算力 + //octopusCpReq := &octopus.ResourceReq{} + //octopusCpResp, err := l.svcCtx.OctopusRpc.GetComputingPower(l.ctx, octopusCpReq) + //if err != nil { + // log.Println("OctopusRpc 算力请求失败", err) + //} + // + ////曙光账号算力 + //acCpReq := &hpcAC.ResourceReq{} + //acCpResp, err := l.svcCtx.ACRpc.GetComputingPower(l.ctx, acCpReq) + //if err != nil { + // log.Println("ACRpc 算力请求失败", err) + //} + // + //computingPowerAggregated := acCpResp.POpsAtFp16 + octopusCpResp.POpsAtFp16 + //apiResp.POpsAtFp16 = computingPowerAggregated - computingPowerAggregated := acCpResp.POpsAtFp16 + octopusCpResp.POpsAtFp16 - apiResp.POpsAtFp16 = computingPowerAggregated return &apiResp, nil }