This commit is contained in:
eric
2026-03-13 06:16:36 -05:00
parent a42e9628ad
commit e673bc9b62
7 changed files with 11 additions and 14 deletions

View File

@@ -39,8 +39,6 @@ function resolvePayApiUrl(request: NextRequest): string {
const hostHeader = request.headers.get("host") || request.headers.get("x-forwarded-host"); const hostHeader = request.headers.get("host") || request.headers.get("x-forwarded-host");
return ( return (
(hostHeader ? getApiUrlFromRequest(hostHeader) : null) || (hostHeader ? getApiUrlFromRequest(hostHeader) : null) ||
process.env.PAYMENT_API_URL ||
process.env.NEXT_PUBLIC_API_URL ||
payConfig.apiUrl payConfig.apiUrl
).replace(/\/$/, ""); ).replace(/\/$/, "");
} }

View File

@@ -133,8 +133,6 @@ export async function POST(request: NextRequest) {
// 优先用请求 Host等同 window.location.host推断同机 payjsapi访问 192.168.41.222:3002 即用 192.168.41.222:8007 // 优先用请求 Host等同 window.location.host推断同机 payjsapi访问 192.168.41.222:3002 即用 192.168.41.222:8007
const apiUrl = ( const apiUrl = (
(hostHeader ? getApiUrlFromRequest(hostHeader) : null) || (hostHeader ? getApiUrlFromRequest(hostHeader) : null) ||
process.env.PAYMENT_API_URL ||
process.env.NEXT_PUBLIC_API_URL ||
payConfig.apiUrl payConfig.apiUrl
) )
.replace(/\/$/, ""); .replace(/\/$/, "");

View File

@@ -8,8 +8,6 @@ function resolvePayApiUrl(request: NextRequest): string {
const hostHeader = request.headers.get("host") || request.headers.get("x-forwarded-host"); const hostHeader = request.headers.get("host") || request.headers.get("x-forwarded-host");
return ( return (
(hostHeader ? getApiUrlFromRequest(hostHeader) : null) || (hostHeader ? getApiUrlFromRequest(hostHeader) : null) ||
process.env.PAYMENT_API_URL ||
process.env.NEXT_PUBLIC_API_URL ||
payConfig.apiUrl payConfig.apiUrl
).replace(/\/$/, ""); ).replace(/\/$/, "");
} }

View File

@@ -37,8 +37,6 @@ function resolvePayApiUrl(request: NextRequest): string {
const hostHeader = request.headers.get("host") || request.headers.get("x-forwarded-host"); const hostHeader = request.headers.get("host") || request.headers.get("x-forwarded-host");
return ( return (
(hostHeader ? getApiUrlFromRequest(hostHeader) : null) || (hostHeader ? getApiUrlFromRequest(hostHeader) : null) ||
process.env.PAYMENT_API_URL ||
process.env.NEXT_PUBLIC_API_URL ||
payConfig.apiUrl payConfig.apiUrl
).replace(/\/$/, ""); ).replace(/\/$/, "");
} }

View File

@@ -20,8 +20,6 @@ function resolvePayApiUrl(request: NextRequest): string {
const hostHeader = request.headers.get("host") || request.headers.get("x-forwarded-host"); const hostHeader = request.headers.get("host") || request.headers.get("x-forwarded-host");
return ( return (
(hostHeader ? getApiUrlFromRequest(hostHeader) : null) || (hostHeader ? getApiUrlFromRequest(hostHeader) : null) ||
process.env.PAYMENT_API_URL ||
process.env.NEXT_PUBLIC_API_URL ||
payConfig.apiUrl payConfig.apiUrl
).replace(/\/$/, ""); ).replace(/\/$/, "");
} }

View File

@@ -15,8 +15,6 @@ function resolvePayApiUrl(request: NextRequest): string {
const hostHeader = request.headers.get("host") || request.headers.get("x-forwarded-host"); const hostHeader = request.headers.get("host") || request.headers.get("x-forwarded-host");
return ( return (
(hostHeader ? getApiUrlFromRequest(hostHeader) : null) || (hostHeader ? getApiUrlFromRequest(hostHeader) : null) ||
process.env.PAYMENT_API_URL ||
process.env.NEXT_PUBLIC_API_URL ||
payConfig.apiUrl payConfig.apiUrl
).replace(/\/$/, ""); ).replace(/\/$/, "");
} }

View File

@@ -51,11 +51,20 @@ export function getApiUrlFromRequest(hostHeader: string | null): string {
return isDev ? `http://${hostname}:${PAYJSAPI_PORT}` : "https://api.hackrobot.cn"; return isDev ? `http://${hostname}:${PAYJSAPI_PORT}` : "https://api.hackrobot.cn";
} }
export function getPaymentConfig(): PaymentConfig { /** 生产环境若 PAYMENT_API_URL 指向 localhost则忽略并使用 api 域名 */
const apiUrl = function resolvePaymentApiUrl(): string {
const url =
process.env.PAYMENT_API_URL || process.env.PAYMENT_API_URL ||
process.env.NEXT_PUBLIC_API_URL || process.env.NEXT_PUBLIC_API_URL ||
(isDev ? `http://127.0.0.1:${PAYJSAPI_PORT}` : "https://api.hackrobot.cn"); (isDev ? `http://127.0.0.1:${PAYJSAPI_PORT}` : "https://api.hackrobot.cn");
if (!isDev && /^(https?:\/\/)?(127\.0\.0\.1|localhost)(:\d+)?(\/|$)/i.test(url)) {
return "https://api.hackrobot.cn";
}
return url;
}
export function getPaymentConfig(): PaymentConfig {
const apiUrl = resolvePaymentApiUrl();
return { return {
apiUrl, apiUrl,
provider: (process.env.PAYMENT_PROVIDER as "zpay" | "xorpay") || "zpay", provider: (process.env.PAYMENT_PROVIDER as "zpay" | "xorpay") || "zpay",