From 8520bfcd27b842e730d1f194f4aab5d68dae1e36 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 10 Nov 2024 20:05:21 +0800
Subject: [PATCH] update

---
 web/admin/files/__init__.py         |  6 +++++-
 web/static/app/firewall.js          | 17 ++++++++---------
 web/templates/default/firewall.html | 21 +++++++++++----------
 web/utils/file.py                   | 12 +++++++++++-
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/web/admin/files/__init__.py b/web/admin/files/__init__.py
index d81227f80..ec8ea3802 100644
--- a/web/admin/files/__init__.py
+++ b/web/admin/files/__init__.py
@@ -155,7 +155,11 @@ def close_recycle_bin():
     return file.closeRecycleBin()
 
 
-
+# 日志清空
+@blueprint.route('/close_logs', endpoint='close_logs', methods=['POST'])
+@panel_login_required
+def close_logs():
+    return file.closeLogs()
 
 
 
diff --git a/web/static/app/firewall.js b/web/static/app/firewall.js
index 4bb37b538..2f5b2437f 100755
--- a/web/static/app/firewall.js
+++ b/web/static/app/firewall.js
@@ -297,21 +297,20 @@ function showAccept(page,search) {
 					break;
 			}
 			body += "<tr>\
-						<td><em class='dlt-num'>" + data.data[i].id + "</em></td>\
-						<td>" + data.data[i].protocol + "</td>\
-						<td>" + (data.data[i].port.indexOf('.') == -1?'放行端口'+':['+data.data[i].port+']':'屏蔽IP'+':['+data.data[i].port+']') + "</td>\
-						<td>" + status + "</td>\
-						<td>" + data.data[i].ps + "</td>\
-						<td>" + data.data[i].add_time + "</td>\
-						<td class='text-right'><a href='javascript:;' class='btlink' onclick=\"delAcceptPort(" + data.data[i].id + ",'" + data.data[i].port + "','"+data.data[i].protocol+"')\">删除</a></td>\
-					</tr>";
+				<td><em class='dlt-num'>" + data.data[i].id + "</em></td>\
+				<td>" + data.data[i].protocol + "</td>\
+				<td>" + (data.data[i].port.indexOf('.') == -1?'放行端口'+':['+data.data[i].port+']':'屏蔽IP'+':['+data.data[i].port+']') + "</td>\
+				<td>" + status + "</td>\
+				<td>" + data.data[i].ps + "</td>\
+				<td>" + data.data[i].add_time + "</td>\
+				<td class='text-right'><a href='javascript:;' class='btlink' onclick=\"delAcceptPort(" + data.data[i].id + ",'" + data.data[i].port + "','"+data.data[i].protocol+"')\">删除</a></td>\
+			</tr>";
 		}
 
 		if (data.data.length == 0){
 			body = '<tr><td colspan="5" style="text-align: center;">当前没有数据</td></tr>';
 		}
 
-
 		$("#firewall_body").html(body);
 		$("#firewall_page").html(data.page);
 	},'json');
diff --git a/web/templates/default/firewall.html b/web/templates/default/firewall.html
index 32b0a4a44..811df6531 100755
--- a/web/templates/default/firewall.html
+++ b/web/templates/default/firewall.html
@@ -13,14 +13,16 @@
 	color:#666;
 	margin: 0 30px;
 }
+
 .weblog span{
 	margin-right:5px;
 }
+
 .weblog a{
 	color:#20a53a;
 }
 .firewall-port-box{
-	margin-bottom:15px;
+	margin-bottom:5px;
 }
 </style>
 <div class="main-content">
@@ -66,14 +68,13 @@
 			</div>
 
 			<div class="mr20 pull-left" style="border-right: 1px solid #ccc; padding-right: 20px;">
-				<form>
-					<div class="ss-text pull-left">
-						<em>启用防火墙</em>
-						<div class='ssh-item' id="firewall_status">
-							<input class='btswitch btswitch-ios' id='firewall_status' type='checkbox'><label class='btswitch-btn sshswitch' for='firewall_status' ></label>
-						</div>
+				<div class="ss-text pull-left">
+					<em>启用防火墙</em>
+					<div class='ssh-item' id="firewall_status">
+						<input class='btswitch btswitch-ios' id='firewall_status' type='checkbox'>
+						<label class='btswitch-btn sshswitch' for='firewall_status'></label>
 					</div>
-				</form>
+				</div>
 			</div>
 
 			<div class="weblog" id='firewall_weblog'></div>
@@ -102,10 +103,10 @@
 							<button id="toAccept" onclick="addAcceptPort();" class="btn btn-default btn-sm va0" type="button">放行</button>
 							<span id="f-ps" class="c9" style="margin-left: 10px;">说明: 支持放行端口范围，如: 3000:3500</span>
 						</div>
-                        <div class="tablescroll">
+                        <div class="tablescroll" style="border-top-width: 0px;">
                             <table id="firewall_body" class="table table-hover" style="min-width: 640px;border: 0 none;"></table>
                         </div>
-                        <div id="firewall_page" class="dataTables_paginate paging_bootstrap page firewall_body" style="margin-bottom:0"></div>
+                        <div id="firewall_page" class="dataTables_paginate paging_bootstrap page firewall_body" style="margin-bottom:0px;"></div>
                     </div>
                 </div>
             </div>
diff --git a/web/utils/file.py b/web/utils/file.py
index 691479979..de7a9325e 100644
--- a/web/utils/file.py
+++ b/web/utils/file.py
@@ -322,7 +322,7 @@ def getDirSize(filePath, size=0):
 # 获取目录大小(bash)
 def getDirSizeByBash(path):
     tmp = mw.execShell('du -sh ' + path)
-    return tmp[0].split()[0]
+    return tmp[0].split()[0].lower()
 
 # 计算文件数量
 def getCount(path, search = None):
@@ -493,3 +493,13 @@ def setMode(path):
     p_stat = os.stat(s_path)
     os.chown(path, p_stat.st_uid, p_stat.st_gid)
     os.chmod(path, p_stat.st_mode)
+
+
+def closeLogs():
+    log_file = mw.getLogsDir()
+    os.system('rm -rf ' + log_file + '/*')
+    mw.opWeb('reload')
+    # os.system('kill -USR1 `cat ' + mw.getServerDir() +'/openresty/nginx/logs/nginx.pid`')
+    mw.writeLog('文件管理', '网站日志已被清空!')
+    tmp = getDirSizeByBash(log_file)
+    return mw.returnData(True, tmp)