XEngineers/CamTalk
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feat/optimize

Browse Source 
# Conflicts:
#	frontend/src/lib/errors.ts
This commit is contained in:
cfy666
2026-06-14 20:40:05 +08:00
parent b60e513317 9dc9025d10
commit 057a226610
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@@ -29,8 +29,8 @@ services:
restart: unless-stopped restart: unless-stopped
postgres: postgres:
# 阿里云镜像，避免从 Docker Hub 拉取超时 # 轩辕镜像加速，避免 Docker Hub 拉取超时
image: registry.cn-hangzhou.aliyuncs.com/library/postgres:15-alpine image: docker.m.daocloud.io/library/postgres:15-alpine
container_name: camtalk-postgres container_name: camtalk-postgres
environment: environment:
POSTGRES_USER: camtalk POSTGRES_USER: camtalk

2
frontend/src/components/ChatPanel/index.tsx
View File

@@ -17,7 +17,7 @@ interface ChatPanelProps {
currentScenario?: string; currentScenario?: string;
isProcessing?: boolean; isProcessing?: boolean;
isVADReady?: boolean; isVADReady?: boolean;
vadError?: string; vadError?: string | null;
isMicOn?: boolean; isMicOn?: boolean;
isSpeaking?: boolean; isSpeaking?: boolean;
onSendText?: (text: string) => void; onSendText?: (text: string) => void;

2
frontend/src/lib/errors.ts
View File

@@ -3,8 +3,6 @@
// 来源：docs/03-接口文档.md §五 错误码 // 来源：docs/03-接口文档.md §五 错误码
// ============================================================ // ============================================================
// ErrorCode type reserved for future use
/** 将错误码转为用户友好文案（需要传入翻译函数） */ /** 将错误码转为用户友好文案（需要传入翻译函数） */
export function getErrorMessage(code: string, translate: (key: string) => string): string { export function getErrorMessage(code: string, translate: (key: string) => string): string {
const key = `error.${code}`; const key = `error.${code}`;