OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

feat: 移除ssh客户端改为本地bash

Browse Source
This commit is contained in:
TsMask
2025-05-13 17:22:04 +08:00
parent 552abb411c
commit f7f63f1950
21 changed files with 526 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/modules/ws/controller/ws_ssh.go
View File

@@ -5,12 +5,11 @@ import (
"fmt"
"time"
"be.ems/src/framework/cmd"
"be.ems/src/framework/i18n"
"be.ems/src/framework/logger"
"be.ems/src/framework/reqctx"
"be.ems/src/framework/resp"
"be.ems/src/framework/ssh"
neService "be.ems/src/modules/network_element/service"
"github.com/gin-gonic/gin"
)
@@ -44,32 +43,32 @@ func (s *WSController) SSH(c *gin.Context) {
return
}
neHost := neService.NewNeHost.FindById(query.HostId)
if neHost.ID != query.HostId || neHost.HostType != "ssh" {
// 没有可访问主机信息数据！
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neHost.noData")))
return
}
// neHost := neService.NewNeHost.FindById(query.HostId)
// if neHost.ID != query.HostId || neHost.HostType != "ssh" {
// // 没有可访问主机信息数据！
// c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neHost.noData")))
// return
// }
// 创建链接SSH客户端
var connSSH ssh.ConnSSH
neHost.CopyTo(&connSSH)
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, resp.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
return
}
defer client.Close()
// // 创建链接SSH客户端
// var connSSH ssh.ConnSSH
// neHost.CopyTo(&connSSH)
// 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, resp.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
// return
// }
// defer client.Close()
// 创建SSH客户端会话
clientSession, err := client.NewClientSession(query.Cols, query.Rows)
clientSession, err := cmd.NewClientSession(query.Cols, query.Rows)
if err != nil {
// 连接主机失败，请检查连接参数后重试
c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
@@ -98,7 +97,7 @@ func (s *WSController) SSH(c *gin.Context) {
if len(outputByte) > 0 {
outputStr := string(outputByte)
msgByte, _ := json.Marshal(resp.Ok(map[string]any{
"requestId": fmt.Sprintf("ssh_%d_%d", neHost.ID, ms.UnixMilli()),
"requestId": fmt.Sprintf("ssh_%d_%d", query.HostId, ms.UnixMilli()),
"data": outputStr,
}))
wsClient.MsgChan <- msgByte