From 679a112a2cd5259df608e090185b9b0fd482ad53 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 6 Jun 2024 18:56:09 +0800
Subject: [PATCH 01/10] Update index.py

---
 plugins/clean/index.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/clean/index.py b/plugins/clean/index.py
index 5a04076f21..f2d55d26c3 100755
--- a/plugins/clean/index.py
+++ b/plugins/clean/index.py
@@ -82,6 +82,10 @@ def initConf():
             "/var/log/yum.log-*",
             "/var/log/messages-*",
             "/var/log/btmp-*",
+            "/var/log/auth.*",
+            "/var/log/messages.*",
+            "/var/log/debug.*",
+            "/var/log/syslog.*",
             "/var/log/audit/audit.log.*",
             "/var/log/rhsm/rhsm.log-*",
             "/var/log/rhsm/rhsmcertd.log-*",

From 6870dbf7114b28b16ac9f2f5197098dbd0ad997b Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 6 Jun 2024 19:18:44 +0800
Subject: [PATCH 02/10] update

---
 plugins/clean/index.html | 44 ++++++++++++++++++++++++++++++++++++++++
 plugins/clean/index.py   | 12 +++++++++++
 2 files changed, 56 insertions(+)

diff --git a/plugins/clean/index.html b/plugins/clean/index.html
index 7caea03235..db6bacdf34 100755
--- a/plugins/clean/index.html
+++ b/plugins/clean/index.html
@@ -3,6 +3,7 @@
 		<div class="bt-w-menu">
 			<p class="bgw" onclick="pluginService('clean');">服务</p>
 			<p onclick="pluginConfig('clean');">配置修改</p>
+			<p onclick="commonFunc();">常用功能</p>
 			<p onclick="pluginLogs('clean',null,'run_log');">运行日志</p>
 			<p onclick="pRead()">说明</p>
 		</div>
@@ -12,8 +13,51 @@
 	</div>
 </div>
 <script type="text/javascript">
+
 pluginService('clean');
 
