perf: update terminal config api

jumpserver · Nov 12, 2024 · 99fb209 · 99fb209
1 parent 0a77455
commit 99fb209
Show file tree

Hide file tree

Showing 9 changed files with 1,633 additions and 603 deletions.
diff --git a/cmd/impl/jms.go b/cmd/impl/jms.go
@@ -381,12 +381,13 @@ func (j *JMServer) GetPublicSetting(ctx context.Context, empty *pb.Empty) (*pb.P
 	setting := j.uploader.GetTerminalSetting()
 	status.Ok = true
 	pbSetting := pb.PublicSetting{
-		XpackEnabled: data.XpackEnabled,
-		ValidLicense: data.ValidLicense,
-		GptBaseUrl:   setting.GPTBaseURL,
-		GptApiKey:    setting.GPTApiKey,
-		GptProxy:     setting.GPTProxy,
-		GptModel:     setting.GPTModel,
+		XpackEnabled:   data.XpackEnabled,
+		ValidLicense:   data.ValidLicense,
+		GptBaseUrl:     setting.GPTBaseURL,
+		GptApiKey:      setting.GPTApiKey,
+		GptProxy:       setting.GPTProxy,
+		GptModel:       setting.GPTModel,
+		LicenseContent: setting.LicenseContent,
 	}
 	return &pb.PublicSettingResponse{Status: &status, Data: &pbSetting}, nil
 }

diff --git a/pkg/jms-sdk-go/model/terminal.go b/pkg/jms-sdk-go/model/terminal.go
@@ -15,6 +15,8 @@ type TerminalConfig struct {
 	HeartbeatDuration   int           `json:"TERMINAL_HEARTBEAT_INTERVAL"`
 	HostKey             string        `json:"TERMINAL_HOST_KEY"`
 	EnableSessionShare  bool          `json:"SECURITY_SESSION_SHARE"`
+	LicenseContent      string        `json:"XPACK_LICENSE_CONTENT"`
+	LicenseIsValid      bool          `json:"XPACK_LICENSE_IS_VALID"`
 
 	GPTBaseURL string `json:"GPT_BASE_URL"`
 	GPTApiKey  string `json:"GPT_API_KEY"`