From 810998992776ee3b26d58da56d43d4e84fe83826 Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 28 Feb 2023 19:41:13 +0800 Subject: [PATCH 1/7] Update layout.html --- route/templates/default/layout.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/route/templates/default/layout.html b/route/templates/default/layout.html index a8903950fb..083f7531b8 100755 --- a/route/templates/default/layout.html +++ b/route/templates/default/layout.html @@ -92,6 +92,10 @@

{{data['ip']}}

mdserver-web ©2018-∞ Linux面板 (源码) / WIKI/ AD + / + 交流论坛 + / + TG吹水群
From ad46b2050e450ccd0b1449c1b01ab331ff2fb24b Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 1 Mar 2023 01:40:57 +0800 Subject: [PATCH 2/7] Update config.json --- plugins/webstats/conf/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/webstats/conf/config.json b/plugins/webstats/conf/config.json index 1a92ebcc53..7e8e00f163 100644 --- a/plugins/webstats/conf/config.json +++ b/plugins/webstats/conf/config.json @@ -27,6 +27,7 @@ "gif", "jpg", "css", + "svg", "js", "ico", "woff2" From 614cc1032f1320d8ee9961ef78e256bb0d8d094f Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 1 Mar 2023 14:03:46 +0800 Subject: [PATCH 3/7] Update webstats_log.lua --- plugins/webstats/lua/webstats_log.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/webstats/lua/webstats_log.lua b/plugins/webstats/lua/webstats_log.lua index fc576a377c..59e928e086 100644 --- a/plugins/webstats/lua/webstats_log.lua +++ b/plugins/webstats/lua/webstats_log.lua @@ -134,6 +134,7 @@ log_by_lua_block { local function exclude_url() if not ngx.var.uri then return false end + if not ngx.var.request_uri then return false end if not auto_config['exclude_url'] then return false end local the_uri = string.sub(ngx.var.request_uri, 2) local url_conf = auto_config["exclude_url"] From 842c16540ae6d2d2430adabd7d9ae72611477552 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 1 Mar 2023 18:03:14 +0800 Subject: [PATCH 4/7] Update index.py --- plugins/supervisor/index.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/supervisor/index.py b/plugins/supervisor/index.py index ae162d68ce..aa428f717c 100755 --- a/plugins/supervisor/index.py +++ b/plugins/supervisor/index.py @@ -220,7 +220,8 @@ def getSupList(): infos = fr.readlines() for line in infos: if "command=" in line.strip(): - d["command"] = line.strip().split('=')[1] + # d["command"] = line.strip().split('=')[1] + d["command"] = "子配置查看" if "user=" in line.strip(): d["user"] = line.strip().split('=')[1] if "priority=" in line.strip(): From f11d2db761ca9cd836a1c3c5bfbd69c0a51df059 Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 1 Mar 2023 18:41:32 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8D=E5=90=AF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/supervisor/index.py | 22 ++++++++++++++++++++++ plugins/supervisor/js/supervisor.js | 11 +++++++++++ 2 files changed, 33 insertions(+) diff --git a/plugins/supervisor/index.py b/plugins/supervisor/index.py index aa428f717c..7344be95fc 100755 --- a/plugins/supervisor/index.py +++ b/plugins/supervisor/index.py @@ -330,6 +330,26 @@ def startJob(): return mw.returnJson(True, action + '[' + name + ']成功!') +def restartJob(): + args = getArgs() + data = checkArgs(args, ['name', 'status']) + if not data[0]: + return data[1] + + supCtl = 'supervisorctl -c ' + getServerDir() + "/supervisor.conf" + + name = args['name'] + status = args['status'] + + action = "启动" + cmd = supCtl + " restart " + name + data = mw.execShell(cmd) + + if data[1] != '': + return mw.returnJson(False, '[' + name + ']重启失败!') + return mw.returnJson(True, '[' + name + ']重启成功!') + + def delJob(): args = getArgs() data = checkArgs(args, ['name']) @@ -568,6 +588,8 @@ def runLog(): print(addJob()) elif func == 'start_job': print(startJob()) + elif func == 'restart_job': + print(restartJob()) elif func == 'del_job': print(delJob()) elif func == 'update_job': diff --git a/plugins/supervisor/js/supervisor.js b/plugins/supervisor/js/supervisor.js index 844e9fb2a6..ba9b16641a 100755 --- a/plugins/supervisor/js/supervisor.js +++ b/plugins/supervisor/js/supervisor.js @@ -70,6 +70,7 @@ function supList(page, search){ list += '\ '+sup_status_desc+' | ' + + '重启 | ' + '修改 | ' + '删除' + ''; @@ -128,6 +129,16 @@ function startOrStop(name,status){ }); } +function restartJob(name,status){ + myPost('restart_job',{'name':name,'status':status}, function(data){ + var rdata = $.parseJSON(data.data); + layer.msg(rdata.msg,{icon:rdata.status?1:2}); + setTimeout(function(){ + supList(1,10); + },2000); + }); +} + function updateJob(name){ myPost('get_job_info',{'name':name},function(data){ var rdata = $.parseJSON(data.data); From 1b1462586e477ec9749c0f43f2846cb3a57d1f54 Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 2 Mar 2023 00:49:44 +0800 Subject: [PATCH 6/7] Update orm.py --- class/plugin/orm.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/class/plugin/orm.py b/class/plugin/orm.py index f2b949c546..3e96ff9f16 100755 --- a/class/plugin/orm.py +++ b/class/plugin/orm.py @@ -65,6 +65,9 @@ def setSocket(self, sock): def setCharset(self, charset): self.__DB_CHARSET = charset + def setHost(self, host): + self.__DB_HOST = host + def setPort(self, port): self.__DB_PORT = port From dffe9a77e7d8719f222640e738045cd007d1329e Mon Sep 17 00:00:00 2001 From: midoks Date: Thu, 2 Mar 2023 00:57:02 +0800 Subject: [PATCH 7/7] Update layout.html --- route/templates/default/layout.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/route/templates/default/layout.html b/route/templates/default/layout.html index 083f7531b8..cad0d0d137 100755 --- a/route/templates/default/layout.html +++ b/route/templates/default/layout.html @@ -90,12 +90,12 @@

{{data['ip']}}

{% block content %}{% endblock %}
mdserver-web ©2018-∞ Linux面板 (源码) / - WIKI/ + WIKI/ AD / - 交流论坛 + 交流论坛 / - TG吹水群 + TG吹水群