+function cleanPost(method, version, args, callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'clean';
+    req_data['func'] = method;
+    req_data['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [10, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function cleanRun(){
+	cleanPost('clean_run', '', {}, function(rdata){
+		var rdata = $.parseJSON(rdata.data);
+        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+	});
+}
+
+function commonFunc(){
+
+    con = '<hr/><p class="conf_p" style="text-align:center;">\
+        	<button class="btn btn-default btn-sm" onclick="cleanRun()">手动执行</button>  \
+    	</p>';
+
+    $(".soft-man-con").html(con);
+}
 
 function pRead(){
 	var readme = '<ul class="help-info-text c7">';
diff --git a/plugins/clean/index.py b/plugins/clean/index.py
index f2d55d26c3..34c699490e 100755
--- a/plugins/clean/index.py
+++ b/plugins/clean/index.py
@@ -205,6 +205,16 @@ def cleanDirLog(path):
             cleanDirLog(abspath)
 
 
+def cleanRun():
+    # cleanLog()
+    plugin_dir = getPluginDir()
+    # print(plugin_dir)
+    log_file = getServerDir()+'/clean.log'
+    cmd = 'python3 '+plugin_dir+'/index.py clean > '+log_file
+    # print(cmd)
+    os.system(cmd)
+    return mw.returnJson(True, '执行成功!')
+
 def cleanLog():
     conf = getConf()
     clist = mw.readFile(conf).strip()
@@ -247,5 +257,7 @@ def cleanLog():
         print(runLog())
     elif func == 'clean':
         cleanLog()
+    elif func == 'clean_run':
+        print(cleanRun())
     else:
         print('error')

From 736677fdc6cf1a6ce6d7e05e012f09ced9c244f8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 6 Jun 2024 19:18:57 +0800
Subject: [PATCH 03/10] Update index.py

---
 plugins/clean/index.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/clean/index.py b/plugins/clean/index.py
index 34c699490e..63f9c0cba0 100755
--- a/plugins/clean/index.py
+++ b/plugins/clean/index.py
@@ -206,12 +206,9 @@ def cleanDirLog(path):
 
 
 def cleanRun():
-    # cleanLog()
     plugin_dir = getPluginDir()
-    # print(plugin_dir)
     log_file = getServerDir()+'/clean.log'
     cmd = 'python3 '+plugin_dir+'/index.py clean > '+log_file
-    # print(cmd)
     os.system(cmd)
     return mw.returnJson(True, '执行成功!')
 

From aadfe8a6e8f1428d0c8e0cbf8683dcbc8bdfec38 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 6 Jun 2024 19:20:32 +0800
Subject: [PATCH 04/10] Update index.html

---
 plugins/clean/index.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/clean/index.html b/plugins/clean/index.html
index db6bacdf34..fd6bf4cf54 100755
--- a/plugins/clean/index.html
+++ b/plugins/clean/index.html
@@ -45,9 +45,11 @@
 
 function cleanRun(){
 	cleanPost('clean_run', '', {}, function(rdata){
-		var rdata = $.parseJSON(rdata.data);
-        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+		// var rdata = $.parseJSON(rdata.data);
+        // layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
 	});
+
+	layer.msg("执行成功!", { icon: 1});
 }
 
 function commonFunc(){

From ba34b851e48c17679cf6a0763738f8a3ba2faf10 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 6 Jun 2024 19:25:08 +0800
Subject: [PATCH 05/10] Update index.py

---
 plugins/clean/index.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/clean/index.py b/plugins/clean/index.py
index 63f9c0cba0..574b8d207b 100755
--- a/plugins/clean/index.py
+++ b/plugins/clean/index.py
@@ -86,6 +86,11 @@ def initConf():
             "/var/log/messages.*",
             "/var/log/debug.*",
             "/var/log/syslog.*",
+            "/var/log/dpkg.log.*",
+            "/var/log/alternatives.log.*",
+            "/var/log/user.log.*",
+            "/var/log/kern.log.*",
+            "/var/log/daemon.log.*",
             "/var/log/audit/audit.log.*",
             "/var/log/rhsm/rhsm.log-*",
             "/var/log/rhsm/rhsmcertd.log-*",

From ee565b22dbe4226b59b7cd3960b3784dcebb33ad Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 6 Jun 2024 19:26:20 +0800
Subject: [PATCH 06/10] Update index.py

---
 plugins/clean/index.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/clean/index.py b/plugins/clean/index.py
index 574b8d207b..4cfb49eb33 100755
--- a/plugins/clean/index.py
+++ b/plugins/clean/index.py
@@ -88,10 +88,12 @@ def initConf():
             "/var/log/syslog.*",
             "/var/log/dpkg.log.*",
             "/var/log/alternatives.log.*",
+
             "/var/log/user.log.*",
             "/var/log/kern.log.*",
             "/var/log/daemon.log.*",
             "/var/log/audit/audit.log.*",
+            "/var/log/apt/*.gz",
             "/var/log/rhsm/rhsm.log-*",
             "/var/log/rhsm/rhsmcertd.log-*",
             "/tmp/yum_save_*",

From b2026ce74fcc28ff6ff91347f821dc763fbcd7eb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 6 Jun 2024 19:29:57 +0800
Subject: [PATCH 07/10] Update index.py

---
 plugins/clean/index.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/clean/index.py b/plugins/clean/index.py
index 4cfb49eb33..4fd08b0761 100755
--- a/plugins/clean/index.py
+++ b/plugins/clean/index.py
@@ -74,7 +74,6 @@ def initConf():
         content = ""
 
         clog = [
-            "/var/spool/clientmqueue/*",
             "/var/log/cron-*",
             "/var/log/maillog-*",
             "/var/log/secure-*",
@@ -86,16 +85,22 @@ def initConf():
             "/var/log/messages.*",
             "/var/log/debug.*",
             "/var/log/syslog.*",
+            "/var/log/btmp.*",
+
             "/var/log/dpkg.log.*",
             "/var/log/alternatives.log.*",
-
             "/var/log/user.log.*",
             "/var/log/kern.log.*",
             "/var/log/daemon.log.*",
+
             "/var/log/audit/audit.log.*",
             "/var/log/apt/*.gz",
+            "/var/log/apt/*.xz",
             "/var/log/rhsm/rhsm.log-*",
             "/var/log/rhsm/rhsmcertd.log-*",
+
+            "/var/spool/clientmqueue/*",
+            "/var/log/journal/*",
             "/tmp/yum_save_*",
             "/tmp/tmp.*",
         ]

From 761cd1f06409d57bc820a7c3045930b0adf3c311 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 6 Jun 2024 19:31:06 +0800
Subject: [PATCH 08/10] Update index.py

---
 plugins/clean/index.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/clean/index.py b/plugins/clean/index.py
index 4fd08b0761..fa358b185c 100755
--- a/plugins/clean/index.py
+++ b/plugins/clean/index.py
@@ -98,9 +98,10 @@ def initConf():
             "/var/log/apt/*.xz",
             "/var/log/rhsm/rhsm.log-*",
             "/var/log/rhsm/rhsmcertd.log-*",
-
-            "/var/spool/clientmqueue/*",
+            "/var/log/exim4/*.gz",
             "/var/log/journal/*",
+            "/var/spool/clientmqueue/*",
+           
             "/tmp/yum_save_*",
             "/tmp/tmp.*",
         ]

From 2908ffc1c8da3564066529da9e9534643ef84dfd Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 6 Jun 2024 19:32:55 +0800
Subject: [PATCH 09/10] Update index.py

---
 plugins/clean/index.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/clean/index.py b/plugins/clean/index.py
index fa358b185c..898112fc3a 100755
--- a/plugins/clean/index.py
+++ b/plugins/clean/index.py
@@ -93,6 +93,9 @@ def initConf():
             "/var/log/kern.log.*",
             "/var/log/daemon.log.*",
 
+            "/var/log/*.gz",
+            "/var/log/*.xz",
+
             "/var/log/audit/audit.log.*",
             "/var/log/apt/*.gz",
             "/var/log/apt/*.xz",

From 4cf00c1a6b4eb07d93de5f43140653e4cdc19b76 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Thu, 6 Jun 2024 19:34:26 +0800
Subject: [PATCH 10/10] Update index.py

---
 plugins/clean/index.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/clean/index.py b/plugins/clean/index.py
index 898112fc3a..4bb65e1521 100755
--- a/plugins/clean/index.py
+++ b/plugins/clean/index.py
@@ -95,6 +95,7 @@ def initConf():
 
             "/var/log/*.gz",
             "/var/log/*.xz",
+            "/var/log/*.log.*",
 
             "/var/log/audit/audit.log.*",
             "/var/log/apt/*.gz",