This commit is contained in:
eric
2026-06-06 04:29:46 -05:00
parent 88aa96a2a1
commit 41493c35ca
50 changed files with 4666 additions and 416 deletions

29
app/lib/api-client.ts Normal file
View File

@@ -0,0 +1,29 @@
export const API_BASE =
process.env.NEXT_PUBLIC_API_BASE_URL || "http://127.0.0.1:8000";
export function apiUrl(path: string): string {
if (/^https?:\/\//i.test(path)) return path;
return `${API_BASE}${path.startsWith("/") ? path : `/${path}`}`;
}
export async function apiFetch<T>(
path: string,
init?: RequestInit
): Promise<T> {
const res = await fetch(apiUrl(path), {
credentials: "include",
...init,
headers:
init?.body instanceof FormData
? init.headers
: {
"Content-Type": "application/json",
...(init?.headers || {}),
},
});
const data = await res.json().catch(() => ({}));
if (!res.ok) {
throw new Error(data?.detail || data?.error || `HTTP ${res.status}`);
}
return data as T;
}

View File

@@ -3,6 +3,7 @@
import { useEffect, useRef, useState } from "react";
import * as echarts from "echarts";
import type { MapCity } from "./types";
import { apiUrl } from "@/app/lib/api-client";
const CHINA_MAP_URL = "/api/geo/china";
@@ -30,7 +31,7 @@ export function MembersMap({
const init = async () => {
try {
const res = await fetch(CHINA_MAP_URL);
const res = await fetch(apiUrl(CHINA_MAP_URL));
const geoJson = await res.json();
echarts.registerMap("china", geoJson);
} catch {

View File

@@ -4,6 +4,7 @@
import { getPaymentConfig, getJoinPaymentConfig } from "@/config/services.config";
import type { PayChannel, PayEnv } from "./types";
import { apiUrl } from "@/app/lib/api-client";
export function redirectToPay(params: {
user_id: string;
@@ -21,7 +22,7 @@ export function redirectToPay(params: {
const payForm = document.createElement("form");
payForm.method = "POST";
payForm.action = "/api/pay";
payForm.action = apiUrl("/api/pay");
payForm.target = "_self";
payForm.style.display = "none";

View File

@@ -1,4 +1,5 @@
import { useEffect, useRef, useState } from "react";
import { apiUrl } from "@/app/lib/api-client";
const COOKIE_NAME = "join_pay_order";
const STORAGE_NAME = "join_pay_order";
@@ -121,7 +122,7 @@ export function usePayStatusPoll(onPaid: (orderId: string) => void): boolean {
inFlight = true;
try {
const res = await fetch(
`/api/pay/status?order_id=${encodeURIComponent(orderId)}`,
apiUrl(`/api/pay/status?order_id=${encodeURIComponent(orderId)}`),
{ cache: "no-store" }
);
const data = await res.json().catch(() => ({}));

View File

@@ -4,6 +4,7 @@
import { getPocketBaseConfig } from "@/config/services.config";
import { PB_STORAGE_KEYS } from "./constants";
import { apiUrl } from "@/app/lib/api-client";
export interface AuthUser {
id: string;
@@ -24,15 +25,15 @@ export async function pbLogin(
identity: string,
password: string
): Promise<AuthResult> {
const url = getPBUrl();
const res = await fetch(`${url}/api/collections/users/auth-with-password`, {
const res = await fetch(apiUrl("/api/auth/login"), {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ identity, password }),
credentials: "include",
body: JSON.stringify({ email: identity, password }),
});
if (!res.ok) {
const err = await res.json();
throw new Error(err?.message || "登录失败");
throw new Error(err?.detail || err?.message || "登录失败");
}
const data = await res.json();
if (!data?.token) throw new Error("登录响应异常");
@@ -44,21 +45,18 @@ export async function pbRegister(
password: string,
passwordConfirm: string
): Promise<AuthResult> {
const url = getPBUrl();
const config = getPocketBaseConfig();
const res = await fetch(
`${url}/api/collections/${config.usersCollection}/records`,
{
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ email, password, passwordConfirm }),
}
);
const res = await fetch(apiUrl("/api/auth/register"), {
method: "POST",
headers: { "Content-Type": "application/json" },
credentials: "include",
body: JSON.stringify({ email, password, passwordConfirm }),
});
if (!res.ok) {
const err = await res.json();
throw new Error(err?.message || "注册失败");
throw new Error(err?.detail || err?.message || "注册失败");
}
return pbLogin(email, password);
const data = await res.json();
return { token: data.token, record: data.record };
}
export function pbSaveAuth(token: string, record: AuthUser): void {
@@ -79,7 +77,7 @@ export async function pbLogout(): Promise<void> {
/* ignore */
}
try {
await fetch("/api/auth/logout", { method: "POST", credentials: "include" });
await fetch(apiUrl("/api/auth/logout"), { method: "POST", credentials: "include" });
} catch {
/* ignore */
}