update:plugin config path

mkitsdts · mkitsdts · commit 228ad6e5aab8 · 2025-10-01T20:12:07.000+08:00
diff --git a/plugin/README.md b/plugin/README.md
@@ -8,10 +8,10 @@
 - 右键或按钮删除文章。
 
 ## 扩展设置
-- `mkBlog.uploadUrl`: 上传接口 URL（PUT, multipart/form-data）
-- `mkBlog.listUrl`: 文章列表接口 URL（GET 返回数组或 `{ data: [] }`）
-- `mkBlog.deleteUrl`: 删除接口 URL，使用 `{id}` 占位符
-- `mkBlog.authToken`: 可选 Bearer Token
+- `mkBlog.baseUrl`: 后端服务基础地址（例如 `http://localhost:8080`）。各接口会自动拼接 `/api/articles`、`/api/article/:title`、`/api/image` 等路径。
+- `mkBlog.defaultAuthor`: 若 Markdown 中未声明作者时使用的默认作者。
+- `mkBlog.defaultCategory`: 若 Markdown 中未声明分类时使用的默认分类。
+- `mkBlog.authToken`: 可选 Bearer Token，会通过 `Authorization: Bearer <token>` 头发送。
 
 ## 命令
 - `mkBlog: 上传文件夹为博客`
