From 74c7a2a414fdc0a0c28bdaa34dd906059a061b85 Mon Sep 17 00:00:00 2001
From: litongmacos <litongjava@qq.com>
Date: Tue, 12 Mar 2024 17:15:45 -1000
Subject: [PATCH 1/3] update version to :v3.2.7

---
 deploy/docker-compose.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml
index 8e0b513a..4e4ce8b0 100644
--- a/deploy/docker-compose.yaml
+++ b/deploy/docker-compose.yaml
@@ -29,7 +29,7 @@ services:
 
   # 后端 API 程序
   chatgpt-plus-api:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-api:v3.1.8.1
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-api:v3.2.7-amd64
     container_name: chatgpt-plus-api
     restart: always
     depends_on:
@@ -50,7 +50,7 @@ services:
 
   # 前端应用
   chatgpt-plus-web:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-web:v3.1.8.1
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/chatgpt-plus-web:v3.2.7-amd64
     container_name: chatgpt-plus-web
     restart: always
     depends_on:
@@ -62,4 +62,3 @@ services:
       - ./conf/nginx/conf.d:/etc/nginx/conf.d
       - ./conf/nginx/nginx.conf:/etc/nginx/nginx.conf
       - ./ssl:/etc/nginx/ssl
-

From 085d96d8558d819f273850bc12f1e1ec9c2d3cde Mon Sep 17 00:00:00 2001
From: litongmacos <litongjava@qq.com>
Date: Tue, 12 Mar 2024 17:36:59 -1000
Subject: [PATCH 2/3] fix docker-compose up -d error

---
 deploy/conf/config.toml    | 8 ++++----
 deploy/docker-compose.yaml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deploy/conf/config.toml b/deploy/conf/config.toml
index 7f3c629e..ed795412 100644
--- a/deploy/conf/config.toml
+++ b/deploy/conf/config.toml
@@ -1,6 +1,6 @@
 Listen = "0.0.0.0:5678"
 ProxyURL = "" # 如 http://127.0.0.1:7777
-MysqlDns = "root:12345678@tcp(172.22.11.200:3307)/chatgpt_plus?charset=utf8&parseTime=True&loc=Local"
+MysqlDns = "root:12345678@tcp(chatgpt-plus-mysql:3306)/chatgpt_plus?charset=utf8&parseTime=True&loc=Local"
 StaticDir = "./static" # 静态资源的目录
 StaticUrl = "/static" # 静态资源访问 URL
 AesEncryptKey = ""
@@ -15,9 +15,9 @@ WeChatBot = false
   Password = "admin123" # 如果是生产环境的话，这里管理员的密码记得修改
 
 [Redis] # redis 配置信息
-  Host = "localhost"
+  Host = "chatgpt-plus-redis"
   Port = 6379
-  Password = ""
+  Password = "12345678"
   DB = 0
 
 [ApiConfig] # 微博热搜，今日头条等函数服务 API 配置，此为第三方插件服务，如需使用请联系作者开通
@@ -126,4 +126,4 @@ WeChatBot = false
   AppId = "" # 商户 ID
   PrivateKey = "" # 秘钥
   ApiURL = "https://payjs.cn"
-  NotifyURL = "https://ai.r9it.com/api/payment/payjs/notify" # 异步回调地址，域名改成你自己的
\ No newline at end of file
+  NotifyURL = "https://ai.r9it.com/api/payment/payjs/notify" # 异步回调地址，域名改成你自己的
diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml
index 4e4ce8b0..58d13a8c 100644
--- a/deploy/docker-compose.yaml
+++ b/deploy/docker-compose.yaml
@@ -25,7 +25,7 @@ services:
     volumes :
       - ./redis/data:/data
     ports:
-      - "6380:6379"
+      - "6379:6379"
 
   # 后端 API 程序
   chatgpt-plus-api:

From 2c857663899eb461317cc38c9746e634d704a658 Mon Sep 17 00:00:00 2001
From: litongjava <litongjava@qq.com>
Date: Wed, 13 Mar 2024 11:46:46 -1000
Subject: [PATCH 3/3] add backend dockerfile

---
 api/Dockerfile                 | 24 ++++++++++++++++++++++++
 api/README.md                  | 11 ++++++++++-
 api/deploy/docker-compose.yaml | 19 +++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 api/Dockerfile
 create mode 100644 api/deploy/docker-compose.yaml

diff --git a/api/Dockerfile b/api/Dockerfile
new file mode 100644
index 00000000..f9531e69
--- /dev/null
+++ b/api/Dockerfile
@@ -0,0 +1,24 @@
+FROM golang:1.19.0 as go-deps
+WORKDIR /src
+COPY go.mod .
+COPY go.sum .
+# 预下载依赖
+RUN go mod download
+
+# 开始第二个构建阶段，命名为 go-builder
+FROM golang:1.19.0 as go-builder
+WORKDIR /src
+# 被 go-deps 阶段预下载的依赖会存放在此
+COPY --from=go-deps /go/pkg/mod /go/pkg/mod
+COPY . .
+# 构建应用
+RUN go build -v -o app.out main.go && ls -al
+
+# 以 debian:stable-slim 作为基础镜像
+FROM debian:stable-slim
+WORKDIR /var/www/app
+# 从 go-builder 阶段拷贝构建产物
+COPY --from=go-builder /src/app.out /var/www/app/app
+
+# 设置容器启动时执行的命令
+CMD ["/var/www/app/app"]
diff --git a/api/README.md b/api/README.md
index 083fe566..a8d9ff58 100644
--- a/api/README.md
+++ b/api/README.md
@@ -1,5 +1,14 @@
 # chatgpt-plus-go
 
 chatgpt-plus 后端 API Go 语言实现。技术选型采用 Gin + Mysql 架构，依赖注入使用的是 fx 框架，ORM 采用的是 GORM 框架。
+# Docker
+## build
+```
+docker build -t litongjava/chatgpt-plus-api:v3.2.7 .
+```
+## run
+```
+CONFIG_FILE
+```
 
-
+``````
diff --git a/api/deploy/docker-compose.yaml b/api/deploy/docker-compose.yaml
new file mode 100644
index 00000000..4711a598
--- /dev/null
+++ b/api/deploy/docker-compose.yaml
@@ -0,0 +1,19 @@
+version: '3'
+services:
+  # 后端 API 程序
+  chatgpt-plus-api:
+    image: litongjava/chatgpt-plus-api:v3.2.7
+    container_name: chatgpt-plus-api
+    restart: always
+    environment:
+      - DEBUG=false
+      - LOG_LEVEL=info
+      - CONFIG_FILE=config.toml
+    ports:
+      - "5678:5678"
+      - "9999:9999"
+    volumes:
+      - /usr/share/zoneinfo/Asia/Shanghai:/etc/localtime
+      - ./conf/config.toml:/var/www/app/config.toml
+      - ./logs:/var/www/app/logs
+      - ./static:/var/www/app/static