Merge branch 'v2' into pr_5

# Conflicts: # applications/view/__init__.py
2021-06-13 16:14:23 +08:00
parent 9e8a5357be 14a32e6d3c
commit 62bd10cc60
33 changed files with 191 additions and 167 deletions
@@ -1,6 +1,7 @@
 from applications.common.utils.validate import xss_escape
 from applications.extensions import db
-from applications.models import Dept, DeptSchema
+from applications.models import Dept
+from applications.schemas import DeptSchema
 from applications.models import User
 from applications.common.curd import model_to_dicts

@@ -1,6 +1,7 @@
 from applications.common.utils.validate import xss_escape
 from applications.extensions import db
-from applications.models import DictType, DictData, DictTypeSchema, DictDataSchema
+from applications.models import DictType, DictData
+from applications.schemas import DictTypeSchema, DictDataSchema
 from applications.common.curd import model_to_dicts


@@ -4,7 +4,8 @@ from sqlalchemy import desc

 from applications.common.utils.upload import photos
 from applications.extensions import db
-from applications.models import Photo, PhotoSchema
+from applications.models import Photo
+from applications.schemas import PhotoSchema
 from applications.common.curd import model_to_dicts


@@ -3,7 +3,7 @@ from flask import session, make_response, current_app
 from flask_login import current_user

 from applications.common.utils.gen_captcha import gen_captcha
-from applications.models.admin_power import PowerSchema
+from applications.schemas import PowerSchema


 # 授权路由存入session
@@ -1,6 +1,7 @@
 from applications.common.utils.validate import xss_escape
 from applications.extensions import db
-from applications.models.admin_power import Power, PowerSchema2
+from applications.models.admin_power import Power
+from applications.schemas import PowerSchema2
 from applications.models import Role
 from applications.common.curd import model_to_dicts

@@ -1,9 +1,10 @@
 from sqlalchemy import and_
-
 from applications.common.utils.validate import xss_escape
 from applications.extensions import db
-from applications.models import Role, RoleSchema
-from applications.models.admin_power import Power, PowerSchema2
+from applications.models import Role
+from applications.schemas import RoleSchema
+from applications.models.admin_power import Power
+from applications.schemas import PowerSchema2
 from applications.models import User

 # 获取角色对象
@@ -2,7 +2,8 @@ from flask import jsonify
 from flask_login import current_user
 from sqlalchemy import and_, desc
 from applications.extensions import db
-from applications.models import User, UserSchema
+from applications.models import User
+from applications.schemas import UserSchema
 from applications.models import Role
 from applications.models import AdminLog