diff --git a/plugin/package.json b/plugin/package.json
@@ -72,35 +72,25 @@
             "type": "object",
             "title": "mkBlog Settings",
             "properties": {
-                "mkBlog.uploadArticleUrl": {
+                "mkBlog.baseUrl": {
                     "type": "string",
-                    "default": "http://localhost:3000/article/{title}",
-                    "description": "Article upload URL(PUT Article JSON)。Support {title} or {id} as placeholder"
+                    "default": "http://localhost:8080",
+                    "description": "后端服务基础地址，例如 http://localhost:8080"
                 },
-                "mkBlog.uploadImageUrl": {
+                "mkBlog.defaultAuthor": {
                     "type": "string",
-                    "default": "http://localhost:3000/image",
-                    "description": "Image upload URL(PUT Image JSON,includes title/data/name)"
+                    "default": "",
+                    "description": "文章默认作者(可在 Markdown 元数据中覆盖)"
                 },
                 "mkBlog.author": {
                     "type": "string",
                     "default": "",
-                    "description": "Default author(Article.Author)"
+                    "description": "(兼容旧版本) 文章默认作者，建议改用 mkBlog.defaultAuthor"
                 },
                 "mkBlog.defaultCategory": {
                     "type": "string",
                     "default": "General",
-                    "description": "Default category(Article.Category)"
-                },
-                "mkBlog.listUrl": {
-                    "type": "string",
-                    "default": "http://localhost:3000/api/articles",
-                    "description": "Article list API URL(GET)"
-                },
-                "mkBlog.deleteUrl": {
-                    "type": "string",
-                    "default": "http://localhost:3000/article/{title}",
-                    "description": "Delete article API URL, support placeholder {title} (replace with filename/title) or {id}?"
+                    "description": "文章默认分类(可在 Markdown 元数据中覆盖)"
                 },
                 "mkBlog.authToken": {
                     "type": "string",
diff --git a/plugin/src/extension.ts b/plugin/src/extension.ts
@@ -1,19 +1,19 @@
 import * as vscode from 'vscode';
 import { ArticleProvider, ArticleTreeItem } from './tree/ArticleProvider';
-import { fetchArticles, deleteArticleById } from './net/api';
+import { fetchArticles, deleteArticleByTitle } from './net/api';
 import { uploadFolderAsBlog } from './uploader';
 
 export async function activate(context: vscode.ExtensionContext) {
   const articleProvider = new ArticleProvider(async () => {
     const cfg = vscode.workspace.getConfiguration();
-    const listUrl = cfg.get<string>('mkBlog.listUrl');
+    const baseUrl = (cfg.get<string>('mkBlog.baseUrl') || '').trim();
     const token = cfg.get<string>('mkBlog.authToken') || '';
-    if (!listUrl) {
-      vscode.window.showWarningMessage('mkBlog: 未配置 listUrl');
+    if (!baseUrl) {
+      vscode.window.showWarningMessage('mkBlog: 未配置 baseUrl');
       return [];
     }
     try {
-      const items = await fetchArticles(listUrl, token);
+      const items = await fetchArticles(baseUrl, token);
       return items;
     } catch (err: any) {
       vscode.window.showErrorMessage(`获取文章列表失败: ${err?.message || err}`);
@@ -46,18 +46,14 @@ export async function activate(context: vscode.ExtensionContext) {
       );
       if (confirm !== '删除') return;
       const cfg = vscode.workspace.getConfiguration();
-      const template = cfg.get<string>('mkBlog.deleteUrl');
+      const baseUrl = (cfg.get<string>('mkBlog.baseUrl') || '').trim();
       const token = cfg.get<string>('mkBlog.authToken') || '';
-      if (!template) {
-        vscode.window.showWarningMessage('mkBlog: 未配置 deleteUrl');
+      if (!baseUrl) {
+        vscode.window.showWarningMessage('mkBlog: 未配置 baseUrl');
         return;
       }
-  // 同时支持 {id} 与 {title} 两种占位符
-  let url = template;
-  url = url.replace('{id}', encodeURIComponent(String(picked.id)));
-  url = url.replace('{title}', encodeURIComponent(String(picked.title)));
       try {
-        await deleteArticleById(url, token);
+        await deleteArticleByTitle(baseUrl, String(picked.title), token);
         vscode.window.showInformationMessage('删除成功');
         await articleProvider.refresh();
       } catch (err: any) {
diff --git a/plugin/src/net/api.ts b/plugin/src/net/api.ts
@@ -5,7 +5,14 @@ export interface RawArticle {
   title: string;
 }
 
-export async function fetchArticles(listUrl: string, token?: string): Promise<RawArticle[]> {
+function joinUrl(baseUrl: string, path: string): string {
+  const base = (baseUrl || '').replace(/\/+$/, '');
+  const suffix = path.startsWith('/') ? path : `/${path}`;
+  return `${base}${suffix}`;
+}
+
+export async function fetchArticles(baseUrl: string, token?: string): Promise<RawArticle[]> {
+  const listUrl = joinUrl(baseUrl, '/api/allarticles');
   const headers: Record<string, string> = { 'Accept': 'application/json' };
   if (token) headers['Authorization'] = `Bearer ${token}`;
   const res = await fetch(listUrl, { method: 'GET', headers });
@@ -42,7 +49,17 @@ export async function fetchArticles(listUrl: string, token?: string): Promise<Ra
   }));
 }
 
-export async function deleteArticleById(url: string, token?: string): Promise<void> {
+export function buildArticleEndpoint(baseUrl: string, title: string): string {
+  const encoded = encodeURIComponent(title);
+  return joinUrl(baseUrl, `/api/article/${encoded}`);
+}
+
+export function buildImageEndpoint(baseUrl: string): string {
+  return joinUrl(baseUrl, '/api/image');
+}
+
+export async function deleteArticleByTitle(baseUrl: string, title: string, token?: string): Promise<void> {
+  const url = buildArticleEndpoint(baseUrl, title);
   const headers: Record<string, string> = { 'Accept': 'application/json' };
   if (token) headers['Authorization'] = `Bearer ${token}`;
   const res = await fetch(url, { method: 'DELETE', headers });
diff --git a/plugin/src/uploader.ts b/plugin/src/uploader.ts
@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import * as path from 'path';
 import { findMarkdownFilesWithImageFolders } from './utils/fs';
+import { buildArticleEndpoint, buildImageEndpoint } from './net/api';
 
 function extractMeta(md: string): { author?: string; category?: string; content: string } {
   let author: string | undefined;
@@ -56,11 +57,10 @@ function extractMeta(md: string): { author?: string; category?: string; content:
 
 export async function uploadFolderAsBlog(uri?: vscode.Uri) {
   const cfg = vscode.workspace.getConfiguration();
-  const uploadArticleUrl = cfg.get<string>('mkBlog.uploadArticleUrl');
-  const uploadImageUrl = cfg.get<string>('mkBlog.uploadImageUrl');
+  const baseUrl = (cfg.get<string>('mkBlog.baseUrl') || '').trim();
   const token = cfg.get<string>('mkBlog.authToken') || '';
-  if (!uploadArticleUrl && !uploadImageUrl) {
-    throw new Error('未配置上传接口：mkBlog.uploadArticleUrl 或 mkBlog.uploadImageUrl');
+  if (!baseUrl) {
+    throw new Error('未配置 mkBlog.baseUrl');
   }
 
   // 优先使用传入目录；否则使用已打开的工作区根目录；若都没有，再让用户选择
@@ -85,6 +85,8 @@ export async function uploadFolderAsBlog(uri?: vscode.Uri) {
   const headers: Record<string, string> = {};
   if (token) headers['Authorization'] = `Bearer ${token}`;
 
+  const imageEndpoint = buildImageEndpoint(baseUrl);
+
   for (const t of tasks) {
     const title = path.basename(t.mdPath, '.md');
     // 分离上传：文章 PUT /article/{title}，图片逐张 PUT /image
@@ -100,31 +102,29 @@ export async function uploadFolderAsBlog(uri?: vscode.Uri) {
       content: meta.content,
     };
     if (meta.author) article.author = meta.author;
-    else article.author = cfg.get<string>('mkBlog.defaultAuthor');
+    else article.author = cfg.get<string>('mkBlog.defaultAuthor') ?? cfg.get<string>('mkBlog.author');
 
     if (meta.category) article.category = meta.category;
     else article.category = cfg.get<string>('mkBlog.defaultCategory');
 
-    if (uploadArticleUrl) {
-      try {
-        const articleUrl = uploadArticleUrl.replace('{title}', encodeURIComponent(title));
+    try {
+      const articleUrl = buildArticleEndpoint(baseUrl, title);
         const jsonHeaders: Record<string, string> = { ...headers, 'Content-Type': 'application/json' };
         const res = await fetch(articleUrl, { method: 'PUT', body: JSON.stringify(article), headers: jsonHeaders });
         if (!res.ok) {
           const text = await res.text().catch(() => '');
           vscode.window.showWarningMessage(`上传文章失败(JSON): ${path.basename(t.mdPath)} -> HTTP ${res.status} ${res.statusText} ${text}，将继续上传图片。`);
         }
-      } catch (err: any) {
-        vscode.window.showWarningMessage(`上传文章异常: ${path.basename(t.mdPath)} -> ${err?.message || err}，将继续上传图片。`);
-      }
+    } catch (err: any) {
+      vscode.window.showWarningMessage(`上传文章异常: ${path.basename(t.mdPath)} -> ${err?.message || err}，将继续上传图片。`);
     }
 
-    if (uploadImageUrl) {
+    if (imageEndpoint) {
       for (const img of t.images) {
         const base64 = Buffer.from(img.buffer).toString('base64');
         const payload = { title, data: base64, name: img.name };
         const jsonHeaders: Record<string, string> = { ...headers, 'Content-Type': 'application/json' };
-        const res = await fetch(uploadImageUrl, { method: 'PUT', body: JSON.stringify(payload), headers: jsonHeaders });
+        const res = await fetch(imageEndpoint, { method: 'PUT', body: JSON.stringify(payload), headers: jsonHeaders });
         if (!res.ok) {
           const text = await res.text().catch(() => '');
           throw new Error(`上传图片失败(JSON): ${img.name} -> HTTP ${res.status} ${res.statusText} ${text}`);
