merge: 合并代码20240531

src/modules/ws/controller/ws.go

@@ -144,8 +144,14 @@ func (s *WSController) SSH(c *gin.Context) {
 	// 创建链接SSH客户端
 	var connSSH ssh.ConnSSH
 	neHost.CopyTo(&connSSH)
-	client, err := connSSH.NewClient()
-	if err != nil {
+	var client *ssh.ConnSSH
+	var clientErr error
+	if neHost.AuthMode == "2" {
+		client, clientErr = connSSH.NewClientByLocalPrivate()
+	} else {
+		client, clientErr = connSSH.NewClient()
+	}
+	if clientErr != nil {
 		// 连接主机失败，请检查连接参数后重试
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
 		return
@@ -250,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")))