Upload 135 files

.env

@@ -1,10 +1,10 @@
 # Glob API URL
 VITE_GLOB_API_URL=/api
 
-VITE_APP_API_BASE_URL=http://localhost:3002/
+VITE_APP_API_BASE_URL=http://127.0.0.1:3002/
 
 # Whether long replies are supported, which may result in higher API fees
 VITE_GLOB_OPEN_LONG_REPLY=false
 
 # When you want to use PWA
-VITE_GLOB_APP_PWA=false
+VITE_GLOB_APP_PWA=false

.eslintignore

@@ -1,2 +1,2 @@
 docker-compose
-kubernetes
+kubernetes

docker-compose/docker-compose.yml

@@ -44,4 +44,4 @@ services:
       - ./nginx/html:/usr/share/nginx/html
       - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf
     links:
-      - app
+      - app

docker-compose/nginx/nginx.conf

@@ -24,4 +24,4 @@ server {
 	proxy_set_header X-Real-IP $remote_addr;
 	proxy_set_header REMOTE-HOST $remote_addr;
 	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-}
+}

kubernetes/README.md

@@ -6,4 +6,4 @@ kubectl apply -f deploy.yaml
 ### 如果需要Ingress域名接入
 ```
 kubectl apply -f ingress.yaml
-```
+```

kubernetes/deploy.yaml

@@ -63,4 +63,4 @@ spec:
       targetPort: 3002
   selector:
     app: chatgpt-web
-  type: ClusterIP
+  type: ClusterIP

kubernetes/ingress.yaml

@@ -18,4 +18,4 @@ spec:
             path: /
             pathType: ImplementationSpecific
   tls:
-    - secretName: chatgpt-web-tls
+    - secretName: chatgpt-web-tls

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-web",
-  "version": "2.11.0",
+  "version": "2.11.1",
   "private": false,
   "description": "ChatGPT Web",
   "author": "ChenZhaoYu <[email protected]>",

pnpm-lock.yaml

@@ -6900,4 +6900,4 @@ packages:
   /[email protected]:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
-    dev: true
+    dev: true

service/.env.example

@@ -1,9 +1,6 @@
 # OpenAI API Key - https://platform.openai.com/overview
 OPENAI_API_KEY=
 
-# OpenAI API Key ARR - https://platform.openai.com/overview
-OPENAI_API_KEY_ARR=
-
 # change this to an `accessToken` extracted from the ChatGPT site's `https://chat.openai.com/api/auth/session` response
 OPENAI_ACCESS_TOKEN=
 
@@ -44,3 +41,4 @@ SOCKS_PROXY_PASSWORD=
 
 # HTTPS PROXY
 HTTPS_PROXY=
+

service/package.json

@@ -44,4 +44,4 @@
     "tsup": "^6.6.3",
     "typescript": "^4.9.5"
   }
-}
+}

src/api/index.ts

@@ -63,4 +63,4 @@ export function fetchVerify<T>(token: string) {
     url: '/verify',
     data: { token },
   })
-}
+}

src/components/common/PromptStore/index.vue

