refactor(重构程序&目录结构)

applications/view/department.py

@@ -1,7 +1,7 @@
 from flask import render_template, request
 
-from applications.common.utils.rights import permission_required, view_logging_required
-from applications.models import CompanyDepartment
+from models import DepartmentModels
+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 = CompanyDepartment.query.get(dept_id)
+    dept = DepartmentModels.query.get(dept_id)
     return render_template('admin/department/dept_edit.html', dept=dept)

applications/view/file.py

@@ -1,7 +1,7 @@
 from flask import render_template
 
 from applications.view import index_bp
-from applications.common.utils.rights import view_logging_required, permission_required
+from common.utils.rights import view_logging_required, permission_required
 
 
 @index_bp.get('/file')

applications/view/logs_view.py

@@ -1,9 +1,9 @@
 from flask import Blueprint, request, render_template
 from sqlalchemy import desc
 
-from applications.common.utils.http import table_api
-from applications.common.utils.rights import permission_required
-from applications.models import LoggingModel
+from common.utils.http import table_api
+from common.utils.rights import permission_required
+from models import LogModel
 
 logs_bp = Blueprint('logs', __name__, url_prefix='/logs')
 
@@ -19,9 +19,9 @@ def index():
 def login_log():
     page = request.args.get('page', type=int)
     limit = request.args.get('limit', type=int)
-    log_paginate = LoggingModel.query.filter_by(
+    log_paginate = LogModel.query.filter_by(
         url='/api/v1/passport/login').order_by(
-        desc(LoggingModel.create_at)).paginate(
+        desc(LogModel.create_at)).paginate(
         page=page, per_page=limit, error_out=False)
     data = [
         {
@@ -47,9 +47,9 @@ def login_log():
 def operate_log():
     page = request.args.get('page', type=int)
     limit = request.args.get('limit', type=int)
-    log_paginate = LoggingModel.query.filter(
-        LoggingModel.url != '/api/v1/passport/login').order_by(
-        desc(LoggingModel.create_at)).paginate(
+    log_paginate = LogModel.query.filter(
+        LogModel.url != '/api/v1/passport/login').order_by(
+        desc(LogModel.create_at)).paginate(
         page=page, per_page=limit, error_out=False)
     data = [
         {

applications/view/passport.py

@@ -1,8 +1,8 @@
-from flask import Blueprint, session, redirect, render_template, url_for
+from flask import session, redirect, render_template, url_for
 from flask_login import login_required, logout_user, current_user
 
-from applications.common.gen_captcha import get_captcha_image
-from applications.common.utils.http import success_api
+from common.gen_captcha import get_captcha_image
+from common.utils.http import success_api
 
 # 获取验证码
 from applications.view import index_bp

applications/view/rights.py

@@ -1,7 +1,7 @@
 from flask import render_template
 
-from applications.common.utils.rights import permission_required, view_logging_required
-from applications.models import RightsPower
+from common.utils.rights import permission_required, view_logging_required
+from models import RightModels
 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 = RightsPower.query.filter_by(id=power_id).first()
+    power = RightModels.query.filter_by(id=power_id).first()
     icon = str(power.icon).split()
     if len(icon) == 2:
         icon = icon[1]

applications/view/roles.py

@@ -1,8 +1,8 @@
 from flask import Blueprint, render_template
 
-from applications.common.utils.rights import permission_required, view_logging_required
+from common.utils.rights import permission_required, view_logging_required
 
-from applications.models import RightsRole
+from models import RoleModels
 
 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 = RightsRole.query.filter_by(id=role_id).first()
+    role = RoleModels.query.filter_by(id=role_id).first()
     return render_template('admin/roles/roles_edit.html', role=role)
 
 

applications/view/users.py

@@ -2,8 +2,8 @@ from flask import render_template
 from flask_login import login_required, current_user
 from sqlalchemy import desc
 
-from applications.common.utils.rights import permission_required, view_logging_required
-from applications.models import LoggingModel, RightsRole, CompanyUser
+from common.utils.rights import permission_required, view_logging_required
+from models import LogModel, RoleModels, UserModels
 from . import index_bp
 
 
@@ -19,7 +19,7 @@ def users_main():
 @view_logging_required
 @permission_required("admin:user:add")
 def users_add_view():
-    roles = RightsRole.query.all()
+    roles = RoleModels.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 = CompanyUser.query.filter_by(id=user_id).first()
-    roles = RightsRole.query.all()
+    user = UserModels.query.filter_by(id=user_id).first()
+    roles = RoleModels.query.all()
     checked_roles = []
     for r in user.role:
         checked_roles.append(r.id)
@@ -39,8 +39,8 @@ def users_user_id_view(user_id):
 @index_bp.get('/users/center')
 @login_required
 def users_center():
-    user_logs = LoggingModel.query.filter_by(url='/passport/login').filter_by(uid=current_user.id).order_by(
-        desc(LoggingModel.create_at)).limit(10)
+    user_logs = LogModel.query.filter_by(url='/passport/login').filter_by(uid=current_user.id).order_by(
+        desc(LogModel.create_at)).limit(10)
     return render_template('admin/users/profile.html', user_info=current_user, user_logs=user_logs)