diff --git a/.github/workflows/dockerToHub.yml b/.github/workflows/dockerToHub.yml index 5decaf0fa..7a5527da7 100644 --- a/.github/workflows/dockerToHub.yml +++ b/.github/workflows/dockerToHub.yml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v4 with: clean: true - github-server-url: 'https://gh.siji.ci' + github-server-url: 'https://gh.sivpn.cn' - name: build and deploy to Docker Hub run: | 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 with: clean: true - github-server-url: 'https://gh.siji.ci' + github-server-url: 'https://gh.sivpn.cn' # deploy-nm: # name: 部署到内蒙服务器 # needs: download-repo diff --git a/Dockerfile b/Dockerfile index 9cb8d6903..6ca213922 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ #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 apk update && apk add --no-cache git tzdata RUN apk add --no-cache \ diff --git a/Dockerfile.linux-build b/Dockerfile.linux-build index c35822a35..6f5539aeb 100644 --- a/Dockerfile.linux-build +++ b/Dockerfile.linux-build @@ -1,5 +1,5 @@ #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 apk update && apk add --no-cache git tzdata # 设置时区环境变量 diff --git a/app/api/admin/users/[[...path]]/route.ts b/app/api/admin/users/[[...path]]/route.ts index df11becd9..46e97ed40 100644 --- a/app/api/admin/users/[[...path]]/route.ts +++ b/app/api/admin/users/[[...path]]/route.ts @@ -31,19 +31,16 @@ async function handle( { name: { contains: searchText, - mode: "insensitive", // 不区分大小写 }, }, { username: { contains: searchText, - mode: "insensitive", // 不区分大小写 }, }, { email: { contains: searchText, - mode: "insensitive", // 不区分大小写 }, }, ], diff --git a/app/components/chat.tsx b/app/components/chat.tsx index 8d3e89ce3..6c08f147f 100644 --- a/app/components/chat.tsx +++ b/app/components/chat.tsx @@ -1340,7 +1340,7 @@ function _Chat() { title={ {localStorage.getItem("current_day_token") ?? 0}{" "} - / 100000 + / 200000 } color={"var(--second)"} @@ -1350,7 +1350,7 @@ function _Chat() { = 100000) { + if (current_day_token >= 200000) { botMessage.content += "\n\n" + prettyObject({ diff --git a/docker-compose.yml b/docker-compose.yml index 0ff5e6193..dc1623b3c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,6 @@ services: # image: yidadaa/chatgpt-next-web restart: always image: registry.gitlab.si.icu/sijinhui/chatgpt-next-web -# image: registry.cn-hangzhou.aliyuncs.com/sijinhui/chatgpt-next-web build: context: . dockerfile: Dockerfile diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 0522d53c1..3395e3ca2 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -1,9 +1,14 @@ // This is your Prisma schema file, // 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 { - provider = "postgresql" - url = env("POSTGRES_PRISMA_URL") // uses connection pooling + provider = "mysql" + url = env("DATABASE_URL") // uses connection pooling // directUrl = env("POSTGRES_URL_NON_POOLING") // uses a direct connection } @@ -14,7 +19,7 @@ generator client { model User { 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) username String? @unique gh_username String? @unique @@ -28,8 +33,6 @@ model User { isAdmin Boolean? @default(false) accounts Account[] sessions Session[] - // sites Site[] - // posts Post[] logs LogEntry[] }