From 413a30b324056434aea003c121d5d1c426442fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=9A=E9=A3=8E=E6=8B=82=E6=9F=B3=E9=A2=9C?= <434857005@qq.com> Date: Mon, 3 Jul 2023 11:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0jsd=E6=B8=85=E7=90=86?= =?UTF-8?q?=E6=9C=BA=E5=88=B6=EF=BC=8C=E6=A3=80=E6=B5=8B=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=89=8D=E8=87=AA=E5=8A=A8=E6=B8=85=E7=A9=BA=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?jsd=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/version.txt | 2 +- templates/admin.html | 2 +- utils/update.py | 14 +++++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/js/version.txt b/js/version.txt index 8a93e5b..825d3ea 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.9.46beta1 \ No newline at end of file +3.9.46beta2 \ No newline at end of file diff --git a/templates/admin.html b/templates/admin.html index 8da2af7..cf4824e 100644 --- a/templates/admin.html +++ b/templates/admin.html @@ -234,7 +234,7 @@ }); $('#clear_drop').click(function () { - if(confirm('若js目录存在同名的jsd文件则视为该源为废弃源。执行此功能将清理与jsd文件同名的js文件。执行此功能前请确保项目的jsd文件跟仓库一致，防止误删。推荐进容器 rm -rf js/*.jsd 后强制升级一次再使用此功能。立即执行则确认否则取消执行')){ + if(confirm('若js目录存在同名的jsd文件则视为该源为废弃源。执行此功能将清理与jsd文件同名的js文件。执行此功能前请确保项目的jsd文件跟仓库一致，防止误删。推荐进容器 rm -rf js/*.jsd 后强制升级一次再使用此功能,后续升级时会自动清空旧版jsd文件。立即执行则确认否则取消执行')){ $.get("/admin/clear_drop", function (data, status) { console.log(data); if (data.code === 200) { diff --git a/utils/update.py b/utils/update.py index a6f1ab6..e780f5c 100644 --- a/utils/update.py +++ b/utils/update.py @@ -156,13 +156,25 @@ def copy_to_update(): # print(f'升级失败,找不到目录{dr_path}') logger.info(f'升级失败,找不到目录{dr_path}') return False + + js_path = os.path.join(base_path, 'js') + files = os.listdir(js_path) + jsd_list = list(filter(lambda x: str(x).endswith('.jsd'), files)) + try: + for jsd in jsd_list: + os.remove(jsd) + logger.info(f'升级过程中共计清理jsd文件数:{len(jsd_list)}') + except Exception as e: + logger.info(f'升级过程中清理jsd文件发生错误:{e}') + # 千万不能覆盖super，base paths = ['js','models','controllers','libs','static','templates','utils','txt','jiexi','py','whl','doc'] exclude_files = ['txt/pycms0.json','txt/pycms1.json','txt/pycms2.json','base/rules.db'] for path in paths: - force_copy_files(os.path.join(dr_path, path),os.path.join(base_path, path),exclude_files) + force_copy_files(os.path.join(dr_path, path), os.path.join(base_path, path),exclude_files) try: shutil.copy(os.path.join(dr_path, 'app.py'), os.path.join(base_path, 'app.py')) # 复制文件 + shutil.copy(os.path.join(dr_path, 'requirements.txt'), os.path.join(base_path, 'requirements.txt')) # 复制文件 except Exception as e: logger.info(f'更新app.py发生错误:{e}') logger.info(f'升级程序执行完毕,全部文件已拷贝覆盖')