From 9ec7c7c514be7845b0c0c7eebe8106a117bf38ae Mon Sep 17 00:00:00 2001
From: Weihan Li <weihanli@outlook.com>
Date: Thu, 25 Jan 2024 13:36:52 +0800
Subject: [PATCH 1/2] add docker-compose support

---
 .env.serve         |  4 +++-
 Dockerfile         |  4 ++++
 README.md          | 20 ++++++++++++++++----
 docker-compose.yml | 19 +++++++++++++++++++
 src/api/index.js   |  2 +-
 5 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 docker-compose.yml

diff --git a/.env.serve b/.env.serve
index 927f91d..5f1cee4 100644
--- a/.env.serve
+++ b/.env.serve
@@ -1,2 +1,4 @@
 #设置openai的key,防止页面刷新重新输入
-VUE_APP_OPENAI_API_KEY=""
\ No newline at end of file
+VUE_APP_OPENAI_API_KEY=""
+#设置 OpenAI Url
+VUE_APP_OPENAI_API_URL=""
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index db3f3b2..5167872 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,10 @@ WORKDIR /app
 COPY package.json .
 RUN npm install
 
+ARG OPENAI_API_KEY=""
+ARG OPENAI_API_URL=""
+RUN export VUE_APP_OPENAI_API_KEY=$OPENAI_API_KEY && export VUE_APP_OPENAI_API_URL=$OPENAI_API_URL
+
 COPY . .
 RUN npm run build
 
diff --git a/README.md b/README.md
index 208ad9e..9180b31 100644
--- a/README.md
+++ b/README.md
@@ -42,25 +42,37 @@ https://www.bilibili.com/video/BV1ss4y1d72g 此项目微调使用的简单案例
 
 # 部署步骤
 ## 本地部署
-```
+
+```sh
 npm install
 npm run serve
 npm run build
 ```
- # 在线体验地址 (需要使用OpenAI KEY)
+
+# 在线体验地址 (需要使用OpenAI KEY)
 
  > https://huggingface.co/spaces/junchenmo/OpenAI-Manager
 
 ## OpenAI-Key设置以及自定义设置
+
 ### 在.env.serve中添加代码
-```
+
+```env
 VUE_APP_OPENAI_API_KEY='你的openai api key'
 ```
+
+### 配置使用自定义的 OpenAI proxy
+
+在 .env.serve 中添加代码
+
+```env
+VUE_APP_OPENAI_API_URL='你的openai api proxy'
+```
+
 ### 在/src/store/mutation-types.js
 
 可以在此文件中设置AI头像+用户头像+用户名称
 
-
 # 技术栈
 
 |  名称   | 版本  |
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..b1a1a7c
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,19 @@
+version: "3.6"
+
+services:
+  chatgpt:
+    container_name: chatgpt
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+      args:
+        - OPENAI_API_KEY=""
+        - OPENAI_API_URL="http://baidu.com"
+    ports:
+      - 8090:80
+    restart: unless-stopped
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "100m"
+        max-file: "1"
\ No newline at end of file
diff --git a/src/api/index.js b/src/api/index.js
index 9efbfdc..453d7b4 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -30,7 +30,7 @@ axios.interceptors.response.use(function (response) {
 
 const base = {
   axios: axios,
-  baseUrl: 'https://api.openai.com'
+  baseUrl: process.env.VUE_APP_OPENAI_API_URL || 'https://api.openai.com'
 }
 
 export default base
\ No newline at end of file

From 41e4d0f53781d33f185f6463a413b75501964323 Mon Sep 17 00:00:00 2001
From: Weihan Li <weihanli@outlook.com>
Date: Thu, 25 Jan 2024 06:42:25 +0000
Subject: [PATCH 2/2] update docker-compose support

---
 Dockerfile         | 3 ++-
 docker-compose.yml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5167872..05a08a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,8 @@ RUN npm install
 
 ARG OPENAI_API_KEY=""
 ARG OPENAI_API_URL=""
-RUN export VUE_APP_OPENAI_API_KEY=$OPENAI_API_KEY && export VUE_APP_OPENAI_API_URL=$OPENAI_API_URL
+ENV VUE_APP_OPENAI_API_KEY="${OPENAI_API_KEY}"
+ENV VUE_APP_OPENAI_API_URL="${OPENAI_API_URL}"
 
 COPY . .
 RUN npm run build
diff --git a/docker-compose.yml b/docker-compose.yml
index b1a1a7c..6abccc4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,8 +7,8 @@ services:
       context: .
       dockerfile: ./Dockerfile
       args:
-        - OPENAI_API_KEY=""
-        - OPENAI_API_URL="http://baidu.com"
+        # - OPENAI_API_KEY=xx-xxx
+        # - OPENAI_API_URL=http://baidu.com
     ports:
       - 8090:80
     restart: unless-stopped