mirror of
https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
synced 2025-10-02 08:06:38 +08:00
123
This commit is contained in:
commit
486692c5a9
4
.github/workflows/dockerToHub.yml
vendored
4
.github/workflows/dockerToHub.yml
vendored
@ -24,7 +24,7 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
clean: true
|
clean: true
|
||||||
github-server-url: 'https://gh.siji.ci'
|
github-server-url: 'https://gh.sivpn.cn'
|
||||||
- name: build and deploy to Docker Hub
|
- name: build and deploy to Docker Hub
|
||||||
run: |
|
run: |
|
||||||
echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin
|
echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin
|
||||||
@ -42,7 +42,7 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
clean: true
|
clean: true
|
||||||
github-server-url: 'https://gh.siji.ci'
|
github-server-url: 'https://gh.sivpn.cn'
|
||||||
# deploy-nm:
|
# deploy-nm:
|
||||||
# name: 部署到内蒙服务器
|
# name: 部署到内蒙服务器
|
||||||
# needs: download-repo
|
# needs: download-repo
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#FROM registry.cn-hangzhou.aliyuncs.com/sijinhui/node:18-alpine AS base
|
#FROM registry.cn-hangzhou.aliyuncs.com/sijinhui/node:18-alpine AS base
|
||||||
FROM hub.siji.ci/library/node:22.1-alpine AS base
|
FROM hub.sivpn.cn/library/node:22.1-alpine AS base
|
||||||
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
|
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
|
||||||
RUN apk update && apk add --no-cache git tzdata
|
RUN apk update && apk add --no-cache git tzdata
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#FROM registry.cn-hangzhou.aliyuncs.com/sijinhui/node:18-alpine AS base
|
#FROM registry.cn-hangzhou.aliyuncs.com/sijinhui/node:18-alpine AS base
|
||||||
FROM hub.siji.ci/library/node:20-alpine AS base
|
FROM hub.sivpn.cn/library/node:20-alpine AS base
|
||||||
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
|
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
|
||||||
RUN apk update && apk add --no-cache git tzdata
|
RUN apk update && apk add --no-cache git tzdata
|
||||||
# 设置时区环境变量
|
# 设置时区环境变量
|
||||||
|
@ -31,19 +31,16 @@ async function handle(
|
|||||||
{
|
{
|
||||||
name: {
|
name: {
|
||||||
contains: searchText,
|
contains: searchText,
|
||||||
mode: "insensitive", // 不区分大小写
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
username: {
|
username: {
|
||||||
contains: searchText,
|
contains: searchText,
|
||||||
mode: "insensitive", // 不区分大小写
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
email: {
|
email: {
|
||||||
contains: searchText,
|
contains: searchText,
|
||||||
mode: "insensitive", // 不区分大小写
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
@ -1340,7 +1340,7 @@ function _Chat() {
|
|||||||
title={
|
title={
|
||||||
<span style={{ color: "black" }}>
|
<span style={{ color: "black" }}>
|
||||||
{localStorage.getItem("current_day_token") ?? 0}{" "}
|
{localStorage.getItem("current_day_token") ?? 0}{" "}
|
||||||
<span style={{ color: "black" }}>/ 100000</span>
|
<span style={{ color: "black" }}>/ 200000</span>
|
||||||
</span>
|
</span>
|
||||||
}
|
}
|
||||||
color={"var(--second)"}
|
color={"var(--second)"}
|
||||||
@ -1350,7 +1350,7 @@ function _Chat() {
|
|||||||
<Progress
|
<Progress
|
||||||
percent={
|
percent={
|
||||||
(parseInt(localStorage.getItem("current_day_token") ?? "0") /
|
(parseInt(localStorage.getItem("current_day_token") ?? "0") /
|
||||||
100000) *
|
200000) *
|
||||||
100
|
100
|
||||||
}
|
}
|
||||||
size="small"
|
size="small"
|
||||||
|
@ -256,9 +256,9 @@ export const DEFAULT_MODELS = [
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
// name: "gpt-4-vision-preview",
|
// name: "gpt-4o-2024-05-13",
|
||||||
// available: true,
|
// available: true,
|
||||||
// describe: "GPT-4多模态,图像识别",
|
// describe: "GPT-4多模态,原生代理",
|
||||||
// provider: {
|
// provider: {
|
||||||
// id: "openai",
|
// id: "openai",
|
||||||
// providerName: "OpenAI",
|
// providerName: "OpenAI",
|
||||||
|
@ -519,7 +519,7 @@ export const useChatStore = createPersistStore(
|
|||||||
localStorage.getItem("current_day_token") ?? "0",
|
localStorage.getItem("current_day_token") ?? "0",
|
||||||
);
|
);
|
||||||
// console.log('---------', current_day_token)
|
// console.log('---------', current_day_token)
|
||||||
if (current_day_token >= 100000) {
|
if (current_day_token >= 200000) {
|
||||||
botMessage.content +=
|
botMessage.content +=
|
||||||
"\n\n" +
|
"\n\n" +
|
||||||
prettyObject({
|
prettyObject({
|
||||||
|
@ -5,7 +5,6 @@ services:
|
|||||||
# image: yidadaa/chatgpt-next-web
|
# image: yidadaa/chatgpt-next-web
|
||||||
restart: always
|
restart: always
|
||||||
image: registry.gitlab.si.icu/sijinhui/chatgpt-next-web
|
image: registry.gitlab.si.icu/sijinhui/chatgpt-next-web
|
||||||
# image: registry.cn-hangzhou.aliyuncs.com/sijinhui/chatgpt-next-web
|
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
@ -1,9 +1,14 @@
|
|||||||
// This is your Prisma schema file,
|
// This is your Prisma schema file,
|
||||||
// learn more about it in the docs: https://pris.ly/d/prisma-schema
|
// learn more about it in the docs: https://pris.ly/d/prisma-schema
|
||||||
|
|
||||||
|
// datasource db {
|
||||||
|
// provider = "postgresql"
|
||||||
|
// url = env("POSTGRES_PRISMA_URL") // uses connection pooling
|
||||||
|
// // directUrl = env("POSTGRES_URL_NON_POOLING") // uses a direct connection
|
||||||
|
// }
|
||||||
datasource db {
|
datasource db {
|
||||||
provider = "postgresql"
|
provider = "mysql"
|
||||||
url = env("POSTGRES_PRISMA_URL") // uses connection pooling
|
url = env("DATABASE_URL") // uses connection pooling
|
||||||
// directUrl = env("POSTGRES_URL_NON_POOLING") // uses a direct connection
|
// directUrl = env("POSTGRES_URL_NON_POOLING") // uses a direct connection
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -14,7 +19,7 @@ generator client {
|
|||||||
|
|
||||||
model User {
|
model User {
|
||||||
id String @id @default(cuid())
|
id String @id @default(cuid())
|
||||||
name String? @unique
|
name String?
|
||||||
// if you are using Github OAuth, you can get rid of the username attribute (that is for Twitter OAuth)
|
// if you are using Github OAuth, you can get rid of the username attribute (that is for Twitter OAuth)
|
||||||
username String? @unique
|
username String? @unique
|
||||||
gh_username String? @unique
|
gh_username String? @unique
|
||||||
@ -28,8 +33,6 @@ model User {
|
|||||||
isAdmin Boolean? @default(false)
|
isAdmin Boolean? @default(false)
|
||||||
accounts Account[]
|
accounts Account[]
|
||||||
sessions Session[]
|
sessions Session[]
|
||||||
// sites Site[]
|
|
||||||
// posts Post[]
|
|
||||||
logs LogEntry[]
|
logs LogEntry[]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user