's'
This commit is contained in:
@@ -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(/\/$/, "");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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(/\/$/, "");
|
||||||
|
|||||||
@@ -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(/\/$/, "");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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(/\/$/, "");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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(/\/$/, "");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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(/\/$/, "");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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",
|
||||||
|
|||||||
Reference in New Issue
Block a user