feat(publish): add tenant publish management with desktop deep-link
Expose tenant-authenticated publish task list and retry endpoints so the admin web can show desktop publish state without an Electron bridge, and register a `shengxintui://` deep-link so the page can hand off to the desktop client workbench. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -77,6 +77,7 @@ const enUS = {
|
|||||||
freeCreate: 'Free Create',
|
freeCreate: 'Free Create',
|
||||||
imitation: 'Imitation Create',
|
imitation: 'Imitation Create',
|
||||||
media: 'Media',
|
media: 'Media',
|
||||||
|
publishManagement: 'Publish Management',
|
||||||
brandManagement: 'Brand Management',
|
brandManagement: 'Brand Management',
|
||||||
tracking: 'Tracking',
|
tracking: 'Tracking',
|
||||||
trackingDetail: 'Data Details',
|
trackingDetail: 'Data Details',
|
||||||
@@ -202,6 +203,11 @@ const enUS = {
|
|||||||
description:
|
description:
|
||||||
'Review desktop-managed media bindings, authorization state, and sync results in one place.',
|
'Review desktop-managed media bindings, authorization state, and sync results in one place.',
|
||||||
},
|
},
|
||||||
|
publishManagement: {
|
||||||
|
title: 'Publish Management',
|
||||||
|
description:
|
||||||
|
'Review desktop publish tasks, external links, account workbench entry points, and retry state.',
|
||||||
|
},
|
||||||
brands: {
|
brands: {
|
||||||
title: 'Brand Library',
|
title: 'Brand Library',
|
||||||
description: 'Manage keywords, question sets, and competitors around each brand.',
|
description: 'Manage keywords, question sets, and competitors around each brand.',
|
||||||
|
|||||||
@@ -77,6 +77,7 @@ const zhCN = {
|
|||||||
freeCreate: "自由创作",
|
freeCreate: "自由创作",
|
||||||
imitation: "仿写创作",
|
imitation: "仿写创作",
|
||||||
media: "媒体管理",
|
media: "媒体管理",
|
||||||
|
publishManagement: "发文管理",
|
||||||
brandManagement: "品牌管理",
|
brandManagement: "品牌管理",
|
||||||
brands: "品牌词库",
|
brands: "品牌词库",
|
||||||
tracking: "数据追踪",
|
tracking: "数据追踪",
|
||||||
@@ -195,6 +196,10 @@ const zhCN = {
|
|||||||
title: "媒体管理",
|
title: "媒体管理",
|
||||||
description: "统一查看桌面端媒体账号绑定、授权状态与同步结果。",
|
description: "统一查看桌面端媒体账号绑定、授权状态与同步结果。",
|
||||||
},
|
},
|
||||||
|
publishManagement: {
|
||||||
|
title: "发文管理",
|
||||||
|
description: "查看桌面端发布任务、外链、账号工作台入口和重发状态。",
|
||||||
|
},
|
||||||
brands: {
|
brands: {
|
||||||
title: "品牌词库",
|
title: "品牌词库",
|
||||||
description: "围绕品牌维护关键词、问题集和竞品信息。",
|
description: "围绕品牌维护关键词、问题集和竞品信息。",
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import {
|
|||||||
PictureOutlined,
|
PictureOutlined,
|
||||||
RadarChartOutlined,
|
RadarChartOutlined,
|
||||||
SearchOutlined,
|
SearchOutlined,
|
||||||
|
SendOutlined,
|
||||||
} from '@ant-design/icons-vue'
|
} from '@ant-design/icons-vue'
|
||||||
import { useQuery } from '@tanstack/vue-query'
|
import { useQuery } from '@tanstack/vue-query'
|
||||||
import { computed, type Component } from 'vue'
|
import { computed, type Component } from 'vue'
|
||||||
@@ -130,6 +131,7 @@ const navSections = computed<NavSection[]>(() => {
|
|||||||
title: t('nav.contentManagement'),
|
title: t('nav.contentManagement'),
|
||||||
items: [
|
items: [
|
||||||
{ key: '/media', label: t('nav.media'), icon: GlobalOutlined },
|
{ key: '/media', label: t('nav.media'), icon: GlobalOutlined },
|
||||||
|
{ key: '/publish-management', label: t('nav.publishManagement'), icon: SendOutlined },
|
||||||
{ key: '/knowledge', label: t('nav.knowledge'), icon: BookOutlined },
|
{ key: '/knowledge', label: t('nav.knowledge'), icon: BookOutlined },
|
||||||
{ key: '/images', label: t('nav.images'), icon: PictureOutlined },
|
{ key: '/images', label: t('nav.images'), icon: PictureOutlined },
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ import type {
|
|||||||
KolSubscriptionPromptCard,
|
KolSubscriptionPromptCard,
|
||||||
KolSubscriptionPromptSchema,
|
KolSubscriptionPromptSchema,
|
||||||
KolWorkspaceCard,
|
KolWorkspaceCard,
|
||||||
|
ListDesktopPublishTasksParams,
|
||||||
LoginRequest,
|
LoginRequest,
|
||||||
LoginResponse,
|
LoginResponse,
|
||||||
MediaPlatform,
|
MediaPlatform,
|
||||||
@@ -114,6 +115,7 @@ import type {
|
|||||||
TemplateSaveDraftResponse,
|
TemplateSaveDraftResponse,
|
||||||
TemplateTitleTaskRequest,
|
TemplateTitleTaskRequest,
|
||||||
TemplateTitleTaskResultResponse,
|
TemplateTitleTaskResultResponse,
|
||||||
|
TenantPublishTaskListResponse,
|
||||||
UpdateArticleRequest,
|
UpdateArticleRequest,
|
||||||
UpdateKolPackageRequest,
|
UpdateKolPackageRequest,
|
||||||
UpdateKolPromptRequest,
|
UpdateKolPromptRequest,
|
||||||
@@ -1105,6 +1107,19 @@ export const publishJobsApi = {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const publishTasksApi = {
|
||||||
|
list(params: ListDesktopPublishTasksParams = {}) {
|
||||||
|
return apiClient.get<TenantPublishTaskListResponse>('/api/tenant/publish-tasks', {
|
||||||
|
params,
|
||||||
|
})
|
||||||
|
},
|
||||||
|
retry(taskId: string) {
|
||||||
|
return apiClient.post<CreatePublishJobResponse>(
|
||||||
|
`/api/tenant/publish-tasks/${encodeURIComponent(taskId)}/retry`,
|
||||||
|
)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
export const complianceApi = {
|
export const complianceApi = {
|
||||||
runtimeStatus() {
|
runtimeStatus() {
|
||||||
return apiClient.get<ComplianceRuntimeStatus>('/api/tenant/compliance/runtime-status')
|
return apiClient.get<ComplianceRuntimeStatus>('/api/tenant/compliance/runtime-status')
|
||||||
|
|||||||
@@ -124,6 +124,16 @@ const router = createRouter({
|
|||||||
navKey: '/media',
|
navKey: '/media',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'publish-management',
|
||||||
|
name: 'publish-management',
|
||||||
|
component: () => import('@/views/PublishManagementView.vue'),
|
||||||
|
meta: {
|
||||||
|
titleKey: 'route.publishManagement.title',
|
||||||
|
descriptionKey: 'route.publishManagement.description',
|
||||||
|
navKey: '/publish-management',
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: 'brands',
|
path: 'brands',
|
||||||
name: 'brands',
|
name: 'brands',
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -46,6 +46,10 @@ mac:
|
|||||||
electronLanguages:
|
electronLanguages:
|
||||||
- en
|
- en
|
||||||
- zh_CN
|
- zh_CN
|
||||||
|
protocols:
|
||||||
|
- name: Shengxintui URL
|
||||||
|
schemes:
|
||||||
|
- shengxintui
|
||||||
extendInfo:
|
extendInfo:
|
||||||
NSCameraUsageDescription: 用于视频会议和录屏功能
|
NSCameraUsageDescription: 用于视频会议和录屏功能
|
||||||
NSMicrophoneUsageDescription: 用于音频采集
|
NSMicrophoneUsageDescription: 用于音频采集
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ if (process.platform === 'win32') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const isDevelopmentRuntime = !app.isPackaged
|
const isDevelopmentRuntime = !app.isPackaged
|
||||||
|
const desktopDeepLinkScheme = 'shengxintui'
|
||||||
|
|
||||||
function silencePackagedConsole(): void {
|
function silencePackagedConsole(): void {
|
||||||
if (isDevelopmentRuntime) {
|
if (isDevelopmentRuntime) {
|
||||||
@@ -119,6 +120,8 @@ let mainWindowCreatePromise: Promise<ElectronBrowserWindow> | null = null
|
|||||||
let loginWindowCreatePromise: Promise<ElectronBrowserWindow> | null = null
|
let loginWindowCreatePromise: Promise<ElectronBrowserWindow> | null = null
|
||||||
let settingsWindowCreatePromise: Promise<ElectronBrowserWindow> | null = null
|
let settingsWindowCreatePromise: Promise<ElectronBrowserWindow> | null = null
|
||||||
let windowModeSwitchQueue: Promise<void> = Promise.resolve()
|
let windowModeSwitchQueue: Promise<void> = Promise.resolve()
|
||||||
|
let canHandleDesktopDeepLinks = false
|
||||||
|
const pendingDesktopDeepLinks: string[] = []
|
||||||
const forceCloseWindows = new WeakSet<ElectronBrowserWindow>()
|
const forceCloseWindows = new WeakSet<ElectronBrowserWindow>()
|
||||||
const appWindowModes = new WeakMap<ElectronBrowserWindow, RendererWindowMode>()
|
const appWindowModes = new WeakMap<ElectronBrowserWindow, RendererWindowMode>()
|
||||||
|
|
||||||
@@ -489,19 +492,19 @@ function queueWindowModeSwitch(
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function openSettingsWindow(): Promise<void> {
|
async function openSettingsWindow(): Promise<void> {
|
||||||
const window = await ensureSettingsWindow();
|
const window = await ensureSettingsWindow()
|
||||||
const parent = settingsWindowParent();
|
const parent = settingsWindowParent()
|
||||||
if (parent && window.getParentWindow() !== parent) {
|
if (parent && window.getParentWindow() !== parent) {
|
||||||
window.setParentWindow(parent);
|
window.setParentWindow(parent)
|
||||||
}
|
}
|
||||||
await revealWindow(window);
|
await revealWindow(window)
|
||||||
}
|
}
|
||||||
|
|
||||||
function settingsWindowParent(): ElectronBrowserWindow | undefined {
|
function settingsWindowParent(): ElectronBrowserWindow | undefined {
|
||||||
if (process.platform !== "win32") {
|
if (process.platform !== 'win32') {
|
||||||
return undefined;
|
return undefined
|
||||||
}
|
}
|
||||||
return currentMainWindow() ?? undefined;
|
return currentMainWindow() ?? undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
function rendererURL(): string | null {
|
function rendererURL(): string | null {
|
||||||
@@ -713,6 +716,79 @@ function isSafeExternalUrl(url: string): boolean {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function registerDesktopProtocolClient(): void {
|
||||||
|
if (app.isDefaultProtocolClient(desktopDeepLinkScheme)) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (process.defaultApp && process.execPath) {
|
||||||
|
app.setAsDefaultProtocolClient(desktopDeepLinkScheme, process.execPath, [
|
||||||
|
process.argv[1] ?? '',
|
||||||
|
])
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
app.setAsDefaultProtocolClient(desktopDeepLinkScheme)
|
||||||
|
}
|
||||||
|
|
||||||
|
function extractDesktopDeepLink(argv: string[]): string | null {
|
||||||
|
return argv.find((item) => item.startsWith(`${desktopDeepLinkScheme}://`)) ?? null
|
||||||
|
}
|
||||||
|
|
||||||
|
function queueDesktopDeepLink(rawUrl: string | null | undefined): void {
|
||||||
|
if (!rawUrl) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!canHandleDesktopDeepLinks) {
|
||||||
|
pendingDesktopDeepLinks.push(rawUrl)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
handleDesktopDeepLink(rawUrl)
|
||||||
|
}
|
||||||
|
|
||||||
|
function flushPendingDesktopDeepLinks(): void {
|
||||||
|
canHandleDesktopDeepLinks = true
|
||||||
|
const links = pendingDesktopDeepLinks.splice(0)
|
||||||
|
for (const link of links) {
|
||||||
|
handleDesktopDeepLink(link)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleDesktopDeepLink(rawUrl: string): void {
|
||||||
|
let parsed: URL
|
||||||
|
try {
|
||||||
|
parsed = new URL(rawUrl)
|
||||||
|
} catch {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (parsed.protocol !== `${desktopDeepLinkScheme}:` || parsed.hostname !== 'desktop') {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
parsed.pathname === '/workbench' ||
|
||||||
|
parsed.searchParams.get('action') === 'open-publish-account-console'
|
||||||
|
) {
|
||||||
|
const account = {
|
||||||
|
id: parsed.searchParams.get('account_id') ?? '',
|
||||||
|
platform: parsed.searchParams.get('platform') ?? '',
|
||||||
|
platformUid: parsed.searchParams.get('platform_uid') ?? '',
|
||||||
|
displayName: parsed.searchParams.get('display_name') ?? '',
|
||||||
|
}
|
||||||
|
if (!account.id || !account.platform) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
void openPublishAccountConsole(account).catch((error) => {
|
||||||
|
console.warn('[desktop-deeplink] open publish account console failed', {
|
||||||
|
accountId: account.id,
|
||||||
|
platform: account.platform,
|
||||||
|
message: error instanceof Error ? error.message : String(error),
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function registerBridgeHandlers(): void {
|
function registerBridgeHandlers(): void {
|
||||||
ipcMain.handle('desktop:ping', () => 'pong')
|
ipcMain.handle('desktop:ping', () => 'pong')
|
||||||
ipcMain.handle('desktop:device-info', () => resolveDesktopDeviceInfo())
|
ipcMain.handle('desktop:device-info', () => resolveDesktopDeviceInfo())
|
||||||
@@ -830,8 +906,9 @@ function registerBridgeHandlers(): void {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
const hasSingleInstanceLock = initSingleInstance(() => {
|
const hasSingleInstanceLock = initSingleInstance((argv) => {
|
||||||
revealActiveWindowSafely('single-instance')
|
revealActiveWindowSafely('single-instance')
|
||||||
|
queueDesktopDeepLink(extractDesktopDeepLink(argv))
|
||||||
})
|
})
|
||||||
|
|
||||||
if (!hasSingleInstanceLock) {
|
if (!hasSingleInstanceLock) {
|
||||||
@@ -842,6 +919,7 @@ if (!hasSingleInstanceLock) {
|
|||||||
.whenReady()
|
.whenReady()
|
||||||
.then(async () => {
|
.then(async () => {
|
||||||
suppressNativeWindowMenu()
|
suppressNativeWindowMenu()
|
||||||
|
registerDesktopProtocolClient()
|
||||||
currentWindowMode = readPersistedWindowMode()
|
currentWindowMode = readPersistedWindowMode()
|
||||||
initDesktopAppSettings()
|
initDesktopAppSettings()
|
||||||
registerBridgeHandlers()
|
registerBridgeHandlers()
|
||||||
@@ -864,6 +942,8 @@ if (!hasSingleInstanceLock) {
|
|||||||
revealActiveWindowSafely('tray')
|
revealActiveWindowSafely('tray')
|
||||||
})
|
})
|
||||||
startDesktopHealthIndicator(() => currentMainWindow())
|
startDesktopHealthIndicator(() => currentMainWindow())
|
||||||
|
queueDesktopDeepLink(extractDesktopDeepLink(process.argv))
|
||||||
|
flushPendingDesktopDeepLinks()
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.error('[desktop-main] app.whenReady failed', error)
|
console.error('[desktop-main] app.whenReady failed', error)
|
||||||
@@ -873,6 +953,12 @@ if (!hasSingleInstanceLock) {
|
|||||||
revealActiveWindowSafely('activate')
|
revealActiveWindowSafely('activate')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
app.on('open-url', (event, url) => {
|
||||||
|
event.preventDefault()
|
||||||
|
revealActiveWindowSafely('deep-link')
|
||||||
|
queueDesktopDeepLink(url)
|
||||||
|
})
|
||||||
|
|
||||||
app.on('window-all-closed', () => {
|
app.on('window-all-closed', () => {
|
||||||
if (getDesktopAppSettings().keepRunningInBackground) {
|
if (getDesktopAppSettings().keepRunningInBackground) {
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { app } from 'electron/main'
|
|||||||
|
|
||||||
let initialized = false
|
let initialized = false
|
||||||
|
|
||||||
export function initSingleInstance(onSecondInstance?: () => void): boolean {
|
export function initSingleInstance(onSecondInstance?: (argv: string[]) => void): boolean {
|
||||||
if (initialized) {
|
if (initialized) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -13,8 +13,8 @@ export function initSingleInstance(onSecondInstance?: () => void): boolean {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
app.on('second-instance', () => {
|
app.on('second-instance', (_event, argv) => {
|
||||||
onSecondInstance?.()
|
onSecondInstance?.(argv)
|
||||||
})
|
})
|
||||||
|
|
||||||
return true
|
return true
|
||||||
|
|||||||
@@ -241,6 +241,8 @@ export interface DesktopPublishTaskListResponse {
|
|||||||
history_total: number
|
history_total: number
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type TenantPublishTaskListResponse = DesktopPublishTaskListResponse
|
||||||
|
|
||||||
export interface LeaseDesktopTaskRequest {
|
export interface LeaseDesktopTaskRequest {
|
||||||
task_id?: string
|
task_id?: string
|
||||||
kind?: 'publish' | 'monitor'
|
kind?: 'publish' | 'monitor'
|
||||||
|
|||||||
@@ -141,6 +141,12 @@ type DesktopPublishTaskList struct {
|
|||||||
HistoryTotal int `json:"history_total"`
|
HistoryTotal int `json:"history_total"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type publishTaskListOwner struct {
|
||||||
|
TenantID int64
|
||||||
|
WorkspaceID int64
|
||||||
|
UserID int64
|
||||||
|
}
|
||||||
|
|
||||||
func (s *DesktopTaskService) Lease(ctx context.Context, client *repository.DesktopClient, req LeaseDesktopTaskRequest, routeTaskID *uuid.UUID) (*LeaseDesktopTaskResponse, error) {
|
func (s *DesktopTaskService) Lease(ctx context.Context, client *repository.DesktopClient, req LeaseDesktopTaskRequest, routeTaskID *uuid.UUID) (*LeaseDesktopTaskResponse, error) {
|
||||||
if client == nil {
|
if client == nil {
|
||||||
return nil, response.ErrUnauthorized(40108, "desktop_client_missing", "desktop client context is required")
|
return nil, response.ErrUnauthorized(40108, "desktop_client_missing", "desktop client context is required")
|
||||||
@@ -858,6 +864,26 @@ func (s *DesktopTaskService) ListPublishTasks(ctx context.Context, client *repos
|
|||||||
if client == nil {
|
if client == nil {
|
||||||
return nil, response.ErrUnauthorized(40108, "desktop_client_missing", "desktop client context is required")
|
return nil, response.ErrUnauthorized(40108, "desktop_client_missing", "desktop client context is required")
|
||||||
}
|
}
|
||||||
|
return s.listPublishTasksForOwner(ctx, publishTaskListOwner{
|
||||||
|
TenantID: client.TenantID,
|
||||||
|
WorkspaceID: client.WorkspaceID,
|
||||||
|
UserID: client.UserID,
|
||||||
|
}, req)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *DesktopTaskService) ListTenantPublishTasks(ctx context.Context, actor auth.Actor, req ListPublishTasksRequest) (*DesktopPublishTaskList, error) {
|
||||||
|
workspaceID := auth.CurrentWorkspaceID(ctx)
|
||||||
|
if actor.TenantID == 0 || actor.UserID == 0 || workspaceID == 0 {
|
||||||
|
return nil, response.ErrUnauthorized(40132, "workspace_scope_missing", "workspace context is required")
|
||||||
|
}
|
||||||
|
return s.listPublishTasksForOwner(ctx, publishTaskListOwner{
|
||||||
|
TenantID: actor.TenantID,
|
||||||
|
WorkspaceID: workspaceID,
|
||||||
|
UserID: actor.UserID,
|
||||||
|
}, req)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *DesktopTaskService) listPublishTasksForOwner(ctx context.Context, owner publishTaskListOwner, req ListPublishTasksRequest) (*DesktopPublishTaskList, error) {
|
||||||
if s.pool == nil {
|
if s.pool == nil {
|
||||||
return nil, response.ErrServiceUnavailable(50342, "desktop_publish_job_store_unavailable", "desktop publish job store is unavailable")
|
return nil, response.ErrServiceUnavailable(50342, "desktop_publish_job_store_unavailable", "desktop publish job store is unavailable")
|
||||||
}
|
}
|
||||||
@@ -877,7 +903,7 @@ func (s *DesktopTaskService) ListPublishTasks(ctx context.Context, client *repos
|
|||||||
|
|
||||||
pendingItems, err := s.listPublishTasksByStatuses(
|
pendingItems, err := s.listPublishTasksByStatuses(
|
||||||
ctx,
|
ctx,
|
||||||
client,
|
owner,
|
||||||
pendingStatuses,
|
pendingStatuses,
|
||||||
title,
|
title,
|
||||||
0,
|
0,
|
||||||
@@ -888,7 +914,7 @@ func (s *DesktopTaskService) ListPublishTasks(ctx context.Context, client *repos
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
historyTotal, err := s.countPublishTasksByStatuses(ctx, client, historyStatuses, title)
|
historyTotal, err := s.countPublishTasksByStatuses(ctx, owner, historyStatuses, title)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -914,7 +940,7 @@ func (s *DesktopTaskService) ListPublishTasks(ctx context.Context, client *repos
|
|||||||
if remaining > 0 && historyOffset < historyTotal {
|
if remaining > 0 && historyOffset < historyTotal {
|
||||||
historyItems, listErr := s.listPublishTasksByStatuses(
|
historyItems, listErr := s.listPublishTasksByStatuses(
|
||||||
ctx,
|
ctx,
|
||||||
client,
|
owner,
|
||||||
historyStatuses,
|
historyStatuses,
|
||||||
title,
|
title,
|
||||||
remaining,
|
remaining,
|
||||||
@@ -939,7 +965,7 @@ func (s *DesktopTaskService) ListPublishTasks(ctx context.Context, client *repos
|
|||||||
|
|
||||||
func (s *DesktopTaskService) listPublishTasksByStatuses(
|
func (s *DesktopTaskService) listPublishTasksByStatuses(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
client *repository.DesktopClient,
|
owner publishTaskListOwner,
|
||||||
statuses []string,
|
statuses []string,
|
||||||
title string,
|
title string,
|
||||||
limit int,
|
limit int,
|
||||||
@@ -974,22 +1000,24 @@ func (s *DesktopTaskService) listPublishTasksByStatuses(
|
|||||||
JOIN desktop_publish_jobs AS j
|
JOIN desktop_publish_jobs AS j
|
||||||
ON j.desktop_id = t.job_id
|
ON j.desktop_id = t.job_id
|
||||||
AND j.workspace_id = t.workspace_id
|
AND j.workspace_id = t.workspace_id
|
||||||
WHERE t.workspace_id = $1
|
WHERE t.tenant_id = $1
|
||||||
AND j.created_by_user_id = $2
|
AND t.workspace_id = $2
|
||||||
|
AND j.tenant_id = $1
|
||||||
|
AND j.created_by_user_id = $3
|
||||||
AND t.kind = 'publish'
|
AND t.kind = 'publish'
|
||||||
AND t.status = ANY($3)
|
AND t.status = ANY($4)
|
||||||
AND (
|
AND (
|
||||||
$4 = ''
|
$5 = ''
|
||||||
OR COALESCE(t.payload->>'title', j.title, '') ILIKE '%' || $4 || '%'
|
OR COALESCE(t.payload->>'title', j.title, '') ILIKE '%' || $5 || '%'
|
||||||
)
|
)
|
||||||
`
|
`
|
||||||
args := []any{client.WorkspaceID, client.UserID, statuses, title}
|
args := []any{owner.TenantID, owner.WorkspaceID, owner.UserID, statuses, title}
|
||||||
|
|
||||||
if strings.TrimSpace(orderBy) != "" {
|
if strings.TrimSpace(orderBy) != "" {
|
||||||
query += "\nORDER BY " + orderBy
|
query += "\nORDER BY " + orderBy
|
||||||
}
|
}
|
||||||
if limit > 0 {
|
if limit > 0 {
|
||||||
query += "\nLIMIT $5 OFFSET $6"
|
query += "\nLIMIT $6 OFFSET $7"
|
||||||
args = append(args, limit, offset)
|
args = append(args, limit, offset)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1004,7 +1032,7 @@ func (s *DesktopTaskService) listPublishTasksByStatuses(
|
|||||||
|
|
||||||
func (s *DesktopTaskService) countPublishTasksByStatuses(
|
func (s *DesktopTaskService) countPublishTasksByStatuses(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
client *repository.DesktopClient,
|
owner publishTaskListOwner,
|
||||||
statuses []string,
|
statuses []string,
|
||||||
title string,
|
title string,
|
||||||
) (int, error) {
|
) (int, error) {
|
||||||
@@ -1015,15 +1043,17 @@ func (s *DesktopTaskService) countPublishTasksByStatuses(
|
|||||||
JOIN desktop_publish_jobs AS j
|
JOIN desktop_publish_jobs AS j
|
||||||
ON j.desktop_id = t.job_id
|
ON j.desktop_id = t.job_id
|
||||||
AND j.workspace_id = t.workspace_id
|
AND j.workspace_id = t.workspace_id
|
||||||
WHERE t.workspace_id = $1
|
WHERE t.tenant_id = $1
|
||||||
AND j.created_by_user_id = $2
|
AND t.workspace_id = $2
|
||||||
|
AND j.tenant_id = $1
|
||||||
|
AND j.created_by_user_id = $3
|
||||||
AND t.kind = 'publish'
|
AND t.kind = 'publish'
|
||||||
AND t.status = ANY($3)
|
AND t.status = ANY($4)
|
||||||
AND (
|
AND (
|
||||||
$4 = ''
|
$5 = ''
|
||||||
OR COALESCE(t.payload->>'title', j.title, '') ILIKE '%' || $4 || '%'
|
OR COALESCE(t.payload->>'title', j.title, '') ILIKE '%' || $5 || '%'
|
||||||
)
|
)
|
||||||
`, client.WorkspaceID, client.UserID, statuses, title).Scan(&count)
|
`, owner.TenantID, owner.WorkspaceID, owner.UserID, statuses, title).Scan(&count)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, response.ErrInternal(50109, "desktop_publish_tasks_query_failed", "failed to list desktop publish tasks")
|
return 0, response.ErrInternal(50109, "desktop_publish_tasks_query_failed", "failed to list desktop publish tasks")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -414,6 +414,64 @@ func (s *PublishJobService) RetryByDesktopTask(
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *PublishJobService) RetryTenantDesktopTask(
|
||||||
|
ctx context.Context,
|
||||||
|
actor auth.Actor,
|
||||||
|
taskID uuid.UUID,
|
||||||
|
) (*CreatePublishJobResponse, error) {
|
||||||
|
workspaceID := auth.CurrentWorkspaceID(ctx)
|
||||||
|
if actor.TenantID == 0 || actor.UserID == 0 || workspaceID == 0 {
|
||||||
|
return nil, response.ErrUnauthorized(40132, "workspace_scope_missing", "workspace context is required")
|
||||||
|
}
|
||||||
|
if s.pool == nil {
|
||||||
|
return nil, response.ErrServiceUnavailable(50342, "desktop_publish_job_store_unavailable", "desktop publish job store is unavailable")
|
||||||
|
}
|
||||||
|
|
||||||
|
taskRepo := repository.NewDesktopTaskRepository(s.pool)
|
||||||
|
task, err := taskRepo.GetByDesktopID(ctx, taskID, workspaceID)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return nil, response.ErrNotFound(40482, "desktop_task_not_found", "desktop task not found")
|
||||||
|
}
|
||||||
|
return nil, response.ErrInternal(50095, "desktop_task_lookup_failed", "failed to inspect desktop task state")
|
||||||
|
}
|
||||||
|
if task.Kind != "publish" {
|
||||||
|
return nil, response.ErrBadRequest(40095, "desktop_task_not_publish", "only publish tasks can be retried")
|
||||||
|
}
|
||||||
|
if err := s.authorizePublishTaskForActor(ctx, actor, workspaceID, task); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if task.Status == "queued" || task.Status == "in_progress" {
|
||||||
|
return nil, response.ErrConflict(40994, "desktop_task_retry_conflict", "desktop task is still pending or running")
|
||||||
|
}
|
||||||
|
|
||||||
|
payload := unmarshalJSONObject(task.Payload)
|
||||||
|
articleID, err := s.resolveRetryArticleID(ctx, actor.TenantID, payload)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
title := strings.TrimSpace(stringPointerValue(extractStringPointer(payload, "title")))
|
||||||
|
if title == "" {
|
||||||
|
title = "文章发布"
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.Create(ctx, auth.Actor{
|
||||||
|
TenantID: actor.TenantID,
|
||||||
|
UserID: actor.UserID,
|
||||||
|
PrimaryWorkspaceID: workspaceID,
|
||||||
|
Role: actor.Role,
|
||||||
|
}, CreatePublishJobRequest{
|
||||||
|
Title: title,
|
||||||
|
ContentRef: map[string]any{
|
||||||
|
"article_id": articleID,
|
||||||
|
},
|
||||||
|
Accounts: []CreatePublishJobAccountRequest{
|
||||||
|
{AccountID: task.TargetAccountID.String()},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func (s *PublishJobService) authorizePublishTaskForClientUser(
|
func (s *PublishJobService) authorizePublishTaskForClientUser(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
client *repository.DesktopClient,
|
client *repository.DesktopClient,
|
||||||
@@ -442,6 +500,36 @@ func (s *PublishJobService) authorizePublishTaskForClientUser(
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *PublishJobService) authorizePublishTaskForActor(
|
||||||
|
ctx context.Context,
|
||||||
|
actor auth.Actor,
|
||||||
|
workspaceID int64,
|
||||||
|
task *repository.DesktopTask,
|
||||||
|
) error {
|
||||||
|
if task == nil || actor.TenantID == 0 || actor.UserID == 0 || workspaceID == 0 {
|
||||||
|
return response.ErrUnauthorized(40132, "workspace_scope_missing", "workspace context is required")
|
||||||
|
}
|
||||||
|
|
||||||
|
var ownsTask bool
|
||||||
|
err := s.pool.QueryRow(ctx, `
|
||||||
|
SELECT EXISTS (
|
||||||
|
SELECT 1
|
||||||
|
FROM desktop_publish_jobs
|
||||||
|
WHERE tenant_id = $1
|
||||||
|
AND desktop_id = $2
|
||||||
|
AND workspace_id = $3
|
||||||
|
AND created_by_user_id = $4
|
||||||
|
)
|
||||||
|
`, actor.TenantID, task.JobID, workspaceID, actor.UserID).Scan(&ownsTask)
|
||||||
|
if err != nil {
|
||||||
|
return response.ErrInternal(50115, "desktop_publish_job_lookup_failed", "failed to validate desktop publish task ownership")
|
||||||
|
}
|
||||||
|
if !ownsTask {
|
||||||
|
return response.ErrForbidden(40384, "desktop_publish_task_not_owned", "desktop publish task belongs to another user")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (s *PublishJobService) resolveRetryArticleID(ctx context.Context, tenantID int64, payload map[string]any) (int64, error) {
|
func (s *PublishJobService) resolveRetryArticleID(ctx context.Context, tenantID int64, payload map[string]any) (int64, error) {
|
||||||
if articleID, ok := resolveRetryArticleIDFromPayload(payload); ok {
|
if articleID, ok := resolveRetryArticleIDFromPayload(payload); ok {
|
||||||
return articleID, nil
|
return articleID, nil
|
||||||
|
|||||||
@@ -65,34 +65,10 @@ func (h *DesktopTaskHandler) Lease(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *DesktopTaskHandler) ListPublish(c *gin.Context) {
|
func (h *DesktopTaskHandler) ListPublish(c *gin.Context) {
|
||||||
req := app.ListPublishTasksRequest{
|
req, ok := parseListPublishTasksRequest(c)
|
||||||
Page: 1,
|
if !ok {
|
||||||
PageSize: 10,
|
return
|
||||||
Title: strings.TrimSpace(c.Query("title")),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if rawPage := c.Query("page"); rawPage != "" {
|
|
||||||
parsed, err := strconv.Atoi(rawPage)
|
|
||||||
if err != nil || parsed <= 0 {
|
|
||||||
response.Error(c, response.ErrBadRequest(40001, "invalid_params", "page must be a positive integer"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
req.Page = parsed
|
|
||||||
}
|
|
||||||
|
|
||||||
rawPageSize := c.Query("page_size")
|
|
||||||
if rawPageSize == "" {
|
|
||||||
rawPageSize = c.Query("limit")
|
|
||||||
}
|
|
||||||
if rawPageSize != "" {
|
|
||||||
parsed, err := strconv.Atoi(rawPageSize)
|
|
||||||
if err != nil || parsed <= 0 {
|
|
||||||
response.Error(c, response.ErrBadRequest(40001, "invalid_params", "page_size must be a positive integer"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
req.PageSize = parsed
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := h.svc.ListPublishTasks(c.Request.Context(), MustDesktopClient(c.Request.Context()), req)
|
data, err := h.svc.ListPublishTasks(c.Request.Context(), MustDesktopClient(c.Request.Context()), req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
response.Error(c, err)
|
response.Error(c, err)
|
||||||
@@ -101,6 +77,19 @@ func (h *DesktopTaskHandler) ListPublish(c *gin.Context) {
|
|||||||
response.Success(c, data)
|
response.Success(c, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *DesktopTaskHandler) TenantListPublish(c *gin.Context) {
|
||||||
|
req, ok := parseListPublishTasksRequest(c)
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
data, err := h.svc.ListTenantPublishTasks(c.Request.Context(), auth.MustActor(c.Request.Context()), req)
|
||||||
|
if err != nil {
|
||||||
|
response.Error(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
response.Success(c, data)
|
||||||
|
}
|
||||||
|
|
||||||
func (h *DesktopTaskHandler) Extend(c *gin.Context) {
|
func (h *DesktopTaskHandler) Extend(c *gin.Context) {
|
||||||
desktopID, err := uuid.Parse(c.Param("id"))
|
desktopID, err := uuid.Parse(c.Param("id"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -158,6 +147,21 @@ func (h *DesktopTaskHandler) RetryPublish(c *gin.Context) {
|
|||||||
response.Success(c, data)
|
response.Success(c, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *DesktopTaskHandler) TenantRetryPublish(c *gin.Context) {
|
||||||
|
desktopID, err := uuid.Parse(c.Param("id"))
|
||||||
|
if err != nil {
|
||||||
|
response.Error(c, response.ErrBadRequest(40084, "invalid_desktop_task_id", "task id must be a uuid"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := h.publishSvc.RetryTenantDesktopTask(c.Request.Context(), auth.MustActor(c.Request.Context()), desktopID)
|
||||||
|
if err != nil {
|
||||||
|
response.Error(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
response.Success(c, data)
|
||||||
|
}
|
||||||
|
|
||||||
func (h *DesktopTaskHandler) Cancel(c *gin.Context) {
|
func (h *DesktopTaskHandler) Cancel(c *gin.Context) {
|
||||||
desktopID, err := uuid.Parse(c.Param("id"))
|
desktopID, err := uuid.Parse(c.Param("id"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -179,6 +183,38 @@ func (h *DesktopTaskHandler) Cancel(c *gin.Context) {
|
|||||||
response.Success(c, data)
|
response.Success(c, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func parseListPublishTasksRequest(c *gin.Context) (app.ListPublishTasksRequest, bool) {
|
||||||
|
req := app.ListPublishTasksRequest{
|
||||||
|
Page: 1,
|
||||||
|
PageSize: 10,
|
||||||
|
Title: strings.TrimSpace(c.Query("title")),
|
||||||
|
}
|
||||||
|
|
||||||
|
if rawPage := c.Query("page"); rawPage != "" {
|
||||||
|
parsed, err := strconv.Atoi(rawPage)
|
||||||
|
if err != nil || parsed <= 0 {
|
||||||
|
response.Error(c, response.ErrBadRequest(40001, "invalid_params", "page must be a positive integer"))
|
||||||
|
return req, false
|
||||||
|
}
|
||||||
|
req.Page = parsed
|
||||||
|
}
|
||||||
|
|
||||||
|
rawPageSize := c.Query("page_size")
|
||||||
|
if rawPageSize == "" {
|
||||||
|
rawPageSize = c.Query("limit")
|
||||||
|
}
|
||||||
|
if rawPageSize != "" {
|
||||||
|
parsed, err := strconv.Atoi(rawPageSize)
|
||||||
|
if err != nil || parsed <= 0 {
|
||||||
|
response.Error(c, response.ErrBadRequest(40001, "invalid_params", "page_size must be a positive integer"))
|
||||||
|
return req, false
|
||||||
|
}
|
||||||
|
req.PageSize = parsed
|
||||||
|
}
|
||||||
|
|
||||||
|
return req, true
|
||||||
|
}
|
||||||
|
|
||||||
func (h *DesktopTaskHandler) TenantCancel(c *gin.Context) {
|
func (h *DesktopTaskHandler) TenantCancel(c *gin.Context) {
|
||||||
desktopID, err := uuid.Parse(c.Param("id"))
|
desktopID, err := uuid.Parse(c.Param("id"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -74,6 +74,8 @@ func RegisterRoutes(app *bootstrap.App) {
|
|||||||
tenantProtected.POST("/accounts/:id/request-delete", desktopAccountHandler.RequestDelete)
|
tenantProtected.POST("/accounts/:id/request-delete", desktopAccountHandler.RequestDelete)
|
||||||
tenantProtected.POST("/tasks/:id/reconcile", desktopTaskHandler.Reconcile)
|
tenantProtected.POST("/tasks/:id/reconcile", desktopTaskHandler.Reconcile)
|
||||||
tenantProtected.POST("/tasks/:id/cancel", desktopTaskHandler.TenantCancel)
|
tenantProtected.POST("/tasks/:id/cancel", desktopTaskHandler.TenantCancel)
|
||||||
|
tenantProtected.GET("/publish-tasks", desktopTaskHandler.TenantListPublish)
|
||||||
|
tenantProtected.POST("/publish-tasks/:id/retry", desktopTaskHandler.TenantRetryPublish)
|
||||||
tenantProtected.POST("/publish-jobs", publishJobHandler.Create)
|
tenantProtected.POST("/publish-jobs", publishJobHandler.Create)
|
||||||
|
|
||||||
complianceHandler := NewComplianceHandler(app)
|
complianceHandler := NewComplianceHandler(app)
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ func TestProtectedRoutes_RequireAuth(t *testing.T) {
|
|||||||
{http.MethodPost, "/api/tenant/accounts/:id/request-delete"},
|
{http.MethodPost, "/api/tenant/accounts/:id/request-delete"},
|
||||||
{http.MethodPost, "/api/tenant/tasks/:id/reconcile"},
|
{http.MethodPost, "/api/tenant/tasks/:id/reconcile"},
|
||||||
{http.MethodPost, "/api/tenant/tasks/:id/cancel"},
|
{http.MethodPost, "/api/tenant/tasks/:id/cancel"},
|
||||||
|
{http.MethodGet, "/api/tenant/publish-tasks"},
|
||||||
|
{http.MethodPost, "/api/tenant/publish-tasks/:id/retry"},
|
||||||
{http.MethodPost, "/api/tenant/publish-jobs"},
|
{http.MethodPost, "/api/tenant/publish-jobs"},
|
||||||
{http.MethodGet, "/api/tenant/media/platforms"},
|
{http.MethodGet, "/api/tenant/media/platforms"},
|
||||||
{http.MethodGet, "/api/tenant/workspace/overview"},
|
{http.MethodGet, "/api/tenant/workspace/overview"},
|
||||||
@@ -77,10 +79,12 @@ func TestDesktopClientRoutes_ClientTokenAuth(t *testing.T) {
|
|||||||
}{
|
}{
|
||||||
{http.MethodGet, "/api/desktop/dispatch"},
|
{http.MethodGet, "/api/desktop/dispatch"},
|
||||||
{http.MethodGet, "/api/desktop/accounts"},
|
{http.MethodGet, "/api/desktop/accounts"},
|
||||||
|
{http.MethodGet, "/api/desktop/publish-tasks"},
|
||||||
{http.MethodGet, "/api/desktop/content/assets/:token"},
|
{http.MethodGet, "/api/desktop/content/assets/:token"},
|
||||||
{http.MethodPost, "/api/desktop/clients/offline"},
|
{http.MethodPost, "/api/desktop/clients/offline"},
|
||||||
{http.MethodPost, "/api/desktop/tasks/lease"},
|
{http.MethodPost, "/api/desktop/tasks/lease"},
|
||||||
{http.MethodPost, "/api/desktop/tasks/:id/result"},
|
{http.MethodPost, "/api/desktop/tasks/:id/result"},
|
||||||
|
{http.MethodPost, "/api/desktop/publish-tasks/:id/retry"},
|
||||||
{http.MethodPost, "/api/desktop/monitoring/tasks/lease"},
|
{http.MethodPost, "/api/desktop/monitoring/tasks/lease"},
|
||||||
{http.MethodPost, "/api/desktop/monitoring/tasks/resume"},
|
{http.MethodPost, "/api/desktop/monitoring/tasks/resume"},
|
||||||
{http.MethodPost, "/api/desktop/monitoring/tasks/:id/result"},
|
{http.MethodPost, "/api/desktop/monitoring/tasks/:id/result"},
|
||||||
|
|||||||
Reference in New Issue
Block a user