diff --git a/internal/web/actions/default/clusters/index.go b/internal/web/actions/default/clusters/index.go index 6b7a4d75..10d7fe4b 100644 --- a/internal/web/actions/default/clusters/index.go +++ b/internal/web/actions/default/clusters/index.go @@ -38,7 +38,7 @@ func (this *IndexAction) RunGet(params struct { // 常用的节点 latestClusterMaps := []maps.Map{} if !isSearching { - clustersResp, err := this.RPC().NodeClusterRPC().FindLatestNodeClusters(this.AdminContext(), &pb.FindLatestNodeClustersRequest{Size: 4}) + clustersResp, err := this.RPC().NodeClusterRPC().FindLatestNodeClusters(this.AdminContext(), &pb.FindLatestNodeClustersRequest{Size: 6}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/servers/index.go b/internal/web/actions/default/servers/index.go index eae05670..be1ed133 100644 --- a/internal/web/actions/default/servers/index.go +++ b/internal/web/actions/default/servers/index.go @@ -30,10 +30,29 @@ func (this *IndexAction) RunGet(params struct { this.Data["auditingFlag"] = params.AuditingFlag this.Data["checkDNS"] = params.CheckDNS + isSearching := params.AuditingFlag == 1 || params.ClusterId > 0 || params.GroupId > 0 || len(params.Keyword) > 0 + if params.AuditingFlag > 0 { this.Data["firstMenuItem"] = "auditing" } + // 常用的服务 + latestServerMaps := []maps.Map{} + if !isSearching { + serversResp, err := this.RPC().ServerRPC().FindLatestServers(this.AdminContext(), &pb.FindLatestServersRequest{Size: 6}) + if err != nil { + this.ErrorPage(err) + return + } + for _, server := range serversResp.Servers { + latestServerMaps = append(latestServerMaps, maps.Map{ + "id": server.Id, + "name": server.Name, + }) + } + } + this.Data["latestServers"] = latestServerMaps + // 审核中的数量 countAuditingResp, err := this.RPC().ServerRPC().CountAllEnabledServersMatch(this.AdminContext(), &pb.CountAllEnabledServersMatchRequest{ AuditingFlag: 1, diff --git a/internal/web/actions/default/servers/server/log/index.go b/internal/web/actions/default/servers/server/log/index.go index 0f30f868..696de90c 100644 --- a/internal/web/actions/default/servers/server/log/index.go +++ b/internal/web/actions/default/servers/server/log/index.go @@ -24,6 +24,16 @@ func (this *IndexAction) RunGet(params struct { this.Data["serverId"] = params.ServerId this.Data["requestId"] = params.RequestId + // 记录最近使用 + _, err := this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{ + ItemType: "server", + ItemId: params.ServerId, + }) + if err != nil { + this.ErrorPage(err) + return + } + this.Show() } diff --git a/internal/web/actions/default/servers/server/settings/index.go b/internal/web/actions/default/servers/server/settings/index.go index d04c8d75..92ad16a8 100644 --- a/internal/web/actions/default/servers/server/settings/index.go +++ b/internal/web/actions/default/servers/server/settings/index.go @@ -10,7 +10,7 @@ import ( "github.com/iwind/TeaGo/maps" ) -// 服务基本信息设置 +// IndexAction 服务基本信息设置 type IndexAction struct { actionutils.ParentAction } @@ -102,10 +102,20 @@ func (this *IndexAction) RunGet(params struct { typeName := serverType.GetString("name") this.Data["typeName"] = typeName + // 记录最近使用 + _, err = this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{ + ItemType: "server", + ItemId: params.ServerId, + }) + if err != nil { + this.ErrorPage(err) + return + } + this.Show() } -// 保存 +// RunPost 保存 func (this *IndexAction) RunPost(params struct { ServerId int64 Name string diff --git a/internal/web/actions/default/servers/server/stat/index.go b/internal/web/actions/default/servers/server/stat/index.go index 8328404f..3cc09479 100644 --- a/internal/web/actions/default/servers/server/stat/index.go +++ b/internal/web/actions/default/servers/server/stat/index.go @@ -146,5 +146,15 @@ func (this *IndexAction) RunGet(params struct { this.Data["provinceStats"] = provinceStatMaps this.Data["cityStats"] = cityStatMaps + // 记录最近使用 + _, err = this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{ + ItemType: "server", + ItemId: params.ServerId, + }) + if err != nil { + this.ErrorPage(err) + return + } + this.Show() } diff --git a/web/views/@default/servers/index.html b/web/views/@default/servers/index.html index e8c6b21b..71dfd4de 100644 --- a/web/views/@default/servers/index.html +++ b/web/views/@default/servers/index.html @@ -25,6 +25,9 @@