From 09c210363ef716e44134a1b463b4c916c5d11957 Mon Sep 17 00:00:00 2001 From: Huo-WenBo <1684240320@qq.com> Date: Thu, 21 Sep 2023 06:43:20 +0000 Subject: [PATCH 1/2] =?UTF-8?q?update=20requirements.txt.=20=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E7=94=9F=E6=88=90=E9=A1=B9=E7=9B=AE=20requirements.tx?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Huo-WenBo <1684240320@qq.com> --- requirements.txt | 56 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index 44355bb..4aec34f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,42 @@ -Flask -Flask-APScheduler -Flask-Migrate -Flask-Login -Flask_Reuploaded -Flask-SQLAlchemy -flask-marshmallow -marshmallow-sqlalchemy -PyMySQL -psutil -Flask-Mail -Pillow -cryptography -validators \ No newline at end of file +alembic==1.11.1 +annotated-types==0.5.0 +APScheduler==3.10.1 +blinker==1.6.2 +cffi==1.15.1 +click==8.1.6 +colorama==0.4.6 +cryptography==41.0.2 +decorator==5.1.1 +Flask==2.3.2 +Flask-APScheduler==1.12.4 +Flask-Login==0.6.2 +Flask-Mail==0.9.1 +flask-marshmallow==0.15.0 +Flask-Migrate==4.0.4 +Flask-Reuploaded==1.3.0 +Flask-SQLAlchemy==3.0.5 +greenlet==2.0.2 +importlib-metadata==6.8.0 +itsdangerous==2.1.2 +Jinja2==3.1.2 +Mako==1.2.4 +MarkupSafe==2.1.3 +marshmallow==3.20.1 +marshmallow-sqlalchemy==0.29.0 +packaging==23.1 +Pillow==10.0.0 +psutil==5.9.5 +pycparser==2.21 +pydantic==2.1.1 +pydantic_core==2.4.0 +PyMySQL==1.1.0 +python-dateutil==2.8.2 +pytz==2023.3 +six==1.16.0 +SQLAlchemy==2.0.19 +typing_extensions==4.7.1 +tzdata==2023.3 +tzlocal==5.0.1 +validators==0.20.0 +Werkzeug==2.3.6 +zipp==3.16.2 -- Gitee From 9abb4ae6a98b041cec6eec9697f8efab98802b1c Mon Sep 17 00:00:00 2001 From: Huo-WenBo <1684240320@qq.com> Date: Thu, 21 Sep 2023 06:44:33 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20from=20flask=5Fsqlalch?= =?UTF-8?q?emyimport=20BaseQuery=20=E4=B8=8D=E8=83=BD=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Huo-WenBo <1684240320@qq.com> --- applications/extensions/init_sqlalchemy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/applications/extensions/init_sqlalchemy.py b/applications/extensions/init_sqlalchemy.py index c0aff14..d128c22 100644 --- a/applications/extensions/init_sqlalchemy.py +++ b/applications/extensions/init_sqlalchemy.py @@ -2,7 +2,8 @@ import datetime import os from flask import Flask, request -from flask_sqlalchemy import SQLAlchemy, BaseQuery +from flask_sqlalchemy import SQLAlchemy +from flask_sqlalchemy.query import Query as BaseQuery from flask_marshmallow import Marshmallow from marshmallow import fields from marshmallow.validate import ( -- Gitee