Merge remote-tracking branch 'origin/2.0' into 2.0

adaptor/PCM-HPC/PCM-AC/rpc/hpcAC/hpcAC_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.21.12
+// - protoc             v3.12.4
 // source: hpcAC.proto
 
 package hpcAC

adaptor/PCM-HPC/PCM-AC/rpc/hpcacclient/hpcac.go

@@ -13,53 +13,53 @@ import (
 )
 
 type (
-	CpuCore                  = hpcAC.CpuCore
-	CpuCoreReq               = hpcAC.CpuCoreReq
-	CpuCoreResp              = hpcAC.CpuCoreResp
-	DeleteJobReq             = hpcAC.DeleteJobReq
-	DeleteJobResp            = hpcAC.DeleteJobResp
-	FileContentResp          = hpcAC.FileContentResp
-	FileDataReq              = hpcAC.FileDataReq
-	FileDataResp             = hpcAC.FileDataResp
-	GetJobDetailResp         = hpcAC.GetJobDetailResp
-	HistoryJob               = hpcAC.HistoryJob
-	HistoryJobDetailReq      = hpcAC.HistoryJobDetailReq
-	HistoryJobDetailResp     = hpcAC.HistoryJobDetailResp
-	HistoryJobDetailRespData = hpcAC.HistoryJobDetailRespData
-	Job                      = hpcAC.Job
-	JobCore                  = hpcAC.JobCore
-	JobDetail                = hpcAC.JobDetail
-	JobDetailReq             = hpcAC.JobDetailReq
-	JobInitAttr              = hpcAC.JobInitAttr
-	JobManager               = hpcAC.JobManager
-	JobManagerReq            = hpcAC.JobManagerReq
-	JobVncSessionInfo        = hpcAC.JobVncSessionInfo
-	JobsReq                  = hpcAC.JobsReq
-	JobsResp                 = hpcAC.JobsResp
-	ListHistoryJobReq        = hpcAC.ListHistoryJobReq
-	ListHistoryJobResp       = hpcAC.ListHistoryJobResp
-	ListJobManagerResp       = hpcAC.ListJobManagerResp
-	ListJobReq               = hpcAC.ListJobReq
-	ListJobResp              = hpcAC.ListJobResp
-	MapAppJobInfo            = hpcAC.MapAppJobInfo
-	Metric                   = hpcAC.Metric
-	ParaStorQuotaReq         = hpcAC.ParaStorQuotaReq
-	ParaStorQuotaResp        = hpcAC.ParaStorQuotaResp
-	Queue                    = hpcAC.Queue
-	QueueData                = hpcAC.QueueData
-	QueueDetailsData         = hpcAC.QueueDetailsData
-	QueueDetailsResp         = hpcAC.QueueDetailsResp
-	QueueJobsReq             = hpcAC.QueueJobsReq
-	QueueJobsResp            = hpcAC.QueueJobsResp
-	QueueReq                 = hpcAC.QueueReq
-	QueueResp                = hpcAC.QueueResp
-	QuotaData                = hpcAC.QuotaData
-	SubmitJobReq             = hpcAC.SubmitJobReq
-	SubmitJobResp            = hpcAC.SubmitJobResp
-	UserQuotasLimitData      = hpcAC.UserQuotasLimitData
-	UserQuotasLimitResp      = hpcAC.UserQuotasLimitResp
-	WallTimeReq              = hpcAC.WallTimeReq
-	WallTimeResp             = hpcAC.WallTimeResp
+	CpuCore              = hpcAC.CpuCore
+	CpuCoreReq           = hpcAC.CpuCoreReq
+	CpuCoreResp          = hpcAC.CpuCoreResp
+	DeleteJobReq         = hpcAC.DeleteJobReq
+	DeleteJobResp        = hpcAC.DeleteJobResp
+	FileContentResp      = hpcAC.FileContentResp
+	FileDataReq          = hpcAC.FileDataReq
+	FileDataResp         = hpcAC.FileDataResp
+	GetJobDetailResp     = hpcAC.GetJobDetailResp
+	HistoryJob           = hpcAC.HistoryJob
+	HistoryJobDetail     = hpcAC.HistoryJobDetail
+	HistoryJobDetailReq  = hpcAC.HistoryJobDetailReq
+	HistoryJobDetailResp = hpcAC.HistoryJobDetailResp
+	Job                  = hpcAC.Job
+	JobCore              = hpcAC.JobCore
+	JobDetail            = hpcAC.JobDetail
+	JobDetailReq         = hpcAC.JobDetailReq
+	JobInitAttr          = hpcAC.JobInitAttr
+	JobManager           = hpcAC.JobManager
+	JobManagerReq        = hpcAC.JobManagerReq
+	JobVncSessionInfo    = hpcAC.JobVncSessionInfo
+	JobsReq              = hpcAC.JobsReq
+	JobsResp             = hpcAC.JobsResp
+	ListHistoryJobReq    = hpcAC.ListHistoryJobReq
+	ListHistoryJobResp   = hpcAC.ListHistoryJobResp
+	ListJobManagerResp   = hpcAC.ListJobManagerResp
+	ListJobReq           = hpcAC.ListJobReq
+	ListJobResp          = hpcAC.ListJobResp
+	MapAppJobInfo        = hpcAC.MapAppJobInfo
+	Metric               = hpcAC.Metric
+	ParaStorQuotaReq     = hpcAC.ParaStorQuotaReq
+	ParaStorQuotaResp    = hpcAC.ParaStorQuotaResp
+	Queue                = hpcAC.Queue
+	QueueData            = hpcAC.QueueData
+	QueueDetailsData     = hpcAC.QueueDetailsData
+	QueueDetailsResp     = hpcAC.QueueDetailsResp
+	QueueJobsReq         = hpcAC.QueueJobsReq
+	QueueJobsResp        = hpcAC.QueueJobsResp
+	QueueReq             = hpcAC.QueueReq
+	QueueResp            = hpcAC.QueueResp
+	QuotaData            = hpcAC.QuotaData
+	SubmitJobReq         = hpcAC.SubmitJobReq
+	SubmitJobResp        = hpcAC.SubmitJobResp
+	UserQuotasLimitData  = hpcAC.UserQuotasLimitData
+	UserQuotasLimitResp  = hpcAC.UserQuotasLimitResp
+	WallTimeReq          = hpcAC.WallTimeReq
+	WallTimeResp         = hpcAC.WallTimeResp
 
 	HpcAC interface {
 		// ListJob list all jobs

adaptor/PCM-HPC/PCM-AC/rpc/internal/logic/deletejoblogic.go

@@ -36,7 +36,7 @@ func (l *DeleteJobLogic) DeleteJob(in *hpcAC.DeleteJobReq) (*hpcAC.DeleteJobResp
 
 	deleteJobUrl := "hpc/openapi/v2/jobs?"
 
-	Gtoken := util.GetToken()
+	token := util.GetToken()
 	c := http.Client{Timeout: time.Duration(3) * time.Second}
 
 	params := url.Values{}
@@ -49,13 +49,6 @@ func (l *DeleteJobLogic) DeleteJob(in *hpcAC.DeleteJobReq) (*hpcAC.DeleteJobResp
 		return nil, err
 	}
 
-	var token string
-	if util.GetTokenState(Gtoken) {
-		token = Gtoken
-	} else {
-		token = util.GetToken()
-		Gtoken = token
-	}
 	reqUrl.Header.Add("token", token)
 
 	respUrl, err := c.Do(reqUrl)
@@ -69,7 +62,7 @@ func (l *DeleteJobLogic) DeleteJob(in *hpcAC.DeleteJobReq) (*hpcAC.DeleteJobResp
 	}
 	if err = json.Unmarshal(body, &resp); err != nil {
 		if resp.Code != "0" {
-			resp.Result = nil
+			resp.Data = nil
 		} else {
 			return nil, err
 		}

adaptor/PCM-HPC/PCM-AC/rpc/internal/logic/getjobdetaillogic.go

@@ -37,7 +37,7 @@ func (l *GetJobDetailLogic) GetJobDetail(in *hpcAC.JobDetailReq) (*hpcAC.GetJobD
 
 	jobId := in.JobId
 
-	Gtoken := util.GetToken()
+	token := util.GetToken()
 	c := http.Client{Timeout: time.Duration(3) * time.Second}
 
 	reqUrl, err := http.NewRequest("GET", "https://api01.hpccube.com:65106/"+jobDetailUrl+jobId, nil)
@@ -46,13 +46,6 @@ func (l *GetJobDetailLogic) GetJobDetail(in *hpcAC.JobDetailReq) (*hpcAC.GetJobD
 		return nil, err
 	}
 
-	var token string
-	if util.GetTokenState(Gtoken) {
-		token = Gtoken
-	} else {
-		token = util.GetToken()
-		Gtoken = token
-	}
 	reqUrl.Header.Add("token", token)
 
 	respUrl, err := c.Do(reqUrl)
@@ -67,7 +60,7 @@ func (l *GetJobDetailLogic) GetJobDetail(in *hpcAC.JobDetailReq) (*hpcAC.GetJobD
 
 	if err = json.Unmarshal(body, &resp); err != nil {
 		if resp.Code != "0" {
-			resp.JobDetail = nil
+			resp.Data = nil
 		} else {
 			return nil, err
 		}

adaptor/PCM-HPC/PCM-AC/rpc/internal/logic/historyjobdetaillogic.go

@@ -27,13 +27,19 @@ func NewHistoryJobDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 }
 
 func (l *HistoryJobDetailLogic) HistoryJobDetail(in *hpcAC.HistoryJobDetailReq) (*hpcAC.HistoryJobDetailResp, error) {
-	url := fmt.Sprint("https://api01.hpccube.com:65106//hpc/openapi/v2/historyjobs/%s/%s?acctTime=%s", in.JobmanagerId, in.JobId, in.AcctTime)
-	var jobsResp *hpcAC.JobsResp
+	var url string
+	if in.AcctTime != "" {
+		url = fmt.Sprintf("https://api01.hpccube.com:65106/hpc/openapi/v2/historyjobs/%s/%s?acctTime=%s", in.JobmanagerId, in.JobId, in.AcctTime)
+	} else {
+		url = fmt.Sprintf("https://api01.hpccube.com:65106/hpc/openapi/v2/historyjobs/%s/%s", in.JobmanagerId, in.JobId)
+	}
+
+	var historyJobDetail *hpcAC.HistoryJobDetailResp
 	acHttpRequest := tool.GetACHttpRequest()
 	acHttpRequest.SetHeader(tool.ContentType, tool.ApplicationJson).
-		SetResult(&jobsResp).
+		SetResult(&historyJobDetail).
 		SetHeader("token", util.GetToken()).
 		Get(url)
 
-	return &hpcAC.HistoryJobDetailResp{}, nil
+	return historyJobDetail, nil
 }

adaptor/PCM-HPC/PCM-AC/rpc/internal/logic/listhistoryjoblogic.go

@@ -40,7 +40,7 @@ func (l *ListHistoryJobLogic) ListHistoryJob(in *hpcAC.ListHistoryJobReq) (*hpcA
 	jobHistoryUrl := "hpc/openapi/v2/historyjobs?"
 
 	ClusterId := util.GetClusterId()
-	Gtoken := util.GetToken()
+	token := util.GetToken()
 	c := http.Client{Timeout: time.Duration(3) * time.Second}
 
 	params := url.Values{}
@@ -59,14 +59,6 @@ func (l *ListHistoryJobLogic) ListHistoryJob(in *hpcAC.ListHistoryJobReq) (*hpcA
 		log.Fatal(err)
 	}
 
-	var token string
-	if util.GetTokenState(Gtoken) {
-		token = Gtoken
-	} else {
-		token = util.GetToken()
-		Gtoken = token
-	}
-
 	reqUrl.Header.Add("token", token)
 
 	respUrl, err := c.Do(reqUrl)

adaptor/PCM-HPC/PCM-AC/rpc/internal/logic/listjoblogic.go

@@ -37,7 +37,7 @@ func (l *ListJobLogic) ListJob(in *hpcAC.ListJobReq) (*hpcAC.ListJobResp, error)
 	jobUrl := "hpc/openapi/v2/jobs?"
 
 	ClusterId := util.GetClusterId()
-	Gtoken := util.GetToken()
+	token := util.GetToken()
 	c := http.Client{Timeout: time.Duration(3) * time.Second}
 
 	params := url.Values{}
@@ -49,14 +49,6 @@ func (l *ListJobLogic) ListJob(in *hpcAC.ListJobReq) (*hpcAC.ListJobResp, error)
 		log.Fatal(err)
 	}
 
-	var token string
-	if util.GetTokenState(Gtoken) {
-		token = Gtoken
-	} else {
-		token = util.GetToken()
-		Gtoken = token
-	}
-
 	reqUrl.Header.Add("token", token)
 
 	respUrl, err := c.Do(reqUrl)

adaptor/PCM-HPC/PCM-AC/rpc/internal/logic/listjobmanagerlogic.go

@@ -35,7 +35,7 @@ func (l *ListJobManagerLogic) ListJobManager(in *hpcAC.JobManagerReq) (*hpcAC.Li
 	var resp hpcAC.ListJobManagerResp
 	jobManagerUrl := "hpc/openapi/v2/cluster"
 
-	Gtoken := util.GetToken()
+	token := util.GetToken()
 	c := http.Client{Timeout: time.Duration(3) * time.Second}
 
 	reqUrl, err := http.NewRequest("GET", "https://api01.hpccube.com:65106/"+jobManagerUrl, nil)
@@ -44,14 +44,6 @@ func (l *ListJobManagerLogic) ListJobManager(in *hpcAC.JobManagerReq) (*hpcAC.Li
 		return nil, err
 	}
 
-	var token string
-	if util.GetTokenState(Gtoken) {
-		token = Gtoken
-	} else {
-		token = util.GetToken()
-		Gtoken = token
-	}
-
 	reqUrl.Header.Add("token", token)
 
 	respUrl, err := c.Do(reqUrl)
@@ -67,7 +59,7 @@ func (l *ListJobManagerLogic) ListJobManager(in *hpcAC.JobManagerReq) (*hpcAC.Li
 
 	if err = json.Unmarshal(body, &resp); err != nil {
 		if resp.Code != "0" {
-			resp.JobManagers = nil
+			resp.Data = nil
 		} else {
 			return nil, err
 		}

adaptor/PCM-HPC/PCM-AC/rpc/internal/logic/submitjoblogic.go

@@ -40,13 +40,7 @@ func (l *SubmitJobLogic) SubmitJob(in *hpcAC.SubmitJobReq) (*hpcAC.SubmitJobResp
 	jsonStr, _ := json.Marshal(in)
 	req_url, err := http.NewRequest("POST", "https://api01.hpccube.com:65106/"+jobSubmitUrl, bytes.NewBuffer(jsonStr))
 
-	var token string
-	if util.GetTokenState(util.Gtoken) {
-		token = util.Gtoken
-	} else {
-		token = util.GetToken()
-		util.Gtoken = token
-	}
+	token := util.GetToken()
 
 	req_url.Header.Add("content-type", "application/json")
 	req_url.Header.Add("token", token)

adaptor/PCM-HPC/PCM-AC/rpc/internal/util/client.go

@@ -6,7 +6,6 @@ import (
 	"PCM/common/tool/httpclient"
 	"context"
 	"errors"
-	"github.com/go-resty/resty/v2"
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/core/logx"
 	"runtime"
@@ -15,13 +14,7 @@ import (
 // NewRequest 构造一个请求
 func NewRequest(cli *resty.Client) (*resty.Request, error) {
 	//TODO 获取AC的token
-	var token string
-	if GetTokenState(Gtoken) {
-		token = Gtoken
-	} else {
-		token = GetToken()
-		Gtoken = token
-	}
+	token := GetToken()
 	cli.SetHeader("token", token).SetBaseURL(getBaseUrl())
 	return cli.R(), nil
 }

adaptor/PCM-HPC/PCM-AC/rpc/internal/util/shuguangAuth.go

@@ -33,7 +33,7 @@ var (
 		"statW": 6,
 		"statX": 7,
 	}
-	Gtoken    = GetToken()
+	gtoken    = getToken()
 	ClusterId = GetClusterId()
 )
 
@@ -83,13 +83,7 @@ func GetClusterId() int {
 		log.Fatal(err)
 	}
 
-	var token string
-	if GetTokenState(Gtoken) {
-		token = Gtoken
-	} else {
-		token = GetToken()
-		Gtoken = token
-	}
+	token := GetToken()
 
 	req.Header.Add("token", token)
 	resp, err := httpClient.Do(req)
@@ -116,8 +110,16 @@ func GetClusterId() int {
 	}
 	return id
 }
-
 func GetToken() string {
+	if getTokenState(gtoken) {
+		return gtoken
+	} else {
+		gtoken = getToken()
+	}
+	return gtoken
+}
+
+func getToken() string {
 	httpClient := http.Client{Timeout: time.Duration(3) * time.Second}
 	var cf config.Config
 	conf.MustLoad(*configFile, &cf)
@@ -157,7 +159,7 @@ func GetToken() string {
 	return ""
 }
 
-func GetTokenState(token string) bool {
+func getTokenState(token string) bool {
 	httpClient := http.Client{Timeout: time.Duration(3) * time.Second}
 	var cf config.Config
 	conf.MustLoad(*configFile, &cf)

adaptor/PCM-HPC/PCM-AC/rpc/pb/hpcAC.proto

@@ -18,7 +18,7 @@ message JobManagerReq{
 message ListJobManagerResp{
   string              code = 1;   // @gotags: copier:"Code", json:"code"
   string              msg = 2;   // @gotags: copier:"Msg", json:"msg"
-  repeated JobManager job_managers = 3;   // @gotags: copier:"JobManagers", json:"data"
+  repeated JobManager data = 3;   // @gotags: copier:"JobManagers", json:"data"
 }
 /******************Cluster End*************************/
 
@@ -155,7 +155,7 @@ message JobDetailReq{
 message GetJobDetailResp{
   string      code          = 1;   // @gotags: copier:"Code", json:"code"
   string      msg           = 2;   // @gotags: copier:"Msg", json:"msg"
-  JobDetail   job_detail    = 3;   // @gotags: copier:"JobDetail", json:"data"
+  JobDetail   data    = 3;   // @gotags: copier:"JobDetail", json:"data"
 }
 /******************Job Detail End*************************/
 
@@ -167,7 +167,7 @@ message DeleteJobReq{
 message DeleteJobResp{
   string                  code             = 1;   // @gotags: copier:"Code", json:"code"
   string                  msg              = 2;   // @gotags: copier:"Msg", json:"msg"
-  map<string, string>     result           = 3;   // @gotags: copier:"Result", json:"data"
+  map<string, string>     data           = 3;   // @gotags: copier:"Result", json:"data"
 }
 /******************Job(Delete) End*************************/
 
@@ -362,72 +362,74 @@ message HistoryJobDetailReq{
   string acctTime = 3;
 }
 
+message HistoryJobDetail {
+  string acctTime = 1;// @gotags: copier:"acctTime"
+  string appType = 2;
+  string command = 3;
+  string commandExist = 4;
+  string cpuNuclearHour = 5;
+  string cpuNuclearSec = 6;
+  double cpuUnitPrice = 7;
+  string dcuCardHour = 8;
+  string dcuCardSec = 9;
+  double dcuUnitPrice = 10;
+  string efficiencyCpu = 11;
+  int64 exclusiveCputime = 12;
+  int64 exclusiveMem = 13;
+  int64 exclusiveWalltime = 14;
+  string goldenable = 15;
+  string gpuCardHour = 16;
+  string gpuCardSec = 17;
+  double gpuUnitPrice = 18;
+  string groupName = 19;
+  string historyAccount = 20;
+  string historyQueuerate = 21;
+  string isSinglejob = 22;
+  int64 jobCpuTime = 23;
+  int64 jobDcuNum = 24;
+  string jobEndTime = 25;
+  string jobExecGpus = 26;
+  string jobExecHost = 27;
+  int64 jobExitStatus = 28;
+  int64 jobGpuNum = 29;
+  string jobId = 30;
+  int64 jobMemUsed = 31;
+  string jobName = 32;
+  int64 jobProcNum = 33;
+  string jobQueueTime = 34;
+  double jobReqCpu = 35;
+  double jobReqDcu = 36;
+  double jobReqGpu = 37;
+  string jobReqMem = 38;
+  double jobReqNodes = 39;
+  int64 jobResponseTime = 40;
+  string jobStartTime = 41;
+  string jobState = 42;
+  int64 jobVmemUsed = 43;
+  int64 jobWaitTime = 44;
+  int64 jobWalltimeUsed = 45;
+  int64 jobmanagerId = 46;
+  string jobmanagerName = 47;
+  string needNodes = 48;
+  int64 nodect = 49;
+  string owner = 50;
+  string queue = 51;
+  string scale = 52;
+  int64 shareCputime = 53;
+  int64 shareMem = 54;
+  int64 shareWalltime = 55;
+  string startCount = 56;
+  string userName = 57;
+  int64 walltime = 58;
+  string workdir = 59;
+}
+
 message HistoryJobDetailResp {
   string code = 1;
   string msg = 2;
-
-  message data {
-    string acctTime = 1;// @gotags: copier:"acctTime"
-    string appType = 2;
-    string command = 3;
-    string commandExist = 4;
-    string cpuNuclearHour = 5;
-    string cpuNuclearSec = 6;
-    double cpuUnitPrice = 7;
-    string dcuCardHour = 8;
-    string dcuCardSec = 9;
-    double dcuUnitPrice = 10;
-    string efficiencyCpu = 11;
-    int64 exclusiveCputime = 12;
-    int64 exclusiveMem = 13;
-    int64 exclusiveWalltime = 14;
-    string goldenable = 15;
-    string gpuCardHour = 16;
-    string gpuCardSec = 17;
-    double gpuUnitPrice = 18;
-    string groupName = 19;
-    string historyAccount = 20;
-    string historyQueuerate = 21;
-    string isSinglejob = 22;
-    int64 jobCpuTime = 23;
-    int64 jobDcuNum = 24;
-    string jobEndTime = 25;
-    string jobExecGpus = 26;
-    string jobExecHost = 27;
-    int64 jobExitStatus = 28;
-    int64 jobGpuNum = 29;
-    string jobId = 30;
-    int64 jobMemUsed = 31;
-    string jobName = 32;
-    int64 jobProcNum = 33;
-    string jobQueueTime = 34;
-    double jobReqCpu = 35;
-    double jobReqDcu = 36;
-    double jobReqGpu = 37;
-    string jobReqMem = 38;
-    double jobReqNodes = 39;
-    int64 jobResponseTime = 40;
-    string jobStartTime = 41;
-    string jobState = 42;
-    int64 jobVmemUsed = 43;
-    int64 jobWaitTime = 44;
-    int64 jobWalltimeUsed = 45;
-    int64 jobmanagerId = 46;
-    string jobmanagerName = 47;
-    string needNodes = 48;
-    int64 nodect = 49;
-    string owner = 50;
-    string queue = 51;
-    string scale = 52;
-    int64 shareCputime = 53;
-    int64 shareMem = 54;
-    int64 shareWalltime = 55;
-    string startCount = 56;
-    string userName = 57;
-    int64 walltime = 58;
-    string workdir = 59;
-  }
+  HistoryJobDetail data =3;
 }
+
 message FileContentResp{
   string        code = 1;  // @gotags: copier:"Code" //状态码	示例:0
   string        msg = 2;  // @gotags: copier:"Msg" //信息	示例:success