diff --git a/applications/service/admin_log.py b/applications/service/admin_log.py
index d25a719..792683b 100644
--- a/applications/service/admin_log.py
+++ b/applications/service/admin_log.py
@@ -4,18 +4,26 @@ from applications.models import db
from applications.models.admin import AdminLog
-def login_log(request):
+def login_log(request,uid, is_access):
info = {
'method': request.method,
'url': request.path,
'ip': request.remote_addr,
'user_agent': request.headers.get('User-Agent'),
'desc': request.form.get('username'),
- 'uid': current_user.id
+ 'uid': uid,
+ 'success': int(is_access)
}
- log = AdminLog(url=info.get('url'), ip=info.get('ip'), user_agent=info.get('user_agent'), desc=info.get('desc'),
- uid=info.get('uid'), method=info.get('method'))
+ log = AdminLog(
+ url=info.get('url'),
+ ip=info.get('ip'),
+ user_agent=info.get('user_agent'),
+ desc=info.get('desc'),
+ uid=info.get('uid'),
+ method=info.get('method'),
+ success = info.get('success')
+ )
db.session.add(log)
db.session.flush()
db.session.commit()
diff --git a/applications/views/admin/admin_log.py b/applications/views/admin/admin_log.py
index 5d52cde..0da8f35 100644
--- a/applications/views/admin/admin_log.py
+++ b/applications/views/admin/admin_log.py
@@ -28,6 +28,7 @@ class LogSchema(ma.Schema): # 序列化类
desc = fields.Str()
ip = fields.Str()
user_agent = fields.Str()
+ success = fields.Bool()
create_time = fields.DateTime()
diff --git a/applications/views/admin/index.py b/applications/views/admin/index.py
index 76db669..c05a7a1 100644
--- a/applications/views/admin/index.py
+++ b/applications/views/admin/index.py
@@ -53,11 +53,11 @@ def login():
# 登录
login_user(user)
# 记录登录日志
- login_log(request)
+ login_log(request, uid=user.id, is_access=True)
# 存入权限
add_auth_session()
return jsonify(msg="登录成功", code=1,success=True)
-
+ login_log(request,uid=user.id, is_access=False)
return jsonify(msg="用户名或密码错误", code=0,success=False)
print(current_user.is_authenticated)
if current_user.is_authenticated:
diff --git a/applications/views/admin/power.py b/applications/views/admin/power.py
index 943758e..d92c385 100644
--- a/applications/views/admin/power.py
+++ b/applications/views/admin/power.py
@@ -80,5 +80,5 @@ def edit(id):
def update():
res = update_power(request.json)
if not res:
- return jsonify(success=False, msg="更新角色失败")
- return jsonify(success=True, msg="更新角色成功")
+ return jsonify(success=False, msg="更新权限失败")
+ return jsonify(success=True, msg="更新权限成功")
diff --git a/templates/admin/admin_log/main.html b/templates/admin/admin_log/main.html
index 8e73488..c24f7cd 100644
--- a/templates/admin/admin_log/main.html
+++ b/templates/admin/admin_log/main.html
@@ -36,7 +36,14 @@
+
@@ -54,9 +61,10 @@
{title: '接口', field: 'url', align: 'center'},
{title: '浏览器', field: 'user_agent', align: 'center'},
{title: '操作地址', field: 'ip', align: 'center'},
- {title: '访问时间', field: 'createTime', templet: '#log-createTime', align: 'center'},
+ {title: '访问时间', field: 'create_time', templet: '#log-createTime', align: 'center'},
{title: '操作人ID', field: 'uid', align: 'center'},
- {title: '描述', field: 'desc', align: 'center'}
+ {title: '描述', field: 'desc', align: 'center'},
+ {title: '访问状态', templet: '#log-status', align: 'center'}
]
]