mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2025-03-01 03:24:14 +08:00
fix: 解决 SSH 会话在多个连接下显示错误的问题 (#1525)
This commit is contained in:
parent
72dcdbad1e
commit
e507611cad
backend
@ -789,6 +789,9 @@ func handleInstalled(appInstallList []model.AppInstall, updated bool) ([]respons
|
|||||||
versions = append(versions, detail.Version)
|
versions = append(versions, detail.Version)
|
||||||
}
|
}
|
||||||
versions = common.GetSortedVersions(versions)
|
versions = common.GetSortedVersions(versions)
|
||||||
|
if len(versions) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
lastVersion := versions[0]
|
lastVersion := versions[0]
|
||||||
if common.IsCrossVersion(installed.Version, lastVersion) {
|
if common.IsCrossVersion(installed.Version, lastVersion) {
|
||||||
installDTO.CanUpdate = app.CrossVersionUpdate
|
installDTO.CanUpdate = app.CrossVersionUpdate
|
||||||
|
@ -275,15 +275,19 @@ func getSSHSessions(config SSHSessionConfig) (res []byte, err error) {
|
|||||||
if config.LoginIP != "" && !strings.Contains(user.Host, config.LoginIP) {
|
if config.LoginIP != "" && !strings.Contains(user.Host, config.LoginIP) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
session := sshSession{
|
if terminal, err := proc.Cmdline(); err == nil {
|
||||||
Username: user.User,
|
if strings.Contains(terminal, user.Terminal) {
|
||||||
Host: user.Host,
|
session := sshSession{
|
||||||
Terminal: user.Terminal,
|
Username: user.User,
|
||||||
PID: proc.Pid,
|
Host: user.Host,
|
||||||
|
Terminal: user.Terminal,
|
||||||
|
PID: proc.Pid,
|
||||||
|
}
|
||||||
|
t := time.Unix(int64(user.Started), 0)
|
||||||
|
session.LoginTime = t.Format("2006-1-2 15:04:05")
|
||||||
|
result = append(result, session)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
t := time.Unix(int64(user.Started), 0)
|
|
||||||
session.LoginTime = t.Format("2006-1-2 15:04:05")
|
|
||||||
result = append(result, session)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user