From e3ba88f8ffb3384c3b8bef2078cbc555d1e912fd Mon Sep 17 00:00:00 2001 From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com> Date: Tue, 28 May 2024 09:32:55 +0800 Subject: [PATCH 01/26] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E9=A1=B5=E7=AD=BE=E4=B9=8B=E9=97=B4=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=85=B1=E4=BA=AB=E9=97=AE=E9=A2=98=20(#561)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/stores/modules/application.ts | 10 ++-------- ui/src/stores/modules/user.ts | 16 ++++------------ ui/src/views/chat/base/index.vue | 1 - ui/src/views/chat/embed/index.vue | 1 - ui/src/views/chat/pc/index.vue | 1 - 5 files changed, 6 insertions(+), 23 deletions(-) diff --git a/ui/src/stores/modules/application.ts b/ui/src/stores/modules/application.ts index bdd713d55..5ad7ddd75 100644 --- a/ui/src/stores/modules/application.ts +++ b/ui/src/stores/modules/application.ts @@ -65,14 +65,8 @@ const useApplicationStore = defineStore({ applicationApi .postAppAuthentication(token, loading) .then((res) => { - const accessTokenObjStr = localStorage.getItem('accessTokenObj') - if (accessTokenObjStr) { - const accessTokenObj = JSON.parse(accessTokenObjStr) - accessTokenObj[token] = res.data - localStorage.setItem('accessTokenObj', JSON.stringify(accessTokenObj)) - } else { - localStorage.setItem('accessTokenObj', JSON.stringify({ [token]: res.data })) - } + localStorage.setItem('accessToken', res.data) + sessionStorage.setItem('accessToken', res.data) resolve(res) }) .catch((error) => { diff --git a/ui/src/stores/modules/user.ts b/ui/src/stores/modules/user.ts index e70aab274..fc269ec2d 100644 --- a/ui/src/stores/modules/user.ts +++ b/ui/src/stores/modules/user.ts @@ -16,8 +16,7 @@ const useUserStore = defineStore({ userType: 1, userInfo: null, token: '', - version: '', - accessToken: '' + version: '' }), actions: { getToken(): String | null { @@ -27,13 +26,9 @@ const useUserStore = defineStore({ return this.userType === 1 ? localStorage.getItem('token') : this.getAccessToken() }, getAccessToken() { - const accessTokenObjStr = localStorage.getItem('accessTokenObj') - if (accessTokenObjStr && this.accessToken) { - const accessTokenObj = JSON.parse(accessTokenObjStr) - const result = accessTokenObj[this.accessToken] - if (result) { - return result - } + const accessToken = sessionStorage.getItem('accessToken') + if (accessToken) { + return accessToken } return localStorage.getItem('accessToken') }, @@ -55,9 +50,6 @@ const useUserStore = defineStore({ changeUserType(num: number) { this.userType = num }, - setAccessToken(accessToken: string) { - this.accessToken = accessToken - }, async asyncGetVersion() { return UserApi.getVersion().then((ok) => { diff --git a/ui/src/views/chat/base/index.vue b/ui/src/views/chat/base/index.vue index fcb58568b..ff14368a1 100644 --- a/ui/src/views/chat/base/index.vue +++ b/ui/src/views/chat/base/index.vue @@ -54,7 +54,6 @@ function getProfile() { onMounted(() => { user.changeUserType(2) - user.setAccessToken(accessToken) getAccessToken(accessToken) }) diff --git a/ui/src/views/chat/embed/index.vue b/ui/src/views/chat/embed/index.vue index 572a2a916..c53abbc17 100644 --- a/ui/src/views/chat/embed/index.vue +++ b/ui/src/views/chat/embed/index.vue @@ -199,7 +199,6 @@ function refresh(id: string) { onMounted(() => { user.changeUserType(2) - user.setAccessToken(accessToken) getAccessToken(accessToken) }) diff --git a/ui/src/views/chat/pc/index.vue b/ui/src/views/chat/pc/index.vue index 5b6d0af1a..1b0570321 100644 --- a/ui/src/views/chat/pc/index.vue +++ b/ui/src/views/chat/pc/index.vue @@ -286,7 +286,6 @@ async function exportHTML(): Promise { onMounted(() => { user.changeUserType(2) - user.setAccessToken(accessToken) getAccessToken(accessToken) }) From 609108707fc614b013805e2a9eb1fce37e190d52 Mon Sep 17 00:00:00 2001 From: wangdan-fit2cloud Date: Tue, 28 May 2024 10:08:50 +0800 Subject: [PATCH 02/26] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=96=87?= =?UTF-8?q?=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/locales/lang/en_US/views/application-overview.ts | 2 +- ui/src/locales/lang/zh_CN/views/application-overview.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/locales/lang/en_US/views/application-overview.ts b/ui/src/locales/lang/en_US/views/application-overview.ts index 13bddfc61..9e5407ae2 100644 --- a/ui/src/locales/lang/en_US/views/application-overview.ts +++ b/ui/src/locales/lang/en_US/views/application-overview.ts @@ -61,7 +61,7 @@ export default { LimitDialog: { dialogTitle: 'Access Restrictions', showSourceLabel: 'Show Source', - clientQueryLimitLabel: 'Client Query Limit', + clientQueryLimitLabel: 'Each Client Query Limit', timesDays: 'Times/Day', whitelistLabel: 'Whitelist', whitelistPlaceholder: 'Please enter allowed third-party source addresses, one per line, such as:\nhttp://127.0.0.1:5678\nhttps://dataease.io', diff --git a/ui/src/locales/lang/zh_CN/views/application-overview.ts b/ui/src/locales/lang/zh_CN/views/application-overview.ts index 4914f9898..75ebf66d7 100644 --- a/ui/src/locales/lang/zh_CN/views/application-overview.ts +++ b/ui/src/locales/lang/zh_CN/views/application-overview.ts @@ -61,7 +61,7 @@ export default { LimitDialog:{ dialogTitle: '访问限制', showSourceLabel: '显示知识来源', - clientQueryLimitLabel: '客户端提问限制', + clientQueryLimitLabel: '每个客户端提问限制', timesDays: '次/天', whitelistLabel: '白名单', whitelistPlaceholder: '请输入允许嵌入第三方的源地址，一行一个，如：\nhttp://127.0.0.1:5678\nhttps://dataease.io', From 817500de726e5f235faba5a2791b959bb63d1eec Mon Sep 17 00:00:00 2001 From: wangdan-fit2cloud Date: Tue, 28 May 2024 10:17:14 +0800 Subject: [PATCH 03/26] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/views/chat/pc/index.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ui/src/views/chat/pc/index.vue b/ui/src/views/chat/pc/index.vue index 1b0570321..32c809ac6 100644 --- a/ui/src/views/chat/pc/index.vue +++ b/ui/src/views/chat/pc/index.vue @@ -59,9 +59,7 @@ {{ paginationConfig.total }} 条提问 - - - +