From 25608e7378efbb741024bedfd3b3aa449ee8fbeb Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Fri, 19 Apr 2024 15:22:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=B8=E5=8F=AF?= =?UTF-8?q?=E8=AF=81=E7=8A=B6=E6=80=81=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=20(#4593)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refs #4589 --- frontend/src/api/interface/setting.ts | 4 ++++ frontend/src/api/modules/setting.ts | 3 +++ frontend/src/layout/index.vue | 4 ++-- frontend/src/views/login/components/login-form.vue | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/frontend/src/api/interface/setting.ts b/frontend/src/api/interface/setting.ts index 6afd77c29..38fb9e345 100644 --- a/frontend/src/api/interface/setting.ts +++ b/frontend/src/api/interface/setting.ts @@ -151,4 +151,8 @@ export namespace Setting { trial: boolean; status: string; } + export interface LicenseStatus { + productPro: string; + status: string; + } } diff --git a/frontend/src/api/modules/setting.ts b/frontend/src/api/modules/setting.ts index ef36427e7..57da56d2a 100644 --- a/frontend/src/api/modules/setting.ts +++ b/frontend/src/api/modules/setting.ts @@ -13,6 +13,9 @@ export const UploadFileData = (params: FormData) => { export const getLicense = () => { return http.get(`/licenses/get`); }; +export const getLicenseStatus = () => { + return http.get(`/licenses/get/status`); +}; export const syncLicense = () => { return http.post(`/licenses/sync`); diff --git a/frontend/src/layout/index.vue b/frontend/src/layout/index.vue index 40ce76d41..b7cc88be3 100644 --- a/frontend/src/layout/index.vue +++ b/frontend/src/layout/index.vue @@ -22,7 +22,7 @@ import { GlobalStore, MenuStore, TabsStore } from '@/store'; import { DeviceType } from '@/enums/app'; import { useI18n } from 'vue-i18n'; import { useTheme } from '@/hooks/use-theme'; -import { getLicense, getSettingInfo, getSystemAvailable } from '@/api/modules/setting'; +import { getLicenseStatus, getSettingInfo, getSystemAvailable } from '@/api/modules/setting'; import { useRoute, useRouter } from 'vue-router'; import { initFavicon, resetXSetting } from '@/utils/xpack'; useResize(); @@ -109,7 +109,7 @@ const loadDataFromXDB = async () => { }; const loadProductProFromDB = async () => { - const res = await getLicense(); + const res = await getLicenseStatus(); if (!res.data) { globalStore.isProductPro = false; return; diff --git a/frontend/src/views/login/components/login-form.vue b/frontend/src/views/login/components/login-form.vue index c74e84e79..1a00097b4 100644 --- a/frontend/src/views/login/components/login-form.vue +++ b/frontend/src/views/login/components/login-form.vue @@ -157,7 +157,7 @@ import { GlobalStore, MenuStore, TabsStore } from '@/store'; import i18n from '@/lang'; import { MsgSuccess } from '@/utils/message'; import { useI18n } from 'vue-i18n'; -import { getLicense } from '@/api/modules/setting'; +import { getLicenseStatus } from '@/api/modules/setting'; import { initFavicon } from '@/utils/xpack'; const globalStore = GlobalStore(); @@ -327,7 +327,7 @@ const loadLanguage = async () => { }; const loadProductProFromDB = async () => { - const res = await getLicense(); + const res = await getLicenseStatus(); if (!res.data) { globalStore.isProductPro = false; return;