diff --git a/internal/web/actions/default/settings/database/cleanSetting.go b/internal/web/actions/default/settings/database/cleanSetting.go index 216de840..1c2a0385 100644 --- a/internal/web/actions/default/settings/database/cleanSetting.go +++ b/internal/web/actions/default/settings/database/cleanSetting.go @@ -24,7 +24,7 @@ func (this *CleanSettingAction) RunGet(params struct{}) { this.ErrorPage(err) return } - var config = &systemconfigs.DatabaseConfig{} + var config = systemconfigs.NewDatabaseConfig() if len(configResp.ValueJSON) > 0 { err = json.Unmarshal(configResp.ValueJSON, config) if err != nil { @@ -32,31 +32,36 @@ func (this *CleanSettingAction) RunGet(params struct{}) { return } } - this.Data["config"] = config.ServerAccessLog.Clean + this.Data["config"] = config this.Show() } func (this *CleanSettingAction) RunPost(params struct { - Days int + ServerAccessLogCleanDays int + ServerBandwidthStatCleanDays int + UserBandwidthStatCleanDays int + ServerDailyStatCleanDays int + ServerDomainHourlyStatCleanDays int + TrafficDailyStatCleanDays int + TrafficHourlyStatCleanDays int + NodeClusterTrafficDailyStatCleanDays int + NodeTrafficDailyStatCleanDays int + NodeTrafficHourlyStatCleanDays int + HttpCacheTaskCleanDays int Must *actions.Must CSRF *actionutils.CSRF }) { defer this.CreateLogInfo(codes.Database_LogUpdateCleanDays) - days := params.Days - if days < 0 { - days = 0 - } - // 读取设置 configResp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: systemconfigs.SettingCodeDatabaseConfigSetting}) if err != nil { this.ErrorPage(err) return } - var config = &systemconfigs.DatabaseConfig{} + var config = systemconfigs.NewDatabaseConfig() if len(configResp.ValueJSON) > 0 { err = json.Unmarshal(configResp.ValueJSON, config) if err != nil { @@ -64,7 +69,62 @@ func (this *CleanSettingAction) RunPost(params struct { return } } - config.ServerAccessLog.Clean.Days = days + + if params.ServerAccessLogCleanDays < 0 { + params.ServerAccessLogCleanDays = 0 + } + config.ServerAccessLog.Clean.Days = params.ServerAccessLogCleanDays + + if params.ServerBandwidthStatCleanDays < 0 { + params.ServerBandwidthStatCleanDays = 0 + } + config.ServerBandwidthStat.Clean.Days = params.ServerBandwidthStatCleanDays + + if params.UserBandwidthStatCleanDays < 0 { + params.UserBandwidthStatCleanDays = 0 + } + config.UserBandwidthStat.Clean.Days = params.UserBandwidthStatCleanDays + + if params.ServerDailyStatCleanDays < 0 { + params.ServerDailyStatCleanDays = 0 + } + config.ServerDailyStat.Clean.Days = params.ServerDailyStatCleanDays + + if params.ServerDomainHourlyStatCleanDays < 0 { + params.ServerDomainHourlyStatCleanDays = 0 + } + config.ServerDomainHourlyStat.Clean.Days = params.ServerDomainHourlyStatCleanDays + + if params.TrafficDailyStatCleanDays < 0 { + params.TrafficDailyStatCleanDays = 0 + } + config.TrafficDailyStat.Clean.Days = params.TrafficDailyStatCleanDays + + if params.TrafficHourlyStatCleanDays < 0 { + params.TrafficHourlyStatCleanDays = 0 + } + config.TrafficHourlyStat.Clean.Days = params.TrafficHourlyStatCleanDays + + if params.NodeClusterTrafficDailyStatCleanDays < 0 { + params.NodeClusterTrafficDailyStatCleanDays = 0 + } + config.NodeClusterTrafficDailyStat.Clean.Days = params.NodeClusterTrafficDailyStatCleanDays + + if params.NodeTrafficDailyStatCleanDays < 0 { + params.NodeTrafficDailyStatCleanDays = 0 + } + config.NodeTrafficDailyStat.Clean.Days = params.NodeTrafficDailyStatCleanDays + + if params.NodeTrafficHourlyStatCleanDays < 0 { + params.NodeTrafficHourlyStatCleanDays = 0 + } + config.NodeTrafficHourlyStat.Clean.Days = params.NodeTrafficHourlyStatCleanDays + + if params.HttpCacheTaskCleanDays < 0 { + params.HttpCacheTaskCleanDays = 0 + } + config.HTTPCacheTask.Clean.Days = params.HttpCacheTaskCleanDays + configJSON, err := json.Marshal(config) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/setup/install.go b/internal/web/actions/default/setup/install.go index 2ca33b1f..1d2bad97 100644 --- a/internal/web/actions/default/setup/install.go +++ b/internal/web/actions/default/setup/install.go @@ -268,7 +268,7 @@ func (this *InstallAction) RunPost(params struct { currentStatusText = "正在配置访问日志保留天数" var accessLogKeepDays = dbMap.GetInt("accessLogKeepDays") if accessLogKeepDays > 0 { - var config = &systemconfigs.DatabaseConfig{} + var config = systemconfigs.NewDatabaseConfig() config.ServerAccessLog.Clean.Days = accessLogKeepDays configJSON, err := json.Marshal(config) if err != nil { @@ -325,7 +325,7 @@ func (this *InstallAction) RunPost(params struct { // 设置访问日志保留天数 var accessLogKeepDays = dbMap.GetInt("accessLogKeepDays") if accessLogKeepDays > 0 { - var config = &systemconfigs.DatabaseConfig{} + var config = systemconfigs.NewDatabaseConfig() config.ServerAccessLog.Clean.Days = accessLogKeepDays configJSON, err := json.Marshal(config) if err != nil { diff --git a/web/views/@default/settings/database/cleanSetting.html b/web/views/@default/settings/database/cleanSetting.html index 6c0f61b7..43410dbf 100644 --- a/web/views/@default/settings/database/cleanSetting.html +++ b/web/views/@default/settings/database/cleanSetting.html @@ -4,18 +4,172 @@
-

服务访问日志

+

网站访问日志

- +
保存天数 *数据保存天数 *
- + 天

天数包括当天。如果填0表示不自动清理。此设置也会同时作用于日志数据库。
+ +
+ 更多设置 +
+
+ +
+
+ +

网站带宽统计

+ + + + + +
数据保存天数 * +
+ + 天 +
+

+
+ +

用户带宽统计

+ + + + + +
数据保存天数 * +
+ + 天 +
+

+
+ +

网站流量统计

+ + + + + +
数据保存天数 * +
+ + 天 +
+

+
+ +
+ +

网站按小时域名统计

+ + + + + +
数据保存天数 * +
+ + 天 +
+

+
+ +

系统整体按天流量统计

+ + + + + +
数据保存天数 * +
+ + 天 +
+

+
+ +

系统整体按小时流量统计

+ + + + + +
数据保存天数 * +
+ + 天 +
+

+
+ +

集群按天流量统计

+ + + + + +
数据保存天数 * +
+ + 天 +
+

+
+ +

节点按天流量统计

+ + + + + +
数据保存天数 * +
+ + 天 +
+

+
+ +

节点按小时流量统计

+ + + + + +
数据保存天数 * +
+ + 天 +
+

+
+ +

缓存任务

+ + + + + +
数据保存天数 * +
+ + 天 +
+

+
+ +
+
+
\ No newline at end of file