From 0152dc9c70b53c796f8aad64a7ce5a82ab88fb6f Mon Sep 17 00:00:00 2001
From: ktianc <ktianc2000@163.com>
Date: Thu, 23 Mar 2023 23:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=201.=20=E6=9B=B4=E6=96=B0=EF=BC=88kinit-api=EF=BC=8Ckinit-admi?=
 =?UTF-8?q?n=EF=BC=89=EF=BC=9A=E6=9B=B4=E6=96=B0=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=AD=97=E6=AE=B5=202.=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=EF=BC=88kinit-api=EF=BC=89=EF=BC=9A=E6=9B=B4=E6=96=B0=20Mongod?=
 =?UTF-8?q?b=20=E6=9F=A5=E8=AF=A2=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/record/operation/components/operation.data.ts    | 6 +++---
 kinit-api/application/settings.py                           | 2 +-
 kinit-api/apps/vadmin/record/schemas/operation.py           | 4 ++--
 kinit-api/core/middleware.py                                | 4 ++--
 kinit-api/core/mongo/mongo_manage.py                        | 3 ++-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/kinit-admin/src/views/vadmin/system/record/operation/components/operation.data.ts b/kinit-admin/src/views/vadmin/system/record/operation/components/operation.data.ts
index 72b73a4..dffe1dc 100644
--- a/kinit-admin/src/views/vadmin/system/record/operation/components/operation.data.ts
+++ b/kinit-admin/src/views/vadmin/system/record/operation/components/operation.data.ts
@@ -36,8 +36,8 @@ export const columns = reactive<TableColumn[]>([
     span: 24
   },
   {
-    field: 'request_ip',
-    label: '登陆地址',
+    field: 'client_ip',
+    label: '客户端地址',
     width: '130px',
     show: true,
     disabled: true,
@@ -70,7 +70,7 @@ export const columns = reactive<TableColumn[]>([
     span: 24
   },
   {
-    field: 'name',
+    field: 'route_name',
     label: '接口函数',
     show: false,
     width: '150px',
diff --git a/kinit-api/application/settings.py b/kinit-api/application/settings.py
index 1aa3913..973cac4 100644
--- a/kinit-api/application/settings.py
+++ b/kinit-api/application/settings.py
@@ -11,7 +11,7 @@ from fastapi.security import OAuth2PasswordBearer
 """
 系统版本
 """
-VERSION = "1.7.0"
+VERSION = "1.7.1"
 
 """安全警告: 不要在生产中打开调试运行!"""
 DEBUG = True
diff --git a/kinit-api/apps/vadmin/record/schemas/operation.py b/kinit-api/apps/vadmin/record/schemas/operation.py
index e536988..d6bc203 100644
--- a/kinit-api/apps/vadmin/record/schemas/operation.py
+++ b/kinit-api/apps/vadmin/record/schemas/operation.py
@@ -18,13 +18,13 @@ class OpertionRecord(BaseModel):
     user_id: Optional[str] = None
     user_name: Optional[str] = None
     status_code: Optional[int] = None
-    request_ip: Optional[str] = None
+    client_ip: Optional[str] = None
     request_method: Optional[str] = None
     api_path: Optional[str] = None
     system: Optional[str] = None
     browser: Optional[str] = None
     summary: Optional[str] = None
-    name: Optional[str] = None
+    route_name: Optional[str] = None
     description: Optional[str] = None
     tags: Optional[List[str]] = None
     process_time: Optional[str] = None
diff --git a/kinit-api/core/middleware.py b/kinit-api/core/middleware.py
index 108af7a..266b566 100644
--- a/kinit-api/core/middleware.py
+++ b/kinit-api/core/middleware.py
@@ -98,7 +98,7 @@ def register_operation_record_middleware(app: FastAPI):
             "user_id": user_id,
             "user_name": user_name,
             "request_api": request.url.__str__(),
-            "request_ip": request.client.host,
+            "client_ip": request.client.host,
             "system": system,
             "browser": browser,
             "request_method": request.method,
@@ -106,7 +106,7 @@ def register_operation_record_middleware(app: FastAPI):
             "summary": route.summary,
             "description": route.description,
             "tags": route.tags,
-            "name": route.name,
+            "route_name": route.name,
             "status_code": response.status_code,
             "content_length": content_length,
             "create_datetime": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
diff --git a/kinit-api/core/mongo/mongo_manage.py b/kinit-api/core/mongo/mongo_manage.py
index ee9ca8c..1201ee0 100644
--- a/kinit-api/core/mongo/mongo_manage.py
+++ b/kinit-api/core/mongo/mongo_manage.py
@@ -5,7 +5,6 @@ from bson.json_util import dumps
 from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorDatabase
 from core.mongo import DatabaseManage
 from pymongo.results import InsertOneResult
-from pydantic import BaseModel
 
 
 class MongoManage(DatabaseManage):
@@ -76,6 +75,8 @@ class MongoManage(DatabaseManage):
             elif isinstance(v, tuple):
                 if v[0] == "like" and v[1]:
                     params[k] = {'$regex': v[1]}
+                elif v[0] == "between" and len(v[1]) == 2:
+                    params[k] = {'$gte': v[1][0], '$lt': v[1][0]}
             else:
                 params[k] = v
         return params