Merge branch 'dev'

app/api/cms/user.py

@@ -38,7 +38,6 @@
     LoginSchema,
     LoginTokenSchema,
     UserBaseInfoSchema,
-    UserPermissionSchema,
     UserRegisterSchema,
     UserSchema,
 )
@@ -215,7 +214,7 @@ def refresh():
 @api.validate(
     tags=["用户"],
     security=[AuthorizationBearerSecurity],
-    resp=DocResponse(r=UserPermissionSchema),
+    # resp=DocResponse(r=UserPermissionSchema), # 当前数据接口无法使用OpenAPI表示
 )
 def get_allowed_apis():
     """

pyproject.toml

@@ -12,10 +12,10 @@ default = true
 [tool.poetry.dependencies]
 python = "^3.8"
 Lin-CMS = "^0.4.8"
-pillow = "^9.0.0"
+pillow = "^9.0.1"
 flask-cors = "^3.0.10"
 gunicorn = "^20.1.0"
-gevent = "^21.8.0"
+gevent = "^21.12.0"
 flask-socketio = "^5.1.1"
 blinker = "^1.4"
 python-dotenv = "^0.19.2"
@@ -24,12 +24,12 @@ pydantic = {extras = ["email"], version = "^1.9.0"}
 
 [tool.poetry.dev-dependencies]
 flask-sqlacodegen = "^1.1.8"
-black = "^21.10b0"
+black = "^21.12b0"
 isort = "^5.10.1"
 watchdog = "^2.1.6"
-coverage = "^6.1.2"
+coverage = "^6.3.2"
 pytest = "^6.2.5"
-pre-commit = "^2.16.0"
+pre-commit = "^2.17.0"
 pytest-ordering = "^0.6"
 flake8 = "^4.0.1"
 

requirements-dev.txt

@@ -1,5 +1,5 @@
 Lin-CMS==0.4.8
-pillow==9.0.0
+pillow==9.0.1
 flask-cors==3.0.10
 gunicorn==20.1.0
 gevent==21.8.0
@@ -8,11 +8,11 @@ blinker==1.4
 python-dotenv==0.19.2
 gevent-websocket==0.10.1
 flask-sqlacodegen==1.1.8
-black==21.10b0
+black==21.12b0
 isort==5.10.1
 watchdog==2.1.6
-coverage==6.1.2
+coverage==6.3.2
 pytest==6.2.5
-pre-commit==2.16.0
+pre-commit==2.17.0
 pytest-ordering==0.6
 flake8==4.0.1

requirements-prod.txt

@@ -1,8 +1,8 @@
 Lin-CMS==0.4.8
-pillow==9.0.0
+pillow==9.0.1
 flask-cors==3.0.10
 gunicorn==20.1.0
-gevent==21.8.0
+gevent==21.12.0
 flask-socketio==5.1.1
 blinker==1.4
 python-dotenv==0.19.2