TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-15 04:41:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加部分数据清理周期设置

Browse Source
This commit is contained in:
GoEdgeLab
2023-07-01 17:57:49 +08:00
parent c1dc3d97bb
commit e8c15fd4b3
3 changed files with 229 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
internal/web/actions/default/settings/database/cleanSetting.go
View File

@@ -24,7 +24,7 @@ func (this *CleanSettingAction) RunGet(params struct{}) {
this.ErrorPage(err) this.ErrorPage(err)
return return
} }
var config = &systemconfigs.DatabaseConfig{} var config = systemconfigs.NewDatabaseConfig()
if len(configResp.ValueJSON) > 0 { if len(configResp.ValueJSON) > 0 {
err = json.Unmarshal(configResp.ValueJSON, config) err = json.Unmarshal(configResp.ValueJSON, config)
if err != nil { if err != nil {
@@ -32,31 +32,36 @@ func (this *CleanSettingAction) RunGet(params struct{}) {
return return
} }
} }
this.Data["config"] = config.ServerAccessLog.Clean this.Data["config"] = config
this.Show() this.Show()
} }
func (this *CleanSettingAction) RunPost(params struct { 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 Must *actions.Must
CSRF *actionutils.CSRF CSRF *actionutils.CSRF
}) { }) {
defer this.CreateLogInfo(codes.Database_LogUpdateCleanDays) 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}) configResp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: systemconfigs.SettingCodeDatabaseConfigSetting})
if err != nil { if err != nil {
this.ErrorPage(err) this.ErrorPage(err)
return return
} }
var config = &systemconfigs.DatabaseConfig{} var config = systemconfigs.NewDatabaseConfig()
if len(configResp.ValueJSON) > 0 { if len(configResp.ValueJSON) > 0 {
err = json.Unmarshal(configResp.ValueJSON, config) err = json.Unmarshal(configResp.ValueJSON, config)
if err != nil { if err != nil {
@@ -64,7 +69,62 @@ func (this *CleanSettingAction) RunPost(params struct {
return 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) configJSON, err := json.Marshal(config)
if err != nil { if err != nil {
this.ErrorPage(err) this.ErrorPage(err)

4
internal/web/actions/default/setup/install.go
View File

@@ -268,7 +268,7 @@ func (this *InstallAction) RunPost(params struct {
currentStatusText = "正在配置访问日志保留天数" currentStatusText = "正在配置访问日志保留天数"
var accessLogKeepDays = dbMap.GetInt("accessLogKeepDays") var accessLogKeepDays = dbMap.GetInt("accessLogKeepDays")
if accessLogKeepDays > 0 { if accessLogKeepDays > 0 {
var config = &systemconfigs.DatabaseConfig{} var config = systemconfigs.NewDatabaseConfig()
config.ServerAccessLog.Clean.Days = accessLogKeepDays config.ServerAccessLog.Clean.Days = accessLogKeepDays
configJSON, err := json.Marshal(config) configJSON, err := json.Marshal(config)
if err != nil { if err != nil {
@@ -325,7 +325,7 @@ func (this *InstallAction) RunPost(params struct {
// 设置访问日志保留天数 // 设置访问日志保留天数
var accessLogKeepDays = dbMap.GetInt("accessLogKeepDays") var accessLogKeepDays = dbMap.GetInt("accessLogKeepDays")
if accessLogKeepDays > 0 { if accessLogKeepDays > 0 {
var config = &systemconfigs.DatabaseConfig{} var config = systemconfigs.NewDatabaseConfig()
config.ServerAccessLog.Clean.Days = accessLogKeepDays config.ServerAccessLog.Clean.Days = accessLogKeepDays
configJSON, err := json.Marshal(config) configJSON, err := json.Marshal(config)
if err != nil { if err != nil {

160
web/views/@default/settings/database/cleanSetting.html
View File

@@ -4,18 +4,172 @@
<form class="ui form" data-tea-success="success" data-tea-action="$"> <form class="ui form" data-tea-success="success" data-tea-action="$">
<csrf-token></csrf-token> <csrf-token></csrf-token>
<h4 style="margin-top: 0">服务访问日志</h4> <h4 style="margin-top: 0">网站访问日志</h4>
<table class="ui table definition selectable"> <table class="ui table definition selectable">
<tr> <tr>
<td class="title">保存天数 *</td> <td class="title">数据保存天数 *</td>
<td> <td>
<div class="ui input right labeled"> <div class="ui input right labeled">
<input type="text" name="days" v-model="config.days" style="width:6em" maxlength="6"/> <input type="text" name="serverAccessLogCleanDays" v-model="config.serverAccessLog.clean.days" style="width:6em" maxlength="6"/>
<span class="ui label">天</span> <span class="ui label">天</span>
</div> </div>
<p class="comment">天数包括当天。如果填0表示不自动清理。此设置也会同时作用于日志数据库。</p> <p class="comment">天数包括当天。如果填0表示不自动清理。此设置也会同时作用于日志数据库。</p>
</td> </td>
</tr> </tr>
</table> </table>
<div>
<a href=""><more-options-indicator>更多设置</more-options-indicator></a>
<div class="margin"></div>
</div>
<div v-show="moreOptionsVisible">
<div class="ui divider"></div>
<h4 style="margin-top: 0">网站带宽统计</h4>
<table class="ui table definition selectable">
<tr>
<td class="title">数据保存天数 *</td>
<td>
<div class="ui input right labeled">
<input type="text" name="serverBandwidthStatCleanDays" v-model="config.serverBandwidthStat.clean.days" style="width:6em" maxlength="6"/>
<span class="ui label">天</span>
</div>
<p class="comment"><pro-warning-label></pro-warning-label></p>
</td>
</tr>
</table>
<h4 style="margin-top: 0">用户带宽统计</h4>
<table class="ui table definition selectable">
<tr>
<td class="title">数据保存天数 *</td>
<td>
<div class="ui input right labeled">
<input type="text" name="userBandwidthStatCleanDays" v-model="config.userBandwidthStat.clean.days" style="width:6em" maxlength="6"/>
<span class="ui label">天</span>
</div>
<p class="comment"><pro-warning-label></pro-warning-label></p>
</td>
</tr>
</table>
<h4 style="margin-top: 0">网站流量统计</h4>
<table class="ui table definition selectable">
<tr>
<td class="title">数据保存天数 *</td>
<td>
<div class="ui input right labeled">
<input type="text" name="serverDailyStatCleanDays" v-model="config.serverDailyStat.clean.days" style="width:6em" maxlength="6"/>
<span class="ui label">天</span>
</div>
<p class="comment"><pro-warning-label></pro-warning-label></p>
</td>
</tr>
</table>
<div class="ui divider"></div>
<h4 style="margin-top: 0">网站按小时域名统计</h4>
<table class="ui table definition selectable">
<tr>
<td class="title">数据保存天数 *</td>
<td>
<div class="ui input right labeled">
<input type="text" name="serverDomainHourlyStatCleanDays" v-model="config.serverDomainHourlyStat.clean.days" style="width:6em" maxlength="6"/>
<span class="ui label">天</span>
</div>
<p class="comment"><pro-warning-label></pro-warning-label></p>
</td>
</tr>
</table>
<h4 style="margin-top: 0">系统整体按天流量统计</h4>
<table class="ui table definition selectable">
<tr>
<td class="title">数据保存天数 *</td>
<td>
<div class="ui input right labeled">
<input type="text" name="trafficDailyStatCleanDays" v-model="config.trafficDailyStat.clean.days" style="width:6em" maxlength="6"/>
<span class="ui label">天</span>
</div>
<p class="comment"><pro-warning-label></pro-warning-label></p>
</td>
</tr>
</table>
<h4 style="margin-top: 0">系统整体按小时流量统计</h4>
<table class="ui table definition selectable">
<tr>
<td class="title">数据保存天数 *</td>
<td>
<div class="ui input right labeled">
<input type="text" name="trafficHourlyStatCleanDays" v-model="config.trafficHourlyStat.clean.days" style="width:6em" maxlength="6"/>
<span class="ui label">天</span>
</div>
<p class="comment"><pro-warning-label></pro-warning-label></p>
</td>
</tr>
</table>
<h4 style="margin-top: 0">集群按天流量统计</h4>
<table class="ui table definition selectable">
<tr>
<td class="title">数据保存天数 *</td>
<td>
<div class="ui input right labeled">
<input type="text" name="nodeClusterTrafficDailyStatCleanDays" v-model="config.nodeClusterTrafficDailyStat.clean.days" style="width:6em" maxlength="6"/>
<span class="ui label">天</span>
</div>
<p class="comment"><pro-warning-label></pro-warning-label></p>
</td>
</tr>
</table>
<h4 style="margin-top: 0">节点按天流量统计</h4>
<table class="ui table definition selectable">
<tr>
<td class="title">数据保存天数 *</td>
<td>
<div class="ui input right labeled">
<input type="text" name="nodeTrafficDailyStatCleanDays" v-model="config.nodeTrafficDailyStat.clean.days" style="width:6em" maxlength="6"/>
<span class="ui label">天</span>
</div>
<p class="comment"><pro-warning-label></pro-warning-label></p>
</td>
</tr>
</table>
<h4 style="margin-top: 0">节点按小时流量统计</h4>
<table class="ui table definition selectable">
<tr>
<td class="title">数据保存天数 *</td>
<td>
<div class="ui input right labeled">
<input type="text" name="nodeTrafficHourlyStatCleanDays" v-model="config.nodeTrafficHourlyStat.clean.days" style="width:6em" maxlength="6"/>
<span class="ui label">天</span>
</div>
<p class="comment"><pro-warning-label></pro-warning-label></p>
</td>
</tr>
</table>
<h4 style="margin-top: 0">缓存任务</h4>
<table class="ui table definition selectable">
<tr>
<td class="title">数据保存天数 *</td>
<td>
<div class="ui input right labeled">
<input type="text" name="httpCacheTaskCleanDays" v-model="config.httpCacheTask.clean.days" style="width:6em" maxlength="6"/>
<span class="ui label">天</span>
</div>
<p class="comment"><pro-warning-label></pro-warning-label></p>
</td>
</tr>
</table>
<div class="margin"></div>
</div>
<submit-btn></submit-btn> <submit-btn></submit-btn>
</form> </form>