diff --git a/changlog.md b/changlog.md index 8217b71ef..3b01bd3df 100644 --- a/changlog.md +++ b/changlog.md @@ -1,6 +1,10 @@ # 功能升级日志 # 计划 +# 2.20.4 +- 🐞 修复:更新了背景图版本后。聊天窗口内容上下滚动有时候会失效,要重新刷新页面才能滚动 #490 +- 🐞 修复:docker部署能不用在编排的时候填写key + # 2.20.3 - 🤖 合并: 新增自定义背景图片 #488 @Yanyutin753 - 💄 合并: 优化文件上传样式 #487 @Yanyutin753 diff --git a/package.json b/package.json index d617489e7..a58486bdb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "chatgpt-web-midjourney-proxy", - "version": "2.20.3", + "version": "2.20.4", "private": false, "description": "ChatGPT Web Midjourney Proxy", "author": "Dooy ", diff --git a/service/src/chatgpt/index.ts b/service/src/chatgpt/index.ts index ae3296d90..f73fb80e1 100644 --- a/service/src/chatgpt/index.ts +++ b/service/src/chatgpt/index.ts @@ -29,8 +29,11 @@ const disableDebug: boolean = process.env.OPENAI_API_DISABLE_DEBUG === 'true' let apiModel: ApiModel const model = isNotEmptyString(process.env.OPENAI_API_MODEL) ? process.env.OPENAI_API_MODEL : 'gpt-3.5-turbo' -if (!isNotEmptyString(process.env.OPENAI_API_KEY) && !isNotEmptyString(process.env.OPENAI_ACCESS_TOKEN)) - throw new Error('Missing OPENAI_API_KEY or OPENAI_ACCESS_TOKEN environment variable') +if (!isNotEmptyString(process.env.OPENAI_API_KEY) && !isNotEmptyString(process.env.OPENAI_ACCESS_TOKEN)){ + process.env.OPENAI_API_BASE_URL="https://api.openai.com" + process.env.OPENAI_API_KEY="sk-xxx" +} + //throw new Error('Missing OPENAI_API_KEY or OPENAI_ACCESS_TOKEN environment variable') let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 3e9a8fea1..b6185eddd 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "ChatGPT-MJ", - "version": "2.20.3" + "version": "2.20.4" }, "tauri": { "allowlist": { diff --git a/src/views/chat/components/Header/index.vue b/src/views/chat/components/Header/index.vue index b8d1df510..54eb03888 100644 --- a/src/views/chat/components/Header/index.vue +++ b/src/views/chat/components/Header/index.vue @@ -91,8 +91,8 @@ watch(()=>homeStore.myData.act,debounce( (n)=> n=='saveChat' && (nGptStore.value - -
+
+