From 94b05256b318b22a18ef216fc82810a593ddf20d Mon Sep 17 00:00:00 2001
From: mkg <1650473152@qq.com>
Date: Tue, 23 Mar 2021 08:48:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=A5=E5=BF=97=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E7=8A=B6=E6=80=81=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=97=B6=E9=97=B4bug=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=BC=96=E8=BE=91=E8=BF=94=E5=9B=9E=E6=8B=BC?=
 =?UTF-8?q?=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/service/admin_log.py     | 16 ++++++++++++----
 applications/views/admin/admin_log.py |  1 +
 applications/views/admin/index.py     |  4 ++--
 applications/views/admin/power.py     |  4 ++--
 templates/admin/admin_log/main.html   | 14 +++++++++++---
 5 files changed, 28 insertions(+), 11 deletions(-)

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 @@
 
 
 <script type="text/html" id="log-createTime">
-    {{'  {{layui.util.toDateString(d.createTime,  "yyyy-MM-dd HH:mm:ss")}' |safe}}}
+    {{'  {{layui.util.toDateString(d.create_time,  "yyyy-MM-dd HH:mm:ss")}' |safe}}}
+</script>
+<script type="text/html" id="log-status">
+    {{'{{#if (d.success == true) { }}
+    <span style="color: green">成功</span>
+    {{# }else if(d.success == false){ }}
+    <span style="color: red">失败</span>
+    {{# } }}'|safe}}
 </script>
         <script src="{{ url_for('static', filename='/admin/component/layui/layui.js') }}"></script>
         <script src="{{ url_for('static', filename='/admin/component/pear/pear.js') }}"></script>
@@ -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'}
             ]
         ]