From 325baed56e195df66222ed840af0443efa0f2edb Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 16 Apr 2024 19:51:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Telnet=E6=94=AF=E6=8C=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8F=91=E9=80=81=E7=AA=97=E5=8F=A3=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/framework/utils/telnet/telnet.go |  6 +++++-
 src/modules/ws/controller/ws.go      | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/framework/utils/telnet/telnet.go b/src/framework/utils/telnet/telnet.go
index 651ede9d..ad2c6b48 100644
--- a/src/framework/utils/telnet/telnet.go
+++ b/src/framework/utils/telnet/telnet.go
@@ -119,12 +119,16 @@ func (c *ConnTelnet) RunCMD(cmd string) (string, error) {
 }
 
 // NewClient 创建Telnet客户端会话对象
-func (c *ConnTelnet) NewClientSession() (*TelnetClientSession, error) {
+func (c *ConnTelnet) NewClientSession(cols, rows uint8) (*TelnetClientSession, error) {
 	if c.Client == nil {
 		return nil, fmt.Errorf("telnet client not connected")
 	}
 	conn := *c.Client
 
+	// 需要确保接收方理解并正确处理发送窗口大小设置命令
+	conn.Write([]byte{255, 251, 31})                             // 发送窗口大小选项
+	conn.Write([]byte{255, 250, 31, 0, rows, 0, cols, 255, 240}) // 发送窗口行和列的大小
+
 	var buf bytes.Buffer
 	tmp := make([]byte, 1024)
 	// 排空连接登录的信息
diff --git a/src/modules/ws/controller/ws.go b/src/modules/ws/controller/ws.go
index 297b8a01..04257dd3 100644
--- a/src/modules/ws/controller/ws.go
+++ b/src/modules/ws/controller/ws.go
@@ -256,8 +256,19 @@ func (s *WSController) Telnet(c *gin.Context) {
 	}
 	defer client.Close()
 
+	// 终端单行字符数
+	cols, err := strconv.Atoi(c.Query("cols"))
+	if err != nil || cols > 254 {
+		cols = 80
+	}
+	// 终端显示行数
+	rows, err := strconv.Atoi(c.Query("rows"))
+	if err != nil || cols > rows {
+		rows = 40
+	}
+
 	// 创建Telnet客户端会话
-	clientSession, err := client.NewClientSession()
+	clientSession, err := client.NewClientSession(uint8(cols), uint8(rows))
 	if err != nil {
 		// 连接主机失败，请检查连接参数后重试
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))