From a2e3c98ebbabaf5681f125d66f272d3b1ad44f5f Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Tue, 27 Sep 2022 11:07:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=87=E7=BA=A7=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/version.txt  | 2 +-
 utils/update.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/version.txt b/js/version.txt
index 07dc2df..f954839 100644
--- a/js/version.txt
+++ b/js/version.txt
@@ -1 +1 @@
-3.7.16
\ No newline at end of file
+3.7.15
\ No newline at end of file
diff --git a/utils/update.py b/utils/update.py
index dbc1b06..38b60e1 100644
--- a/utils/update.py
+++ b/utils/update.py
@@ -84,7 +84,6 @@ def copytree(src, dst, ignore=None):
         ignore = []
     dirs = os.listdir(src)  # 获取目录下的所有文件包括文件夹
     logger.info(f'{dirs}')
-    print(dirs)
     for dir in dirs:  # 遍历文件或文件夹
         from_dir = os.path.join(src, dir)  # 将要复制的文件夹或文件路径
         to_dir = os.path.join(dst, dir)  # 将要复制到的文件夹或文件路径
@@ -130,7 +129,7 @@ def copy_to_update():
         logger.info(f'升级失败,找不到目录{dr_path}')
         return False
     # 千万不能覆盖super，base
-    paths = ['js','models','controllers','libs','static','templates','utils','txt','jiexi']
+    paths = ['js','models','controllers','libs','static','templates','utils','txt','jiexi','py']
     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)
@@ -138,6 +137,7 @@ def copy_to_update():
         shutil.copy(os.path.join(dr_path, 'app.py'), os.path.join(base_path, 'app.py'))  # 复制文件
     except Exception as e:
         logger.info(f'更新app.py发生错误:{e}')
+    logger.info(f'升级程序执行完毕,全部文件已拷贝覆盖')
     return True
 
 def download_new_version():
-- 
GitLab