mirror of
https://ghfast.top/https://github.com/aeroxw/tick-stock-panel.git
synced 2026-09-12 17:54:15 +08:00
fix(ext-data): 卡片「最新」时间按北京墙钟, 不再随服务端时区漂移
扩展数据页同一张卡片上两个时间对不上: 底部「最新」显示 10:30:00, 而设置 里拉取面板的「上次」显示 18:30 —— 说的是同一次同步。Docker 镜像默认 UTC, 差的正好是一个时区。 latest_sync_date 由 parquet mtime 经 datetime.fromtimestamp(mtime) 格式化, 拿的是宿主机时钟, 且不带时区后缀; 前端 ExtDataStatCard 原样展示这串裸时间, 没有任何换算余地。旁边的 pull.last_run/next_run 是 datetime.now(timezone.utc) 的带偏移 ISO, 前端 new Date(iso) 按浏览器时区渲染, 所以那一侧是对的。 快照与时序两条路径都改成 fromtimestamp(mtime, tz=CN_TZ), 与 json_report_store._now_iso「用北京墙钟而非宿主机时钟」同口径。 展示格式不变。
This commit is contained in:
@@ -0,0 +1,62 @@
|
||||
"""扩展数据卡片的「最新」时间必须是北京墙钟, 不随服务端时区漂移。
|
||||
|
||||
latest_sync_date 由 parquet 的 mtime 格式化而来, 前端 ExtDataStatCard 原样
|
||||
展示这串裸时间。用宿主机时钟格式化, 容器默认 UTC 时同一次同步在卡片上显示
|
||||
成 8 小时前, 而同一页拉取面板里的 pull.last_run(带时区的 ISO, 前端按浏览器
|
||||
时区渲染)显示的是正确时间 —— 一个页面两个时间对不上。
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import types
|
||||
from datetime import datetime
|
||||
|
||||
import pytest
|
||||
|
||||
from app.api.ext_data import _latest_sync_date
|
||||
from app.market_time import CN_TZ
|
||||
|
||||
# 固定 epoch 秒 = 北京时间 2026-09-04 22:13:20
|
||||
_MTIME = 1_788_531_200
|
||||
|
||||
|
||||
def _beijing(fmt: str) -> str:
|
||||
return datetime.fromtimestamp(_MTIME, tz=CN_TZ).strftime(fmt)
|
||||
|
||||
|
||||
def _touch(path, mtime: int) -> None:
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
path.write_bytes(b"")
|
||||
os.utime(path, (mtime, mtime))
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def snapshot_config():
|
||||
return types.SimpleNamespace(id="ext_gn_ths", mode="snapshot")
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def timeseries_config():
|
||||
return types.SimpleNamespace(id="ext_ts_demo", mode="timeseries")
|
||||
|
||||
|
||||
def test_snapshot_latest_sync_is_beijing_wall_clock(tmp_path, snapshot_config):
|
||||
_touch(tmp_path / "ext_data" / snapshot_config.id / "part.parquet", _MTIME)
|
||||
|
||||
got = _latest_sync_date(snapshot_config, tmp_path)
|
||||
|
||||
assert got == _beijing("%Y-%m-%d %H:%M:%S")
|
||||
|
||||
|
||||
def test_timeseries_latest_sync_is_beijing_wall_clock(tmp_path, timeseries_config):
|
||||
base = tmp_path / "ext_data" / timeseries_config.id / "timeseries"
|
||||
_touch(base / "date=2026-09-03" / "part.parquet", _MTIME - 86400)
|
||||
_touch(base / "date=2026-09-04" / "part.parquet", _MTIME)
|
||||
|
||||
got = _latest_sync_date(timeseries_config, tmp_path)
|
||||
|
||||
assert got == f"2026-09-04 {_beijing('%H:%M:%S')}"
|
||||
|
||||
|
||||
def test_latest_sync_is_none_without_any_data(tmp_path, snapshot_config):
|
||||
assert _latest_sync_date(snapshot_config, tmp_path) is None
|
||||
Reference in New Issue
Block a user