@@ -477,4 +477,4 @@ const dataSource = computed(() => {
       </NButton>
     </NSpace>
   </NModal>
-</template>
+</template>

src/components/common/Setting/Advanced.vue

@@ -42,7 +42,7 @@ function handleReset() {
       <div class="flex items-center space-x-4">
         <span class="flex-shrink-0 w-[120px]">{{ $t('setting.temperature') }} </span>
         <div class="flex-1">
-          <NSlider v-model:value="temperature" :max="1" :min="0" :step="0.1" />
+          <NSlider v-model:value="temperature" :max="2" :min="0" :step="0.1" />
         </div>
         <span>{{ temperature }}</span>
         <NButton size="tiny" text type="primary" @click="updateSettings({ temperature })">
@@ -67,4 +67,4 @@ function handleReset() {
       </div>
     </div>
   </div>
-</template>
+</template>

src/components/common/Setting/General.vue

@@ -54,8 +54,11 @@ const themeOptions: { label: string; key: Theme; icon: string }[] = [
 ]
 
 const languageOptions: { label: string; key: Language; value: Language }[] = [
-  { label: 'Tiếng Việt', key: 'vi-VN', value: 'vi-VN' },
+  { label: '简体中文', key: 'zh-CN', value: 'zh-CN' },
+  { label: '繁體中文', key: 'zh-TW', value: 'zh-TW' },
   { label: 'English', key: 'en-US', value: 'en-US' },
+  { label: '한국어', key: 'ko-KR', value: 'ko-KR' },
+  { label: 'Русский язык', key: 'ru-RU', value: 'ru-RU' },
 ]
 
 function updateUserInfo(options: Partial<UserInfo>) {
@@ -219,4 +222,4 @@ function handleImportButtonClick(): void {
       </div>
     </div>
   </div>
-</template>
+</template>

src/components/common/Setting/index.vue

@@ -67,4 +67,4 @@ const show = computed({
       </NTabs>
     </div>
   </NModal>
-</template>
+</template>

src/router/permission.ts

@@ -25,4 +25,4 @@ export function setupPageGuard(router: Router) {
       next()
     }
   })
-}
+}

src/store/helper.ts

@@ -0,0 +1,3 @@
+import { createPinia } from 'pinia'
+
+export const store = createPinia()

src/store/index.ts

@@ -1,7 +1,5 @@
 import type { App } from 'vue'
-import { createPinia } from 'pinia'
-
-export const store = createPinia()
+import { store } from './helper'
 
 export function setupStore(app: App) {
   app.use(store)

src/store/modules/app/helper.ts

@@ -4,7 +4,7 @@ const LOCAL_NAME = 'appSetting'
 
 export type Theme = 'light' | 'dark' | 'auto'
 
-export type Language = 'vi-VN' | 'en-US'
+export type Language = 'zh-CN' | 'zh-TW' | 'en-US' | 'ko-KR' | 'ru-RU'
 
 export interface AppState {
   siderCollapsed: boolean
@@ -13,7 +13,7 @@ export interface AppState {
 }
 
 export function defaultSetting(): AppState {
-  return { siderCollapsed: false, theme: 'light', language: 'en-US' }
+  return { siderCollapsed: false, theme: 'light', language: 'zh-CN' }
 }
 
 export function getLocalSetting(): AppState {

src/store/modules/app/index.ts

@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import type { AppState, Language, Theme } from './helper'
 import { getLocalSetting, setLocalSetting } from './helper'
-import { store } from '@/store'
+import { store } from '@/store/helper'
 
 export const useAppStore = defineStore('app-store', {
   state: (): AppState => getLocalSetting(),

src/store/modules/auth/index.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import { getToken, removeToken, setToken } from './helper'
-import { store } from '@/store'
+import { store } from '@/store/helper'
 import { fetchSession } from '@/api'
 
 interface SessionResponse {

src/store/modules/chat/index.ts

@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { getLocalState, setLocalState } from './helper'
+import { defaultState, getLocalState, setLocalState } from './helper'
 import { router } from '@/router'
 
 export const useChatStore = defineStore('chat-store', {
@@ -182,6 +182,11 @@ export const useChatStore = defineStore('chat-store', {
       }
     },
 
+    clearHistory() {
+      this.$state = { ...defaultState() }
+      this.recordState()
+    },
+
     async reloadRoute(uuid?: number) {
       this.recordState()
       await router.push({ name: 'Chat', params: { uuid } })

src/store/modules/settings/helper.ts

@@ -27,4 +27,4 @@ export function setLocalState(setting: SettingsState): void {
 
 export function removeLocalState() {
   ss.remove(LOCAL_NAME)
-}
+}

src/store/modules/settings/index.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import type { SettingsState } from './helper'
-import { defaultSetting, getLocalState, setLocalState } from './helper'
+import { defaultSetting, getLocalState, removeLocalState, setLocalState } from './helper'
 
 export const useSettingStore = defineStore('setting-store', {
   state: (): SettingsState => getLocalState(),
@@ -12,11 +12,11 @@ export const useSettingStore = defineStore('setting-store', {
 
     resetSetting() {
       this.$state = defaultSetting()
-      this.recordState()
+      removeLocalState()
     },
 
     recordState() {
       setLocalState(this.$state)
     },
   },
-})
+})

src/store/modules/user/helper.ts

@@ -15,9 +15,9 @@ export interface UserState {
 export function defaultSetting(): UserState {
   return {
     userInfo: {
-      avatar: 'https://pnghive.com/core/images/full/chat-gpt-logo-png-1680406057.png',
-      name: 'ChatGPT',
-      description: 'AI assistant',
+      avatar: 'https://raw.githubusercontent.com/Chanzhaoyu/chatgpt-web/main/src/assets/avatar.jpg',
+      name: 'ChenZhaoYu',
+      description: 'Star on <a href="https://github.com/Chanzhaoyu/chatgpt-bot" class="text-blue-500" target="_blank" >GitHub</a>',
     },
   }
 }

src/styles/lib/highlight.less

@@ -203,4 +203,4 @@ html {
 	.hljs-link {
 		text-decoration: underline
 	}
-}
+}

src/typings/env.d.ts

@@ -5,4 +5,4 @@ interface ImportMetaEnv {
 	readonly VITE_APP_API_BASE_URL: string;
 	readonly VITE_GLOB_OPEN_LONG_REPLY: string;
 	readonly VITE_GLOB_APP_PWA: string;
-}
+}

src/utils/functions/debounce.ts

@@ -15,4 +15,4 @@ export function debounce<T extends unknown[]>(
     clearTimeout(timeoutId)
     timeoutId = setTimeout(later, wait)
   }
-}
+}

src/utils/request/index.ts

@@ -81,4 +81,4 @@ export function post<T = any>(
   })
 }
 
-export default post
+export default post

src/utils/storage/index.ts

@@ -1 +1,57 @@
-export * from './local'
+interface StorageData<T = any> {
+  data: T
+  expire: number | null
+}
+
+export function createLocalStorage(options?: { expire?: number | null }) {
+  const DEFAULT_CACHE_TIME = 60 * 60 * 24 * 7
+
+  const { expire } = Object.assign({ expire: DEFAULT_CACHE_TIME }, options)
+
+  function set<T = any>(key: string, data: T) {
+    const storageData: StorageData<T> = {
+      data,
+      expire: expire !== null ? new Date().getTime() + expire * 1000 : null,
+    }
+
+    const json = JSON.stringify(storageData)
+    window.localStorage.setItem(key, json)
+  }
+
+  function get(key: string) {
+    const json = window.localStorage.getItem(key)
+    if (json) {
+      let storageData: StorageData | null = null
+
+      try {
+        storageData = JSON.parse(json)
+      }
+      catch {
+        // Prevent failure
+      }
+
+      if (storageData) {
+        const { data, expire } = storageData
+        if (expire === null || expire >= Date.now())
+          return data
+      }
+
+      remove(key)
+      return null
+    }
+  }
+
+  function remove(key: string) {
+    window.localStorage.removeItem(key)
+  }
+
+  function clear() {
+    window.localStorage.clear()
+  }
+
+  return { set, get, remove, clear }
+}
+
+export const ls = createLocalStorage()
+
+export const ss = createLocalStorage({ expire: null })

src/views/chat/components/Header/index.vue

@@ -9,7 +9,7 @@ interface Props {
 
 interface Emit {
   (ev: 'export'): void
-  (ev: 'toggleUsingContext'): void
+  (ev: 'handleClear'): void
 }
 
 defineProps<Props>()
@@ -36,8 +36,8 @@ function handleExport() {
   emit('export')
 }
 
-function toggleUsingContext() {
-  emit('toggleUsingContext')
+function handleClear() {
+  emit('handleClear')
 }
 </script>
 
@@ -62,16 +62,16 @@ function toggleUsingContext() {
         {{ currentChatHistory?.title ?? '' }}
       </h1>
       <div class="flex items-center space-x-2">
-        <HoverButton @click="toggleUsingContext">
-          <span class="text-xl" :class="{ 'text-[#4b9e5f]': usingContext, 'text-[#a8071a]': !usingContext }">
-            <SvgIcon icon="ri:chat-history-line" />
-          </span>
-        </HoverButton>
         <HoverButton @click="handleExport">
           <span class="text-xl text-[#4f555e] dark:text-white">
             <SvgIcon icon="ri:download-2-line" />
           </span>
         </HoverButton>
+        <HoverButton @click="handleClear">
+          <span class="text-xl text-[#4f555e] dark:text-white">
+            <SvgIcon icon="ri:delete-bin-line" />
+          </span>
+        </HoverButton>
       </div>
     </div>
   </header>

src/views/chat/components/Message/Text.vue

@@ -107,17 +107,14 @@ onUnmounted(() => {
   <div class="text-black" :class="wrapClass">
     <div ref="textRef" class="leading-relaxed break-words">
       <div v-if="!inversion">
-        <div v-if="!asRawText" class="markdown-body" v-html="text" />
+        <div v-if="!asRawText" class="markdown-body" :class="{ 'markdown-body-generate': loading }" v-html="text" />
         <div v-else class="whitespace-pre-wrap" v-text="text" />
       </div>
       <div v-else class="whitespace-pre-wrap" v-text="text" />
-      <template v-if="loading">
-        <span class="dark:text-white w-[4px] h-[20px] block animate-blink" />
-      </template>
     </div>
   </div>
 </template>
 
 <style lang="less">
 @import url(./style.less);
-</style>
+</style>

src/views/chat/components/Message/index.vue

@@ -142,4 +142,4 @@ async function handleCopy() {
       </div>
     </div>
   </div>
-</template>
+</template>

src/views/chat/components/Message/style.less

@@ -57,10 +57,60 @@
 		}
 	}
 
+
+	&.markdown-body-generate>dd:last-child:after,
+	&.markdown-body-generate>dl:last-child:after,
+	&.markdown-body-generate>dt:last-child:after,
+	&.markdown-body-generate>h1:last-child:after,
+	&.markdown-body-generate>h2:last-child:after,
+	&.markdown-body-generate>h3:last-child:after,
+	&.markdown-body-generate>h4:last-child:after,
+	&.markdown-body-generate>h5:last-child:after,
+	&.markdown-body-generate>h6:last-child:after,
+	&.markdown-body-generate>li:last-child:after,
+	&.markdown-body-generate>ol:last-child li:last-child:after,
+	&.markdown-body-generate>p:last-child:after,
+	&.markdown-body-generate>pre:last-child code:after,
+	&.markdown-body-generate>td:last-child:after,
+	&.markdown-body-generate>ul:last-child li:last-child:after {
+		animation: blink 1s steps(5, start) infinite;
+		color: #000;
+		content: '_';
+		font-weight: 700;
+		margin-left: 3px;
+		vertical-align: baseline;
+	}
+
+	@keyframes blink {
+		to {
+			visibility: hidden;
+		}
+	}
 }
 
 html.dark {
 
+	.markdown-body {
+
+		&.markdown-body-generate>dd:last-child:after,
+		&.markdown-body-generate>dl:last-child:after,
+		&.markdown-body-generate>dt:last-child:after,
+		&.markdown-body-generate>h1:last-child:after,
+		&.markdown-body-generate>h2:last-child:after,
+		&.markdown-body-generate>h3:last-child:after,
+		&.markdown-body-generate>h4:last-child:after,
+		&.markdown-body-generate>h5:last-child:after,
+		&.markdown-body-generate>h6:last-child:after,
+		&.markdown-body-generate>li:last-child:after,
+		&.markdown-body-generate>ol:last-child li:last-child:after,
+		&.markdown-body-generate>p:last-child:after,
+		&.markdown-body-generate>pre:last-child code:after,
+		&.markdown-body-generate>td:last-child:after,
+		&.markdown-body-generate>ul:last-child li:last-child:after {
+			color: #65a665;
+		}
+	}
+
 	.message-reply {
 		.whitespace-pre-wrap {
 			white-space: pre-wrap;
@@ -72,4 +122,14 @@ html.dark {
 	pre {
 		background-color: #282c34;
 	}
-}
+}
+
+@media screen and (max-width: 533px) {
+	.markdown-body .code-block-wrapper {
+		padding: unset;
+
+		code {
+			padding: 24px 16px 16px 16px;
+		}
+	}
+}

src/views/chat/index.vue

@@ -93,7 +93,7 @@ async function onConversation() {
     +uuid,
     {
       dateTime: new Date().toLocaleString(),
-      text: '',
+      text: '思考中',
       loading: true,
       inversion: false,
       error: false,
@@ -469,7 +469,7 @@ onUnmounted(() => {
       v-if="isMobile"
       :using-context="usingContext"
       @export="handleExport"
-      @toggle-using-context="toggleUsingContext"
+      @handle-clear="handleClear"
     />
     <main class="flex-1 overflow-hidden">
       <div id="scrollRef" ref="scrollRef" class="h-full overflow-hidden overflow-y-auto">
@@ -513,7 +513,7 @@ onUnmounted(() => {
     <footer :class="footerClass">
       <div class="w-full max-w-screen-xl m-auto">
         <div class="flex items-center justify-between space-x-2">
-          <HoverButton @click="handleClear">
+          <HoverButton v-if="!isMobile" @click="handleClear">
             <span class="text-xl text-[#4f555e] dark:text-white">
               <SvgIcon icon="ri:delete-bin-line" />
             </span>
@@ -523,7 +523,7 @@ onUnmounted(() => {
               <SvgIcon icon="ri:download-2-line" />
             </span>
           </HoverButton>
-          <HoverButton v-if="!isMobile" @click="toggleUsingContext">
+          <HoverButton @click="toggleUsingContext">
             <span class="text-xl" :class="{ 'text-[#4b9e5f]': usingContext, 'text-[#a8071a]': !usingContext }">
               <SvgIcon icon="ri:chat-history-line" />
             </span>
@@ -554,4 +554,4 @@ onUnmounted(() => {
       </div>
     </footer>
   </div>
-</template>
+</template>

src/views/chat/layout/sider/List.vue

@@ -102,4 +102,4 @@ function isActive(uuid: number) {
       </template>
     </div>
   </NScrollbar>
-</template>
+</template>

src/views/chat/layout/sider/index.vue

@@ -1,16 +1,19 @@
 <script setup lang='ts'>
 import type { CSSProperties } from 'vue'
 import { computed, ref, watch } from 'vue'
-import { NButton, NLayoutSider } from 'naive-ui'
+import { NButton, NLayoutSider, useDialog } from 'naive-ui'
 import List from './List.vue'
 import Footer from './Footer.vue'
 import { useAppStore, useChatStore } from '@/store'
 import { useBasicLayout } from '@/hooks/useBasicLayout'
-import { PromptStore } from '@/components/common'
+import { PromptStore, SvgIcon } from '@/components/common'
+import { t } from '@/locales'
 
 const appStore = useAppStore()
 const chatStore = useChatStore()
 
+const dialog = useDialog()
+
 const { isMobile } = useBasicLayout()
 const show = ref(false)
 
@@ -26,6 +29,20 @@ function handleUpdateCollapsed() {
   appStore.setSiderCollapsed(!collapsed.value)
 }
 
+function handleClearAll() {
+  dialog.warning({
+    title: t('chat.deleteMessage'),
+    content: t('chat.clearHistoryConfirm'),
+    positiveText: t('common.yes'),
+    negativeText: t('common.no'),
+    onPositiveClick: () => {
+      chatStore.clearHistory()
+      if (isMobile.value)
+        appStore.setSiderCollapsed(true)
+    },
+  })
+}
+
 const getMobileClass = computed<CSSProperties>(() => {
   if (isMobile.value) {
     return {
@@ -79,9 +96,14 @@ watch(
         <div class="flex-1 min-h-0 pb-4 overflow-hidden">
           <List />
         </div>
-        <div class="p-4">
-          <NButton block @click="show = true">
-            {{ $t('store.siderButton') }}
+        <div class="flex items-center p-4 space-x-4">
+          <div class="flex-1">
+            <NButton block @click="show = true">
+              {{ $t('store.siderButton') }}
+            </NButton>
+          </div>
+          <NButton @click="handleClearAll">
+            <SvgIcon icon="ri:close-circle-line" />
           </NButton>
         </div>
       </main>
@@ -92,4 +114,4 @@ watch(
     <div v-show="!collapsed" class="fixed inset-0 z-40 w-full h-full bg-black/40" @click="handleUpdateCollapsed" />
   </template>
   <PromptStore v-model:visible="show" />
-</template>
+</template>

start.cmd

@@ -6,4 +6,4 @@ echo "Start service complete!"
 cd ..
 echo "" > front.log
 start pnpm dev > front.log &
-echo "Start front complete!"
+echo "Start front complete!"

vite.config.ts

@@ -51,4 +51,4 @@ export default defineConfig((env) => {
       },
     },
   }
-})
+})