guanwei 1.2.4 → 1.2.5

package/README.en.md

@@ -78,25 +78,28 @@ AI:       multi-LLM adapter (OpenAI-compatible & Google formats; DeepSeek / Gemi
 
 ```bash
 npm i -g guanwei
-guanwei setup --key YOUR_API_KEY
+guanwei setup
 guanwei start
 ```
 
 Open http://localhost:5173 . Upgrade: `guanwei update`. Stop: `guanwei stop`.
 
+> 💡 **Configure your key (`guanwei setup`)**: interactive wizard — pick a provider, paste your key (not echoed), stored in `~/.guanwei/.env` (readable only by you). Or one-shot: `guanwei setup --key YOUR_API_KEY` (5 providers, see below).
+> 💡 **No key? Still works**: `guanwei start` runs fine — charting, demos and classics all work; only AI reading needs a key (the page shows a config hint).
+
 ### ⚡ Docker one-liner (no Node needed, easiest)
 
 ```bash
-docker run -d --name guanwei -p 5173:80 -e LLM_DEEPSEEK_KEY=YOUR_API_KEY ghcr.io/rubyccll/guanwei:latest
+docker run -d --name guanwei -p 5173:80 -e LLM_DEEPSEEK_KEY=sk-YOUR_REAL_KEY ghcr.io/rubyccll/guanwei:latest
 ```
 
-Open http://localhost:5173 . Stop: `docker stop guanwei`. Other providers: `-e LLM_PROVIDER=gemini -e LLM_GEMINI_KEY=...` (deepseek / gemini / groq / qwen / custom).
+Open http://localhost:5173 . Stop: `docker stop guanwei`. Other providers: `-e LLM_PROVIDER=gemini -e LLM_GEMINI_KEY=sk-YOUR_REAL_KEY` (deepseek / gemini / groq / qwen / custom).
 
 ### ⚡ Source installer (fallback)
 
 ```bash
 curl -fsSL https://raw.githubusercontent.com/RubyCcll/guanwei/main/scripts/install.sh | bash
-guanwei setup --key YOUR_API_KEY
+guanwei setup
 guanwei start
 ```
 
@@ -140,7 +143,8 @@ The script installs dependencies, writes `server/.env` (key stays local), and st
 ```bash
 npm link        # install globally (or use ./scripts/guanwei directly)
 
-guanwei setup --key sk-xxx   # configure API key (interactive: guanwei setup)
+guanwei setup                # configure API key (interactive wizard)
+guanwei setup --key sk-xxx   # one-shot (replace sk-xxx with your real key)
 guanwei start                # start (--docker for containers)
 guanwei doctor               # environment self-check (Node/config/ports/deps/version)
 guanwei update               # update to latest (git incremental merge; local config preserved)

package/README.md

@@ -93,25 +93,28 @@ AI 层：多 LLM 适配（OpenAI 兼容 / Google 格式，DeepSeek / Gemini / Gr
 
 ```bash
 npm i -g guanwei
-guanwei setup --key 你的APIKey
+guanwei setup
 guanwei start
 ```
 
 打开 http://localhost:5173 即用。国内用户自动走 npmmirror 加速；升级：`guanwei update`。停止：`guanwei stop`。
 
+> 💡 **配置 Key（`guanwei setup`）**：交互式引导——选服务商 → 粘贴 Key（不回显），写进 `~/.guanwei/.env` 仅本机可读。也可一步到位：`guanwei setup --key sk-你的真实Key`（DeepSeek 等 5 家任选，Key 申请见下文）。
+> 💡 **不配 Key 也能启动**：`guanwei start` 直接跑，排盘/演示/古籍全部可用，仅 AI 解读不可用（页面会提示配置入口）。
+
 ### ⚡ 方式二：Docker 一行启动（免装 Node，最省心）
 
 ```bash
-docker run -d --name guanwei -p 5173:80 -e LLM_DEEPSEEK_KEY=你的APIKey ghcr.io/rubyccll/guanwei:latest
+docker run -d --name guanwei -p 5173:80 -e LLM_DEEPSEEK_KEY=sk-你的真实Key ghcr.io/rubyccll/guanwei:latest
 ```
 
-打开 http://localhost:5173 即用。停止：`docker stop guanwei`。其他服务商：`-e LLM_PROVIDER=gemini -e LLM_GEMINI_KEY=你的Key`（deepseek / gemini / groq / qwen / custom 均可）。
+打开 http://localhost:5173 即用。停止：`docker stop guanwei`。其他服务商：`-e LLM_PROVIDER=gemini -e LLM_GEMINI_KEY=sk-你的真实Key`（deepseek / gemini / groq / qwen / custom 均可）。
 
 ### ⚡ 方式三：curl 一键安装（源码方式，备用）
 
 ```bash
 curl -fsSL https://raw.githubusercontent.com/RubyCcll/guanwei/main/scripts/install.sh | bash
-guanwei setup --key 你的APIKey
+guanwei setup
 guanwei start
 ```
 
@@ -126,7 +129,7 @@ guanwei start
 点击按钮 → 云端环境自动装好依赖 → 终端执行：
 
 ```bash
-./scripts/setup.sh --key 你的APIKey
+./scripts/setup.sh --key sk-你的真实Key
 ```
 
 #### 方式五：Docker Compose（多容器）
@@ -134,7 +137,7 @@ guanwei start
 预构建镜像已发布到 GitHub Container Registry（amd64 + arm64 双平台）：
 
 ```bash
-./scripts/setup.sh --docker --key 你的APIKey   # 自动配置 + 拉取镜像 + 启动
+./scripts/setup.sh --docker --key sk-你的真实Key   # 自动配置 + 拉取镜像 + 启动
 # 或手动：
 #   cp server/.env.example server/.env   （填入 Key）
 #   docker compose up -d                  （自动拉取 GHCR 镜像）
@@ -147,7 +150,8 @@ guanwei start
 #### 方式六：本地 Node.js（≥ 22.5，需 node:sqlite 内置支持）
 
 ```bash
-./scripts/setup.sh --key 你的APIKey   # 交互式可直接运行 ./scripts/setup.sh
+./scripts/setup.sh                    # 交互式：选服务商 + 输入 Key
+# 或一步到位：./scripts/setup.sh --key sk-你的真实Key
 ```
 
 脚本自动：安装依赖 → 写入 `server/.env`（Key 仅存本地）→ 启动前后端。打开 http://localhost:5173 → 缘起页注册 → 九术页起占 → 召 AI 成报告。
@@ -159,7 +163,8 @@ guanwei start
 npm link
 # ② 不想全局安装？直接使用：./scripts/guanwei <命令>
 
-guanwei setup --key sk-xxx   # 配置 API Key（交互式：guanwei setup）
+guanwei setup                # 配置 API Key（交互式：选服务商 + 粘贴 Key）
+guanwei setup --key sk-xxx   # 一步到位（sk-xxx 换成你的真实 Key）
 guanwei start                # 启动（--docker 用容器）
 guanwei doctor               # 环境自检（Node/配置/占位密钥/端口/依赖/版本）
 guanwei update               # 更新到最新版（git 增量合并，.env 等本地配置不覆盖）

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "guanwei",
   "private": false,
-  "version": "1.2.4",
+  "version": "1.2.5",
   "type": "module",
   "scripts": {
     "dev": "vite",

package/server/src/data/db.json

@@ -6432,6 +6432,162 @@
       "samples": [],
       "records": [],
       "token": "a4c67d7d395086f836811508e9199d007487ad24f3f92db0492163bcef07ed44"
+    },
+    {
+      "username": "联调4720",
+      "passHash": "scrypt$3f5d6299295a3a9918e0416c626bcdef$67f7d06f536c2dcf312ea7ae15b50565916f97e200b904476ab96b3c4ef5d9fe3bd093734fbcf27a271682972fff3b9dff32bf02c671c496c338cf0df82c95a3",
+      "createdAt": 1787978014815,
+      "profile": {
+        "birthDate": "1996-09-09",
+        "birthHourIndex": 5,
+        "gender": "男",
+        "location": null
+      },
+      "samples": [],
+      "records": [
+        {
+          "artId": "bazi",
+          "createdAt": 1,
+          "result": {
+            "dayGZ": "壬申"
+          }
+        }
+      ],
+      "token": "5acff6d1a3d077e1043b57bfd0e7b197b554e6895c3c5ad7aab91eb6c5e055dd"
+    },
+    {
+      "username": "鉴权5000",
+      "passHash": "scrypt$4abab2b41008b858f4f0d57083e0b00d$1af134638bb86539577633e60e77bae1c31125bc041f7ff372877984ab00c9b917c2b52fb9b2a283a2e0a57576471e879f625ea44bbdd0ab525b95ea15ffaaa9",
+      "createdAt": 1787978015042,
+      "profile": {
+        "birthDate": "1999-01-01"
+      },
+      "samples": [],
+      "records": [],
+      "token": "c483184079880cc968ca31607701d9dcdafbe6a97302345a5193ab6ac4c97a18"
+    },
+    {
+      "username": "他人5082",
+      "passHash": "scrypt$51321757c7a676de91f379a812ad7bce$e1750ec9daf3b5f19c8213c9fb51420746986cbabd9ecd507d805fc957942996011489220975566de6782616b614212a7755f507ae31d21946864c6e3458650b",
+      "createdAt": 1787978015129,
+      "profile": {},
+      "samples": [],
+      "records": [],
+      "token": "07a612c8e5de4e8982efedd10cb9084b446bb3c5ece03bfcd3392a075997b7b0"
+    },
+    {
+      "username": "登鉴5138",
+      "passHash": "scrypt$10094d85734baa9671128fc10c5e8d83$ec7d061fac3f81efb0ef5b1e8297372ef9165f2221492185a6d19a8158bf0677ea664d935fb4ccd7742f0e3c1b5caaab715c860b5c4c8fd0c1368ea53eb21521",
+      "createdAt": 1787978015183,
+      "profile": {},
+      "samples": [],
+      "records": [],
+      "token": "a6c1d3612e8f34e83d735e8dddaa5fadba775fa79b85f2cfc1e0720063b92ad9"
+    },
+    {
+      "username": "占位5233",
+      "passHash": "scrypt$86ce84ec1222fe4888a75d2b19324c83$0316d5c423c34fa2bcf1088670bbbe35617ee2f501451af7ec8e3bad915eda8ed49cadf9836f2127b0b72f043a0d24ba9bad598b79d3ff19f451e89a7e8b33d2",
+      "createdAt": 1787978015236,
+      "profile": {},
+      "samples": [],
+      "records": [],
+      "token": "267fd8173c3e0536a66bf6432ca5b07ed8e87e044be6c33edf41b3d55abb0748"
+    },
+    {
+      "username": "甲5347",
+      "passHash": "scrypt$bb2c32b24b75e33435eb8c6910f5ab2f$20a91be38796f811012fb1879a4ffb9da462049340994af0df150206388879c1d34e76ca7b9b9024870b42311062b2c3915c7102e55e74a31a819892f268f0f0",
+      "createdAt": 1787978015397,
+      "profile": {},
+      "samples": [],
+      "records": [],
+      "token": "ba249a40c22dbc4c5a6b9068d3ebc3e1d1afe5212821dbffd0d2b192abf543be"
+    },
+    {
+      "username": "乙5347",
+      "passHash": "scrypt$cfe4fd0384b866b77abed2746d6c882d$c275b3373db1986865e430a392f771e29ed776006d4a7e1a9cef7afe583d81158b0dcb2b86361e863b2fae7273da61d86bbad0c8cadf06eba268b22c14f667b1",
+      "createdAt": 1787978015472,
+      "profile": {},
+      "samples": [],
+      "records": [],
+      "token": "e12f06635335a7d365dca3dc5f4d3c87f0c0c0989199100e3cd40fb1f51b563b"
+    },
+    {
+      "username": "联调1046",
+      "passHash": "scrypt$9212a84cc0e275b12e32aba82966195f$943a2029711318c91a68ca0e9f3393a128d753b6ad00936ad9f08d14ae0abf033b6b0b808f2defecc2f284bccdbe7da6e4624ce15e75c7eb670d6d8486380dd1",
+      "createdAt": 1787978041147,
+      "profile": {
+        "birthDate": "1996-09-09",
+        "birthHourIndex": 5,
+        "gender": "男",
+        "location": null
+      },
+      "samples": [],
+      "records": [
+        {
+          "artId": "bazi",
+          "createdAt": 1,
+          "result": {
+            "dayGZ": "壬申"
+          }
+        }
+      ],
+      "token": "2b8f9cdcbeae6f368028bbdac2171f56975d41542f440b98faea51ea24348eb0"
+    },
+    {
+      "username": "鉴权1356",
+      "passHash": "scrypt$d1c69b653d8c59bac97a60cc564a2812$85b38421cc4a8449957a390bea3fafedbec2f1426a3c59a17fd60045a67ea25840da9c03e49159012a18bae42ea997ad98b585a504cfaf1dba41d159c91a6a88",
+      "createdAt": 1787978041401,
+      "profile": {
+        "birthDate": "1999-01-01"
+      },
+      "samples": [],
+      "records": [],
+      "token": "03ae064372554daa1be328b5f435b7a9aa9f5eb5f57d3fdf0e1775de05a42c8f"
+    },
+    {
+      "username": "他人1429",
+      "passHash": "scrypt$d0ff8f7529212c5927843355c53719da$1fa2d57a5ee18124b8752222f5587a02372060f2b2b9faba6ed4ff0b77a90b0c7178f9d182dedd9c8ae300dd20ce1e5f7ec79f368ed21610f5f8756ff2d7da35",
+      "createdAt": 1787978041467,
+      "profile": {},
+      "samples": [],
+      "records": [],
+      "token": "611138970fc695680cbaf59a4e85dc1a121c58aad81a540111b6f548eb607784"
+    },
+    {
+      "username": "登鉴1475",
+      "passHash": "scrypt$faf0d6d072301c2442a54f390f47e6f3$6f5727c69f5164d10607626e7197c4a0532945f9f881a7f9d8526188b106836c274d1e9d0552d4d8b4ae3c2627014fdc7423ee99a81bb61049845ab6e96d8738",
+      "createdAt": 1787978041510,
+      "profile": {},
+      "samples": [],
+      "records": [],
+      "token": "c315d05d8d733976a00e43a89b62fc324251051badbb2ab7921b14f168bc2fe8"
+    },
+    {
+      "username": "占位1550",
+      "passHash": "scrypt$95a6313661da39b23785cc467c9e6acc$d40d094d3f0c92b9d3382640fcc073163aa45aaaaa13dc3adc8379e25239e4aae0ff4a8f85c4115e8ad50e72fff0a317aaeb648c8e5b5fff76b93a08e5f8b38d",
+      "createdAt": 1787978041553,
+      "profile": {},
+      "samples": [],
+      "records": [],
+      "token": "0ad1e0459861b10d3c123ff5e8738ab688b31c258b418f19a11ed55ccc83b365"
+    },
+    {
+      "username": "甲1644",
+      "passHash": "scrypt$b2815193a5c0e718566dabbb6beb7387$3663b9efe26b1e02eac7b5130920f6709847853d06b80857ff09205b9757d1ce9534d8da5bd440763f45c16cbdd1078099c8f76e9e6672fd039b35936cb813d3",
+      "createdAt": 1787978041683,
+      "profile": {},
+      "samples": [],
+      "records": [],
+      "token": "586d4a39d7b0cd5d4a4196ccacf8225459e94c9b07947988640e41ebfb0fe390"
+    },
+    {
+      "username": "乙1644",
+      "passHash": "scrypt$f22718cad108fe66f6c2e822a15d80b2$833ac84622054781111427dff13b732a5fb2f68f01fa95d7176ac3d6c168bd4a314e566e232b6481fa77e431e6feae1f0878ebfe909a0c062429247fb6e9ee49",
+      "createdAt": 1787978041733,
+      "profile": {},
+      "samples": [],
+      "records": [],
+      "token": "957487f61daf7c8a30abe1a6d8c7f18615a60ad1f482b41603a847bf4aa02af8"
     }
   ]
 }

