From c393a5231ed5aef0792b0597b21422563bcdfe98 Mon Sep 17 00:00:00 2001 From: que01 Date: Sat, 19 Sep 2026 18:20:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3=E4=B8=8E=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=AB=98=E4=BC=98=E5=85=88=E7=BA=A7=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/src/entry.ts | 2 +- apps/admin/src/main.tsx | 6 +++--- apps/admin/src/vite-env.d.ts | 7 +++++++ apps/api/src/admin.dto.ts | 11 +++++++++++ apps/api/src/main.ts | 27 +++++++++++++++++++------- apps/api/test/http.integration.test.js | 14 ++++++++++--- 6 files changed, 53 insertions(+), 14 deletions(-) create mode 100644 apps/admin/src/vite-env.d.ts diff --git a/apps/admin/src/entry.ts b/apps/admin/src/entry.ts index cb33047..06fda3c 100644 --- a/apps/admin/src/entry.ts +++ b/apps/admin/src/entry.ts @@ -10,7 +10,7 @@ if (root) { event.preventDefault(); const username = (root.querySelector("#username") as HTMLInputElement).value; const password = (root.querySelector("#password") as HTMLInputElement).value; - try { const client = new ApiClient({ baseUrl: "http://localhost:3001", fetcher: (input, init) => fetch(input, init) }); const result = await client.loginAdmin(username, password); localStorage.setItem("adminToken", result.token); location.reload(); } catch (error) { alert(error instanceof Error ? error.message : "登录失败"); } + try { const client = new ApiClient({ baseUrl: import.meta.env.VITE_API_BASE_URL ?? "http://localhost:3001", fetcher: (input, init) => fetch(input, init) }); const result = await client.loginAdmin(username, password); localStorage.setItem("adminToken", result.token); location.reload(); } catch (error) { alert(error instanceof Error ? error.message : "登录失败"); } }); } else bootstrapAdmin(root); } diff --git a/apps/admin/src/main.tsx b/apps/admin/src/main.tsx index c54432e..b0de915 100644 --- a/apps/admin/src/main.tsx +++ b/apps/admin/src/main.tsx @@ -6,7 +6,7 @@ import { ApiClient } from "@personal-brand/api-client"; import type { BrandProfile, PublicService, TrustContent, TrustContentInput } from "@personal-brand/api-client"; import "antd/dist/reset.css"; -const apiBaseUrl = "http://localhost:3001"; +const apiBaseUrl = import.meta.env.VITE_API_BASE_URL ?? "http://localhost:3001"; const queryClient = new QueryClient(); const api = () => new ApiClient({ baseUrl: apiBaseUrl, token: localStorage.getItem("adminToken") ?? undefined, fetcher: (input, init) => fetch(input, init) }); @@ -29,10 +29,10 @@ function BrandPage() { function TrustContentPage() { const client = api(); const queryClientHook = useQueryClient(); const [editing, setEditing] = useState(null); const [modalOpen, setModalOpen] = useState(false); const [form] = Form.useForm(); const query = useQuery({ queryKey: ["trust-content"], queryFn: () => client.listAdminTrustContent() }); - const save = useMutation({ mutationFn: (values: TrustContentInput) => editing ? client.updateAdminTrustContent(editing.id, values) : client.createAdminTrustContent(values), onSuccess: () => { message.success("信任内容已保存"); setEditing(null); form.resetFields(); void queryClientHook.invalidateQueries({ queryKey: ["trust-content"] }); } }); + const save = useMutation({ mutationFn: (values: TrustContentInput) => editing ? client.updateAdminTrustContent(editing.id, values) : client.createAdminTrustContent(values), onSuccess: () => { message.success("信任内容已保存"); setModalOpen(false); setEditing(null); form.resetFields(); void queryClientHook.invalidateQueries({ queryKey: ["trust-content"] }); } }); const remove = useMutation({ mutationFn: (id: string) => client.deleteAdminTrustContent(id), onSuccess: () => { message.success("内容已删除"); void queryClientHook.invalidateQueries({ queryKey: ["trust-content"] }); } }); function open(item?: TrustContent) { setEditing(item ?? null); setModalOpen(true); form.setFieldsValue(item ? { type: item.type, title: item.title, summary: item.summary ?? undefined, content: item.content, sortOrder: item.sortOrder, isPublished: item.isPublished } : { type: "profile", isPublished: true }); } - return open()}>新增内容}>{value} }, { title: "标题", dataIndex: "title" }, { title: "状态", dataIndex: "isPublished", render: (value) => value ? "已发布" : "草稿" }, { title: "操作", render: (_: unknown, item: TrustContent) => remove.mutate(item.id)}> }]} /> { setModalOpen(false); setEditing(null); form.resetFields(); }} onOk={() => form.submit()} confirmLoading={save.isPending}>
{ save.mutate(values); setModalOpen(false); }}>
{value} }, { title: "标题", dataIndex: "title" }, { title: "状态", dataIndex: "isPublished", render: (value) => value ? "已发布" : "草稿" }, { title: "操作", render: (_: unknown, item: TrustContent) => remove.mutate(item.id)}> }]} /> { setModalOpen(false); setEditing(null); form.resetFields(); }} onOk={() => form.submit()} confirmLoading={save.isPending}> save.mutate(values)}>