diff --git a/internal/web/actions/default/servers/components/cache/batch/init.go b/internal/web/actions/default/servers/components/cache/batch/init.go index e4695be9..d438eded 100644 --- a/internal/web/actions/default/servers/components/cache/batch/init.go +++ b/internal/web/actions/default/servers/components/cache/batch/init.go @@ -16,7 +16,7 @@ func init() { GetPost("", new(IndexAction)). GetPost("/fetch", new(FetchAction)). Get("/tasks", new(TasksAction)). - Get("/task", new(TaskAction)). + GetPost("/task", new(TaskAction)). Post("/deleteTask", new(DeleteTaskAction)). Post("/resetTask", new(ResetTaskAction)). EndAll() diff --git a/internal/web/actions/default/servers/components/cache/batch/task.go b/internal/web/actions/default/servers/components/cache/batch/task.go index 6b361c8e..047190e5 100644 --- a/internal/web/actions/default/servers/components/cache/batch/task.go +++ b/internal/web/actions/default/servers/components/cache/batch/task.go @@ -29,14 +29,32 @@ func (this *TaskAction) RunGet(params struct { return } - taskResp, err := this.RPC().HTTPCacheTaskRPC().FindEnabledHTTPCacheTask(this.AdminContext(), &pb.FindEnabledHTTPCacheTaskRequest{HttpCacheTaskId: params.TaskId}) + if !this.readTask(params.TaskId) { + return + } + + this.Show() +} + +func (this *TaskAction) RunPost(params struct { + TaskId int64 +}) { + if !this.readTask(params.TaskId) { + return + } + this.Success() +} + +// 读取任务信息 +func (this *TaskAction) readTask(taskId int64) (ok bool) { + taskResp, err := this.RPC().HTTPCacheTaskRPC().FindEnabledHTTPCacheTask(this.AdminContext(), &pb.FindEnabledHTTPCacheTaskRequest{HttpCacheTaskId: taskId}) if err != nil { this.ErrorPage(err) return } var task = taskResp.HttpCacheTask if task == nil { - this.NotFound("HTTPCacheTask", params.TaskId) + this.NotFound("HTTPCacheTask", taskId) return } @@ -101,5 +119,6 @@ func (this *TaskAction) RunGet(params struct { "user": userMap, } - this.Show() + ok = true + return } diff --git a/web/views/@default/servers/components/cache/batch/fetch.html b/web/views/@default/servers/components/cache/batch/fetch.html index d7937a47..d7d658b5 100644 --- a/web/views/@default/servers/components/cache/batch/fetch.html +++ b/web/views/@default/servers/components/cache/batch/fetch.html @@ -5,10 +5,10 @@ - + diff --git a/web/views/@default/servers/components/cache/batch/index.html b/web/views/@default/servers/components/cache/batch/index.html index 8ad9172d..1a1998a4 100644 --- a/web/views/@default/servers/components/cache/batch/index.html +++ b/web/views/@default/servers/components/cache/batch/index.html @@ -7,21 +7,21 @@
要预热的Key列表要预热的URL列表 -

每行一个Key。

+

每行一个URL。

- + diff --git a/web/views/@default/servers/components/cache/batch/task.html b/web/views/@default/servers/components/cache/batch/task.html index b5bf89b1..b5d72fe5 100644 --- a/web/views/@default/servers/components/cache/batch/task.html +++ b/web/views/@default/servers/components/cache/batch/task.html @@ -20,10 +20,10 @@ - + diff --git a/web/views/@default/servers/components/cache/batch/task.js b/web/views/@default/servers/components/cache/batch/task.js index abbf9e92..f77e9c17 100644 --- a/web/views/@default/servers/components/cache/batch/task.js +++ b/web/views/@default/servers/components/cache/batch/task.js @@ -1,4 +1,8 @@ Tea.context(function () { + this.$delay(function () { + this.reload() + }) + this.deleteTask = function (taskId) { teaweb.confirm("确定要删除此任务吗?", function () { this.$post(".deleteTask") @@ -20,4 +24,19 @@ Tea.context(function () { .refresh() }) } + + this.reload = function () { + this.$post("$") + .params({ + taskId: this.task.id + }) + .success(function (resp) { + this.task = resp.data.task + }) + .done(function () { + this.$delay(function () { + this.reload() + }, 10000) + }) + } }) \ No newline at end of file diff --git a/web/views/@default/servers/components/cache/batch/tasks.html b/web/views/@default/servers/components/cache/batch/tasks.html index 17bd218f..85fd4e22 100644 --- a/web/views/@default/servers/components/cache/batch/tasks.html +++ b/web/views/@default/servers/components/cache/batch/tasks.html @@ -8,7 +8,7 @@ - + diff --git a/web/views/@default/servers/components/cache/fetch.html b/web/views/@default/servers/components/cache/fetch.html index 01715a74..9a5cadcd 100644 --- a/web/views/@default/servers/components/cache/fetch.html +++ b/web/views/@default/servers/components/cache/fetch.html @@ -5,10 +5,10 @@
缓存Key类型URL类型 - 根据Key   - 根据前缀 + URL   + 目录
- 要刷新的Key列表 - 要刷新的Key前缀列表 + 要刷新的URL列表 + 要刷新的URL目录列表 -

每行一个Key,比如是一个完整的URLhttps://example.com/hello/world.html

-

每行一个Key前缀,比如是一个URL前缀https://example.com/hello/

+

每行一个URL,比如https://example.com/hello/world.html

+

每行一个URL目录,比如https://example.com/hello/

Key类型缓存URL类型 URL - 前缀 + 目录
任务编号 任务类型Key类型URL类型 创建时间 所属用户 任务状态
- + diff --git a/web/views/@default/servers/components/cache/purge.html b/web/views/@default/servers/components/cache/purge.html index b93c3c69..c20e41a3 100644 --- a/web/views/@default/servers/components/cache/purge.html +++ b/web/views/@default/servers/components/cache/purge.html @@ -1,26 +1,26 @@ {$layout} {$template "policy_menu"} -

可以在这里批量删除一组Key。

+

可以在这里批量刷新一组URL。

Key列表URL列表 -

每行一个Key。

+

每行一个URL。

- + diff --git a/web/views/@default/servers/groups/group/settings/cache/fetch.html b/web/views/@default/servers/groups/group/settings/cache/fetch.html index 41cbeac7..40a33b4d 100644 --- a/web/views/@default/servers/groups/group/settings/cache/fetch.html +++ b/web/views/@default/servers/groups/group/settings/cache/fetch.html @@ -9,16 +9,16 @@

没有开启缓存,不需要清理。

-

可以在这里批量预热一组Key。

+

可以在这里批量预热一组缓存URL。

操作类型URL类型 - 根据Key   - 根据前缀 + URL   + 目录
- Key列表 - Key前缀列表 + URL + 目录 -

每行一个Key,比如是一个完整的URLhttps://example.com/hello/world.html

-

每行一个Key前缀,比如是一个URL前缀https://example.com/hello/

+

每行一个URL,比如https://example.com/hello/world.html

+

每行一个URL目录,比如https://example.com/hello/

- + diff --git a/web/views/@default/servers/groups/group/settings/cache/purge.html b/web/views/@default/servers/groups/group/settings/cache/purge.html index d65beecb..ad3aae0f 100644 --- a/web/views/@default/servers/groups/group/settings/cache/purge.html +++ b/web/views/@default/servers/groups/group/settings/cache/purge.html @@ -18,19 +18,19 @@ diff --git a/web/views/@default/servers/server/settings/cache/fetch.html b/web/views/@default/servers/server/settings/cache/fetch.html index 504e83c2..5ec49068 100644 --- a/web/views/@default/servers/server/settings/cache/fetch.html +++ b/web/views/@default/servers/server/settings/cache/fetch.html @@ -10,16 +10,16 @@

没有开启缓存,暂时无法预热缓存。

-

可以在这里批量预热一组Key。

+

可以在这里批量预热一组URL。

Key列表URL列表 -

每行一个Key。

+

每行一个URL。

操作类型 - 根据Key   - 根据前缀 + URL   + 目录
- Key列表 - Key前缀列表 + URL + 目录 -

每行一个Key,比如是一个完整的URLhttps://example.com/hello/world.html

-

每行一个Key前缀,比如是一个URL前缀https://example.com/hello/

+

每行一个URL,比如https://example.com/hello/world.html

+

每行一个URL目录,比如https://example.com/hello/

- + diff --git a/web/views/@default/servers/server/settings/cache/purge.html b/web/views/@default/servers/server/settings/cache/purge.html index d1d17984..c29d0c1a 100644 --- a/web/views/@default/servers/server/settings/cache/purge.html +++ b/web/views/@default/servers/server/settings/cache/purge.html @@ -7,31 +7,31 @@
-

没有开启缓存,不需要清理。

+

没有开启缓存,不需要刷新。

-

可以在这里批量删除一组Key。

+

可以在这里批量刷新一组URL缓存。

Key列表URL列表 -

每行一个Key。

+

每行一个URL。

- +
操作类型URL类型 - 根据Key   - 根据前缀 + URL   + 目录
- Key列表 - Key前缀列表 + URL + 目录 -

每行一个Key,比如是一个完整的URLhttps://example.com/hello/world.html

-

每行一个Key前缀,比如是一个URL前缀https://example.com/hello/

+

每行一个URL,比如https://example.com/hello/world.html

+

每行一个URL目录,比如https://example.com/hello/