From 2ae1db4730c5a95c282193d63b5a913a0eb06367 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Sat, 13 May 2023 20:20:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20ssl=20=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E5=92=8C=E7=AB=AF=E5=8F=A3=E4=BF=AE=E6=94=B9=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=97=AE=E9=A2=98=20(#1030)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/setting/safe/port/index.vue | 5 ++++- frontend/src/views/setting/safe/ssl/index.vue | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/setting/safe/port/index.vue b/frontend/src/views/setting/safe/port/index.vue index 6dc5ddb68..b8bac1f3f 100644 --- a/frontend/src/views/setting/safe/port/index.vue +++ b/frontend/src/views/setting/safe/port/index.vue @@ -31,6 +31,8 @@ import { MsgSuccess } from '@/utils/message'; import { updatePort } from '@/api/modules/setting'; import { ElMessageBox, FormInstance } from 'element-plus'; import { Rules } from '@/global/form-rules'; +import { GlobalStore } from '@/store'; +const globalStore = GlobalStore(); interface DialogProps { serverPort: number; @@ -66,9 +68,10 @@ const onSavePort = async (formEl: FormInstance | undefined) => { .then(() => { loading.value = false; MsgSuccess(i18n.global.t('commons.msg.operationSuccess')); + globalStore.isLogin = false; let href = window.location.href; let ip = href.split('//')[1].split(':')[0]; - window.open(`${href.split('//')[0]}//${ip}:${form.serverPort}/`, '_self'); + window.open(`${href.split('//')[0]}//${ip}:${form.serverPort}/${globalStore.entrance}`, '_self'); }) .catch(() => { loading.value = false; diff --git a/frontend/src/views/setting/safe/ssl/index.vue b/frontend/src/views/setting/safe/ssl/index.vue index 0b3423d58..f2ba57056 100644 --- a/frontend/src/views/setting/safe/ssl/index.vue +++ b/frontend/src/views/setting/safe/ssl/index.vue @@ -112,6 +112,8 @@ import { DownloadByPath } from '@/api/modules/files'; import { Rules } from '@/global/form-rules'; import { ElMessageBox, FormInstance } from 'element-plus'; import { Setting } from '@/api/interface/setting'; +import { GlobalStore } from '@/store'; +const globalStore = GlobalStore(); const loading = ref(); const drawerVisiable = ref(); @@ -207,8 +209,10 @@ const onSaveSSL = async (formEl: FormInstance | undefined) => { await updateSSL(param).then(() => { MsgSuccess(i18n.global.t('commons.msg.operationSuccess')); let href = window.location.href; + globalStore.isLogin = false; let address = href.split('://')[1]; - window.open(`https://${address}/`, '_self'); + address = address.replaceAll('settings/safe', globalStore.entrance); + window.open(`https://${address}`, '_self'); }); }); });