diff --git a/internal/web/actions/default/servers/server/log/history.go b/internal/web/actions/default/servers/server/log/history.go index c0e48815..2ed36b4b 100644 --- a/internal/web/actions/default/servers/server/log/history.go +++ b/internal/web/actions/default/servers/server/log/history.go @@ -2,6 +2,7 @@ package log import ( "github.com/TeaOSLab/EdgeCommon/pkg/iplibrary" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/maps" @@ -61,6 +62,27 @@ func (this *HistoryAction) RunGet(params struct { return } + // 检查当前网站有无开启访问日志 + this.Data["serverAccessLogIsOn"] = true + + groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ + ServerId: params.ServerId, + }) + if err != nil { + this.ErrorPage(err) + return + } + if !groupResp.HasAccessLogConfig { + webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId) + if err != nil { + this.ErrorPage(err) + return + } + if webConfig != nil && webConfig.AccessLogRef != nil && !webConfig.AccessLogRef.IsOn { + this.Data["serverAccessLogIsOn"] = false + } + } + var day = params.Day var ipList = []string{} var wafMaps = []maps.Map{} diff --git a/internal/web/actions/default/servers/server/log/index.go b/internal/web/actions/default/servers/server/log/index.go index f78807fe..1c288a93 100644 --- a/internal/web/actions/default/servers/server/log/index.go +++ b/internal/web/actions/default/servers/server/log/index.go @@ -2,6 +2,7 @@ package log import ( "github.com/TeaOSLab/EdgeCommon/pkg/iplibrary" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/lists" @@ -41,8 +42,29 @@ func (this *IndexAction) RunGet(params struct { return } + // 检查当前网站有无开启访问日志 + this.Data["serverAccessLogIsOn"] = true + + groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ + ServerId: params.ServerId, + }) + if err != nil { + this.ErrorPage(err) + return + } + if !groupResp.HasAccessLogConfig { + webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId) + if err != nil { + this.ErrorPage(err) + return + } + if webConfig != nil && webConfig.AccessLogRef != nil && !webConfig.AccessLogRef.IsOn { + this.Data["serverAccessLogIsOn"] = false + } + } + // 记录最近使用 - _, err := this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{ + _, err = this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{ ItemType: "server", ItemId: params.ServerId, }) diff --git a/internal/web/actions/default/servers/server/log/today.go b/internal/web/actions/default/servers/server/log/today.go index 41bb4e08..34402128 100644 --- a/internal/web/actions/default/servers/server/log/today.go +++ b/internal/web/actions/default/servers/server/log/today.go @@ -2,6 +2,7 @@ package log import ( "github.com/TeaOSLab/EdgeCommon/pkg/iplibrary" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/maps" @@ -55,6 +56,27 @@ func (this *TodayAction) RunGet(params struct { return } + // 检查当前网站有无开启访问日志 + this.Data["serverAccessLogIsOn"] = true + + groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ + ServerId: params.ServerId, + }) + if err != nil { + this.ErrorPage(err) + return + } + if !groupResp.HasAccessLogConfig { + webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId) + if err != nil { + this.ErrorPage(err) + return + } + if webConfig != nil && webConfig.AccessLogRef != nil && !webConfig.AccessLogRef.IsOn { + this.Data["serverAccessLogIsOn"] = false + } + } + resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{ Partition: params.Partition, RequestId: params.RequestId, diff --git a/internal/web/actions/default/servers/server/settings/accessLog/index.go b/internal/web/actions/default/servers/server/settings/accessLog/index.go index a15df934..7712c3d1 100644 --- a/internal/web/actions/default/servers/server/settings/accessLog/index.go +++ b/internal/web/actions/default/servers/server/settings/accessLog/index.go @@ -21,7 +21,7 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ServerId int64 }) { - // 服务分组设置 + // 网站分组设置 groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{ ServerId: params.ServerId, }) diff --git a/web/views/@default/servers/server/log/history.html b/web/views/@default/servers/server/log/history.html index 8e7c317c..714ed580 100644 --- a/web/views/@default/servers/server/log/history.html +++ b/web/views/@default/servers/server/log/history.html @@ -20,6 +20,12 @@ 当前集群已经设置不允许网站记录访问日志,可以在"集群设置" -- "网站设置"中修改此选项。 + +
+
+ 当前网站尚未启用访问日志,可以在 [这里] 修改。 +
+ 所有日志 错误日志 diff --git a/web/views/@default/servers/server/log/index.html b/web/views/@default/servers/server/log/index.html index 0aadd572..300f93ae 100644 --- a/web/views/@default/servers/server/log/index.html +++ b/web/views/@default/servers/server/log/index.html @@ -18,6 +18,12 @@ 当前集群已经设置不允许网站记录访问日志,可以在"集群设置" -- "网站设置"中修改此选项。 + +
+
+ 当前网站尚未启用访问日志,可以在 [这里] 修改。 +
+
diff --git a/web/views/@default/servers/server/log/today.html b/web/views/@default/servers/server/log/today.html index 737ea092..d025c196 100644 --- a/web/views/@default/servers/server/log/today.html +++ b/web/views/@default/servers/server/log/today.html @@ -18,6 +18,12 @@ 当前集群已经设置不允许网站记录访问日志,可以在"集群设置" -- "网站设置"中修改此选项。 + +
+
+ 当前网站尚未启用访问日志,可以在 [这里] 修改。 +
+ 所有日志 错误日志