diff --git a/apps/admin/src/features/publication/PublicationPage.tsx b/apps/admin/src/features/publication/PublicationPage.tsx index eab0fef..41abfb6 100644 --- a/apps/admin/src/features/publication/PublicationPage.tsx +++ b/apps/admin/src/features/publication/PublicationPage.tsx @@ -1,4 +1,4 @@ -import { useEffect, useState } from "react"; +import { useState } from "react"; import { useNavigate } from "react-router-dom"; import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; import { @@ -41,10 +41,6 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool const [confirmAction, setConfirmAction] = useState<"publish" | "revoke" | null>(null); const [rollbackVersion, setRollbackVersion] = useState(null); const [note, setNote] = useState(""); - const [settingsOpen, setSettingsOpen] = useState(false); - const [settingsAppId, setSettingsAppId] = useState(""); - const [settingsArtifactPath, setSettingsArtifactPath] = useState(""); - const [settingsPrivateKey, setSettingsPrivateKey] = useState(""); const [activeTab, setActiveTab] = useState("content"); const brand = useQuery({ queryKey: ["publication-brand"], @@ -148,19 +144,15 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool refresh(); }, }); - const createMiniAppRelease = useMutation({ - mutationFn: () => client.createAdminMiniAppRelease(), - onSuccess: () => { - message.success("小程序发布任务已创建"); - void miniAppReleases.refetch(); + const uploadLatestMiniAppRelease = useMutation({ + mutationFn: async () => { + const latest = await client.getLatestAdminMiniAppRelease(); + if (!latest) throw new Error("还没有可发布的内容版本"); + return client.uploadAdminMiniAppRelease(latest.id); }, - }); - const saveMiniAppSettings = useMutation({ - mutationFn: (values: { appId?: string; artifactPath?: string; privateKey?: string }) => - client.updateAdminMiniAppSettings(values), onSuccess: () => { - message.success("小程序上传配置已保存"); - void miniAppSettings.refetch(); + message.success("小程序代码已上传"); + void miniAppReleases.refetch(); }, }); const uploadMiniAppRelease = useMutation({ @@ -219,13 +211,6 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool ? brand.data.config.visualTemplateKey : (visuals[0]?.key ?? null); const currentRelease = releases.data?.find((item) => item.status === "published"); - const settings = miniAppSettings.data; - useEffect(() => { - if (!miniAppSettings.data) return; - setSettingsAppId(miniAppSettings.data.appId); - setSettingsArtifactPath(miniAppSettings.data.artifactPath); - setSettingsPrivateKey(""); - }, [settings]); const publishedHistory = (releases.data ?? []).filter( (item) => item.status === "published" || item.status === "superseded", ); @@ -438,13 +423,13 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool - {miniAppSettings.data?.hasStoredCredentials ? ( 已配置上传凭据 ) : ( @@ -590,44 +575,6 @@ export function PublicationPage({ canManageTemplate }: { canManageTemplate: bool > 模板会更新当前品牌的草稿结构,不会立即改变已发布的小程序。请安装后核对业务内容与视觉模板。 - setSettingsOpen(false)} - confirmLoading={saveMiniAppSettings.isPending} - onOk={() => - saveMiniAppSettings.mutate({ - appId: settingsAppId, - artifactPath: settingsArtifactPath, - ...(settingsPrivateKey ? { privateKey: settingsPrivateKey } : {}), - }) - } - > - - setSettingsAppId(event.target.value)} - placeholder="微信 AppID" - /> - setSettingsArtifactPath(event.target.value)} - placeholder="服务端可访问的构建产物路径" - /> - setSettingsPrivateKey(event.target.value)} - placeholder={ - miniAppSettings.data?.hasStoredCredentials - ? "已加密保存,输入新值可替换" - : "微信上传私钥" - } - /> - - 私钥使用 AES-256-GCM 加密后保存;加密密钥只保留在服务端环境变量中。 - - - ); } diff --git a/apps/api/src/modules/admin/admin-miniapp-release.controller.ts b/apps/api/src/modules/admin/admin-miniapp-release.controller.ts index 21bd3df..3294d5b 100644 --- a/apps/api/src/modules/admin/admin-miniapp-release.controller.ts +++ b/apps/api/src/modules/admin/admin-miniapp-release.controller.ts @@ -47,6 +47,16 @@ export class AdminMiniAppReleaseController { private readonly prisma: PrismaService, ) {} + @Get("latest") + async latest(@Req() request: FastifyRequest): Promise { + const identity = await this.identity(request); + const task = await this.prisma.miniAppReleaseTask.findFirst({ + where: { brandId: identity.brandId }, + orderBy: { createdAt: "desc" }, + }); + return task ?? null; + } + @Get("settings") async settings(@Req() request: FastifyRequest): Promise { const identity = await this.identity(request); @@ -129,7 +139,8 @@ export class AdminMiniAppReleaseController { where: { id: taskId, brandId: identity.brandId }, }); if (!task) throw new BadRequestException("小程序发布任务不存在"); - if (task.status !== "built") throw new BadRequestException("当前小程序发布任务不能重复上传"); + if (task.status !== "built" && task.status !== "failed") + throw new BadRequestException("当前小程序发布任务不能重复上传"); const brand = await this.prisma.brandProfile.findUniqueOrThrow({ where: { id: identity.brandId }, select: { miniAppSettings: true }, diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts index 4b9e53f..5876956 100644 --- a/packages/api-client/src/index.ts +++ b/packages/api-client/src/index.ts @@ -212,6 +212,9 @@ export class ApiClient listAdminMiniAppReleases = ( ...arguments_: Parameters ) => this.resources.brand.listAdminMiniAppReleases(...arguments_); + getLatestAdminMiniAppRelease = ( + ...arguments_: Parameters + ) => this.resources.brand.getLatestAdminMiniAppRelease(...arguments_); createAdminMiniAppRelease = ( ...arguments_: Parameters ) => this.resources.brand.createAdminMiniAppRelease(...arguments_); diff --git a/packages/api-client/src/resources/brand.ts b/packages/api-client/src/resources/brand.ts index 36fc7c6..31594ba 100644 --- a/packages/api-client/src/resources/brand.ts +++ b/packages/api-client/src/resources/brand.ts @@ -62,6 +62,7 @@ export interface BrandMethods { Pick >; listAdminMiniAppReleases(): Promise; + getLatestAdminMiniAppRelease(): Promise; createAdminMiniAppRelease(releaseId?: string): Promise; uploadAdminMiniAppRelease( id: string, @@ -117,6 +118,7 @@ export function brandMethods({ request }: { request: RequestFn }): BrandMethods }), revokeAdminRelease: () => request("/admin/releases/revoke", { method: "POST" }), listAdminMiniAppReleases: () => request("/admin/miniapp-releases"), + getLatestAdminMiniAppRelease: () => request("/admin/miniapp-releases/latest"), createAdminMiniAppRelease: (releaseId) => request("/admin/miniapp-releases", { method: "POST",