diff --git a/plugins/clean/index.py b/plugins/clean/index.py index d6d59b36cc..bef3597cea 100755 --- a/plugins/clean/index.py +++ b/plugins/clean/index.py @@ -156,6 +156,7 @@ def initConf(): "/www/server/redis/data", "/www/server/alist/data/log", "/www/server/dztasks/logs", + "/www/server/rsyncd/lsyncd.log" "/www/server/cron", ] for i in clogcom: diff --git a/plugins/tgbot/startup/extend/push_ad.py b/plugins/tgbot/startup/extend/push_ad.py index b65c1135a1..ff0ddeafec 100644 --- a/plugins/tgbot/startup/extend/push_ad.py +++ b/plugins/tgbot/startup/extend/push_ad.py @@ -49,7 +49,7 @@ def send_msg(bot, tag='ad', trigger_time=300): # TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比 | 10/m | @ssdpflood # https://t.me/gjgzs2022 | 22/m | @GJ_gzs # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x - # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,12/30 | @nngzs + # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,6/30 | @nngzs # 桃花资源采集| 13/m| next,1/13 | @xiaolizi1122 keyboard = [ [ diff --git a/plugins/tgbot/startup/extend/push_notice_msg.py b/plugins/tgbot/startup/extend/push_notice_msg.py index 9b42a8521f..d1bfb46e92 100644 --- a/plugins/tgbot/startup/extend/push_notice_msg.py +++ b/plugins/tgbot/startup/extend/push_notice_msg.py @@ -58,7 +58,7 @@ def send_msg(bot, tag='ad', trigger_time=300): # TTKCDN | 10/m | @ssdpflood | 5 # https://t.me/gjgzs2022 | 22/m | @GJ_gzs # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x - # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,12/30 | @nngzs + # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,6/30 | @nngzs # 桃花资源采集| 13/m| next,1/13 | @xiaolizi1122 keyboard = [ [ diff --git a/web/admin/files/files.py b/web/admin/files/files.py index e114061d65..0caa5d2227 100644 --- a/web/admin/files/files.py +++ b/web/admin/files/files.py @@ -252,8 +252,10 @@ def create_dir(): @panel_login_required def get_dir_size(): path = request.form.get('path', '') - size = file.getDirSize(path) - return mw.returnData(True, mw.toSize(size)) + size = file.getDirSizeByBash(path) + return mw.returnData(True, size) + # size = file.getDirSize(path) + # return mw.returnData(True, mw.toSize(size)) # 删除文件 diff --git a/web/utils/file.py b/web/utils/file.py index a09d2d9b6b..418d1b5da9 100644 --- a/web/utils/file.py +++ b/web/utils/file.py @@ -632,7 +632,10 @@ def checkFileName(filename): def getDirSize(filePath, size=0): for root, dirs, files in os.walk(filePath): for f in files: - size += os.path.getsize(os.path.join(root, f)) + try: + size += os.path.getsize(os.path.join(root, f)) + except Exception as e: + pass # print(f) return size