From 8f0052577cc87ca3f8ff77290627fe386ce32551 Mon Sep 17 00:00:00 2001
From: markyangkp <markyangkp@outlook.com>
Date: Thu, 28 May 2026 23:15:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=A4=8D=E5=88=B6/=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=20Markdown=20=E6=97=B6=E5=9B=BE=E7=89=87=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E4=B8=BA=E7=9B=B8=E5=AF=B9=E8=B7=AF=E5=BE=84=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=A4=96=E9=83=A8=E5=B7=A5=E5=85=B7=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

后端存储的 Markdown 图片使用根相对路径（/static/screenshots/...），
前端预览时临时补后端地址可以正常显示，但复制和下载直接使用了原始
相对路径，粘贴到外部 Markdown 工具后图片全部失效。

修复方案：
- 新增 getBackendOrigin() 安全获取后端 origin，替代脆弱的 replace('/api', '')
- 新增 toPortableMarkdown() 将根相对图片路径转为绝对 URL
- Web 前端和扩展端所有复制/下载入口统一走转换函数
- 扩展端 absolutizeMarkdownImages 正则扩大为所有根相对路径，并排除 // 协议相对 URL
---
 .../src/components/MarkdownView.vue           |  4 +--
 BillNote_extension/src/logic/api.ts           |  4 +--
 .../src/sidepanel/Sidepanel.vue               |  6 ++--
 .../HomePage/components/MarkdownViewer.tsx    | 10 +++---
 BillNote_frontend/src/utils/index.ts          | 31 +++++++++++++++++++
 5 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/BillNote_extension/src/components/MarkdownView.vue b/BillNote_extension/src/components/MarkdownView.vue
index a492703f..ece27120 100644
--- a/BillNote_extension/src/components/MarkdownView.vue
+++ b/BillNote_extension/src/components/MarkdownView.vue
@@ -10,11 +10,11 @@ const md = new MarkdownIt({ html: false, linkify: true, breaks: true })
 const html = computed(() => md.render(absolutizeMarkdownImages(stripSourceLink(props.markdown || ''))))
 
 async function copy() {
-  await navigator.clipboard.writeText(props.markdown)
+  await navigator.clipboard.writeText(absolutizeMarkdownImages(props.markdown))
 }
 
 function download() {
-  const blob = new Blob([props.markdown], { type: 'text/markdown;charset=utf-8' })
+  const blob = new Blob([absolutizeMarkdownImages(props.markdown)], { type: 'text/markdown;charset=utf-8' })
   const url = URL.createObjectURL(blob)
   const a = document.createElement('a')
   a.href = url
diff --git a/BillNote_extension/src/logic/api.ts b/BillNote_extension/src/logic/api.ts
index 9f935ea2..6121380d 100644
--- a/BillNote_extension/src/logic/api.ts
+++ b/BillNote_extension/src/logic/api.ts
@@ -208,10 +208,10 @@ export async function ping(): Promise<boolean> {
   }
 }
 
-// markdown 里的 /static/screenshots/xxx 是相对路径，extension 渲染时需要拼绝对地址
+// markdown 里的根相对路径图片（如 /static/screenshots/xxx）需要拼绝对地址
 export function absolutizeMarkdownImages(md: string): string {
   const base = backendUrl()
-  return md.replace(/!\[([^\]]*)\]\((\/static\/[^)]+)\)/g, (_, alt, path) => `![${alt}](${base}${path})`)
+  return md.replace(/!\[([^\]]*)\]\((?!https?:\/\/|data:|\/\/)(\/[^)]+)\)/g, (_, alt, path) => `![${alt}](${base}${path})`)
 }
 
 // backend 用 note_helper 在笔记开头插一行 '> 来源链接：URL'。侧边栏顶部已经有原片链接卡片，
