Skip to content

Commit

Permalink
v2.20.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Dooy committed Aug 23, 2024
1 parent 0a8b13b commit fe8e51f
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 10 deletions.
4 changes: 4 additions & 0 deletions changlog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# 功能升级日志

# 计划
# 2.20.4
- 🐞 修复:更新了背景图版本后。聊天窗口内容上下滚动有时候会失效,要重新刷新页面才能滚动 #490
- 🐞 修复:docker部署能不用在编排的时候填写key

# 2.20.3
- 🤖 合并: 新增自定义背景图片 #488 @Yanyutin753
- 💄 合并: 优化文件上传样式 #487 @Yanyutin753
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
Expand Down
7 changes: 5 additions & 2 deletions service/src/chatgpt/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "ChatGPT-MJ",
"version": "2.20.3"
"version": "2.20.4"
},
"tauri": {
"allowlist": {
Expand Down
4 changes: 2 additions & 2 deletions src/views/chat/components/Header/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ watch(()=>homeStore.myData.act,debounce( (n)=> n=='saveChat' && (nGptStore.value
</div>
</div>

<!-- <div @click="st.isShow=true" class="absolute left-1/2 top-full -translate-x-1/2 cursor-pointer select-none rounded-b-md border bg-white px-2 dark:border-neutral-800 dark:bg-[#111114]"> -->
<div @click="st.isShow=true" class="absolute left-1/2 top-full -translate-x-1/2 cursor-pointer select-none rounded-b-md px-2">
<div @click="st.isShow=true" class="absolute left-1/2 top-full -translate-x-1/2 cursor-pointer select-none rounded-b-md border bg-white px-2 dark:border-neutral-800 dark:bg-[#111114]">
<!-- <div @click="st.isShow=true" class="absolute left-1/2 top-full -translate-x-1/2 cursor-pointer select-none rounded-b-md px-2"> -->
<div class="flex items-center justify-center space-x-1 cursor-pointer hover:text-[#4b9e5f]" v-if="homeStore.myData.local!='draw'">
<template v-if="nGptStore.gpts">
<SvgIcon icon="ri:apps-fill" />
Expand Down
8 changes: 4 additions & 4 deletions src/views/chat/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const userStore = useUserStore();
const userInfo = computed(() => userStore.userInfo);
const backgroundImage = ref(userInfo.value.backgroundImage ?? "");
const backgroundImage = computed(()=>userInfo.value.backgroundImage ?? "");
function handleSubmit() {
//onConversation() //把这个放到aiGpt
Expand Down Expand Up @@ -605,11 +605,11 @@ const ychat = computed(() => {
</script>

<template>
<div
class="absolute top-0 left-0 w-full h-full bg-cover bg-center bg-no-repeat"
<div v-if="backgroundImage"
class=" fixed z-[200] pointer-events-none top-0 left-0 w-full h-full bg-cover bg-center bg-no-repeat"
:style="{
'background-image': 'url(' + backgroundImage + ')',
opacity: 0.15,
opacity: 0.19,
}"
></div>
<div class="flex flex-col w-full h-full">
Expand Down

0 comments on commit fe8e51f

Please sign in to comment.