版本更新：

1. 更新（kinit-api，kinit-admin）：更新操作记录字段
2. 更新（kinit-api）：更新 Mongodb 查询操作

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',

kinit-api/application/settings.py

@@ -11,7 +11,7 @@ from fastapi.security import OAuth2PasswordBearer
 """
 系统版本
 """
-VERSION = "1.7.0"
+VERSION = "1.7.1"
 
 """安全警告: 不要在生产中打开调试运行!"""
 DEBUG = True

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

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"),

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