add feature# 用户认证日志

@@ -93,7 +93,9 @@ class DataManager(BlueprintApi):
             log = OAuthLog(user_id=user.id, username=user.username,
                            auth_type=AuthEnum.Other.name.lower(),
                            message="认证成功", create_time=datetime.now(),
-                           operate_type=OperateEnum.Login)
+                           operate_type=OperateEnum.Login,
+                           displayname=user.displayname, ip=request.remote_addr
+                           )
             db.session.add(log)
             db.session.commit()
 
@@ -145,7 +147,9 @@ class DataManager(BlueprintApi):
             log = OAuthLog(user_id=user.id, username=user.username,
                            auth_type=AuthEnum.Other.name.lower(),
                            message="注销成功", create_time=datetime.now(),
-                           operate_type=OperateEnum.Logout, token=access_token)
+                           operate_type=OperateEnum.Logout, token=access_token,
+                           displayname=user.displayname, ip=request.remote_addr
+                           )
             db.session.add(log)
             db.session.commit()
 
@@ -263,6 +267,7 @@ class DataManager(BlueprintApi):
     @bp.route("/oa/callback", methods=["GET"])
     def oa_callback():
         try:
+            print(request.remote_addr)
             client = oauth2.WebApplicationClient(
                 configure.OA["client_id"])
 
@@ -341,9 +346,11 @@ class DataManager(BlueprintApi):
                 response.set_cookie('id_token', id_token,
                                     max_age=configure.expiretime)
 
-                log = OAuthLog(user_id=user.id, username=user_name, auth_type=AuthEnum.Other.name.lower(),
+                log = OAuthLog(user_id=user.id, username=user_name,
+                               auth_type=AuthEnum.Other.name.lower(),
                                message="三方认证成功", create_time=datetime.now(),
-                               operate_type=OperateEnum.Login, token=access_token)
+                               operate_type=OperateEnum.Login, token=access_token,
+                               displayname=display_name, ip=request.remote_addr)
                 db.session.add(log)
                 db.session.commit()
 

 # coding=utf-8
-#author:        qianyingz
+# author:        qianyingz
 # createtime:    2022/03/09
-#email:         qianyingz@chinadci.com
-from datetime import datetime
+# email:         qianyingz@chinadci.com
+from tokenize import String
+from numpy import number
+from sqlalchemy import or_
 from .models import *
 from app.util.component.ApiTemplate import ApiTemplate
-import time
+import json
 
 
 class Api(ApiTemplate):
@@ -22,10 +24,31 @@ class Api(ApiTemplate):
             # 业务逻辑
             page_index = int(self.para.get("page_index", "0"))
             page_size = int(self.para.get("page_size", "1000"))
-            #name = self.para.get("name")
-            sort_key = self.para.get("sort_key")
+            # name = self.para.get("name")
+            order_by = self.para.get("order_by")
+            filter_param = self.para.get("filter_param", "")
+            filter_param_json = {} if filter_param == "" else json.loads(
+                filter_param)
+            kw = filter_param_json["kw"] if "kw" in filter_param_json else None
+            type = filter_param_json["type"] if "type" in filter_param_json else None
 
             log_query = OAuthLog.query
+
+            if kw != None:
+                if isinstance(kw, str):
+                    filter_username_query = log_query.filter(OAuthLog.username.like(
+                        "%" + kw + "%"))
+                    filter_display_query = log_query.filter(
+                        OAuthLog.displayname.like("%" + kw + "%"))
+                    log_query = filter_username_query.union(
+                        filter_display_query)
+
+            if type != None:
+                if isinstance(type, (str,int)):
+                    log_query = log_query.filter(OAuthLog.operate_type == type)
+                elif isinstance(type, list):
+                     log_query = log_query.filter(OAuthLog.operate_type.in_(type))
+
             log_query = log_query.order_by(OAuthLog.create_time.desc())
 
             count = log_query.count()
@@ -40,14 +63,6 @@ class Api(ApiTemplate):
                                              "auth_type": t.auth_type,
                                              "displayname": t.displayname}, logs))}
 
-            # if id:
-            #     tmp_user = User.query.filter_by(id=id).first()
-            #     res["data"] = {"guid": tmp_user.id, "username": tmp_user.username,
-            #                    "role": tmp_user.role, "company": tmp_user.company,
-            #                    "position": tmp_user.position, "email": tmp_user.email,
-            #                    "phone": tmp_user.phone, "display_name": tmp_user.display_name,
-            #                    "status": tmp_user.status}
-            # else:
             #     # 获取集合
             #     userLinq = User.query.order_by(User.id.desc())
             #     if name:
@@ -83,10 +98,14 @@ class Api(ApiTemplate):
              "type": "int",
              "description": "条数",
              "default": 1000},
-            {"name": "sort_key",
+            {"name": "order_by",
              "in": "query",
              "type": "string",
-             "description": "排序"}
+             "description": "排序"},
+            {"name": "filter_param",
+             "in": "query",
+             "type": "json",
+             "description": "过滤"}
         ],
         "responses": {
             200: {

-from sqlalchemy import  Column, Integer, Text, Time, ForeignKey, column
+from sqlalchemy import  Column, Integer, Text, Time, ForeignKey, DateTime
 from app.models import db
 from authlib.integrations.sqla_oauth2 import (
     OAuth2ClientMixin,
@@ -21,8 +21,8 @@ class User (db.Model):
     position = Column(Text)
     phone = Column(Text)
     email = Column(Text)
-    create_time = Column(Time)
-    update_time = Column(Time)
+    create_time = Column(DateTime)
+    update_time = Column(DateTime)
     role = Column(Text)
     displayname = Column(Text, nullable=True)  # 昵称
     # 用户来源，默认dmap平台用户
@@ -89,6 +89,6 @@ class OAuthLog(db.Model):
     # 登录方式：password，三方登录
     auth_type = Column(Text)
     message = Column(Text)  # 登录返回提示
-    create_time = Column(Time)  # 记录创建时间
+    create_time = Column(DateTime)  # 记录创建时间
     operate_type = Column(Integer, nullable=False)  # 操作类型，登录，注销
     token = Column(Text)