diff --git a/BillNote_extension/src/sidepanel/Sidepanel.vue b/BillNote_extension/src/sidepanel/Sidepanel.vue
index 155625b7..f916e5c1 100644
--- a/BillNote_extension/src/sidepanel/Sidepanel.vue
+++ b/BillNote_extension/src/sidepanel/Sidepanel.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref } from 'vue'
-import { getTaskStatus, resolveImageUrl } from '~/logic/api'
+import { getTaskStatus, resolveImageUrl, absolutizeMarkdownImages } from '~/logic/api'
 import { tasks, tasksReady, settingsReady, upsertTask } from '~/logic/storage'
 import type { TaskRecord } from '~/logic/types'
 
@@ -72,7 +72,7 @@ function openOptions() {
 async function copyMarkdown() {
   const md = activeTask.value?.result?.markdown
   if (md)
-    await navigator.clipboard.writeText(md)
+    await navigator.clipboard.writeText(absolutizeMarkdownImages(md))
 }
 
 function downloadMarkdown() {
@@ -80,7 +80,7 @@ function downloadMarkdown() {
   if (!md)
     return
   const title = (activeTask.value?.result?.audio_meta as { title?: string } | undefined)?.title || 'bilinote'
-  const blob = new Blob([md], { type: 'text/markdown;charset=utf-8' })
+  const blob = new Blob([absolutizeMarkdownImages(md)], { type: 'text/markdown;charset=utf-8' })
   const url = URL.createObjectURL(blob)
   const a = document.createElement('a')
   a.href = url
diff --git a/BillNote_frontend/src/pages/HomePage/components/MarkdownViewer.tsx b/BillNote_frontend/src/pages/HomePage/components/MarkdownViewer.tsx
index c34a0e54..305cc118 100644
--- a/BillNote_frontend/src/pages/HomePage/components/MarkdownViewer.tsx
+++ b/BillNote_frontend/src/pages/HomePage/components/MarkdownViewer.tsx
@@ -19,6 +19,7 @@ import 'katex/dist/katex.min.css'
 import 'github-markdown-css/github-markdown-light.css'
 import { ScrollArea } from '@/components/ui/scroll-area.tsx'
 import { useTaskStore } from '@/store/taskStore'
+import { toPortableMarkdown, getBackendOrigin } from '@/utils/index'
 import { noteStyles } from '@/constant/note.ts'
 import { MarkdownHeader } from '@/pages/HomePage/components/MarkdownHeader.tsx'
 import TranscriptViewer from '@/pages/HomePage/components/transcriptViewer.tsx'
@@ -320,8 +321,7 @@ const MarkdownViewer: FC<MarkdownViewerProps> = memo(({ status }) => {
   const [modelName, setModelName] = useState<string>('')
   const [style, setStyle] = useState<string>('')
   const [createTime, setCreateTime] = useState<string>('')
-  // 确保baseURL没有尾部斜杠
-  const baseURL = (String(import.meta.env.VITE_API_BASE_URL || '').replace('/api','') || '').replace(/\/$/, '')
+  const baseURL = getBackendOrigin()
   const getCurrentTask = useTaskStore.getState().getCurrentTask
   const currentTask = useTaskStore(state => state.getCurrentTask())
   const taskStatus = currentTask?.status || 'PENDING'
@@ -368,7 +368,8 @@ const MarkdownViewer: FC<MarkdownViewerProps> = memo(({ status }) => {
   }, [currentVerId, currentTask?.id])
   const handleCopy = async () => {
     try {
-      await navigator.clipboard.writeText(selectedContent)
+      const portable = toPortableMarkdown(selectedContent, baseURL)
+      await navigator.clipboard.writeText(portable)
       setCopied(true)
       toast.success('已复制到剪贴板')
       setTimeout(() => setCopied(false), 2000)
@@ -406,7 +407,8 @@ const MarkdownViewer: FC<MarkdownViewerProps> = memo(({ status }) => {
   const handleDownload = () => {
     const task = getCurrentTask()
     const name = task?.audioMeta.title || 'note'
-    const blob = new Blob([selectedContent], { type: 'text/markdown;charset=utf-8' })
+    const portable = toPortableMarkdown(selectedContent, baseURL)
+    const blob = new Blob([portable], { type: 'text/markdown;charset=utf-8' })
     const link = document.createElement('a')
     link.href = URL.createObjectURL(blob)
     link.download = `${name}.md`
diff --git a/BillNote_frontend/src/utils/index.ts b/BillNote_frontend/src/utils/index.ts
index 21186435..b1f7df84 100644
--- a/BillNote_frontend/src/utils/index.ts
+++ b/BillNote_frontend/src/utils/index.ts
@@ -1,3 +1,34 @@
+/**
+ * 安全获取后端 origin，用于将 Markdown 中的根相对图片路径转为绝对 URL。
+ *
+ * 解析策略（按优先级）：
+ * 1. VITE_API_BASE_URL 是完整 URL → 取 origin（如 https://api.example.com）
+ * 2. VITE_API_BASE_URL 是根相对路径（如 /api）→ 拼 window.location.origin
+ * 3. 未配置 → window.location.origin（Docker/nginx 代理场景，前后端同源）
+ */
+export function getBackendOrigin(): string {
+  const raw = import.meta.env.VITE_API_BASE_URL
+  if (!raw) return window.location.origin
+  try {
+    // 完整 URL（http://...、https://...）→ 直接取 origin
+    const url = new URL(raw)
+    return url.origin
+  } catch {
+    // 根相对路径（/api、/static 等）→ 拼当前页面 origin
+    return window.location.origin
+  }
+}
+
+/**
+ * 将 Markdown 中根相对路径的图片（如 /static/screenshots/xxx.jpg）
+ * 转换为绝对 URL，使复制/下载后的 Markdown 在外部工具中也能正常显示图片。
+ * 已经是 http://、https://、data: 的图片不做处理。
+ */
+export function toPortableMarkdown(md: string, backendBaseUrl: string): string {
+  const base = backendBaseUrl.replace(/\/$/, '')
+  return md.replace(/!\[([^\]]*)\]\((?!https?:\/\/|data:|\/\/)(\/[^)]+)\)/g, (_, alt, path) => `![${alt}](${base}${path})`)
+}
+
 // 解析URL
 export function parseUrl(url: string): { protocol: string, host: string, path: string } {
   const urlObj = new URL(url);

From 3505d20c7d272af4714acbac47f535d897d3073f Mon Sep 17 00:00:00 2001
From: markyangkp <markyangkp@outlook.com>
Date: Fri, 29 May 2026 02:27:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(frontend):=20Docker=20=E9=83=A8?=
 =?UTF-8?q?=E7=BD=B2=E5=AD=90=E8=B7=AF=E7=94=B1=E5=88=B7=E6=96=B0=E7=99=BD?=
 =?UTF-8?q?=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Docker 构建时 base: './' 导致资源使用相对路径，在 /settings 等
子路由刷新时浏览器将 ./assets/xxx.js 解析到错误路径，JS 加载失败。
改为 Docker 构建时使用 base: '/'（绝对路径），本地/Tauri 保持 './'。
---
 BillNote_frontend/Dockerfile     | 1 +
 BillNote_frontend/vite.config.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BillNote_frontend/Dockerfile b/BillNote_frontend/Dockerfile
index da5637cb..c6fec83f 100644
--- a/BillNote_frontend/Dockerfile
+++ b/BillNote_frontend/Dockerfile
@@ -8,6 +8,7 @@ FROM ${BASE_REGISTRY}/library/node:20-alpine AS builder
 # 可由发布 workflow 从 git tag 注入，用于前端 About 页展示版本；未传时由 Vite 回退读取 tauri.conf.json。
 ARG VITE_APP_VERSION=
 ENV VITE_APP_VERSION=${VITE_APP_VERSION}
+ENV DOCKER_BUILD=1
 
 # pnpm pin 到 9.x：lockfile 是 v9 生成；pnpm 11 要求 Node 22+ 与 node:20 不兼容
 RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
diff --git a/BillNote_frontend/vite.config.ts b/BillNote_frontend/vite.config.ts
index e2af180b..044b848e 100644
--- a/BillNote_frontend/vite.config.ts
+++ b/BillNote_frontend/vite.config.ts
@@ -31,7 +31,7 @@ export default defineConfig(({ mode }) => {
   const appVersion = env.VITE_APP_VERSION || process.env.VITE_APP_VERSION || readAppVersion()
 
   return {
-    base: './',
+    base: process.env.DOCKER_BUILD ? '/' : './',
     define: {
       __APP_VERSION__: JSON.stringify(appVersion),
     },

From 3dc3ccbf386a568c9879433bda66c2ccc6f7e5bd Mon Sep 17 00:00:00 2001
From: markyangkp <markyangkp@outlook.com>
Date: Fri, 29 May 2026 17:49:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=88=AA=E5=9B=BE=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=90=8E=20404=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Root Cause
Markdown 缓存写入时机错误。缓存文件在  中写入的是 GPT
原始输出（含 *Screenshot-[mm:ss] 标记），但截图 URL 替换发生在后续的
 中。导致：
- 首次显示：前端拿到内存中最终处理过的 Markdown，截图正常
- 刷新页面：前端从缓存读到未经替换的原始 Markdown，截图丢失

## Fixes
1. note.py: 在 _post_process_markdown 后会写 Markdown 缓存，
   确保缓存保存的是含 ![](/static/screenshots/xxx.jpg) 的最终版本
2. screenshot_marker.py: 正则 \d{2} → \d{1,2}，兼容 LLM 输出的 1-digit 时间格式
3. prompt_builder.py: 增强 Prompt 格式约束，明确要求两位数字
4. test_screenshot_marker.py: 新增 6 个测试用例覆盖 1-digit 时间等边缘情况
---
 backend/app/gpt/prompt_builder.py       |  7 ++--
 backend/app/services/note.py            | 13 ++++++--
 backend/app/utils/screenshot_marker.py  |  2 +-
 backend/tests/test_screenshot_marker.py | 43 +++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/backend/app/gpt/prompt_builder.py b/backend/app/gpt/prompt_builder.py
index 78606307..4b91e515 100644
--- a/backend/app/gpt/prompt_builder.py
+++ b/backend/app/gpt/prompt_builder.py
@@ -103,8 +103,11 @@ def get_link_format():
 
 def get_screenshot_format():
     return '''
-11. **原片截图**:你收到的截图一般是一个网格，网格的每张图片就是一个时间点，左上角会包含时间mm:ss的格式，请你结合我发你的图片插入截图提示，请你帮助用户更好的理解视频内容，请你认真的分析每个图片和对应的转写文案，插入最合适的内容来备注用户理解，请一定按照这个格式 返回否则系统无法解析：
-- 格式：`*Screenshot-[mm:ss]`
+11. **原片截图**: 你收到的截图一般是一个网格，每张图片就是一个时间点，左上角会包含时间 mm:ss 格式。请结合图片和转写文案，在最合适的位置插入截图提示，帮助用户理解视频内容。
+
+**必须严格遵循以下格式**（否则系统无法解析）：
+- 格式：`*Screenshot-[mm:ss]`（注意：时间必须使用两位数字，如 `*Screenshot-[01:05]`，而非 `*Screenshot-[1:5]`）
+- 只在对理解内容真正有帮助的地方插入
 
     '''
 
diff --git a/backend/app/services/note.py b/backend/app/services/note.py
index ebbe83a6..b0114635 100644
--- a/backend/app/services/note.py
+++ b/backend/app/services/note.py
@@ -225,6 +225,14 @@ def generate(
 
             markdown = prepend_source_link(markdown, str(video_url))
 
+            # 4.1 用最终版本（含截图 URL、来源链接）覆盖缓存，
+            #     避免刷新页面时前端从缓存读到未经 post-process 的原始 Markdown
+            try:
+                markdown_cache_file.write_text(markdown, encoding="utf-8")
+                logger.info(f"已用后处理结果覆盖缓存 ({markdown_cache_file})")
+            except Exception as exc:
+                logger.warning(f"覆盖 Markdown 缓存失败：{exc}")
+
             # 5. 保存记录到数据库
             self._update_status(task_id, TaskStatus.SAVING)
             self._save_metadata(video_id=audio_meta.video_id, platform=platform, task_id=task_id)
@@ -667,9 +675,8 @@ def _insert_screenshots(self, markdown: str, video_path: Path) -> str | None | A
                 img_url = f"{IMAGE_BASE_URL.rstrip('/')}/{filename}"
                 markdown = markdown.replace(marker, f"![]({img_url})", 1)
             except Exception as exc:
-                logger.error(f"生成截图失败 (timestamp={ts})：{exc}")
-                # self._handle_exception(task_id, exc)
-                return None
+                logger.error(f"生成截图失败 (timestamp={ts}, marker={marker})：{exc}")
+                continue
         return markdown
 
     @staticmethod
diff --git a/backend/app/utils/screenshot_marker.py b/backend/app/utils/screenshot_marker.py
index 2e3b056e..0603d03b 100644
--- a/backend/app/utils/screenshot_marker.py
+++ b/backend/app/utils/screenshot_marker.py
@@ -3,7 +3,7 @@
 
 
 def extract_screenshot_timestamps(markdown: str) -> List[Tuple[str, int]]:
-    pattern = r"(\*?Screenshot-(?:\[(\d{2}):(\d{2})\]|(\d{2}):(\d{2})))"
+    pattern = r"(\*?Screenshot-(?:\[(\d{1,2}):(\d{1,2})\]|(\d{1,2}):(\d{1,2})))"
     results: List[Tuple[str, int]] = []
     for match in re.finditer(pattern, markdown):
         mm = match.group(2) or match.group(4)
diff --git a/backend/tests/test_screenshot_marker.py b/backend/tests/test_screenshot_marker.py
index f947ef87..5ba22cd2 100644
--- a/backend/tests/test_screenshot_marker.py
+++ b/backend/tests/test_screenshot_marker.py
@@ -30,6 +30,49 @@ def test_extract_accepts_legacy_formats(self):
             ],
         )
 
+    def test_extract_accepts_single_digit_minutes(self):
+        """LLM 有时输出 1-digit 分钟（如 *Screenshot-[1:05]），本应兼容"""
+        markdown = "*Screenshot-[1:05]"
+        matches = extract_screenshot_timestamps(markdown)
+        self.assertEqual(matches, [("*Screenshot-[1:05]", 65)])
+
+    def test_extract_accepts_single_digit_both(self):
+        """兼容分钟和秒都是 1-digit 的情况（如 *Screenshot-[1:5]）"""
+        markdown = "*Screenshot-[1:5]"
+        matches = extract_screenshot_timestamps(markdown)
+        self.assertEqual(matches, [("*Screenshot-[1:5]", 65)])
+
+    def test_extract_accepts_mixed_digits(self):
+        """混合 1-digit 和 2-digit 格式"""
+        markdown = "A *Screenshot-[01:05] B *Screenshot-[1:05] C *Screenshot-[1:5]"
+        matches = extract_screenshot_timestamps(markdown)
+        self.assertEqual(
+            matches,
+            [
+                ("*Screenshot-[01:05]", 65),
+                ("*Screenshot-[1:05]", 65),
+                ("*Screenshot-[1:5]", 65),
+            ],
+        )
+
+    def test_extract_without_asterisk_single_digit(self):
+        """Screenshot- 不带星号 + 1-digit 分钟"""
+        markdown = "Screenshot-[1:05]"
+        matches = extract_screenshot_timestamps(markdown)
+        self.assertEqual(matches, [("Screenshot-[1:05]", 65)])
+
+    def test_extract_long_timestamp(self):
+        """10 分钟以上时间戳（如 10:30），确保多位数字正常匹配"""
+        markdown = "*Screenshot-[10:30]"
+        matches = extract_screenshot_timestamps(markdown)
+        self.assertEqual(matches, [("*Screenshot-[10:30]", 630)])
+
+    def test_extract_no_match(self):
+        """不含截图标记的文本应返回空列表"""
+        markdown = "这是一段普通文本，没有截图标记"
+        matches = extract_screenshot_timestamps(markdown)
+        self.assertEqual(matches, [])
+
 
 if __name__ == "__main__":
     unittest.main()