add logging configuration and database changes; update API for private key and passphrase

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

.gitignore

@@ -24,5 +24,6 @@ buf.lock
 configs/tenanter.yaml
 
 log/
+logs/
 /cache/
 /vendor/

desc/core/pcm-core.api

@@ -927,6 +927,8 @@ type (
         Token string `json:"token,omitempty" db:"token"`
         Ak string `json:"ak,omitempty" db:"ak"`
         Sk string `json:"sk,omitempty" db:"sk"`
+        PrivateKey  string `json:"privateKey,omitempty" db:"private_key"`
+        Passphrase  string `json:"passphrase,omitempty" db:"passphrase"`
         Region string `json:"region,omitempty" db:"region"`
         ProjectId string `json:"projectId,omitempty" db:"project_id"`
         Version string `json:"version,omitempty" db:"version"`

desc/pcm.api

@@ -211,7 +211,7 @@ service pcm {
 	@doc "获取资源规格范围"
 	@handler resourceRange
 	get /core/ai/resourceSpec/range (ResourceSpecReq) returns (ListResult)
-	//集群资源规格----- 结束
+//集群资源规格----- 结束
 }
 
 //hpc二级接口
@@ -456,7 +456,7 @@ service pcm {
 	@doc "文本识别"
 	@handler ChatHandler
 	post /ai/chat (ChatReq) returns (ChatResult)
-	/******chat end***********/
+/******chat end***********/
 }
 
 //screen接口
@@ -1145,4 +1145,5 @@ service pcm {
 
 	@handler scheduleSituationHandler
 	get /monitoring/schedule/situation returns (scheduleSituationResp)
-}
+}
+

etc/pcm.yaml

@@ -2,11 +2,17 @@ Name: pcm.core.api
 Host: 0.0.0.0
 Port: 8999
 MaxBytes: 524288000
+Log:
+  Mode: file
+  Level: debug
+  Path: ./logs
+  Rotation: daily
+  ServiceName: "pcm.core.api"
 
 Timeout: 500000
 
 DB:
-   DataSource: root:uJpLd6u-J?HC1@(47.92.88.143:3306)/pcm?parseTime=true&loc=Local
+   DataSource: root:uJpLd6u-J?HC1@(119.45.255.234:3306)/pcm?parseTime=true&loc=Local
 Redis:
   Host: 10.206.0.12:6379
   Pass: redisPW123

internal/logic/hpc/commithpctasklogic.go

@@ -45,6 +45,7 @@ type CommonParams struct {
 	Nodes     string `json:"nodes"`
 	NTasks    string `json:"ntasks"`
 	Time      string `json:"time,omitempty"`
+	App       string `json:"app"`
 }
 
 func NewCommitHpcTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CommitHpcTaskLogic {
@@ -181,6 +182,7 @@ func ConvertToJobRequest(job *types.CommitHpcTaskReq) (JobRequest, error) {
 			Nodes:     job.Parameters["nodes"],
 			NTasks:    job.Parameters["ntasks"],
 			Time:      job.Parameters["time"],
+			App:       job.App,
 		},
 		AppSpecific: utils.MpaStringToInterface(job.Parameters),
 	}, nil

version.sql

@@ -0,0 +1,8 @@
+alter table t_cluster
+    add private_key varchar(1000) null comment 'PEM格式私钥内容' after sk;
+
+alter table t_cluster
+    add passphrase varchar(100) null comment ' 私钥的加密口令' after private_key;
+
+alter table t_cluster
+    modify auth_type tinyint(1) not null comment '认证方式：0->ak,sk;1->user,pwd;2->token;3->ssh密钥认证;';