From 711c0ba8d1191c992441064bd1aeed55cb22c61a Mon Sep 17 00:00:00 2001 From: liuzhexian <1037512352@qq.com> Date: Mon, 6 Nov 2023 15:10:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8mysql=EF=BC=8C=E4=BF=AE=E6=94=B9read?= =?UTF-8?q?me=E5=AE=89=E8=A3=85=E6=AD=A5=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++++ applications/config.py | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 07233f7..590bcdf 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,12 @@ Pear Admin Flask git clone https://gitee.com/pear-admin/pear-admin-flask # 安 装 +# 配置虚拟环境 +python -m venv venv +# 激活虚拟环境 +venv\Scripts\activate +# PyCharm 打开Setting，选中 Python Interpreter，Add，选择Existing environment Apply +# 安装库 pip install -r requirements.txt ``` diff --git a/applications/config.py b/applications/config.py index ed79ce1..e867fc9 100644 --- a/applications/config.py +++ b/applications/config.py @@ -35,15 +35,15 @@ class BaseConfig: SECRET_KEY = "pear-system-flask" # mysql 配置 - # MYSQL_USERNAME = "root" - # MYSQL_PASSWORD = "123456" - # MYSQL_HOST = "127.0.0.1" - # MYSQL_PORT = 3306 - # MYSQL_DATABASE = "PearAdminFlask" + MYSQL_USERNAME = "root" + MYSQL_PASSWORD = "123456" + MYSQL_HOST = "127.0.0.1" + MYSQL_PORT = 3306 + MYSQL_DATABASE = "PearAdminFlask" # 数据库的配置信息 - SQLALCHEMY_DATABASE_URI = 'sqlite:///../pear.db' - # SQLALCHEMY_DATABASE_URI = f"mysql+pymysql://{MYSQL_USERNAME}:{urlquote(MYSQL_PASSWORD)}@{MYSQL_HOST}:{MYSQL_PORT}/{MYSQL_DATABASE}?charset=utf8mb4" + # SQLALCHEMY_DATABASE_URI = 'sqlite:///../pear.db' + SQLALCHEMY_DATABASE_URI = f"mysql+pymysql://{MYSQL_USERNAME}:{MYSQL_PASSWORD}@{MYSQL_HOST}:{MYSQL_PORT}/{MYSQL_DATABASE}?charset=utf8mb4" # 默认日志等级 LOG_LEVEL = logging.WARN -- Gitee From eaec3871a9bb708bb2b95adc7ccd97509cf7d0e9 Mon Sep 17 00:00:00 2001 From: liuzhexian <1037512352@qq.com> Date: Wed, 13 Dec 2023 16:52:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=81=8F=E7=A7=BB=E9=87=8F=E5=87=BD=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E6=B5=8F=E8=A7=88=E5=99=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=97=B6=E5=8C=BA=E5=81=8F=E7=A7=BB=E9=87=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/system/component/pear/pear.js | 12 +++++++++++- templates/system/mail/main.html | 2 +- templates/system/user/main.html | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/static/system/component/pear/pear.js b/static/system/component/pear/pear.js index 236631c..f2bcd40 100644 --- a/static/system/component/pear/pear.js +++ b/static/system/component/pear/pear.js @@ -48,4 +48,14 @@ layui.config({ popover:"popover/popover" //汽泡组件 }).use(['layer', 'theme'], function () { layui.theme.changeTheme(window, false); -}); \ No newline at end of file +}); + +// 调整时间偏移量 +const toLocalTime = function (date) { + const now = new Date(date) + // 获取浏览器的时区偏移量（以分钟为单位） + const timezoneOffset = now.getTimezoneOffset(); + console.log(timezoneOffset) + // 根据时区偏移量调整时间 + return now.setMinutes(now.getMinutes() + timezoneOffset); +} \ No newline at end of file diff --git a/templates/system/mail/main.html b/templates/system/mail/main.html index 2039983..8f51082 100644 --- a/templates/system/mail/main.html +++ b/templates/system/mail/main.html @@ -78,7 +78,7 @@ {# 用户注册时间 #} {% include 'system/common/footer.html' %} diff --git a/templates/system/user/main.html b/templates/system/user/main.html index 6e976d5..712dd20 100644 --- a/templates/system/user/main.html +++ b/templates/system/user/main.html @@ -86,11 +86,11 @@ {% endraw %} -- Gitee From d506d46708488a79a8588ceb3e7f45535164d409 Mon Sep 17 00:00:00 2001 From: liuzhexian <1037512352@qq.com> Date: Wed, 13 Dec 2023 17:05:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=A0=E9=99=A4console.log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/system/component/pear/pear.js | 1 - 1 file changed, 1 deletion(-) diff --git a/static/system/component/pear/pear.js b/static/system/component/pear/pear.js index f2bcd40..806554a 100644 --- a/static/system/component/pear/pear.js +++ b/static/system/component/pear/pear.js @@ -55,7 +55,6 @@ const toLocalTime = function (date) { const now = new Date(date) // 获取浏览器的时区偏移量（以分钟为单位） const timezoneOffset = now.getTimezoneOffset(); - console.log(timezoneOffset) // 根据时区偏移量调整时间 return now.setMinutes(now.getMinutes() + timezoneOffset); } \ No newline at end of file -- Gitee From cf68ca091dd01155c278d4be91d5da0c3159e545 Mon Sep 17 00:00:00 2001 From: liuzhexian <1037512352@qq.com> Date: Wed, 13 Dec 2023 17:16:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=BA=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ------ applications/config.py | 14 +++++++------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 590bcdf..07233f7 100644 --- a/README.md +++ b/README.md @@ -99,12 +99,6 @@ Pear Admin Flask git clone https://gitee.com/pear-admin/pear-admin-flask # 安 装 -# 配置虚拟环境 -python -m venv venv -# 激活虚拟环境 -venv\Scripts\activate -# PyCharm 打开Setting，选中 Python Interpreter，Add，选择Existing environment Apply -# 安装库 pip install -r requirements.txt ``` diff --git a/applications/config.py b/applications/config.py index e867fc9..ed79ce1 100644 --- a/applications/config.py +++ b/applications/config.py @@ -35,15 +35,15 @@ class BaseConfig: SECRET_KEY = "pear-system-flask" # mysql 配置 - MYSQL_USERNAME = "root" - MYSQL_PASSWORD = "123456" - MYSQL_HOST = "127.0.0.1" - MYSQL_PORT = 3306 - MYSQL_DATABASE = "PearAdminFlask" + # MYSQL_USERNAME = "root" + # MYSQL_PASSWORD = "123456" + # MYSQL_HOST = "127.0.0.1" + # MYSQL_PORT = 3306 + # MYSQL_DATABASE = "PearAdminFlask" # 数据库的配置信息 - # SQLALCHEMY_DATABASE_URI = 'sqlite:///../pear.db' - SQLALCHEMY_DATABASE_URI = f"mysql+pymysql://{MYSQL_USERNAME}:{MYSQL_PASSWORD}@{MYSQL_HOST}:{MYSQL_PORT}/{MYSQL_DATABASE}?charset=utf8mb4" + SQLALCHEMY_DATABASE_URI = 'sqlite:///../pear.db' + # SQLALCHEMY_DATABASE_URI = f"mysql+pymysql://{MYSQL_USERNAME}:{urlquote(MYSQL_PASSWORD)}@{MYSQL_HOST}:{MYSQL_PORT}/{MYSQL_DATABASE}?charset=utf8mb4" # 默认日志等级 LOG_LEVEL = logging.WARN -- Gitee From e462c568ec125753ba7c0ea20ddfd24686429890 Mon Sep 17 00:00:00 2001 From: liuzhexian <1037512352@qq.com> Date: Wed, 13 Dec 2023 17:26:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=9E=E9=80=82?= =?UTF-8?q?=E5=90=88=E8=87=AA=E5=B7=B1=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++++ applications/config.py | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 07233f7..590bcdf 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,12 @@ Pear Admin Flask git clone https://gitee.com/pear-admin/pear-admin-flask # 安 装 +# 配置虚拟环境 +python -m venv venv +# 激活虚拟环境 +venv\Scripts\activate +# PyCharm 打开Setting，选中 Python Interpreter，Add，选择Existing environment Apply +# 安装库 pip install -r requirements.txt ``` diff --git a/applications/config.py b/applications/config.py index ed79ce1..e867fc9 100644 --- a/applications/config.py +++ b/applications/config.py @@ -35,15 +35,15 @@ class BaseConfig: SECRET_KEY = "pear-system-flask" # mysql 配置 - # MYSQL_USERNAME = "root" - # MYSQL_PASSWORD = "123456" - # MYSQL_HOST = "127.0.0.1" - # MYSQL_PORT = 3306 - # MYSQL_DATABASE = "PearAdminFlask" + MYSQL_USERNAME = "root" + MYSQL_PASSWORD = "123456" + MYSQL_HOST = "127.0.0.1" + MYSQL_PORT = 3306 + MYSQL_DATABASE = "PearAdminFlask" # 数据库的配置信息 - SQLALCHEMY_DATABASE_URI = 'sqlite:///../pear.db' - # SQLALCHEMY_DATABASE_URI = f"mysql+pymysql://{MYSQL_USERNAME}:{urlquote(MYSQL_PASSWORD)}@{MYSQL_HOST}:{MYSQL_PORT}/{MYSQL_DATABASE}?charset=utf8mb4" + # SQLALCHEMY_DATABASE_URI = 'sqlite:///../pear.db' + SQLALCHEMY_DATABASE_URI = f"mysql+pymysql://{MYSQL_USERNAME}:{MYSQL_PASSWORD}@{MYSQL_HOST}:{MYSQL_PORT}/{MYSQL_DATABASE}?charset=utf8mb4" # 默认日志等级 LOG_LEVEL = logging.WARN -- Gitee