diff --git a/goodprice/web/templates/login_status.html b/goodprice/web/templates/login_status.html
index 78ddab1..e9e865b 100644
--- a/goodprice/web/templates/login_status.html
+++ b/goodprice/web/templates/login_status.html
@@ -3,7 +3,7 @@
{{ login_message }}
{% if login_remote and login_browser_accessible %}
- 请打开
{{ request.url.hostname }}:16080/vnc.html 查看浏览器窗口，完成登录后会自动保存 Cookie。
+ 请打开
{{ request.url.hostname }}:{{ novnc_port }}/vnc.html 查看浏览器窗口，完成登录后会自动保存 Cookie。
{% elif not login_remote %}
请在本机新打开的浏览器窗口中扫码或登录，完成后会自动保存 Cookie。
{% endif %}
diff --git a/goodprice/web/templates/settings.html b/goodprice/web/templates/settings.html
index 3a29094..5642c0a 100644
--- a/goodprice/web/templates/settings.html
+++ b/goodprice/web/templates/settings.html
@@ -404,11 +404,12 @@
4. 消息推送渠道
document.getElementById('vision_model').value = 'glm-4.6v-flash';
document.getElementById('vision_api_format').value = 'chat_completions';
} else if (type === 'local') {
- document.getElementById('llm_base_url').value = 'http://192.168.5.21:15722/v1';
- document.getElementById('llm_model').value = 'gpt-5.6-luna';
+ // 通用占位：请替换为你的 OpenAI 兼容中转地址，不要写入具体内网 IP。
+ document.getElementById('llm_base_url').value = 'http://<你的中转地址>/v1';
+ document.getElementById('llm_model').value = '';
document.getElementById('llm_api_format').value = 'responses';
- document.getElementById('vision_base_url').value = 'http://192.168.5.21:15722/v1';
- document.getElementById('vision_model').value = 'gpt-5.6-luna';
+ document.getElementById('vision_base_url').value = 'http://<你的中转地址>/v1';
+ document.getElementById('vision_model').value = '';
document.getElementById('vision_api_format').value = 'responses';
}
}
diff --git a/goodprice/web/templates/tasks_edit.html b/goodprice/web/templates/tasks_edit.html
deleted file mode 100644
index a8ec8be..0000000
--- a/goodprice/web/templates/tasks_edit.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends "base.html" %}
-{% block title %}编辑任务 - 闲鱼盯价助手{% endblock %}
-{% block content %}
-
-
编辑监控任务 #{{ task.id }}
-
-
-{% endblock %}
diff --git a/scripts/start-docker.sh b/scripts/start-docker.sh
index ac4d261..9262468 100755
--- a/scripts/start-docker.sh
+++ b/scripts/start-docker.sh
@@ -48,9 +48,27 @@ else
docker compose up -d --build
fi
+# Compose reads project variables from the shell first, then .env. Mirror that lookup for
+# the printed login URL without sourcing .env as shell code.
+novnc_port="${NOVNC_PORT:-}"
+if [ -z "$novnc_port" ] && [ -f .env ]; then
+ novnc_port="$(awk '
+ /^[[:space:]]*#/ { next }
+ /^[[:space:]]*NOVNC_PORT[[:space:]]*=/ {
+ value = $0
+ sub(/^[^=]*=/, "", value)
+ sub(/[[:space:]]+#.*/, "", value)
+ gsub(/^[[:space:]]+|[[:space:]]+$/, "", value)
+ gsub(/^["\047]|["\047]$/, "", value)
+ }
+ END { print value }
+ ' .env)"
+fi
+novnc_port="${novnc_port:-16080}"
+
echo "second-eye 已启动：http://127.0.0.1:18000"
if [ "$login" -eq 1 ]; then
- echo "登录模式已启用 noVNC：http://<主机IP>:16080/vnc.html"
+ echo "登录模式已启用 noVNC：http://<主机IP>:$novnc_port/vnc.html"
echo "登录完成后请重新执行：$0（关闭 noVNC）"
else
echo "普通运行模式：noVNC 已关闭。需要登录时执行 $0 --login"
diff --git a/tests/test_api.py b/tests/test_api.py
index ef9022d..e978f8d 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -565,7 +565,7 @@ def test_settings_save_recomputes_satisfaction(base_settings, session_factory):
assert session.query(Listing).one().satisfaction == 90.0
-def test_task_api_accepts_round8_fields(base_settings, session_factory):
+def test_task_api_accepts_price_and_exclude_fields(base_settings, session_factory):
client = _client(base_settings, session_factory)
task = client.post(
"/api/tasks",
@@ -610,7 +610,7 @@ def test_edit_page_redirects_to_detail(base_settings, session_factory):
assert f"/tasks/{task['id']}" in resp.headers["location"]
-def test_task_detail_form_saves_round8_fields(base_settings, session_factory):
+def test_task_detail_form_saves_price_and_exclude_fields(base_settings, session_factory):
client = _client(base_settings, session_factory)
task = client.post("/api/tasks", json={"keyword": "k"}).json()
resp = client.post(
@@ -629,11 +629,16 @@ def test_task_detail_form_saves_round8_fields(base_settings, session_factory):
def _settings_form():
- return {
+ """设置页表单基线：字段须与 settings.html 一致，不得再出现已废弃字段。"""
+ from goodprice.config import Settings
+
+ defaults = Settings(_env_file=None)
+ form = {
"xianyu_cookie": "",
"llm_base_url": "",
"llm_api_key": "",
- "llm_model": "qwen-vl-max",
+ "llm_model": defaults.llm_model,
+ "llm_api_format": "chat_completions",
"serverchan_sendkey": "",
"proxy": "",
"default_crawl_interval_minutes": "20",
@@ -641,14 +646,25 @@ def _settings_form():
"vision_base_url": "",
"vision_api_key": "",
"vision_model": "",
- "wecom_corpid": "",
- "wecom_agentid": "",
- "wecom_secret": "",
+ "vision_api_format": "chat_completions",
"wecom_webhook": "",
+ "feishu_webhook": "",
+ "feishu_secret": "",
+ "gotify_url": "",
+ "gotify_token": "",
+ "gotify_priority": "5",
+ "jev_api_key": "",
+ "jev_auto_threshold": "0.85",
+ "jev_backend": "adapter",
"serverchan_enabled": "1",
"wecom_robot_enabled": "1",
+ "feishu_enabled": "1",
+ "gotify_enabled": "1",
"vision_enabled": "1",
+ "jev_enabled": "0",
}
+ assert set(form) <= set(Settings.model_fields)
+ return form
def test_api_rejects_invalid_task_input(base_settings, session_factory):
diff --git a/tests/test_config.py b/tests/test_config.py
index 5ed3fc6..cd5e54b 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -17,9 +17,10 @@ def test_settings_defaults():
assert settings.default_crawl_jitter_minutes == 10
-def test_round2_settings_defaults():
+def test_llm_and_vision_defaults():
settings = Settings(_env_file=None)
- assert settings.vision_model == "qwen-vl-max"
+ assert settings.llm_model == "glm-4.7-flash"
+ assert settings.vision_model == "glm-4.6v-flash"
assert settings.vision_api_format == "chat_completions"
assert settings.vision_base_url == ""
assert settings.serverchan_enabled is True
@@ -27,7 +28,7 @@ def test_round2_settings_defaults():
assert settings.vision_enabled is True
-def test_round2_settings_env_overrides(monkeypatch):
+def test_vision_env_overrides(monkeypatch):
monkeypatch.setenv("VISION_ENABLED", "false")
monkeypatch.setenv("VISION_BASE_URL", "https://dashscope.aliyuncs.com/compatible-mode/v1")
settings = Settings(_env_file=None)
diff --git a/tests/test_crawler_parser.py b/tests/test_crawler_parser.py
index 2084e7f..8baea0e 100644
--- a/tests/test_crawler_parser.py
+++ b/tests/test_crawler_parser.py
@@ -4,6 +4,8 @@
from goodprice.crawler.parser import (
extract_id,
+ extract_user_id,
+ is_product_image,
parse_detail_html,
parse_price,
parse_search_html,
@@ -38,12 +40,14 @@ def test_parse_search_html():
assert first.price == 2999.0
assert first.url == "https://www.goofish.com/item?id=1001&categoryId=1"
assert first.image_urls == ["https://img.alicdn.com/bao/uploaded/1001.jpg"]
- assert first.seller == "杭州"
+ # 搜索卡片里 seller-text-- 实际是地区文本，不是卖家昵称
+ assert first.seller is None
assert first.location == "杭州"
second = items[1]
assert second.external_id == "1002"
assert second.price == 450.0
assert second.seller is None
+ assert second.location is None
def test_parse_search_html_drops_placeholder_images():
@@ -100,15 +104,11 @@ def test_parse_detail_html_price_range_as_variants():
def test_extract_user_id():
- from goodprice.crawler.parser import extract_user_id
-
assert extract_user_id("https://www.goofish.com/personal?userId=2672367114") == "2672367114"
assert extract_user_id("https://x/other") is None
def test_is_product_image_filters_placeholder():
- from goodprice.crawler.parser import is_product_image
-
assert is_product_image("https://img.alicdn.com/bao/uploaded/i2/x.jpg") is True
assert is_product_image("https://img.alicdn.com/imgextra/i4/xxx-2-tps-2-2.png") is False
assert is_product_image("https://img.alicdn.com/imgextra/i1/xxx-tps-480-144.png") is False
diff --git a/tests/test_db.py b/tests/test_db.py
index 58106f4..85cb302 100644
--- a/tests/test_db.py
+++ b/tests/test_db.py
@@ -22,6 +22,14 @@ def test_migrate_is_idempotent(session_factory):
migrate_schema(session_factory)
+def test_listings_ddl_covers_model_columns():
+ """重建表用的列定义必须与 ORM 模型完全一致，否则重建会丢列。"""
+ from goodprice.db import _COLUMN_DDL
+ from goodprice.models import Listing
+
+ assert set(_COLUMN_DDL) == {column.name for column in Listing.__table__.columns}
+
+
def test_migrate_adds_seller_columns(tmp_db):
engine = create_engine(tmp_db)
with engine.begin() as conn:
@@ -58,7 +66,7 @@ def test_migrate_adds_notification_columns(tmp_db):
assert {"title", "content"} <= cols
-def test_migrate_adds_round7_columns(tmp_db):
+def test_migrate_adds_listing_value_columns(tmp_db):
engine = create_engine(tmp_db)
with engine.begin() as conn:
conn.execute(text("CREATE TABLE listings (id INTEGER PRIMARY KEY, external_id TEXT)"))
@@ -77,7 +85,7 @@ def test_migrate_adds_round7_columns(tmp_db):
} <= cols
-def test_migrate_adds_round8_task_columns(tmp_db):
+def test_migrate_adds_task_price_columns(tmp_db):
engine = create_engine(tmp_db)
with engine.begin() as conn:
conn.execute(text("CREATE TABLE watch_tasks (id INTEGER PRIMARY KEY, keyword TEXT)"))
diff --git a/tests/test_judge.py b/tests/test_judge.py
index 9b2da9a..b6ce08d 100644
--- a/tests/test_judge.py
+++ b/tests/test_judge.py
@@ -133,8 +133,6 @@ def test_build_judger_typesafe_backend():
backend="typesafe",
api_key="ts-key",
)
- from goodprice.analysis.jev_typesafe import TypeSafeJudger
-
assert isinstance(judger, TypeSafeJudger)
assert judger.enabled is True
assert build_judger(
diff --git a/tests/test_models.py b/tests/test_models.py
index 3b0e6a8..29d5fcb 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -51,7 +51,7 @@ def test_listing_relations(session_factory):
assert len(listing.notifications) == 1
-def test_round2_model_columns(session_factory):
+def test_task_and_listing_optional_columns(session_factory):
with session_factory() as session:
task = WatchTask(keyword="k")
session.add(task)
@@ -99,7 +99,7 @@ def test_blocked_flags(session_factory):
assert s.blocked is True
-def test_round7_listing_columns(session_factory):
+def test_listing_status_and_value_defaults(session_factory):
with session_factory() as session:
listing = Listing(platform="xianyu", external_id="1", title="t", price=1, url="u")
session.add(listing)
@@ -113,7 +113,7 @@ def test_round7_listing_columns(session_factory):
assert listing.last_notified_satisfaction is None
-def test_round8_task_columns(session_factory):
+def test_task_price_and_exclude_defaults(session_factory):
with session_factory() as session:
task = WatchTask(keyword="k")
session.add(task)
diff --git a/tests/test_notify_registry.py b/tests/test_notify_registry.py
new file mode 100644
index 0000000..8bd3af0
--- /dev/null
+++ b/tests/test_notify_registry.py
@@ -0,0 +1,49 @@
+"""通知渠道注册表的一致性守卫。
+
+渠道名/开关字段/构造逻辑集中在 goodprice.notify.registry；本测试保证注册表、
+Settings 字段与设置页模板三者不脱节。
+"""
+from goodprice.config import PROJECT_ROOT, Settings
+from goodprice.notify.registry import (
+ CHANNELS,
+ build_channel,
+ build_enabled_notifiers,
+ channel_names,
+)
+
+SETTINGS_HTML = PROJECT_ROOT / "goodprice" / "web" / "templates" / "settings.html"
+
+
+def test_channel_names_are_unique_and_expected():
+ names = [spec.name for spec in CHANNELS]
+ assert len(names) == len(set(names))
+ assert channel_names() == {"serverchan", "wecom_robot", "feishu", "gotify"}
+
+
+def test_channel_specs_point_to_settings_fields():
+ for spec in CHANNELS:
+ assert spec.enabled_field in Settings.model_fields, spec.name
+ notifier = build_channel(spec.name, Settings(_env_file=None))
+ assert notifier is not None
+ assert notifier.channel == spec.name
+
+
+def test_unknown_channel_returns_none():
+ assert build_channel("nope", Settings(_env_file=None)) is None
+
+
+def test_disabled_channels_are_skipped():
+ settings = Settings(
+ _env_file=None,
+ serverchan_enabled=False,
+ wecom_robot_enabled=False,
+ feishu_enabled=False,
+ gotify_enabled=False,
+ )
+ assert build_enabled_notifiers(settings) == []
+
+
+def test_template_exposes_every_channel():
+ html = SETTINGS_HTML.read_text(encoding="utf-8")
+ for spec in CHANNELS:
+ assert spec.name in html, f"settings.html 缺少渠道 {spec.name} 的配置区"
diff --git a/tests/test_prompts_consistency.py b/tests/test_prompts_consistency.py
new file mode 100644
index 0000000..57a0cc9
--- /dev/null
+++ b/tests/test_prompts_consistency.py
@@ -0,0 +1,58 @@
+"""提示词核心判据的单一来源守卫。
+
+需求匹配与性价比的判据措辞由 goodprice.analysis.prompts 统一定义，adapter 与
+typesafe 两个后端共用；本测试同时锁定措辞，防止重构时无意改动模型行为。
+"""
+from goodprice.analysis.jev_typesafe import (
+ REQUIREMENT_NOUL_INSTRUCTION,
+ VALUE_SCORE_INSTRUCTION,
+)
+from goodprice.analysis.judge import (
+ REQUIREMENT_TYPED_SYSTEM_PROMPT,
+ REQUIREMENT_TYPED_USER_TEMPLATE,
+ VALUE_TYPED_SYSTEM_PROMPT,
+)
+from goodprice.analysis.prompts import (
+ BATCH_VALUE_SYSTEM_PROMPT,
+ REQUIREMENT_CRITERION,
+ REQUIREMENT_SYSTEM_PREFIX,
+ REQUIREMENT_SYSTEM_PROMPT,
+ REQUIREMENT_USER_TEMPLATE,
+ VALUE_CRITERION,
+)
+
+
+def test_requirement_criterion_shared_across_backends():
+ for text in (
+ REQUIREMENT_SYSTEM_PROMPT,
+ REQUIREMENT_TYPED_SYSTEM_PROMPT,
+ REQUIREMENT_NOUL_INSTRUCTION,
+ ):
+ assert REQUIREMENT_CRITERION in text
+
+
+def test_value_criterion_shared_across_backends():
+ for text in (
+ BATCH_VALUE_SYSTEM_PROMPT,
+ VALUE_TYPED_SYSTEM_PROMPT,
+ VALUE_SCORE_INSTRUCTION,
+ ):
+ assert VALUE_CRITERION in text
+
+
+def test_prompt_wording_is_unchanged():
+ assert "请判断商品是否满足买家的硬性需求。" in REQUIREMENT_SYSTEM_PROMPT
+ assert "请判断商品是否满足买家的硬性需求。" in REQUIREMENT_TYPED_SYSTEM_PROMPT
+ assert REQUIREMENT_NOUL_INSTRUCTION == "该二手商品是否满足买家的硬性需求？"
+ assert "判断每个商品按当前价格是否划算。" in BATCH_VALUE_SYSTEM_PROMPT
+ assert "请仅依据该商品本身独立评估按当前价格是否划算。" in VALUE_TYPED_SYSTEM_PROMPT
+ assert VALUE_SCORE_INSTRUCTION == "该商品按当前价格是否划算，1 分最不划算，10 分最划算"
+
+
+def test_requirement_user_template_is_shared():
+ assert REQUIREMENT_TYPED_USER_TEMPLATE == REQUIREMENT_USER_TEMPLATE
+
+
+def test_requirement_system_prefix_is_shared():
+ assert REQUIREMENT_SYSTEM_PROMPT.startswith(REQUIREMENT_SYSTEM_PREFIX)
+ assert REQUIREMENT_TYPED_SYSTEM_PROMPT.startswith(REQUIREMENT_SYSTEM_PREFIX)
diff --git a/tests/test_settings_consistency.py b/tests/test_settings_consistency.py
new file mode 100644
index 0000000..e76da59
--- /dev/null
+++ b/tests/test_settings_consistency.py
@@ -0,0 +1,54 @@
+"""守住「设置字段只在一处定义」的边界。
+
+设置字段的唯一事实来源是 goodprice.config.Settings；.env.example 是它的部署文档。
+本测试保证新增字段时不会漏写文档、也不会凭空多出无人读取的变量，从根上防止
+「代码 / 模板 / 表单」多处平行维护导致的漂移。
+"""
+from goodprice.config import PROJECT_ROOT, Settings
+
+ENV_EXAMPLE = PROJECT_ROOT / ".env.example"
+
+# 有意不写入 .env.example 的字段：内部字段或由容器注入。
+INTERNAL_FIELDS = {"app_name", "runtime_mode"}
+
+# .env.example 中属于 compose/部署层、并非 Settings 字段的变量。
+COMPOSE_ONLY_KEYS = {"BIND_ADDRESS", "SECOND_EYE_IMAGE"}
+
+
+def _env_example_keys() -> set[str]:
+ keys: set[str] = set()
+ for line in ENV_EXAMPLE.read_text(encoding="utf-8").splitlines():
+ line = line.strip()
+ if not line or line.startswith("#") or "=" not in line:
+ continue
+ keys.add(line.split("=", 1)[0].strip())
+ return keys
+
+
+def test_env_example_documents_every_settings_field():
+ keys = _env_example_keys()
+ missing = sorted(
+ name.upper()
+ for name in Settings.model_fields
+ if name not in INTERNAL_FIELDS and name.upper() not in keys
+ )
+ assert not missing, f".env.example 缺少以下设置项: {missing}"
+
+
+def test_env_example_has_no_unknown_variables():
+ known = {name.upper() for name in Settings.model_fields} | COMPOSE_ONLY_KEYS
+ unknown = sorted(_env_example_keys() - known)
+ assert not unknown, f".env.example 含未知变量（可能与代码脱节）: {unknown}"
+
+
+def test_env_example_model_defaults_match_settings():
+ """默认模型名只在 Settings 定义；.env.example 的取值必须与之一致。"""
+ values = {}
+ for line in ENV_EXAMPLE.read_text(encoding="utf-8").splitlines():
+ line = line.strip()
+ if line and not line.startswith("#") and "=" in line:
+ key, _, value = line.partition("=")
+ values[key.strip()] = value.strip()
+ defaults = Settings(_env_file=None)
+ assert values["LLM_MODEL"] == defaults.llm_model
+ assert values["VISION_MODEL"] == defaults.vision_model
diff --git a/tests/test_settings_service.py b/tests/test_settings_service.py
index c64f725..9554a62 100644
--- a/tests/test_settings_service.py
+++ b/tests/test_settings_service.py
@@ -25,7 +25,7 @@ def test_empty_value_clears_override(session_factory, base_settings):
assert service.get().xianyu_cookie == ""
-def test_round2_settings_persist(session_factory, base_settings):
+def test_webhook_and_vision_persist(session_factory, base_settings):
service = SettingsService(session_factory, base=base_settings)
service.set_many({"wecom_webhook": "https://x/send?key=abc", "vision_model": "glm-4v-flash", "vision_api_format": "responses"})
settings = service.get()
@@ -35,7 +35,7 @@ def test_round2_settings_persist(session_factory, base_settings):
assert settings.serverchan_enabled is True
-def test_round5_toggle_persist(session_factory, base_settings):
+def test_toggle_flags_persist(session_factory, base_settings):
service = SettingsService(session_factory, base=base_settings)
service.set_many({"serverchan_enabled": "0", "vision_enabled": "0"})
settings = service.get()
diff --git a/tests/test_task_service.py b/tests/test_task_service.py
index b41adfd..d7e4560 100644
--- a/tests/test_task_service.py
+++ b/tests/test_task_service.py
@@ -1,3 +1,5 @@
+import pytest
+
from goodprice.services.task_service import TaskService
@@ -60,12 +62,8 @@ def test_rejects_invalid_task_ranges(session_factory):
{"keyword": "x", "interval_minutes": 0},
{"keyword": "x", "max_price": float("inf")},
):
- try:
+ with pytest.raises(ValueError):
service.create_task(data)
- except ValueError:
- pass
- else:
- raise AssertionError(f"expected invalid data to fail: {data}")
def test_normalizes_task_text_and_numbers(session_factory):
@@ -87,3 +85,13 @@ def test_normalizes_task_text_and_numbers(session_factory):
assert task.condition_requirement == "screen"
assert task.min_price == 10.0
assert task.interval_minutes == 5
+
+
+def test_task_to_dict_covers_all_editable_fields(session_factory):
+ from goodprice.services.task_service import TASK_FIELDS, TaskService, task_to_dict
+
+ task = TaskService(session_factory).create_task({"keyword": "k", "fetch_detail": False})
+ data = task_to_dict(task)
+ assert set(TASK_FIELDS) <= set(data)
+ assert data["fetch_detail"] is False
+ assert "last_run_count" in data
diff --git a/tests/test_web_safety.py b/tests/test_web_safety.py
new file mode 100644
index 0000000..f32a18e
--- /dev/null
+++ b/tests/test_web_safety.py
@@ -0,0 +1,34 @@
+"""「测试连接」地址校验（SSRF 防护）的单元测试。"""
+import pytest
+
+from goodprice.web.routes import _safe_test_url
+
+
+def test_empty_returns_empty():
+ assert _safe_test_url("") == ""
+ assert _safe_test_url(" ") == ""
+
+
+def test_allows_public_https():
+ url = "https://open.bigmodel.cn/api/paas/v4"
+ assert _safe_test_url(url) == url
+
+
+def test_allows_loopback_and_private_lan():
+ assert _safe_test_url("http://127.0.0.1:8000/v1") == "http://127.0.0.1:8000/v1"
+ assert _safe_test_url("http://192.168.1.5:1234/v1") == "http://192.168.1.5:1234/v1"
+
+
+@pytest.mark.parametrize(
+ "bad",
+ [
+ "ftp://example.com/v1",
+ "javascript:alert(1)",
+ "http://metadata.google.internal/",
+ "http://169.254.169.254/latest/meta-data/",
+ "http://0.0.0.0:8000",
+ ],
+)
+def test_blocks_unsafe_targets(bad):
+ with pytest.raises(ValueError):
+ _safe_test_url(bad)