调整目录结构

applications/models/__init__.py

@@ -1,47 +1,9 @@
-from flask_sqlalchemy import SQLAlchemy
-from flask_marshmallow import Marshmallow
-from marshmallow import fields
-from marshmallow.validate import (
-    URL, Email, Range, Length, Equal, Regexp,
-    Predicate, NoneOf, OneOf, ContainsOnly
-)
-
-URL.default_message = '无效的链接'
-Email.default_message = '无效的邮箱地址'
-Range.message_min = '不能小于{min}'
-Range.message_max = '不能小于{max}'
-Range.message_all = '不能超过{min}和{max}这个范围'
-Length.message_min = '长度不得小于{min}位'
-Length.message_max = '长度不得大于{max}位'
-Length.message_all = '长度不能超过{min}和{max}这个范围'
-Length.message_equal = '长度必须等于{equal}位'
-Equal.default_message = '必须等于{other}'
-Regexp.default_message = '非法输入'
-Predicate.default_message = '非法输入'
-NoneOf.default_message = '非法输入'
-OneOf.default_message = '无效的选择'
-ContainsOnly.default_message = '一个或多个无效的选择'
-
-fields.Field.default_error_messages = {
-    "required": "缺少必要数据",
-    "null": "数据不能为空",
-    "validator_failed": "非法数据",
-}
-
-fields.Str.default_error_messages = {
-    'invalid': "不是合法文本"
-}
-
-fields.Int.default_error_messages = {
-    "invalid": "不是合法整数"
-}
-
-fields.Number.default_error_messages = {
-    "invalid": "不是合法数字"
-}
-
-fields.Boolean.default_error_messages = {
-    "invalid": "不是合法布尔值"
-}
-db = SQLAlchemy()
-ma = Marshmallow()
+from .admin_dept import Dept, DeptSchema
+from .admin_dict import DictType, DictData, DictTypeSchema, DictDataSchema
+from .admin_log import AdminLog, LogSchema
+from .admin_photo import Photo, PhotoSchema
+from .admin_power import Power, PowerSchema, PowerSchema2
+from .admin_role import Role, RoleSchema
+from .admin_role_power import role_power
+from .admin_user import User, UserSchema
+from .admin_user_role import user_role

applications/models/admin_dept.py

@@ -1,6 +1,6 @@
 import datetime
-from applications.models import db, ma
-from marshmallow import fields,validate
+from applications.extensions import db, ma
+from marshmallow import fields, validate
 
 
 class Dept(db.Model):

applications/models/admin_dict.py

@@ -1,6 +1,6 @@
 import datetime
 
-from applications.models import db, ma
+from applications.extensions import db, ma
 from marshmallow import fields
 
 

applications/models/admin_log.py

@@ -1,5 +1,5 @@
 import datetime
-from applications.models import db, ma
+from applications.extensions import db, ma
 from marshmallow import fields
 
 

applications/models/admin_photo.py

@@ -1,6 +1,6 @@
 import datetime
 
-from applications.models import db, ma
+from applications.extensions import db, ma
 from marshmallow import fields
 
 

applications/models/admin_power.py

@@ -1,5 +1,5 @@
 import datetime
-from applications.models import db, ma
+from applications.extensions import db, ma
 from marshmallow import fields
 
 
@@ -47,4 +47,3 @@ class PowerSchema2(ma.Schema):  # 序列化类
     create_time = fields.DateTime()
     update_time = fields.DateTime()
     enable = fields.Integer()
-

applications/models/admin_role.py

@@ -1,7 +1,6 @@
 import datetime
-from applications.models import db, ma
+from applications.extensions import db, ma
 from marshmallow import fields
-from applications.models import admin_role_power
 
 
 class Role(db.Model):

applications/models/admin_role_power.py

@@ -1,8 +1,9 @@
-from applications.models import db
+from applications.extensions import db
+
 # 创建中间表
 role_power = db.Table(
     "admin_role_power",  # 中间表名称
     db.Column("id", db.Integer, primary_key=True, autoincrement=True, comment='标识'),  # 主键
     db.Column("power_id", db.Integer, db.ForeignKey("admin_power.id"), comment='用户编号'),  # 属性 外键
     db.Column("role_id", db.Integer, db.ForeignKey("admin_role.id"), comment='角色编号'),  # 属性 外键
-)
+)

applications/models/admin_user.py

@@ -1,10 +1,9 @@
 import datetime
 from flask_login import UserMixin
 from werkzeug.security import generate_password_hash, check_password_hash
-from applications.models import db, ma
+from applications.extensions import db, ma
 from marshmallow import fields
-from applications.models import admin_user_role
-from applications.models.admin_dept import Dept
+from applications.models import Dept
 
 
 class User(db.Model, UserMixin):
@@ -43,4 +42,3 @@ class UserSchema(ma.Schema):
             return Dept.query.filter_by(id=obj.dept_id).first().dept_name
         else:
             return None
-

applications/models/admin_user_role.py

@@ -1,4 +1,5 @@
-from applications.models import db
+from applications.extensions import db
+
 # 创建中间表
 user_role = db.Table(
     "admin_user_role",  # 中间表名称