test/1Panel
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/1Panel.git synced 2024-12-02 11:57:56 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

fix: ssh 登录日志时区修改 (#1223)

Browse Source
This commit is contained in:
ssongliu 2023-06-01 22:04:57 +08:00 committed by GitHub
parent 7d968348f5
commit 0187d2f5c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/app/service/ssh.go
View File

@ -6,7 +6,6 @@ import (
"os/user" "os/user"
"path" "path"
"path/filepath" "path/filepath"
"sort"
"strings" "strings"
"time" "time"
@ -252,24 +251,23 @@ func (u *SSHService) LoadLog(req dto.SearchSSHLog) (*dto.SSHLog, error) {
} }
} }
data.SuccessfulCount = data.TotalCount - data.FailedCount data.SuccessfulCount = data.TotalCount - data.FailedCount
if len(data.Logs) < 1 {
return nil, nil
}
timeNow := time.Now() timeNow := time.Now()
nyc, _ := time.LoadLocation(common.LoadTimeZone()) nyc, _ := time.LoadLocation(common.LoadTimeZone())
qqWry, err := qqwry.NewQQwry() qqWry, err := qqwry.NewQQwry()
if err != nil { if err != nil {
global.LOG.Errorf("load qqwry datas failed: %s", err) global.LOG.Errorf("load qqwry datas failed: %s", err)
} }
for i := 0; i < len(data.Logs); i++ { var itemLogs []dto.SSHHistory
for i := len(data.Logs) - 1; i >= 0; i-- {
data.Logs[i].Area = qqWry.Find(data.Logs[i].Address).Area data.Logs[i].Area = qqWry.Find(data.Logs[i].Address).Area
data.Logs[i].Date, _ = time.ParseInLocation("2006 Jan 2 15:04:05", fmt.Sprintf("%d %s", timeNow.Year(), data.Logs[i].DateStr), nyc) data.Logs[i].Date, _ = time.ParseInLocation("2006 Jan 2 15:04:05", fmt.Sprintf("%d %s", timeNow.Year(), data.Logs[i].DateStr), nyc)
if data.Logs[i].Date.After(timeNow) { itemLogs = append(itemLogs, data.Logs[i])
data.Logs[i].Date = data.Logs[i].Date.AddDate(-1, 0, 0)
} }
} data.Logs = itemLogs
sort.Slice(data.Logs, func(i, j int) bool {
return data.Logs[i].Date.After(data.Logs[j].Date)
})
var itemDatas []dto.SSHHistory var itemDatas []dto.SSHHistory
total, start, end := len(data.Logs), (req.Page-1)*req.PageSize, req.Page*req.PageSize total, start, end := len(data.Logs), (req.Page-1)*req.PageSize, req.Page*req.PageSize