package/server/src/services/promptBuilder.ts

@@ -79,6 +79,14 @@ function hourUnknownNote(profile?: unknown): string {
 }
 
 // 命主已知人生经历 → 解读校准注入（报告须呼应该年份事件、不得与其矛盾）
+// 当前公历时间事实：注入给 AI，防止其自行推算年份（占问类无出生档案，AI 不知道"现在是哪年"）
+function nowFact(): string {
+  const d = new Date();
+  const p = (n: number) => String(n).padStart(2, '0');
+  const week = '日一二三四五六'[d.getDay()];
+  return '【当前时间 · 事实】现在是公历 ' + d.getFullYear() + ' 年 ' + (d.getMonth() + 1) + ' 月 ' + d.getDate() + ' 日 ' + p(d.getHours()) + ':' + p(d.getMinutes()) + '（星期' + week + '）。\n凡涉及年份/日期/时令的表述（如"今年""去年""明年""当下节令"），必须以此为准，不得自行推算或编造年份。';
+}
+
 function lifeEventsNote(profile?: unknown): string {
   const evs: { year: number; text: string }[] = (profile as any)?.lifeEvents;
   if (!Array.isArray(evs) || evs.length === 0) return '';
@@ -166,6 +174,8 @@ export function buildReportMessages(
     '【盘面事实（以下为不可更改的排盘结果，解读必须逐字引用、不得编造）】',
     chartBrief(artId, resultRaw),
     '',
+    nowFact(),
+    '',
     lifeEventsNote(profile),
     '',
     semantic ? '【问题语义分析】' + JSON.stringify(semantic, null, 1) : '',
@@ -213,6 +223,8 @@ export function buildStep1Messages(
     '【盘面事实】',
     chartBrief(artId, resultRaw),
     '',
+    nowFact(),
+    '',
     '请输出盘面解析 json。',
   ].filter(Boolean).join('\n');
   return [