fix(修复模型名)

applications/rights/department.py

@@ -3,13 +3,13 @@ from flask_restful import Resource, reqparse
 
 from common.utils.http import success_api, fail_api
 from extensions import db
-from models import DepartmentModels, UserModels
+from models import DepartmentModel, UserModel
 
 
 class DepartmentsResource(Resource):
 
     def get(self):
-        dept_data = DepartmentModels.query.order_by(DepartmentModels.sort).all()
+        dept_data = DepartmentModel.query.order_by(DepartmentModel.sort).all()
         # TODO dtree 需要返回状态信息
         res = {
             "status": {"code": 200, "message": "默认"},
@@ -44,7 +44,7 @@ class DepartmentsResource(Resource):
 
         res = parser.parse_args()
 
-        dept = DepartmentModels(
+        dept = DepartmentModel(
             parent_id=res.parent_id,
             dept_name=res.dept_name,
             sort=res.sort,
@@ -62,7 +62,7 @@ class DepartmentsResource(Resource):
 
 class DepartmentResource(Resource):
     def get(self, dept_id):
-        dept = DepartmentModels.query.filter_by(id=dept_id).first()
+        dept = DepartmentModel.query.filter_by(id=dept_id).first()
         dept_data = {
             'id': dept.id,
             'dept_name': dept.dept_name,
@@ -95,15 +95,15 @@ class DepartmentResource(Resource):
             "status": res.status,
             "address": res.address
         }
-        res = DepartmentModels.query.filter_by(id=dept_id).update(data)
+        res = DepartmentModel.query.filter_by(id=dept_id).update(data)
         if not res:
             return fail_api(message="更新失败")
         db.session.commit()
         return success_api(message="更新成功")
 
     def delete(self, dept_id):
-        ret = DepartmentModels.query.filter_by(id=dept_id).delete()
+        ret = DepartmentModel.query.filter_by(id=dept_id).delete()
-        UserModels.query.filter_by(dept_id=dept_id).update({"dept_id": None})
+        UserModel.query.filter_by(dept_id=dept_id).update({"dept_id": None})
         db.session.commit()
         if ret:
             return success_api(message="删除成功")
@@ -112,7 +112,7 @@ class DepartmentResource(Resource):
 
 class DeptEnableResource(Resource):
     def put(self, dept_id):
-        d = DepartmentModels.query.get(dept_id)
+        d = DepartmentModel.query.get(dept_id)
         if d:
             d.status = not d.status
             db.session.commit()

applications/rights/rights.py

@@ -7,7 +7,7 @@ from flask_restful import Resource, reqparse
 
 from common.utils.http import success_api, fail_api
 from extensions import db
-from models import RightModels, RoleModels
+from models import RightModel, RoleModel
 
 
 def get_render_config():
@@ -140,15 +140,15 @@ def make_menu_tree():
 
 # 删除权限（目前没有判断父节点自动删除子节点）
 def remove_power(power_id):
-    power = RightModels.query.filter_by(id=power_id).first()
+    power = RightModel.query.filter_by(id=power_id).first()
     role_id_list = []
     roles = power.role
     for role in roles:
         role_id_list.append(role.id)
-    roles = RoleModels.query.filter(RoleModels.id.in_(role_id_list)).all()
+    roles = RoleModel.query.filter(RoleModel.id.in_(role_id_list)).all()
     for p in roles:
         power.role.remove(p)
-    r = RightModels.query.filter_by(id=power_id).delete()
+    r = RightModel.query.filter_by(id=power_id).delete()
     db.session.commit()
     return r
 
@@ -174,8 +174,8 @@ class RightRightsResource(Resource):
     def get(self):
         """获取选择父节点"""
 
-        power = RightModels.query.all()
+        power = RightModel.query.all()
-        # power_data = marshal(power, RightModels.fields())
+        # power_data = marshal(power, RightModel.fields())
         power_data = [
             {
                 'powerId': item.id,
@@ -206,7 +206,7 @@ class RightPowerResource(Resource):
 
     def post(self, power_id):
         res = parser_power.parse_args()
-        power = RightModels(
+        power = RightModel(
             icon=res.icon,
             open_type=res.open_type,
             parent_id=res.parent_id,
@@ -228,15 +228,15 @@ class RightPowerResource(Resource):
 
     def delete(self, power_id):
         # 删除权限（目前没有判断父节点自动删除子节点）
-        power = RightModels.query.filter_by(id=power_id).first()
+        power = RightModel.query.filter_by(id=power_id).first()
         role_id_list = []
         roles = power.role
         for role in roles:
             role_id_list.append(role.id)
-        roles = RoleModels.query.filter(RoleModels.id.in_(role_id_list)).all()
+        roles = RoleModel.query.filter(RoleModel.id.in_(role_id_list)).all()
         for p in roles:
             power.role.remove(p)
-        r = RightModels.query.filter_by(id=power_id).delete()
+        r = RightModel.query.filter_by(id=power_id).delete()
         db.session.commit()
 
         if r:
@@ -257,7 +257,7 @@ class RightPowerResource(Resource):
             "url": res.power_url,
             "sort": res.sort
         }
-        power = RightModels.query.filter_by(id=power_id).update(data)
+        power = RightModel.query.filter_by(id=power_id).update(data)
         db.session.commit()
 
         if not power:
@@ -268,7 +268,7 @@ class RightPowerResource(Resource):
 class RightPowerEnableResource(Resource):
     def put(self, right_id):
 
-        power = RightModels.query.get(right_id)
+        power = RightModel.query.get(right_id)
         if power:
             power.enable = not power.enable
             db.session.commit()

applications/rights/roles.py

@@ -2,27 +2,27 @@ from flask_restful import Resource, reqparse, marshal
 
 from common.utils.http import table_api, success_api, fail_api
 from extensions import db
-from models import RightModels, RoleModels, UserModels
+from models import RightModel, RoleModel, UserModel
 
 
 def remove_role(role_id):
     """ 删除角色 """
-    role = RoleModels.query.filter_by(id=role_id).first()
+    role = RoleModel.query.filter_by(id=role_id).first()
     # 删除该角色的权限
     power_id_list = []
     for p in role.power:
         power_id_list.append(p.id)
 
-    powers = RightModels.query.filter(RightModels.id.in_(power_id_list)).all()
+    powers = RightModel.query.filter(RightModel.id.in_(power_id_list)).all()
     for p in powers:
         role.power.remove(p)
     user_id_list = []
     for u in role.user:
         user_id_list.append(u.id)
-    users = UserModels.query.filter(UserModels.id.in_(user_id_list)).all()
+    users = UserModel.query.filter(UserModel.id.in_(user_id_list)).all()
     for u in users:
         role.user.remove(u)
-    r = RoleModels.query.filter_by(id=role_id).delete()
+    r = RoleModel.query.filter_by(id=role_id).delete()
     db.session.commit()
     return r
 
@@ -46,11 +46,11 @@ class RoleRolesResource(Resource):
 
         filters = []
         if res.role_name:
-            filters.append(RoleModels.name.like('%' + res.role_name + '%'))
+            filters.append(RoleModel.name.like('%' + res.role_name + '%'))
         if res.role_code:
-            filters.append(RoleModels.code.like('%' + res.role_code + '%'))
+            filters.append(RoleModel.code.like('%' + res.role_code + '%'))
 
-        paginate = RoleModels.query.filter(*filters).paginate(page=res.page, per_page=res.limit, error_out=False)
+        paginate = RoleModel.query.filter(*filters).paginate(page=res.page, per_page=res.limit, error_out=False)
 
         return table_api(result={'items': [{'id': item.id,
                                             'roleName': item.name,
@@ -85,7 +85,7 @@ class RoleRoleResource(Resource):
 
         res = parser.parse_args()
 
-        role = RoleModels(
+        role = RoleModel(
             details=res.details,
             enable=res.enable,
             code=res.role_code,
@@ -116,7 +116,7 @@ class RoleRoleResource(Resource):
             "details": res.details
         }
 
-        role = RoleModels.query.filter_by(id=role_id).update(data)
+        role = RoleModel.query.filter_by(id=role_id).update(data)
         db.session.commit()
         if not role:
             return fail_api(message="更新角色失败")
@@ -127,7 +127,7 @@ class RoleEnableResource(Resource):
     """启用用户"""
 
     def put(self, role_id):
-        ret = RoleModels.query.get(role_id)
+        ret = RoleModel.query.get(role_id)
         ret.enable = not ret.enable
         db.session.commit()
 
@@ -141,10 +141,10 @@ class RolePowerResource(Resource):
 
     def get(self, role_id):
         # 获取角色权限
-        role = RoleModels.query.filter_by(id=role_id).first()
+        role = RoleModel.query.filter_by(id=role_id).first()
         # 获取权限列表的 id
         check_powers_list = [rp.id for rp in role.power]
-        powers = RightModels.query.all()  # 获取所有的权限
+        powers = RightModel.query.all()  # 获取所有的权限
         powers = [{
             'powerId': item.id,
             'powerName': item.name,
@@ -176,14 +176,14 @@ class RolePowerResource(Resource):
         power_list = res.power_ids.split(',')
 
         """ 更新角色权限 """
-        role = RoleModels.query.filter_by(id=role_id).first()
+        role = RoleModel.query.filter_by(id=role_id).first()
         power_id_list = []
         for p in role.power:
             power_id_list.append(p.id)
-        powers = RightModels.query.filter(RightModels.id.in_(power_id_list)).all()
+        powers = RightModel.query.filter(RightModel.id.in_(power_id_list)).all()
         for p in powers:
             role.power.remove(p)
-        powers = RightModels.query.filter(RightModels.id.in_(power_list)).all()
+        powers = RightModel.query.filter(RightModel.id.in_(power_list)).all()
         for p in powers:
             role.power.append(p)
         db.session.commit()

applications/system/file.py

@@ -7,7 +7,7 @@ from sqlalchemy import desc
 from common.utils.http import fail_api, success_api, table_api
 from common.utils.upload import upload_one, delete_photo_by_id
 from extensions import db
-from models import PhotoModels
+from models import PhotoModel
 
 
 class FilePhotosResource(Resource):
@@ -15,10 +15,10 @@ class FilePhotosResource(Resource):
     def get(self):
         page = request.args.get('page', type=int)
         limit = request.args.get('limit', type=int)
-        photo_paginate = PhotoModels.query.order_by(desc(PhotoModels.create_at)
+        photo_paginate = PhotoModel.query.order_by(desc(PhotoModel.create_at)
-                                                    ).paginate(page=page,
+                                                   ).paginate(page=page,
-                                                             per_page=limit,
+                                                              per_page=limit,
-                                                             error_out=False)
+                                                              error_out=False)
         data = [
             {
                 'id': item.id,
@@ -54,11 +54,11 @@ class FilePhotosResource(Resource):
         """图片批量删除"""
         # TODO bugs 图片删除失败
         ids = request.form.getlist('ids[]')
-        photo_name = PhotoModels.query.filter(PhotoModels.id.in_(ids)).all()
+        photo_name = PhotoModel.query.filter(PhotoModel.id.in_(ids)).all()
         upload_url = current_app.config.get("UPLOADED_PHOTOS_DEST")
         for p in photo_name:
             os.remove(upload_url + '/' + p.name)
-        photo = PhotoModels.query.filter(PhotoModels.id.in_(ids)).delete(synchronize_session=False)
+        photo = PhotoModel.query.filter(PhotoModel.id.in_(ids)).delete(synchronize_session=False)
         db.session.commit()
         if photo:
             return success_api(message="删除成功")

applications/system/passport.py

@@ -6,7 +6,7 @@ from flask_restful import Resource, reqparse
 from common.gen_captcha import add_auth_session
 from common.utils.http import fail_api, success_api
 from common.utils.rights import record_logging
-from models import UserModels
+from models import UserModel
 
 
 class LoginResource(Resource):
@@ -28,7 +28,7 @@ class LoginResource(Resource):
 
         if req.captcha != s_code:
             return fail_api(message="验证码错误")
-        user = UserModels.query.filter_by(username=req.username).first()
+        user = UserModel.query.filter_by(username=req.username).first()
 
         if user is None:
             return fail_api(message="不存在的用户")

applications/users/profile.py

@@ -4,7 +4,7 @@ from flask_restful import Resource, reqparse
 
 from common.utils.http import fail_api, success_api
 from extensions import db
-from models import UserModels
+from models import UserModel
 
 
 class UserStatusResource(Resource):
@@ -18,11 +18,11 @@ class UserStatusResource(Resource):
         res = parser.parse_args()
 
         if res.operate == 1:
-            user = UserModels.query.get(user_id)
+            user = UserModel.query.get(user_id)
             user.enable = res.operate
             message = success_api(message="启动成功")
         else:
-            user = UserModels.query.filter_by(id=res.user_id).update({"enable": res.operate})
+            user = UserModel.query.filter_by(id=res.user_id).update({"enable": res.operate})
             message = success_api(message="禁用成功")
         if user:
             db.session.commit()
@@ -36,7 +36,7 @@ class UserAvatarResource(Resource):
 
     def put(self, user_id):
         url = request.json.get("avatar").get("src")
-        ret = UserModels.query.get(user_id)
+        ret = UserModel.query.get(user_id)
         ret.avatar = url
         db.session.commit()
         if not ret:
@@ -55,7 +55,7 @@ class UserInfoResource(Resource):
 
         res = parser.parse_args()
 
-        ret = UserModels.query.get(user_id)
+        ret = UserModel.query.get(user_id)
         ret.username = res.username
         ret.realname = res.real_name
         ret.remark = res.details
@@ -80,7 +80,7 @@ class UserPasswordResource(Resource):
             return fail_api(message='确认密码不一致')
 
         """ 修改当前用户密码 """
-        user = UserModels.query.get(user_id)
+        user = UserModel.query.get(user_id)
         is_right = user.validate_password(res.oldPassword)
         if not is_right:
             return jsonify(success=False, message="旧密码错误")

applications/users/user.py

@@ -5,7 +5,7 @@ from sqlalchemy import desc
 
 from common.utils.http import fail_api, success_api, table_api
 from extensions import db
-from models import UserModels, RoleModels, DepartmentModels
+from models import UserModel, RoleModel, DepartmentModel
 from models import LogModel
 
 
@@ -18,20 +18,20 @@ def get_current_user_logs():
 
 def is_user_exists(username):
     """ 判断用户是否存在 """
-    res = UserModels.query.filter_by(username=username).count()
+    res = UserModel.query.filter_by(username=username).count()
     return bool(res)
 
 
 def delete_by_id(_id):
     """ 删除用户 """
-    user = UserModels.query.filter_by(id=_id).first()
+    user = UserModel.query.filter_by(id=_id).first()
     roles_id = []
     for role in user.role:
         roles_id.append(role.id)
-    roles = RoleModels.query.filter(RoleModels.id.in_(roles_id)).all()
+    roles = RoleModel.query.filter(RoleModel.id.in_(roles_id)).all()
     for r in roles:
         user.role.remove(r)
-    res = UserModels.query.filter_by(id=_id).delete()
+    res = UserModel.query.filter_by(id=_id).delete()
     db.session.commit()
     return res
 
@@ -43,14 +43,14 @@ def batch_remove(ids):
 
 
 def update_user_role(_id, roles_list):
-    user = UserModels.query.filter_by(id=_id).first()
+    user = UserModel.query.filter_by(id=_id).first()
     roles_id = []
     for role in user.role:
         roles_id.append(role.id)
-    roles = RoleModels.query.filter(RoleModels.id.in_(roles_id)).all()
+    roles = RoleModel.query.filter(RoleModel.id.in_(roles_id)).all()
     for r in roles:
         user.role.remove(r)
-    roles = RoleModels.query.filter(RoleModels.id.in_(roles_list)).all()
+    roles = RoleModel.query.filter(RoleModel.id.in_(roles_list)).all()
     for r in roles:
         user.role.append(r)
     db.session.commit()
@@ -72,17 +72,17 @@ class UserUsersResource(Resource):
         filters = []
 
         if res.real_name:
-            filters.append(UserModels.realname.like('%' + res.real_name + '%'))
+            filters.append(UserModel.realname.like('%' + res.real_name + '%'))
         if res.username:
-            filters.append(UserModels.username.like('%' + res.username + '%'))
+            filters.append(UserModel.username.like('%' + res.username + '%'))
         if res.dept_id:
-            filters.append(UserModels.dept_id == res.dept_id)
+            filters.append(UserModel.dept_id == res.dept_id)
 
-        paginate = UserModels.query.filter(*filters).paginate(page=res.page,
+        paginate = UserModel.query.filter(*filters).paginate(page=res.page,
-                                                              per_page=res.limit,
+                                                             per_page=res.limit,
-                                                              error_out=False)
+                                                             error_out=False)
 
-        dept_name = lambda dept_id: DepartmentModels.query.filter_by(id=dept_id).first().dept_name if dept_id else ""
+        dept_name = lambda dept_id: DepartmentModel.query.filter_by(id=dept_id).first().dept_name if dept_id else ""
         user_data = [{
             'id': item.id,
             'username': item.username,
@@ -111,7 +111,7 @@ class UserUsersResource(Resource):
         if is_user_exists(res.username):
             return fail_api(message="用户已经存在")
 
-        user = UserModels()
+        user = UserModel()
         user.username = res.username
         user.realname = res.real_name
         user.set_password(res.password)
@@ -119,8 +119,8 @@ class UserUsersResource(Resource):
         db.session.commit()
 
         """ 增加用户角色 """
-        user = UserModels.query.filter_by(id=user.id).first()
+        user = UserModel.query.filter_by(id=user.id).first()
-        roles = RoleModels.query.filter(RoleModels.id.in_(role_ids)).all()
+        roles = RoleModel.query.filter(RoleModel.id.in_(role_ids)).all()
         for r in roles:
             user.role.append(r)
         db.session.commit()
@@ -152,7 +152,7 @@ class UserUserResource(Resource):
         if is_user_exists(res.username):
             return fail_api(message="用户已经存在")
 
-        user = UserModels()
+        user = UserModel()
         user.username = res.username
         user.realname = res.real_name
         user.set_password(res.password)
@@ -160,8 +160,8 @@ class UserUserResource(Resource):
         db.session.commit()
 
         """ 增加用户角色 """
-        user = UserModels.query.filter_by(id=user.id).first()
+        user = UserModel.query.filter_by(id=user.id).first()
-        roles = RoleModels.query.filter(RoleModels.id.in_(role_ids)).all()
+        roles = RoleModel.query.filter(RoleModel.id.in_(role_ids)).all()
         for r in roles:
             user.role.append(r)
         db.session.commit()
@@ -189,7 +189,7 @@ class UserRoleResource(Resource):
         role_ids = res.role_ids.split(',')
 
         # 更新用户数据
-        UserModels.query.filter_by(id=user_id).update({'username': res.username,
+        UserModel.query.filter_by(id=user_id).update({'username': res.username,
                                                         'realname': res.real_name,
                                                         'dept_id': res.dept_id})
         db.session.commit()

applications/view/department.py

@@ -1,6 +1,6 @@
 from flask import render_template, request
 
-from models import DepartmentModels
+from models import DepartmentModel
 from common.utils.rights import permission_required, view_logging_required
 from applications.view import index_bp
 
@@ -24,5 +24,5 @@ def add():
 @permission_required("admin:dept:edit")
 def edit():
     dept_id = request.args.get("deptId", type=int)
-    dept = DepartmentModels.query.get(dept_id)
+    dept = DepartmentModel.query.get(dept_id)
     return render_template('admin/department/dept_edit.html', dept=dept)

applications/view/rights.py

@@ -1,7 +1,7 @@
 from flask import render_template
 
 from common.utils.rights import permission_required, view_logging_required
-from models import RightModels
+from models import RightModel
 from applications.view import index_bp
 
 
@@ -16,7 +16,7 @@ def rights_index():
 @view_logging_required
 @permission_required("admin:power:edit")
 def rights_edit(power_id):
-    power = RightModels.query.filter_by(id=power_id).first()
+    power = RightModel.query.filter_by(id=power_id).first()
     icon = str(power.icon).split()
     if len(icon) == 2:
         icon = icon[1]

applications/view/roles.py

@@ -2,7 +2,7 @@ from flask import Blueprint, render_template
 
 from common.utils.rights import permission_required, view_logging_required
 
-from models import RoleModels
+from models import RoleModel
 
 role_bp = Blueprint('role', __name__, url_prefix='/admin/role')
 
@@ -28,7 +28,7 @@ def power(role_id):
 @view_logging_required
 @permission_required("admin:role:edit")
 def role_editor(role_id):
-    role = RoleModels.query.filter_by(id=role_id).first()
+    role = RoleModel.query.filter_by(id=role_id).first()
     return render_template('admin/roles/roles_edit.html', role=role)
 
 

applications/view/users.py

@@ -3,7 +3,7 @@ from flask_login import login_required, current_user
 from sqlalchemy import desc
 
 from common.utils.rights import permission_required, view_logging_required
-from models import LogModel, RoleModels, UserModels
+from models import LogModel, RoleModel, UserModel
 from . import index_bp
 
 
@@ -19,7 +19,7 @@ def users_main():
 @view_logging_required
 @permission_required("admin:user:add")
 def users_add_view():
-    roles = RoleModels.query.all()
+    roles = RoleModel.query.all()
     return render_template('admin/users/users_add.html', roles=roles)
 
 
@@ -28,8 +28,8 @@ def users_add_view():
 @permission_required("admin:user:edit")
 def users_user_id_view(user_id):
     #  获取编辑用户信息
-    user = UserModels.query.filter_by(id=user_id).first()
+    user = UserModel.query.filter_by(id=user_id).first()
-    roles = RoleModels.query.all()
+    roles = RoleModel.query.all()
     checked_roles = []
     for r in user.role:
         checked_roles.append(r.id)

common/utils/upload.py

@@ -4,7 +4,7 @@ from flask import current_app
 
 from common.flask_uploads import UploadSet, IMAGES
 from extensions import db
-from models import PhotoModels
+from models import PhotoModel
 
 photos = UploadSet('photos', IMAGES)
 
@@ -15,15 +15,15 @@ def upload_one(photo, mime):
 
     upload_url = current_app.config.get("UPLOADED_PHOTOS_DEST")
     size = os.path.getsize(upload_url + '/' + filename)
-    photo = PhotoModels(name=filename, href=file_url, mime=mime, size=size)
+    photo = PhotoModel(name=filename, href=file_url, mime=mime, size=size)
     db.session.add(photo)
     db.session.commit()
     return file_url
 
 
 def delete_photo_by_id(_id):
-    photo_name = PhotoModels.query.filter_by(id=_id).first().name
+    photo_name = PhotoModel.query.filter_by(id=_id).first().name
-    photo = PhotoModels.query.filter_by(id=_id).delete()
+    photo = PhotoModel.query.filter_by(id=_id).delete()
     db.session.commit()
     upload_url = current_app.config.get("UPLOADED_PHOTOS_DEST")
     os.remove(upload_url + '/' + photo_name)

extensions/init_databases.py

@@ -39,20 +39,20 @@ def register_script(app: Flask):
         """数据库初始化"""
 
         # 创建化部门数据
-        from models import DepartmentModels
+        from models import DepartmentModel
-        add_data(cp_dept_data_list, DepartmentModels)
+        add_data(cp_dept_data_list, DepartmentModel)
 
         # 图片数据
-        from models import PhotoModels
+        from models import PhotoModel
 
-        add_data(file_photo_data_list, PhotoModels)
+        add_data(file_photo_data_list, PhotoModel)
 
         # 初始化权限表数据
-        from models import RightModels
+        from models import RightModel
 
-        add_data(rt_power_data_list, RightModels)
+        add_data(rt_power_data_list, RightModel)
         # 初始化角色表
-        from models import RoleModels
+        from models import RoleModel
 
         # 角色权限关系表
         from extensions import db
@@ -60,12 +60,12 @@ def register_script(app: Flask):
             db.session.execute('insert into rt_role_power VALUES (%s, %s, %s);' % tuple(data))
         db.session.commit()
 
-        add_data(rt_role_data_list, RoleModels)
+        add_data(rt_role_data_list, RoleModel)
 
         # 管理员用户
-        from models import UserModels
+        from models import UserModel
 
-        add_data(cp_user_data_list, UserModels)
+        add_data(cp_user_data_list, UserModel)
 
         # 用户角色表
         from extensions import db

extensions/init_login.py

@@ -10,6 +10,6 @@ def init_login_manager(app):
 
     @login_manager.user_loader
     def load_user(user_id):
-        from models import UserModels
+        from models import UserModel
-        user = UserModels.query.get(int(user_id))
+        user = UserModel.query.get(int(user_id))
         return user

models/__init__.py

@@ -1,4 +1,4 @@
-from .file import PhotoModels
+from .file import PhotoModel
-from .rights import RightModels, RoleModels
+from .rights import RightModel, RoleModel
 from .system import LogModel
-from .users import UserModels, DepartmentModels
+from .users import UserModel, DepartmentModel

models/file.py

@@ -3,7 +3,7 @@ from datetime import datetime
 from extensions import db
 
 
-class PhotoModels(db.Model):
+class PhotoModel(db.Model):
     __tablename__ = 'file_photo'
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(255), nullable=False)

models/rights.py

@@ -17,7 +17,7 @@ role_power = db.Table(
 )
 
 
-class RightModels(db.Model):
+class RightModel(db.Model):
     __tablename__ = 'rt_power'
     id = db.Column(db.Integer, primary_key=True, comment='权限编号')
     name = db.Column(db.String(255), comment='权限名称')
@@ -30,10 +30,10 @@ class RightModels(db.Model):
     sort = db.Column(db.Integer, comment='排序')
     enable = db.Column(db.Boolean, comment='是否开启')
 
-    parent = db.relationship("RightModels", remote_side=[id])  # 自关联
+    parent = db.relationship("RightModel", remote_side=[id])  # 自关联
 
 
-class RoleModels(db.Model):
+class RoleModel(db.Model):
     __tablename__ = 'rt_role'
     id = db.Column(db.Integer, primary_key=True, comment='角色ID')
     name = db.Column(db.String(255), comment='角色名称')
@@ -43,4 +43,4 @@ class RoleModels(db.Model):
     details = db.Column(db.String(255), comment='详情')
     sort = db.Column(db.Integer, comment='排序')
 
-    power = db.relationship('RightModels', secondary="rt_role_power", backref=db.backref('role'))
+    power = db.relationship('RightModel', secondary="rt_role_power", backref=db.backref('role'))

models/users.py

@@ -6,7 +6,7 @@ from werkzeug.security import generate_password_hash, check_password_hash
 from extensions import db
 
 
-class UserModels(db.Model, UserMixin):
+class UserModel(db.Model, UserMixin):
     __tablename__ = 'cp_user'
     id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='用户ID')
     username = db.Column(db.String(20), comment='用户名')
@@ -18,7 +18,7 @@ class UserModels(db.Model, UserMixin):
     enable = db.Column(db.Integer, default=0, comment='启用')
     dept_id = db.Column(db.Integer, comment='部门id')
 
-    role = db.relationship('RoleModels', secondary="rt_user_role", backref=db.backref('user'), lazy='dynamic')
+    role = db.relationship('RoleModel', secondary="rt_user_role", backref=db.backref('user'), lazy='dynamic')
 
     def set_password(self, password):
         """设置密码，对密码进行加密存储"""
@@ -32,7 +32,7 @@ class UserModels(db.Model, UserMixin):
     update_at = db.Column(db.DateTime, default=datetime.now, onupdate=datetime.now, comment='更新时间')
 
 
-class DepartmentModels(db.Model):
+class DepartmentModel(db.Model):
     __tablename__ = 'cp_dept'
     id = db.Column(db.Integer, primary_key=True, comment="部门ID")
     parent_id = db.Column(db.Integer, comment="父级编号")