TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2026-01-04 18:16:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加操作日志查看界面

Browse Source
This commit is contained in:
GoEdgeLab
2020-11-10 20:30:47 +08:00
parent 32f8ba02b6
commit d088e88e58
13 changed files with 101 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/web/actions/default/index/index.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/TeaOSLab/EdgeAdmin/internal/utils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/actions"
"github.com/iwind/TeaGo/types"
@@ -93,12 +94,7 @@ func (this *IndexAction) RunPost(params struct {
})
if err != nil {
_, err = rpcClient.AdminRPC().CreateAdminLog(rpcClient.Context(0), &pb.CreateAdminLogRequest{
Level: oplogs.LevelError,
Description: "登录时发生系统错误：" + err.Error(),
Action: this.Request.URL.Path,
Ip: this.RequestRemoteIP(),
})
err = models.SharedLogDAO.CreateAdminLog(rpcClient.Context(0), oplogs.LevelError, this.Request.URL.Path, "登录时发生系统错误："+err.Error(), this.RequestRemoteIP())
if err != nil {
utils.PrintError(err)
}
@@ -107,12 +103,7 @@ func (this *IndexAction) RunPost(params struct {
}
if !resp.IsOk {
_, err = rpcClient.AdminRPC().CreateAdminLog(rpcClient.Context(0), &pb.CreateAdminLogRequest{
Level: oplogs.LevelWarn,
Description: "登录失败，用户名：" + params.Username,
Action: this.Request.URL.Path,
Ip: this.RequestRemoteIP(),
})
err = models.SharedLogDAO.CreateAdminLog(rpcClient.Context(0), oplogs.LevelWarn, this.Request.URL.Path, "登录失败，用户名："+params.Username, this.RequestRemoteIP())
if err != nil {
utils.PrintError(err)
}
@@ -120,16 +111,11 @@ func (this *IndexAction) RunPost(params struct {
this.Fail("请输入正确的用户名密码")
}
adminId := int(resp.AdminId)
adminId := resp.AdminId
params.Auth.StoreAdmin(adminId, params.Remember)
// 记录日志
_, err = rpcClient.AdminRPC().CreateAdminLog(rpcClient.Context(0), &pb.CreateAdminLogRequest{
Level: oplogs.LevelInfo,
Description: "成功登录系统，用户名：" + params.Username,
Action: this.Request.URL.Path,
Ip: this.RequestRemoteIP(),
})
err = models.SharedLogDAO.CreateAdminLog(rpcClient.Context(adminId), oplogs.LevelInfo, this.Request.URL.Path, "成功登录系统，用户名："+params.Username, this.RequestRemoteIP())
if err != nil {
utils.PrintError(err)
}

7
internal/web/actions/default/log/helper.go
View File

@@ -1,7 +1,6 @@
package log
import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/iwind/TeaGo/actions"
"net/http"
)
@@ -15,10 +14,4 @@ func (this *Helper) BeforeAction(action *actions.ActionObject) {
}
action.Data["teaMenu"] = "log"
selectedTabbar, _ := action.Data["mainTab"]
tabbar := actionutils.NewTabbar()
tabbar.Add("日志节点", "", "/log", "", selectedTabbar == "log")
actionutils.SetTabbar(action, tabbar)
}

37
internal/web/actions/default/log/index.go
View File

@@ -1,6 +1,11 @@
package log
import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/maps"
timeutil "github.com/iwind/TeaGo/utils/time"
)
type IndexAction struct {
actionutils.ParentAction
@@ -11,5 +16,35 @@ func (this *IndexAction) Init() {
}
func (this *IndexAction) RunGet(params struct{}) {
countResp, err := this.RPC().LogRPC().CountLogs(this.AdminContext(), &pb.CountLogRequest{})
if err != nil {
this.ErrorPage(err)
return
}
count := countResp.Count
page := this.NewPage(count)
this.Data["page"] = page.AsHTML()
logsResp, err := this.RPC().LogRPC().ListLogs(this.AdminContext(), &pb.ListLogsRequest{
Offset: page.Offset,
Size: page.Size,
})
if err != nil {
this.ErrorPage(err)
return
}
logMaps := []maps.Map{}
for _, log := range logsResp.Logs {
logMaps = append(logMaps, maps.Map{
"description": log.Description,
"userName": log.Description,
"createdTime": timeutil.FormatTime("Y-m-d H:i:s", log.CreatedAt),
"level": log.Level,
"type": log.Type,
"ip": log.Ip,
})
}
this.Data["logs"] = logMaps
this.Show()
}