From 87f0d359ccd08bfd5c6a088c76066066763b581e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=91=86=E7=93=9C?=
 <1630365+dclaoshi@user.noreply.gitee.com>
Date: Sun, 13 Mar 2022 13:56:42 +0000
Subject: [PATCH 1/2] update template/app_doc/foot_base.html.

---
 template/app_doc/foot_base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/app_doc/foot_base.html b/template/app_doc/foot_base.html
index 5db1b97..fc32912 100644
--- a/template/app_doc/foot_base.html
+++ b/template/app_doc/foot_base.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="layui-footer" style="border-top: 1px #e6e6e6 solid;text-align:center;margin-top:38px;width:100%;">
+<div class="layui-footer" style="border-top: 1px #e6e6e6 solid;text-align:center;margin-top:18px;width:100%;">
     <div style="margin-top:10px;padding-bottom: 10px;">
         © <a href="https://mrdoc.pro">MrDoc 2019-2021</a>&nbsp;|&nbsp;
         <a href="https://zmister.com" target="_blank">州的先生</a>出品 |
-- 
Gitee


From b4fbc6da1f822d67be85096e58bd22ea1e29e9ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=91=86=E7=93=9C?=
 <1630365+dclaoshi@user.noreply.gitee.com>
Date: Sun, 13 Mar 2022 14:01:27 +0000
Subject: [PATCH 2/2] =?UTF-8?q?update=20app=5Fdoc/import=5Futils.py.=20?=
 =?UTF-8?q?=E5=9C=A8windows=E4=B8=8B=E9=83=A8=E7=BD=B2=E6=97=B6=E6=96=87?=
 =?UTF-8?q?=E9=9B=86=E5=8E=8B=E7=BC=A9=E5=8C=85=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87=E4=B9=B1=E7=A0=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_doc/import_utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app_doc/import_utils.py b/app_doc/import_utils.py
index 78a1ac0..58a7123 100644
--- a/app_doc/import_utils.py
+++ b/app_doc/import_utils.py
@@ -41,7 +41,7 @@ class ImportZipProject():
         for root, dirs, files in os.walk(self.temp_dir):
             for dir in dirs:
                 try:
-                    new_dir = dir.encode('cp437').decode('utf-8')
+                    new_dir = dir.encode('cp437').decode('gbk')
                 except:
                     new_dir = dir.encode('utf-8').decode('utf-8')
                 # print(new_dir)
@@ -49,7 +49,7 @@ class ImportZipProject():
 
             for file in files:
                 try:
-                    new_file = file.encode('cp437').decode('utf-8')
+                    new_file = file.encode('cp437').decode('gbk')
                 except:
                     new_file = file.encode('utf-8').decode('utf-8')
                 # print(root, new_file)
-- 
Gitee