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 += "
\
- " + data.data[i].id + " | \
- " + data.data[i].protocol + " | \
- " + (data.data[i].port.indexOf('.') == -1?'放行端口'+':['+data.data[i].port+']':'屏蔽IP'+':['+data.data[i].port+']') + " | \
- " + status + " | \
- " + data.data[i].ps + " | \
- " + data.data[i].add_time + " | \
- 删除 | \
-
";
+ " + data.data[i].id + " | \
+ " + data.data[i].protocol + " | \
+ " + (data.data[i].port.indexOf('.') == -1?'放行端口'+':['+data.data[i].port+']':'屏蔽IP'+':['+data.data[i].port+']') + " | \
+ " + status + " | \
+ " + data.data[i].ps + " | \
+ " + data.data[i].add_time + " | \
+ 删除 | \
+ ";
}
if (data.data.length == 0){
body = '当前没有数据 |
';
}
-
$("#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;
}
@@ -66,14 +68,13 @@
-
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)