Merge branch 'dev1023' into dev
解决 9 个冲突文件,并修复合并后遗留问题: - 大厅候选集:采用 FIFO 窗口 + 全部置顶单 UNION(列表与抢单/拼单复核同源) - 拼单份额:采用多次参与模型(每次参与 INSERT 新份额、requestId 幂等), 取消后可重新参与;移除 HEAD 已废弃的单行 rejoin 逻辑与对应测试 - 工单迁移与成本中心 103–108 编号撞车:合并重写为 109_work_order_share_participation / 110_work_order_hall_and_shop_indexes; 临时库全量执行与重跑幂等验证通过(10 列、唯一键已删、7 个索引) - 实时补丁:保留个性化字段、置顶重排、分页总数同步;补回 orderTimelineVisible 类型 - 打手大厅:保留 memo 组件化,移植「再拼一次」多份额按钮逻辑 - 全项目表格统一 PercentTable:WorkerOrderShareTable 改造 验证:backend typecheck/lint/check:sql/test(833 pass)、 frontend typecheck/lint/test(172 pass)/build 全绿。
This commit is contained in:
@@ -129,6 +129,15 @@ export function createDefaultRuntimeConfig(projectRoot: string): RuntimeConfig {
|
||||
// 打手:7 天空闲过期,登录后最多 30 天必须重新登录。
|
||||
sessionIdleTtlHours: 168,
|
||||
sessionAbsoluteTtlHours: 720,
|
||||
acceptanceVideo: {
|
||||
enabled: true,
|
||||
maxDurationSeconds: 30,
|
||||
maxSizeMb: 12,
|
||||
targetHeight: 720,
|
||||
bitrateKbps: 1200,
|
||||
audioBitrateKbps: 64,
|
||||
fps: 30,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -109,6 +109,26 @@ export const ENV_OVERRIDES: readonly EnvOverride[] = [
|
||||
'skuMapping',
|
||||
]),
|
||||
corsOriginsEnv('CORS_ALLOWED_ORIGINS', ['cors', 'allowedOrigins']),
|
||||
// 验收视频(选填):只走 .env,后台没有配置界面。
|
||||
booleanEnv('WORKER_ACCEPTANCE_VIDEO_ENABLED', ['worker', 'acceptanceVideo', 'enabled']),
|
||||
integerEnv('WORKER_ACCEPTANCE_VIDEO_MAX_DURATION_SECONDS', [
|
||||
'worker',
|
||||
'acceptanceVideo',
|
||||
'maxDurationSeconds',
|
||||
]),
|
||||
integerEnv('WORKER_ACCEPTANCE_VIDEO_MAX_SIZE_MB', ['worker', 'acceptanceVideo', 'maxSizeMb']),
|
||||
integerEnv('WORKER_ACCEPTANCE_VIDEO_TARGET_HEIGHT', [
|
||||
'worker',
|
||||
'acceptanceVideo',
|
||||
'targetHeight',
|
||||
]),
|
||||
integerEnv('WORKER_ACCEPTANCE_VIDEO_BITRATE_KBPS', ['worker', 'acceptanceVideo', 'bitrateKbps']),
|
||||
integerEnv('WORKER_ACCEPTANCE_VIDEO_AUDIO_BITRATE_KBPS', [
|
||||
'worker',
|
||||
'acceptanceVideo',
|
||||
'audioBitrateKbps',
|
||||
]),
|
||||
integerEnv('WORKER_ACCEPTANCE_VIDEO_FPS', ['worker', 'acceptanceVideo', 'fps']),
|
||||
]
|
||||
|
||||
export function applyEnvOverrides(
|
||||
|
||||
Reference in New Issue
Block a user