chenchaoyun commited on
Commit ·
229d96a
1
Parent(s): 8f26f9a
refactor: 精简设备记录字段,移除冗余信息
Browse files- api_routes.py +0 -10
- database.py +2 -26
api_routes.py
CHANGED
|
@@ -1579,25 +1579,15 @@ async def app_analyze_face(
|
|
| 1579 |
device_id = request.headers.get("x-device-id")
|
| 1580 |
if device_id:
|
| 1581 |
try:
|
| 1582 |
-
# 提取公共头
|
| 1583 |
-
ts_str = request.headers.get("x-timestamp")
|
| 1584 |
-
ts_ms = int(ts_str) if ts_str and ts_str.isdigit() else None
|
| 1585 |
-
|
| 1586 |
device_info = {
|
| 1587 |
"device_id": device_id,
|
| 1588 |
"device_type": request.headers.get("x-device-type"),
|
| 1589 |
"device_model": request.headers.get("x-device-model"),
|
| 1590 |
"os_version": request.headers.get("x-os-version"),
|
| 1591 |
-
"app_id": request.headers.get("x-app-id"),
|
| 1592 |
"app_version": request.headers.get("x-app-version"),
|
| 1593 |
-
"bundle_id": request.headers.get("x-bundle-id"),
|
| 1594 |
"timezone": request.headers.get("x-timezone"),
|
| 1595 |
"region": request.headers.get("x-region"),
|
| 1596 |
"language": request.headers.get("Accept-Language"),
|
| 1597 |
-
"request_id": request.headers.get("x-request-id"),
|
| 1598 |
-
"timestamp_ms": ts_ms,
|
| 1599 |
-
"nonce": request.headers.get("x-nonce"),
|
| 1600 |
-
"nickname": nickname
|
| 1601 |
}
|
| 1602 |
# 创建异步任务,不阻塞当前请求
|
| 1603 |
asyncio.create_task(upsert_device_record(**device_info))
|
|
|
|
| 1579 |
device_id = request.headers.get("x-device-id")
|
| 1580 |
if device_id:
|
| 1581 |
try:
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1582 |
device_info = {
|
| 1583 |
"device_id": device_id,
|
| 1584 |
"device_type": request.headers.get("x-device-type"),
|
| 1585 |
"device_model": request.headers.get("x-device-model"),
|
| 1586 |
"os_version": request.headers.get("x-os-version"),
|
|
|
|
| 1587 |
"app_version": request.headers.get("x-app-version"),
|
|
|
|
| 1588 |
"timezone": request.headers.get("x-timezone"),
|
| 1589 |
"region": request.headers.get("x-region"),
|
| 1590 |
"language": request.headers.get("Accept-Language"),
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1591 |
}
|
| 1592 |
# 创建异步任务,不阻塞当前请求
|
| 1593 |
asyncio.create_task(upsert_device_record(**device_info))
|
database.py
CHANGED
|
@@ -340,16 +340,10 @@ async def upsert_device_record(
|
|
| 340 |
device_type: Optional[str] = None,
|
| 341 |
device_model: Optional[str] = None,
|
| 342 |
os_version: Optional[str] = None,
|
| 343 |
-
app_id: Optional[str] = None,
|
| 344 |
app_version: Optional[str] = None,
|
| 345 |
-
bundle_id: Optional[str] = None,
|
| 346 |
timezone: Optional[str] = None,
|
| 347 |
region: Optional[str] = None,
|
| 348 |
language: Optional[str] = None,
|
| 349 |
-
request_id: Optional[str] = None,
|
| 350 |
-
timestamp_ms: Optional[int] = None,
|
| 351 |
-
nonce: Optional[str] = None,
|
| 352 |
-
nickname: Optional[str] = None,
|
| 353 |
) -> None:
|
| 354 |
"""写入或更新设备记录"""
|
| 355 |
query = """
|
|
@@ -358,31 +352,19 @@ async def upsert_device_record(
|
|
| 358 |
device_type,
|
| 359 |
device_model,
|
| 360 |
os_version,
|
| 361 |
-
app_id,
|
| 362 |
app_version,
|
| 363 |
-
bundle_id,
|
| 364 |
timezone,
|
| 365 |
region,
|
| 366 |
-
language
|
| 367 |
-
|
| 368 |
-
timestamp_ms,
|
| 369 |
-
nonce,
|
| 370 |
-
nickname
|
| 371 |
-
) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
|
| 372 |
ON DUPLICATE KEY UPDATE
|
| 373 |
device_type = VALUES(device_type),
|
| 374 |
device_model = VALUES(device_model),
|
| 375 |
os_version = VALUES(os_version),
|
| 376 |
-
app_id = VALUES(app_id),
|
| 377 |
app_version = VALUES(app_version),
|
| 378 |
-
bundle_id = VALUES(bundle_id),
|
| 379 |
timezone = VALUES(timezone),
|
| 380 |
region = VALUES(region),
|
| 381 |
language = VALUES(language),
|
| 382 |
-
request_id = VALUES(request_id),
|
| 383 |
-
timestamp_ms = VALUES(timestamp_ms),
|
| 384 |
-
nonce = VALUES(nonce),
|
| 385 |
-
nickname = VALUES(nickname),
|
| 386 |
updated_at = CURRENT_TIMESTAMP
|
| 387 |
"""
|
| 388 |
import time
|
|
@@ -395,16 +377,10 @@ async def upsert_device_record(
|
|
| 395 |
device_type,
|
| 396 |
device_model,
|
| 397 |
os_version,
|
| 398 |
-
app_id,
|
| 399 |
app_version,
|
| 400 |
-
bundle_id,
|
| 401 |
timezone,
|
| 402 |
region,
|
| 403 |
language,
|
| 404 |
-
request_id,
|
| 405 |
-
timestamp_ms,
|
| 406 |
-
nonce,
|
| 407 |
-
nickname,
|
| 408 |
),
|
| 409 |
)
|
| 410 |
duration = (time.perf_counter() - start_time) * 1000
|
|
|
|
| 340 |
device_type: Optional[str] = None,
|
| 341 |
device_model: Optional[str] = None,
|
| 342 |
os_version: Optional[str] = None,
|
|
|
|
| 343 |
app_version: Optional[str] = None,
|
|
|
|
| 344 |
timezone: Optional[str] = None,
|
| 345 |
region: Optional[str] = None,
|
| 346 |
language: Optional[str] = None,
|
|
|
|
|
|
|
|
|
|
|
|
|
| 347 |
) -> None:
|
| 348 |
"""写入或更新设备记录"""
|
| 349 |
query = """
|
|
|
|
| 352 |
device_type,
|
| 353 |
device_model,
|
| 354 |
os_version,
|
|
|
|
| 355 |
app_version,
|
|
|
|
| 356 |
timezone,
|
| 357 |
region,
|
| 358 |
+
language
|
| 359 |
+
) VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
|
|
|
|
|
|
|
|
|
|
|
|
|
| 360 |
ON DUPLICATE KEY UPDATE
|
| 361 |
device_type = VALUES(device_type),
|
| 362 |
device_model = VALUES(device_model),
|
| 363 |
os_version = VALUES(os_version),
|
|
|
|
| 364 |
app_version = VALUES(app_version),
|
|
|
|
| 365 |
timezone = VALUES(timezone),
|
| 366 |
region = VALUES(region),
|
| 367 |
language = VALUES(language),
|
|
|
|
|
|
|
|
|
|
|
|
|
| 368 |
updated_at = CURRENT_TIMESTAMP
|
| 369 |
"""
|
| 370 |
import time
|
|
|
|
| 377 |
device_type,
|
| 378 |
device_model,
|
| 379 |
os_version,
|
|
|
|
| 380 |
app_version,
|
|
|
|
| 381 |
timezone,
|
| 382 |
region,
|
| 383 |
language,
|
|
|
|
|
|
|
|
|
|
|
|
|
| 384 |
),
|
| 385 |
)
|
| 386 |
duration = (time.perf_counter() - start_time) * 1000
|