mirror/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-11-24 02:59:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat: 解决登录页授权 IP 跳转失败的问题 (#4517)

Browse Source
This commit is contained in:
ssongliu 2024-04-15 15:10:10 +08:00 committed by GitHub
parent fbd0e836d7
commit a3312331d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/layout/index.vue
View File

@ -100,6 +100,10 @@ const resetSetting = () => {
const loadProductProFromDB = async () => {
const res = await getLicense();
if (!res.data) {
globalStore.isProductPro = false;
return;
}
globalStore.isProductPro =
res.data.status === 'Enable' || res.data.status === 'Lost01' || res.data.status === 'Lost02';

2
frontend/src/routers/index.ts
View File

@ -13,7 +13,7 @@ router.beforeEach((to, from, next) => {
if (to.name !== 'entrance' && !globalStore.isLogin) {
next({
name: 'entrance',
params: to.params,
params: { code: to.params?.code || globalStore.entrance },
});
NProgress.done();
return;

15
frontend/src/views/login/entrance/index.vue
View File

@ -60,7 +60,6 @@ const loading = ref();
const mySafetyCode = defineProps({
code: {
type: String,
required: true,
default: '',
},
});
@ -94,10 +93,18 @@ const getStatus = async () => {
errStatus.value = '';
loading.value = false;
})
.catch(() => {
pageCode.value = '200';
errStatus.value = 'err-unsafe';
.catch((errRes) => {
pageCode.value = pageCode.value || '200';
loading.value = false;
if (errRes?.code === 408) {
errStatus.value = 'err-ip';
return;
}
if (errRes?.code === 409) {
errStatus.value = 'err-domain';
return;
}
errStatus.value = 'err-unsafe';
});
})
.catch(() => {