Merge branch 'main-v2' into lite

src/framework/ssh/files.go

@@ -2,6 +2,7 @@ package ssh
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 
 	"be.ems/src/framework/cmd"
@@ -99,5 +100,10 @@ func FileList(sshClient *ConnSSH, path, search string) ([]FileListRow, error) {
 			FileName:     fileName,
 		})
 	}
+
+	// 按时间排序
+	sort.Slice(rows, func(i, j int) bool {
+		return rows[i].ModifiedTime > rows[j].ModifiedTime
+	})
 	return rows, nil
 }

src/framework/telnet/telnet.go

@@ -27,9 +27,8 @@ func (c *ConnTelnet) NewClient() (*ConnTelnet, error) {
 	proto := "tcp"
 	if strings.Contains(c.Addr, ":") {
 		proto = "tcp6"
-		c.Addr = fmt.Sprintf("[%s]", c.Addr)
 	}
-	addr := fmt.Sprintf("%s:%d", c.Addr, c.Port)
+	addr := net.JoinHostPort(c.Addr, fmt.Sprint(c.Port))
 
 	// 默认等待5s
 	if c.DialTimeOut == 0 {
@@ -76,6 +75,7 @@ func (c *ConnTelnet) RunCMD(cmd string) (string, error) {
 		if _, err := conn.Write([]byte(cmd)); err != nil {
 			return "", err
 		}
+		time.Sleep(100 * time.Millisecond)
 	}
 
 	var buf bytes.Buffer

src/framework/utils/file/files.go

@@ -3,6 +3,7 @@ package file
 import (
 	"os"
 	"path/filepath"
+	"sort"
 )
 
 // FileListRow 文件列表行数据
@@ -74,5 +75,9 @@ func FileList(path, search string) ([]FileListRow, error) {
 		})
 	}
 
+	// 按时间排序
+	sort.Slice(rows, func(i, j int) bool {
+		return rows[i].ModifiedTime > rows[j].ModifiedTime
+	})
 	return rows, nil
 }