flask-restful依赖替换完成

applications/models/__init__.py

@@ -1,7 +1,7 @@
-from applications.models.company import Dept, DeptSchema, User
-from .log import AdminLog, LogSchema
-from applications.models.file.photo import Photo, PhotoSchema
-from applications.models.rights.power import Power, PowerSchema
-from applications.models.rights.role import Role, RoleSchema
+from applications.models.company import Dept, User
+from applications.models.log import AdminLog
+from applications.models.file.photo import Photo
+from applications.models.rights.power import Power
+from applications.models.rights.role import Role
 from applications.models.rights.role_power import role_power
 from applications.models.rights.user_role import user_role

applications/models/company/__init__.py

@@ -1,2 +1,2 @@
-from .dept import Dept, DeptSchema
+from .dept import Dept
 from .users import User

applications/models/company/dept.py

@@ -1,6 +1,5 @@
 import datetime
-from applications.extensions import db, ma
-from marshmallow import fields, validate
+from applications.extensions import db
 
 
 class Dept(db.Model):
@@ -17,15 +16,3 @@ class Dept(db.Model):
     address = db.Column(db.String(255), comment="详细地址")
     create_at = db.Column(db.DateTime, default=datetime.datetime.now, comment='创建时间')
     update_at = db.Column(db.DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now, comment='创建时间')
-
-
-class DeptSchema(ma.Schema):  # 序列化类
-    deptId = fields.Integer(attribute="id")
-    parentId = fields.Integer(attribute="parent_id")
-    deptName = fields.Str(attribute="dept_name")
-    leader = fields.Str()
-    phone = fields.Str()
-    email = fields.Str(validate=validate.Email())
-    address = fields.Str()
-    status = fields.Str(validate=validate.OneOf(["0", "1"]))
-    sort = fields.Integer()

applications/models/company/users.py

@@ -1,8 +1,7 @@
 import datetime
 from flask_login import UserMixin
 from werkzeug.security import generate_password_hash, check_password_hash
-from applications.extensions import db, ma
-from marshmallow import fields
+from applications.extensions import db
 
 
 class User(db.Model, UserMixin):

applications/models/file/photo.py

@@ -1,7 +1,6 @@
 import datetime
 
-from applications.extensions import db, ma
-from marshmallow import fields
+from applications.extensions import db
 
 
 class Photo(db.Model):
@@ -13,12 +12,3 @@ class Photo(db.Model):
     size = db.Column(db.CHAR(30), nullable=False)
     create_time = db.Column(db.DateTime, default=datetime.datetime.now)
 
-
-class PhotoSchema(ma.Schema):
-    id = fields.Integer()
-    name = fields.Str()
-    href = fields.Str()
-    mime = fields.Str()
-    size = fields.Str()
-    ext = fields.Str()
-    create_time = fields.DateTime()

applications/models/log.py

@@ -1,6 +1,5 @@
 from datetime import datetime
-from applications.extensions import db, ma
-from marshmallow import fields
+from applications.extensions import db
 
 
 class AdminLog(db.Model):
@@ -14,15 +13,3 @@ class AdminLog(db.Model):
     success = db.Column(db.Integer)
     user_agent = db.Column(db.Text)
     create_time = db.Column(db.DateTime, default=datetime.now)
-
-
-class LogSchema(ma.Schema):  # 序列化类
-    id = fields.Integer()
-    method = fields.Str()
-    uid = fields.Str()
-    url = fields.Str()
-    desc = fields.Str()
-    ip = fields.Str()
-    user_agent = fields.Str()
-    success = fields.Bool()
-    create_time = fields.DateTime()

applications/models/rights/power.py

@@ -1,6 +1,5 @@
 import datetime
-from applications.extensions import db, ma
-from marshmallow import fields
+from applications.extensions import db
 
 
 class Power(db.Model):
@@ -19,21 +18,3 @@ class Power(db.Model):
     enable = db.Column(db.Integer, comment='是否开启')
 
     parent = db.relationship("Power", remote_side=[id])  # 自关联
-
-
-# 权限 models 序列化类
-class PowerSchema(ma.Schema):
-    id = fields.Integer()
-    title = fields.Str(attribute="name")
-    type = fields.Str()
-    code = fields.Str()
-    href = fields.Str(attribute="url")
-    openType = fields.Str(attribute="open_type")
-    parent_id = fields.Integer()
-    icon = fields.Str()
-    sort = fields.Integer()
-    create_time = fields.DateTime()
-    update_time = fields.DateTime()
-    enable = fields.Integer()
-
-

applications/models/rights/role.py

@@ -1,6 +1,5 @@
 import datetime
-from applications.extensions import db, ma
-from marshmallow import fields
+from applications.extensions import db
 
 
 class Role(db.Model):
@@ -15,15 +14,3 @@ class Role(db.Model):
     create_time = db.Column(db.DateTime, default=datetime.datetime.now, comment='创建时间')
     update_time = db.Column(db.DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now, comment='更新时间')
     power = db.relationship('Power', secondary="rt_role_power", backref=db.backref('role'))
-
-
-class RoleSchema(ma.Schema):
-    id = fields.Integer()
-    roleName = fields.Str(attribute="name")
-    roleCode = fields.Str(attribute="code")
-    enable = fields.Str()
-    remark = fields.Str()
-    details = fields.Str()
-    sort = fields.Integer()
-    create_at = fields.DateTime()
-    update_at = fields.DateTime()