mirror of
https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
synced 2025-10-01 23:56:39 +08:00
merge
This commit is contained in:
parent
f07a3729b9
commit
a1a09c4061
@ -501,7 +501,7 @@ export function ChatActions(props: {
|
|||||||
// show next model to default model if exist
|
// show next model to default model if exist
|
||||||
let nextModel: ModelType = (
|
let nextModel: ModelType = (
|
||||||
models.find((model) => model.isDefault) || models[0]
|
models.find((model) => model.isDefault) || models[0]
|
||||||
).name;
|
).name as ModelType;
|
||||||
chatStore.updateCurrentSession(
|
chatStore.updateCurrentSession(
|
||||||
(session) => (session.mask.modelConfig.model = nextModel),
|
(session) => (session.mask.modelConfig.model = nextModel),
|
||||||
);
|
);
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useSession } from "next-auth/react";
|
|
||||||
|
|
||||||
require("../polyfill");
|
require("../polyfill");
|
||||||
|
|
||||||
import { useState, useEffect } from "react";
|
import { useState, useEffect } from "react";
|
||||||
|
@ -71,6 +71,7 @@ export function collectModelTableWithDefaultModel(
|
|||||||
name: defaultModel,
|
name: defaultModel,
|
||||||
displayName: defaultModel,
|
displayName: defaultModel,
|
||||||
available: true,
|
available: true,
|
||||||
|
describe: "默认模型",
|
||||||
provider:
|
provider:
|
||||||
modelTable[defaultModel]?.provider ?? customProvider(defaultModel),
|
modelTable[defaultModel]?.provider ?? customProvider(defaultModel),
|
||||||
isDefault: true,
|
isDefault: true,
|
||||||
|
@ -15,10 +15,6 @@ export default async function middleware(req: NextRequest) {
|
|||||||
return NextResponse.redirect(new URL(path.replace('/app', ''), req.url), 301);
|
return NextResponse.redirect(new URL(path.replace('/app', ''), req.url), 301);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果是主页,交给主页判断,这里判断会影响性能
|
|
||||||
// if (path == "/") {
|
|
||||||
// return NextResponse.next()
|
|
||||||
// }
|
|
||||||
|
|
||||||
const session = await getToken({ req });
|
const session = await getToken({ req });
|
||||||
const isUser = await VerifiedUser(session);
|
const isUser = await VerifiedUser(session);
|
||||||
@ -38,8 +34,6 @@ export default async function middleware(req: NextRequest) {
|
|||||||
return NextResponse.redirect(new URL("/", req.url))
|
return NextResponse.redirect(new URL("/", req.url))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (path == '/login') {
|
if (path == '/login') {
|
||||||
return NextResponse.rewrite(
|
return NextResponse.rewrite(
|
||||||
new URL(`/app${path}`, req.url),
|
new URL(`/app${path}`, req.url),
|
||||||
|
@ -3,8 +3,8 @@ import webpack from "webpack";
|
|||||||
const mode = process.env.BUILD_MODE ?? "standalone";
|
const mode = process.env.BUILD_MODE ?? "standalone";
|
||||||
console.log("[Next] build mode", mode);
|
console.log("[Next] build mode", mode);
|
||||||
|
|
||||||
// const disableChunk = !!process.env.DISABLE_CHUNK || mode === "export";
|
const disableChunk = !!process.env.DISABLE_CHUNK || mode === "export";
|
||||||
const disableChunk = true;
|
// const disableChunk = true;
|
||||||
console.log("[Next] build with chunk: ", disableChunk);
|
console.log("[Next] build with chunk: ", disableChunk);
|
||||||
|
|
||||||
/** @type {import('next').NextConfig} */
|
/** @type {import('next').NextConfig} */
|
||||||
|
Loading…
Reference in New Issue
Block a user