From 1b1ad3201a0be6d0cbb23b10608d539e84a948c0 Mon Sep 17 00:00:00 2001
From: sijinhui <sijinhui@qq.com>
Date: Fri, 17 May 2024 11:37:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=8A=A0=E8=BD=BD=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml | 33 ++-------------------------------
 package.json       |  2 +-
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c13a85293..f161d4922 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,37 +17,8 @@ services:
     network_mode: "host"
     environment:
       - TZ=Asia/Shanghai
-      - OPENAI_API_KEY=$OPENAI_API_KEY
-      - GOOGLE_API_KEY=$GOOGLE_API_KEY
-      - GOOGLE_URL=$GOOGLE_URL
-      - CODE=$CODE
-      - BASE_URL=$BASE_URL
-      - OPENAI_ORG_ID=$OPENAI_ORG_ID
-      - HIDE_USER_API_KEY=$HIDE_USER_API_KEY
-      - DISABLE_GPT4=$DISABLE_GPT4
-      - GPT_4_BASE_URL=$GPT_4_BASE_URL
-      - GPT_4_KEY=$GPT_4_KEY
-      - MIDJOURNEY_PROXY_KEY=$MIDJOURNEY_PROXY_KEY
-      - MIDJOURNEY_PROXY_URL=$MIDJOURNEY_PROXY_URL
-      - ENABLE_BALANCE_QUERY=$ENABLE_BALANCE_QUERY
-      - DISABLE_FAST_LINK=$DISABLE_FAST_LINK
-      - OPENAI_SB=$OPENAI_SB
-      - AZURE_URL=$AZURE_URL
-      - AZURE_API_KEY=$AZURE_API_KEY
-      - AZURE_API_VERSION=$AZURE_API_VERSION
-      - AZURE_VOICE_KEY=$AZURE_VOICE_KEY
-      - NEXTAUTH_URL=$NEXTAUTH_URL
-      - POSTGRES_PRISMA_URL=$POSTGRES_PRISMA_URL
-      - NEXTAUTH_SECRET=$NEXTAUTH_SECRET
-      - AUTH_GITHUB_ID=$AUTH_GITHUB_ID
-      - AUTH_GITHUB_SECRET=$AUTH_GITHUB_SECRET
-      - EMAIL_SERVER_HOST=$EMAIL_SERVER_HOST
-      - EMAIL_SERVER_PORT=$EMAIL_SERVER_PORT
-      - EMAIL_SERVER_USER=$EMAIL_SERVER_USER
-      - EMAIL_SERVER_PASSWORD=$EMAIL_SERVER_PASSWORD
-      - EMAIL_FROM=$EMAIL_FROM
-      - SECURE_COOKIES=$SECURE_COOKIES
-      - PORT=$PORT
+    env_file:
+      - .env
     volumes:
       - /etc/localtime:/etc/localtime
 #    networks:
diff --git a/package.json b/package.json
index 26aa065bb..4d3579ba4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nextchat",
   "private": false,
-  "license": "mit",
+  "license": "MIT",
   "scripts": {
     "dev": "npx prisma generate && npx prisma db push && next dev --hostname 0.0.0.0 --port 23000",
     "build": "npx next telemetry disable && npx prisma generate && cross-env BUILD_MODE=standalone next build",