From 3194becdad2f45a4a185eeae91b520c256838a48 Mon Sep 17 00:00:00 2001
From: ly307787186 <475067517@qq.com>
Date: Fri, 30 Jun 2023 13:20:30 +0800
Subject: [PATCH 1/3] Update Setting.vue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关掉aip-key 必需的验证
---
 web/src/views/mobile/Setting.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/src/views/mobile/Setting.vue b/web/src/views/mobile/Setting.vue
index 155cd2fd..12a567d7 100644
--- a/web/src/views/mobile/Setting.vue
+++ b/web/src/views/mobile/Setting.vue
@@ -45,7 +45,6 @@
               name="API KEY"
               label="API KEY"
               placeholder="配置自己的 api key"
-              :rules="[{ required: true, message: '请填写 API KEY' }]"
           />
         </van-cell-group>
         <div style="margin: 16px;">
@@ -126,4 +125,4 @@ const save = () => {
     padding-top 60px
   }
 }
-</style>
\ No newline at end of file
+</style>

From 31c14bf7483800da31a50c4da6f5e97cceb2494b Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Sat, 1 Jul 2023 23:29:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=20token=20=E6=B6=88=E8=80=97=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/go/handler/chat_handler.go      |  4 ++++
 api/go/handler/user_handler.go      |  2 +-
 web/src/components/ConfigDialog.vue | 11 ++---------
 web/src/views/mobile/Profile.vue    |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/api/go/handler/chat_handler.go b/api/go/handler/chat_handler.go
index 177e5296..3707d80c 100644
--- a/api/go/handler/chat_handler.go
+++ b/api/go/handler/chat_handler.go
@@ -319,6 +319,10 @@ func (h *ChatHandler) sendMessage(ctx context.Context, session types.ChatSession
 				if res.Error != nil {
 					logger.Error("failed to save reply history message: ", res.Error)
 				}
+
+				// 统计用户 token 数量
+				h.db.Model(&user).UpdateColumn("tokens", gorm.Expr("tokens + ?",
+					historyUserMsg.Tokens+historyReplyMsg.Tokens))
 			}
 
 			// 保存当前会话
diff --git a/api/go/handler/user_handler.go b/api/go/handler/user_handler.go
index c329957c..8a2e662a 100644
--- a/api/go/handler/user_handler.go
+++ b/api/go/handler/user_handler.go
@@ -240,7 +240,7 @@ type userProfile struct {
 	Avatar     string           `json:"avatar"`
 	ChatConfig types.ChatConfig `json:"chat_config"`
 	Calls      int              `json:"calls"`
-	Tokens     int              `json:"tokens"`
+	Tokens     int64            `json:"tokens"`
 }
 
 func (h *UserHandler) Profile(c *gin.Context) {
diff --git a/web/src/components/ConfigDialog.vue b/web/src/components/ConfigDialog.vue
index 10931e10..8de7c8e3 100644
--- a/web/src/components/ConfigDialog.vue
+++ b/web/src/components/ConfigDialog.vue
@@ -3,7 +3,7 @@
       v-model="showDialog"
       :close-on-click-modal="false"
       :before-close="close"
-      :top="top"
+      :top="50+'px'"
       title="用户设置"
   >
     <div class="user-info" id="user-info">
@@ -53,7 +53,7 @@
         <el-form-item label="剩余调用次数">
           <el-tag>{{ form['calls'] }}</el-tag>
         </el-form-item>
-        <el-form-item label="剩余 Tokens">
+        <el-form-item label="消耗 Tokens">
           <el-tag type="info">{{ form['tokens'] }}</el-tag>
         </el-form-item>
         <el-form-item label="API KEY">
@@ -100,13 +100,6 @@ const form = ref({
   tokens: 0,
   chat_configs: {}
 })
-const top = computed(() => {
-  if (window.innerHeight < 1024) {
-    return '5vh';
-  } else {
-    return '15vh';
-  }
-})
 
 onMounted(() => {
   // 获取最新用户信息
diff --git a/web/src/views/mobile/Profile.vue b/web/src/views/mobile/Profile.vue
index bb6fea5a..800ec24d 100644
--- a/web/src/views/mobile/Profile.vue
+++ b/web/src/views/mobile/Profile.vue
@@ -35,7 +35,7 @@
             </template>
           </van-field>
 
-          <van-field label="剩余 Tokens">
+          <van-field label="消耗 Tokens">
             <template #input>
               <van-tag type="primary">{{ form.tokens }}</van-tag>
             </template>

From adf69165986812bac791ea16d3257b693dddc3fd Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Sun, 2 Jul 2023 00:04:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20nodejs=20apple?=
 =?UTF-8?q?=20M1=20=E8=B7=A8=E5=B9=B3=E5=8F=B0=E6=89=93=E5=8C=85=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=8A=A5=E9=94=99=20exec=20format=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/build.sh            | 2 +-
 docker/docker-compose.yaml | 4 ++--
 docker/dockerfile-api-go   | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/docker/build.sh b/docker/build.sh
index a24fd374..0652adcf 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -20,7 +20,7 @@ docker build -t chatgpt-plus-go:$version -f dockerfile-api-go ../
 # build docker image for chatgpt-plus-vue
 docker rmi -f registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-vue:$version
 docker rmi -f chatgpt-plus-vue:$version
-docker build -t chatgpt-plus-vue:$version -f dockerfile-vue ../
+docker build --platform linux/amd64 -t chatgpt-plus-vue:$version -f dockerfile-vue ../
 
 # add tag for aliyum docker registry
 goImageId=`docker images |grep chatgpt-plus-go |grep $version |awk '{print $3}'`
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 390a77dd..0f545f47 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3'
 services:
   # 后端 API 程序
   chatgpt-plus-go:
-    image: registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-go:v3.0.2
+    image: registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-go:v3.0.4
     #    image: chatgpt-plus-go:v3.0.2
     container_name: chatgpt-plus-go
     restart: always
@@ -17,7 +17,7 @@ services:
 
   # 前端应用
   chatgpt-vue:
-    image: registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-vue:v3.0.2
+    image: registry.cn-hangzhou.aliyuncs.com/geekmaster/chatgpt-plus-vue:v3.0.4
     #    image: chatgpt-plus-vue:v3.0.2
     container_name: chatgpt-plus-vue
     restart: always
diff --git a/docker/dockerfile-api-go b/docker/dockerfile-api-go
index 809cb850..9618cda7 100644
--- a/docker/dockerfile-api-go
+++ b/docker/dockerfile-api-go
@@ -8,8 +8,5 @@ COPY ./api/go/bin/chatgpt-v3-amd64-linux /var/www/app
 
 EXPOSE 5678
 
-RUN apt-get -qq update \
-    && apt-get -qq install -y --no-install-recommends ca-certificates curl
-
 # 容器启动时执行的命令
 CMD ["./chatgpt-v3-amd64-linux"]