From 1f68c15e934ea757fe6c751d8c8bda7b0c0bba10 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 14 Jun 2024 17:01:19 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E8=A1=A5=E5=85=85=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/network_element/controller/ne_host.go | 1 + src/modules/network_element/service/ne_license.impl.go | 2 +- src/modules/ws/controller/ws.go | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/network_element/controller/ne_host.go b/src/modules/network_element/controller/ne_host.go index 9336733a..57685740 100644 --- a/src/modules/network_element/controller/ne_host.go +++ b/src/modules/network_element/controller/ne_host.go @@ -203,6 +203,7 @@ func (s *NeHostController) Test(c *gin.Context) { return } defer client.Close() + // 是否有终止符 if strings.HasSuffix(client.LastResult, ">") || strings.HasSuffix(client.LastResult, "> ") || strings.HasSuffix(client.LastResult, "# ") { c.JSON(200, result.Ok(nil)) } else { diff --git a/src/modules/network_element/service/ne_license.impl.go b/src/modules/network_element/service/ne_license.impl.go index 231b6036..41075a15 100644 --- a/src/modules/network_element/service/ne_license.impl.go +++ b/src/modules/network_element/service/ne_license.impl.go @@ -174,7 +174,7 @@ func (r *NeLicenseImpl) UploadLicense(neLicense model.NeLicense) error { // 上传授权文件去覆盖 if err := sftpClient.CopyFileLocalToRemote(omcLicensePath, neLicensePath); err != nil { - return err + return fmt.Errorf("please check if scp remote copy is allowed") } // 重启服务 diff --git a/src/modules/ws/controller/ws.go b/src/modules/ws/controller/ws.go index 04257dd3..afb4722c 100644 --- a/src/modules/ws/controller/ws.go +++ b/src/modules/ws/controller/ws.go @@ -259,12 +259,12 @@ func (s *WSController) Telnet(c *gin.Context) { // 终端单行字符数 cols, err := strconv.Atoi(c.Query("cols")) if err != nil || cols > 254 { - cols = 80 + cols = 120 } // 终端显示行数 rows, err := strconv.Atoi(c.Query("rows")) if err != nil || cols > rows { - rows = 40 + rows = 128 } // 创建Telnet客户端会话