分解models

applications/service/admin/dict.py

@@ -5,7 +5,7 @@ from flask_marshmallow import Marshmallow
 from marshmallow import fields
 
 from applications.models import db
-from applications.models.admin import DictType, DictData
+from applications.models.admin_dict import DictType, DictData
 
 ma = Marshmallow()
 

applications/service/admin/file.py

@@ -4,7 +4,7 @@ from flask_marshmallow import Marshmallow
 from marshmallow import fields
 from sqlalchemy import desc
 from applications.models import db
-from applications.models.admin import Photo
+from applications.models.admin_photo import Photo
 from applications.service.upload import photos
 
 ma = Marshmallow()

applications/service/admin/index.py

@@ -3,7 +3,6 @@ from flask import session, make_response
 from flask_login import current_user
 from flask_marshmallow import Marshmallow
 from marshmallow import fields
-from applications.models.admin import Power
 from applications.service.CaptchaTool import gen_captcha
 
 ma = Marshmallow()

applications/service/admin/power.py

@@ -2,7 +2,8 @@ from flask_marshmallow import Marshmallow
 from marshmallow import fields
 
 from applications.models import db
-from applications.models.admin import Power, Role
+from applications.models.admin_power import Power
+from applications.models.admin_role import  Role
 
 ma = Marshmallow()
 

applications/service/admin/role.py

@@ -1,10 +1,10 @@
-from flask import jsonify
 from flask_marshmallow import Marshmallow
 from marshmallow import fields
 from sqlalchemy import and_
-
 from applications.models import db
-from applications.models.admin import Role, Power, User
+from applications.models.admin_role import Role
+from applications.models.admin_power import Power
+from applications.models.admin_user import User
 
 ma = Marshmallow()
 
@@ -147,8 +147,6 @@ def disable_status(id):
     return False
 
 
-
-
 # 删除角色
 def remove_role(id):
     role = Role.query.filter_by(id=id).first()
@@ -177,4 +175,3 @@ def batch_remove(ids):
     # db.session.commit()
     for id in ids:
         remove_role(id)
-

applications/service/admin/user.py

@@ -6,7 +6,9 @@ from sqlalchemy import and_, desc
 from sqlalchemy.sql import exists
 
 from applications.models import db
-from applications.models.admin import User, Role, AdminLog
+from applications.models.admin_user import User
+from applications.models.admin_role import  Role
+from applications.models.admin_log import  AdminLog
 from sqlalchemy.orm.dynamic import AppenderQuery
 
 ma = Marshmallow()

applications/service/admin_log.py

@@ -1,7 +1,7 @@
 from flask_login import current_user
 
 from applications.models import db
-from applications.models.admin import AdminLog
+from applications.models.admin_log import AdminLog
 
 
 def login_log(request,uid, is_access):

applications/service/login.py

@@ -10,6 +10,6 @@ def init_flask_login(app):
 
     @login_manager.user_loader
     def load_user(user_id):
-        from applications.models.admin import User
+        from applications.models.admin_user import User
         user = User.query.get(int(user_id))
         return user