xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-11-17 14:33:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into dev

Browse Source 
# Conflicts:
#	app/api/common.ts
#	app/components/settings.tsx
#	app/store/access.ts
This commit is contained in:
sijinhui
2024-07-17 12:58:32 +08:00
parent 98a93e0020 ec95292209
commit c53ee2f065
3 changed files with 288 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/api/common.ts
View File

@@ -50,9 +50,9 @@ export async function requestOpenai(
"/api/openai/",
"",
);
let baseUrl = isAzure
? serverConfig.azureUrl
: serverConfig.baseUrl || OPENAI_BASE_URL;
let baseUrl =
(isAzure ? serverConfig.azureUrl : serverConfig.baseUrl) || OPENAI_BASE_URL;
if (!baseUrl.startsWith("http")) {
baseUrl = `https://${baseUrl}`;
@@ -110,10 +110,9 @@ export async function requestOpenai(
}
}
// const fetchUrl = `${baseUrl}/${path}`;
const jsonBody = await req.json();
const fetchUrl = cloudflareAIGatewayUrl(`${baseUrl}/${path}`);
console.log("fetchUrl", fetchUrl);
const jsonBody = await req.json();
const fetchOptions: RequestInit = {
headers: {
"Content-Type": "application/json",