bwadmin/pear-admin-flask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rbac基本完成

Browse Source
This commit is contained in:
mkg
2021-03-22 20:42:02 +08:00
parent 328458eda9
commit 4c8917fe05
17 changed files with 777 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/views/admin/admin_log.py
+1 -1
View File
@@ -72,7 +72,7 @@ def operateLog():
log = AdminLog.query.filter(AdminLog.url != '/admin/login').order_by(desc(AdminLog.create_time)).paginate(page=page,
per_page=limit,
error_out=False)
count = AdminLog.query.count()
count = AdminLog.query.filter(AdminLog.url != '/admin/login').count()
role_schema = LogSchema(many=True)
output = role_schema.dump(log.items)
res = {
applications/views/admin/file.py
+6 -5
View File
@@ -4,20 +4,21 @@ from flask_login import login_required
from applications.models import db
from applications.models.admin import Photo
from applications.service.admin.file import get_photo, upload_one, delete_photo_by_id
from applications.service.route_auth import authorize_and_log
admin_file = Blueprint('adminFile', __name__, url_prefix='/admin/file')
# 图片管理
@admin_file.route('/')
@login_required
@authorize_and_log("admin:file:main")
def index():
return render_template('admin/photo/photo.html')
# 图片数据
@admin_file.route('/table')
@login_required
@authorize_and_log("admin:file:main")
def table():
page = request.args.get('page', type=int)
limit = request.args.get('limit', type=int)
@@ -35,7 +36,7 @@ def table():
# 上传接口
@admin_file.route('/upload', methods=['GET', 'POST'])
@login_required
@authorize_and_log("admin:file:add")
def upload():
if request.method == 'POST' and 'file' in request.files:
photo = request.files['file']
@@ -54,7 +55,7 @@ def upload():
# 图片删除
@admin_file.route('/delete', methods=['GET', 'POST'])
@login_required
@authorize_and_log("admin:file:delete")
def delete():
id = request.form.get('id')
res = delete_photo_by_id(id)
@@ -66,7 +67,7 @@ def delete():
# 图片批量删除
@admin_file.route('/batchRemove', methods=['GET', 'POST'])
@login_required
@authorize_and_log("admin:file:delete")
def batchRemove():
ids = request.form.getlist('ids[]')
photo_name = Photo.query.filter(Photo.id.in_(ids)).all()
applications/views/admin/index.py
+4 -9
View File
@@ -1,23 +1,18 @@
from flask import Blueprint, render_template, jsonify, request, session, redirect, url_for
from flask_login import login_user, login_required, logout_user, current_user
from applications.models.admin import User
from applications.service.admin.index import add_auth_session, make_menu_tree, get_captcha
from flask_marshmallow import Marshmallow
from applications.service.route_auth import PreAuthorize
from applications.service.admin_log import login_log
from applications.models.admin import User
admin_index = Blueprint('adminIndex', __name__, url_prefix='/admin')
ma = Marshmallow()
# 首页
@admin_index.route('/')
@login_required
def index():
username = current_user.username
return render_template('admin/index.html', username=username)
realname = current_user.realname
return render_template('admin/index.html', realname=realname)
# 获取验证码
@@ -51,7 +46,7 @@ def login():
if user is None:
return jsonify(msg="不存在的用户", code=0,success=False)
if user.enable is 0:
if user.enable is 1:
return jsonify(msg="用户被暂停使用", code=0,success=False)
if username == user.username and user.validate_password(password):
applications/views/admin/monitor.py
+7 -17
View File
@@ -2,30 +2,21 @@ import os
import platform
import re
from datetime import datetime
import psutil
from flask import Blueprint, request, render_template
from flask_login import login_required
from flask import Blueprint, render_template
from flask_marshmallow import Marshmallow
from applications.service.admin_log import admin_log
from applications.service.route_auth import authorize_and_log
ma = Marshmallow()
admin_Monitor = Blueprint('adminMonitor', __name__, url_prefix='/admin/monitor')
# @admin_Monitor.before_request
# @login_required
# def Monitor_log():
# admin_log(request)
# ----------------------------------------------------------
# ------------------------- 系统监控 --------------------------
# ----------------------------------------------------------
# 系统监控
@admin_Monitor.route('/')
@login_required
def index():
@authorize_and_log("admin:monitor:main")
def main():
# 主机名称
hostname = platform.node()
# 系统版本
@@ -80,5 +71,4 @@ def index():
boot_time=boot_time,
up_time_format=up_time_format,
disk_partitions_list=disk_partitions_list
)
applications/views/admin/power.py
+11 -4
View File
@@ -2,19 +2,19 @@ from flask import Blueprint, render_template, request, jsonify
from flask_login import login_required
from applications.service.admin.power import get_power_dict, select_parent, save_power, remove_power, get_power_by_id, \
update_power
from applications.service.route_auth import authorize_and_log
admin_power = Blueprint('adminPower', __name__, url_prefix='/admin/power')
@admin_power.route('/')
@login_required
@authorize_and_log("admin:power:main")
def index():
return render_template('admin/power/main.html')
@admin_power.route('/data')
@login_required
@authorize_and_log("admin:power:main")
def data():
power_data = get_power_dict()
res = {
@@ -24,12 +24,13 @@ def data():
@admin_power.route('/add')
@login_required
@authorize_and_log("admin:power:add")
def add():
return render_template('admin/power/add.html')
@admin_power.route('/selectParent')
@authorize_and_log("admin:power:main")
def selectParent():
power_data = select_parent()
res = {
@@ -40,14 +41,18 @@ def selectParent():
return jsonify(res)
# 增加
@admin_power.route('/save', methods=['POST'])
@authorize_and_log("admin:power:add")
def save():
req = request.json
save_power(req)
return jsonify(msg="成功", success=True)
# 权限删除
@admin_power.route('/remove/<int:id>', methods=['DELETE'])
@authorize_and_log("admin:power:remove")
def remove(id):
r = remove_power(id)
if r:
@@ -58,6 +63,7 @@ def remove(id):
# 权限编辑
@admin_power.route('/edit/<int:id>', methods=['GET', 'POST'])
@authorize_and_log("admin:power:edit")
def edit(id):
power = get_power_by_id(id)
icon = str(power.icon).split()
@@ -70,6 +76,7 @@ def edit(id):
# 权限更新
@admin_power.route('/update', methods=['PUT'])
@authorize_and_log("admin:power:edit")
def update():
res = update_power(request.json)
if not res:
applications/views/admin/role.py
+21 -11
View File
@@ -2,21 +2,22 @@ from flask import Blueprint, render_template, request, jsonify
from flask_login import login_required
from applications.service.admin.role import get_role_data_dict, add_role, get_role_power, update_role_power, \
get_role_by_id, update_role, remove_role
get_role_by_id, update_role, remove_role, batch_remove
from applications.service.route_auth import authorize_and_log
admin_role = Blueprint('adminRole', __name__, url_prefix='/admin/role')
# 用户管理
@admin_role.route('/')
@login_required
def index():
@authorize_and_log("admin:role:main")
def main():
return render_template('admin/role/main.html')
# 表格数据
@admin_role.route('/data')
@login_required
@authorize_and_log("admin:role:main")
def table():
page = request.args.get('page', type=int)
limit = request.args.get('limit', type=int)
@@ -41,6 +42,7 @@ def table():
# 角色增加
@admin_role.route('/add')
@authorize_and_log("admin:role:add")
@login_required
def add():
return render_template('admin/role/add.html')
@@ -48,7 +50,7 @@ def add():
# 角色增加
@admin_role.route('/save', methods=['POST'])
@login_required
@authorize_and_log("admin:role:add")
def save():
req = request.json
add_role(req=req)
@@ -57,12 +59,14 @@ def save():
# 角色授权
@admin_role.route('/power/<int:id>')
@authorize_and_log("admin:role:power")
def power(id):
return render_template('admin/role/power.html', id=id)
# 获取角色权限
@admin_role.route('/getRolePower/<int:id>')
@authorize_and_log("admin:role:main")
def getRolePower(id):
powers = get_role_power(id)
res = {
@@ -74,6 +78,7 @@ def getRolePower(id):
# 保存角色权限
@admin_role.route('/saveRolePower', methods=['PUT'])
@authorize_and_log("admin:role:edit")
def saveRolePower():
req_form = request.form
powerIds = req_form.get("powerIds")
@@ -85,6 +90,7 @@ def saveRolePower():
# 角色编辑
@admin_role.route('/edit/<int:id>', methods=['GET', 'POST'])
@authorize_and_log("admin:role:edit")
def edit(id):
role = get_role_by_id(id)
return render_template('admin/role/edit.html', role=role)
@@ -92,6 +98,7 @@ def edit(id):
# 更新角色
@admin_role.route('/update', methods=['PUT'])
@authorize_and_log("admin:role:edit")
def update():
res = update_role(request.json)
if not res:
@@ -100,16 +107,19 @@ def update():
@admin_role.route('/remove/<int:id>', methods=['DELETE'])
@authorize_and_log("admin:role:remove")
def remove(id):
res = remove_role(id)
if not res:
return jsonify(success=False, msg="角色删除失败")
return jsonify(success=True, msg="角色删除成功")
# 批量删除
# @admin_user.route('/batchRemove', methods=['GET', 'POST'])
# @login_required
# def batchRemove():
# ids = request.form.getlist('ids[]')
# res = batch_remove(ids)
# return res
@admin_role.route('/batchRemove', methods=['DELETE'])
@authorize_and_log("admin:role:remove")
@login_required
def batchRemove():
ids = request.form.getlist('ids[]')
batch_remove(ids)
return jsonify(success=True,msg="批量删除成功")
applications/views/admin/user.py
+27 -84
View File
@@ -1,33 +1,33 @@
from flask import Blueprint, render_template, request, jsonify
from flask_login import login_required, current_user
from applications.models import db
from flask_login import login_required
from applications.models.admin import User, Role
from applications.service.admin.user import get_user_data_dict, get_user_by_name, add_user, delete_by_id, update_status, \
batch_remove, update_user, update_user_role, is_user_exists
from applications.service.admin.user import get_user_data_dict, add_user, delete_by_id, update_status, \
batch_remove, update_user, update_user_role, is_user_exists, add_user_role
from applications.service.route_auth import authorize_and_log
admin_user = Blueprint('adminUser', __name__, url_prefix='/admin/user')
# 用户管理
@admin_user.route('/')
@login_required
def index():
@authorize_and_log("admin:user:main")
def main():
return render_template('admin/user/main.html')
# 用户 分页查询
# 用户分页查询
@admin_user.route('/data')
@login_required
@authorize_and_log("admin:user:main")
def data():
page = request.args.get('page', type=int)
limit = request.args.get('limit', type=int)
realName = request.args.get('realName', type=str)
username = request.args.get('username',type=str)
username = request.args.get('username', type=str)
filters = {}
if realName:
filters["realname"]=('%'+realName+'%')
filters["realname"] = ('%' + realName + '%')
if username:
filters["username"]=('%'+username+'%')
filters["username"] = ('%' + username + '%')
data, count = get_user_data_dict(page=page, limit=limit, filters=filters)
res = {
'msg': "",
@@ -41,14 +41,15 @@ def data():
# 用户增加
@admin_user.route('/add')
@authorize_and_log("admin:user:add")
def add():
roles = Role.query.all()
return render_template('admin/user/add.html', roles=roles)
@admin_user.route('/save', methods=['POST'])
@authorize_and_log("admin:user:add")
def save():
req_json = request.json
a = req_json.get("roleIds")
@@ -63,50 +64,25 @@ def save():
if is_user_exists(username):
return jsonify(success=False, msg="用户已经存在")
add_user(username, realName, password)
id = add_user(username, realName, password)
add_user_role(id, role_ids)
return jsonify(success=True, msg="增加成功")
# @admin_user.route('/add', methods=['GET', 'POST'])
# @login_required
# def insert():
# if request.method == 'POST':
# username = request.form.get('username')
# password = request.form.get('password')
# role = request.form.get('role')
# if username and password and role:
# if get_user_by_name(username=username) is None:
# add_user(username=username, password=password)
# return jsonify(msg="添加成功", code=200)
# else:
# return jsonify(msg="用户已经存在", code=999)
# else:
# return jsonify(msg="用户名密码角色不能为空", code=999)
#
# else:
# role = ['管理员', '普通用户']
# return render_template('admin/user_add.html', role=role)
# ==========================================================
# 删除用户
# ==========================================================
# 删除用户
@admin_user.route('/remove/<int:id>', methods=['DELETE'])
@login_required
@authorize_and_log("admin:user:remove")
def delete(id):
user = delete_by_id(id)
db.session.commit()
if user:
return jsonify(msg="删除成功", success=True)
else:
res = delete_by_id(id)
if not res:
return jsonify(msg="删除失败", success=False)
return jsonify(msg="删除成功", success=True)
# 编辑用户
@admin_user.route('/edit/<int:id>', methods=['GET', 'POST'])
@login_required
@authorize_and_log("admin:user:edit")
def edit(id):
user = User.query.filter_by(id=id).first()
roles = Role.query.all()
@@ -114,43 +90,10 @@ def edit(id):
for r in user.role:
checked_roles.append(r.id)
return render_template('admin/user/edit.html', user=user, roles=roles, checked_roles=checked_roles)
#
# if request.method == 'POST':
# username = request.form.get('username')
# password = request.form.get('password')
# role = request.form.get('role')
# if username and role:
# if password is None:
# if User.query.filter_by(id=id).first() is not None:
# update_user(id, username)
# return jsonify(msg="修改成功", code=200)
#
# else:
# res = {"msg": "用户已经存在", "code": 200}
# return jsonify(res)
# else:
# user = User.query.filter_by(id=id).first()
# if user is not None:
# User.query.filter_by(id=id).update({'username': username, 'role': role})
# user.set_password(password)
# db.session.commit()
# return jsonify(msg="修改成功", code=200)
# else:
# return jsonify(msg="用户不存在", code=200)
#
# else:
#
# return jsonify(msg="用户名密码角色不能为空", code=999)
# else:
# user = User.query.filter_by(id=id).first()
# roles = Role.query.all()
# checked_roles = []
# for r in user.role:
# checked_roles.append(r.id)
# return render_template('admin/user/edit.html', user=user, roles=roles, checked_roles=checked_roles)
@admin_user.route('/update', methods=['PUT'])
@authorize_and_log("admin:user:edit")
def update():
req_json = request.json
a = req_json.get("roleIds")
@@ -176,9 +119,9 @@ def update():
# 批量删除
@admin_user.route('/batchRemove', methods=['GET', 'POST'])
@login_required
@admin_user.route('/batchRemove', methods=['DELETE'])
@authorize_and_log("admin:user:remove")
def batchRemove():
ids = request.form.getlist('ids[]')
res = batch_remove(ids)
return res
batch_remove(ids)
return jsonify(success=True, msg="批量删除成功")