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 ab57a6f6..ee106878 100644 --- a/api/go/handler/user_handler.go +++ b/api/go/handler/user_handler.go @@ -218,7 +218,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/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"] 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="用户设置" >
@@ -53,7 +53,7 @@ {{ form['calls'] }} - + {{ form['tokens'] }} @@ -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 @@ - +