From 10364e7ea59b8c2a8aeb2d75d61dab47c6b43485 Mon Sep 17 00:00:00 2001 From: hanc00l Date: Wed, 3 Jan 2024 10:49:14 +0800 Subject: [PATCH] Update: worker task mode config --- web/static/js/server/dashboard.js | 4 +- web/static/js/server/worker-list.js | 31 ++++++++++++- web/views/dashboard.html | 17 ++----- web/views/worker-list.html | 69 +++++++++++++++++++++++------ 4 files changed, 90 insertions(+), 31 deletions(-) diff --git a/web/static/js/server/dashboard.js b/web/static/js/server/dashboard.js index 445527a..fe61217 100644 --- a/web/static/js/server/dashboard.js +++ b/web/static/js/server/dashboard.js @@ -97,11 +97,11 @@ $(function () { function get_count_data() { //异步获取任务统计信息 $.post("/dashboard", function (data) { - $("#task_active").html(data['task_active']); $("#vulnerability_count").html(data['vulnerability_count']); $("#domain_count").html(data['domain_count']); $("#ip_count").html(data['ip_count']); - $('#worker_count').html(data['worker_count']); + $("#task_active").html("TASK: " + data['task_active']); + $('#worker_count').html("WORKER: " + data['worker_count']); }); } diff --git a/web/static/js/server/worker-list.js b/web/static/js/server/worker-list.js index 38abed7..84ffecc 100644 --- a/web/static/js/server/worker-list.js +++ b/web/static/js/server/worker-list.js @@ -108,12 +108,29 @@ $(function () { $("#worker_table").DataTable().draw(true); }); $("#buttonUpdate").click(function () { + let worker_run_task_mode = ""; + if ($('#checkbox_task_mode_0').is(":checked")) { + worker_run_task_mode = "0" + } else { + let sep = ""; + for (let i = 1; i <= 5; i++) { + if ($('#checkbox_task_mode_' + i).is(":checked")) { + worker_run_task_mode += sep; + worker_run_task_mode += i; + sep = "," + } + } + } + if (worker_run_task_mode === "") { + alert("必须指定Worker的任务模式！") + return + } $.post("/worker-update", { "worker_name": $('#input_worker_name').val(), "concurrency": $('#select_concurrency').val(), "worker_performance": $('#select_worker_performance').val(), - "worker_run_task_mode": $('#select_worker_run_task_mode').val(), + "worker_run_task_mode": worker_run_task_mode, "task_workspace_guid": $('#input_task_workspace_guid').val(), "default_config_file": $('#input_default_config_file').val(), "no_proxy": $('#checkbox_no_proxy').is(":checked"), @@ -226,7 +243,17 @@ function edit_option(worker_name, daemon_process) { if (e === "success") { $('#select_concurrency').val(data['concurrency']); $('#select_worker_performance').val(data['worker_performance']); - $('#select_worker_run_task_mode').val(data['worker_run_task_mode']); + for (let i = 0; i <= 5; i++) { + $('#checkbox_task_mode_' + i).prop("checked", false); + } + data['worker_run_task_mode'].split(",").forEach(function (item) { + if (item === "0") { + $('#checkbox_task_mode_0').prop("checked", true); + return + } else { + $('#checkbox_task_mode_' + item).prop("checked", true); + } + }); $('#input_task_workspace_guid').val(data['task_workspace_guid']); $('#input_default_config_file').val(data['default_config_file']); $('#checkbox_no_proxy').prop("checked", data['no_proxy']); diff --git a/web/views/dashboard.html b/web/views/dashboard.html index 3c33441..7ea44aa 100644 --- a/web/views/dashboard.html +++ b/web/views/dashboard.html @@ -31,7 +31,7 @@

Domain资产

-
+
@@ -42,25 +42,14 @@

漏洞

-
+
-

Worker

-

0

-
-
-
-
-
- - - -
-

Task

0

+

0

diff --git a/web/views/worker-list.html b/web/views/worker-list.html index 661f599..44c01c8 100644 --- a/web/views/worker-list.html +++ b/web/views/worker-list.html @@ -41,7 +41,7 @@

- + - - - + +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ -