diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml index de01039..008c13d 100644 --- a/backend/docker-compose.yml +++ b/backend/docker-compose.yml @@ -4,7 +4,7 @@ services: pocketbase: image: ghcr.io/muchobien/pocketbase:0.22.4 container_name: gamegroup-pb - user: "${PB_UID:-1000}:${PB_GID:-1000}" + # user: "${PB_UID:-1000}:${PB_GID:-1000}" ports: - "${PB_PORT:-8711}:8090" volumes: diff --git a/frontend/src/api/pocketbase.ts b/frontend/src/api/pocketbase.ts index 3e44728..dfa679c 100644 --- a/frontend/src/api/pocketbase.ts +++ b/frontend/src/api/pocketbase.ts @@ -1,7 +1,7 @@ // src/api/pocketbase.ts import PocketBase from 'pocketbase' -const pbUrl = import.meta.env.VITE_PB_URL || '/api' +const pbUrl = import.meta.env.VITE_PB_URL || 'http://localhost:8090' export const pb = new PocketBase(pbUrl) diff --git a/frontend/src/api/sessions.ts b/frontend/src/api/sessions.ts index 2df3bbe..98b77f3 100644 --- a/frontend/src/api/sessions.ts +++ b/frontend/src/api/sessions.ts @@ -9,7 +9,7 @@ export async function createTeamSession(data: { gameName: string members: string[] }): Promise { - return pb.collection('teamSessions').create({ + return pb.collection('team_sessions').create({ ...data, status: 'recruiting' }) as unknown as TeamSession @@ -20,7 +20,7 @@ export async function getActiveTeamSession(): Promise { const user = pb.authStore.model if (!user) return null - const result = await pb.collection('teamSessions').getList(1, 1, { + const result = await pb.collection('team_sessions').getList(1, 1, { filter: `members ~ "${user.id}" && status != "dissolved" && status != "finished"`, sort: '-created' }) @@ -30,7 +30,7 @@ export async function getActiveTeamSession(): Promise { // 获取群组的临时小组列表 export async function getGroupTeamSessions(groupId: string): Promise { - const result = await pb.collection('teamSessions').getList(1, 20, { + const result = await pb.collection('team_sessions').getList(1, 20, { filter: `sourceGroup="${groupId}"`, sort: '-created' }) @@ -46,7 +46,7 @@ export async function updateTeamStatus(sessionId: string, status: TeamStatus): P updateData.dissolvedAt = new Date().toISOString() } - return pb.collection('teamSessions').update(sessionId, updateData) as unknown as TeamSession + return pb.collection('team_sessions').update(sessionId, updateData) as unknown as TeamSession } // 结束游戏(解散临时小组) @@ -59,21 +59,21 @@ export async function joinTeamSession(sessionId: string) { const user = pb.authStore.model if (!user) throw new Error('未登录') - const session = await pb.collection('teamSessions').getOne(sessionId) as { members: string[] } + const session = await pb.collection('team_sessions').getOne(sessionId) as { members: string[] } const members = session.members as string[] if (members.includes(user.id)) { throw new Error('已在小组中') } - return pb.collection('teamSessions').update(sessionId, { + return pb.collection('team_sessions').update(sessionId, { members: [...members, user.id] }) } // 订阅临时小组变更 export function subscribeTeamSession(sessionId: string, callback: (session: TeamSession) => void) { - return pb.collection('teamSessions').subscribe('*', (payload) => { + return pb.collection('team_sessions').subscribe('*', (payload) => { if (payload.record.id === sessionId) { callback(payload.record as unknown as TeamSession) } diff --git a/frontend/src/composables/useRealtime.ts b/frontend/src/composables/useRealtime.ts index d19ca41..c551438 100644 --- a/frontend/src/composables/useRealtime.ts +++ b/frontend/src/composables/useRealtime.ts @@ -50,7 +50,7 @@ export function useRealtime() { const session = teamStore.currentSession if (!session) return - const unsub = await pb.collection('teamSessions').subscribe('*', (payload) => { + const unsub = await pb.collection('team_sessions').subscribe('*', (payload) => { if (payload.record.id === session.id) { // 更新临时小组状态 teamStore.loadActiveSession() diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue index eb0a012..02a14c6 100644 --- a/frontend/src/views/Login.vue +++ b/frontend/src/views/Login.vue @@ -1,13 +1,12 @@