perf: session 新增 account_id

jumpserver · Feb 16, 2023 · 3630212 · 3630212
1 parent d6e7f5b
commit 3630212
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 63 deletions.
diff --git a/cmd/impl/convert_model.go b/cmd/impl/convert_model.go
@@ -30,6 +30,7 @@ func ConvertToSession(sees *pb.Session) model.Session {
 		OrgID:      sees.OrgId,
 		UserID:     sees.UserId,
 		AssetID:    sees.AssetId,
+		AccountID:  sees.AccountId,
 		Type:       model.NORMALType,
 	}
 }

diff --git a/cmd/impl/convert_pb.go b/cmd/impl/convert_pb.go
@@ -64,6 +64,7 @@ func ConvertToProtobufAsset(asset model.Asset) *pb.Asset {
 func ConvertToProtobufAccount(account model.Account) *pb.Account {
 	secretType := account.SecretType
 	return &pb.Account{
+		Id:       account.ID,
 		Name:     account.Name,
 		Username: account.Username,
 		Secret:   account.Secret,

diff --git a/pkg/jms-sdk-go/model/account.go b/pkg/jms-sdk-go/model/account.go
@@ -3,6 +3,7 @@ package model
 import "fmt"
 
 type BaseAccount struct {
+	ID         string     `json:"id"`
 	Name       string     `json:"name"`
 	Username   string     `json:"username"`
 	Secret     string     `json:"secret"`

diff --git a/pkg/jms-sdk-go/model/session.go b/pkg/jms-sdk-go/model/session.go
@@ -48,6 +48,7 @@ type Session struct {
 	OrgID      string         `json:"org_id"`
 	UserID     string         `json:"user_id"`
 	AssetID    string         `json:"asset_id"`
+	AccountID  string         `json:"account_id"`
 	Type       LabelFiled     `json:"type"`
 }
 

diff --git a/protobuf-go/protobuf/common.pb.go b/protobuf-go/protobuf/common.pb.go
diff --git a/protos/common.proto b/protos/common.proto
@@ -13,6 +13,7 @@ message User {
 }
 
 message Account {
+  string id =1;
   string name = 2;
   string username = 4;
   string secret = 5;
@@ -120,6 +121,7 @@ message Session {
   string org_id = 9;
   string user_id = 10;
   string asset_id = 11;
+  string account_id = 12;
 }
 
 enum TaskAction {KillSession = 0;}