diff --git a/easyflow-ui-admin/app/src/api/request.ts b/easyflow-ui-admin/app/src/api/request.ts index 12a67c9..ecafbe9 100644 --- a/easyflow-ui-admin/app/src/api/request.ts +++ b/easyflow-ui-admin/app/src/api/request.ts @@ -92,7 +92,7 @@ function createRequestClient(baseURL: string, options?: RequestClientOptions) { client, doReAuthenticate, doRefreshToken, - enableRefreshToken: preferences.app.enableRefreshToken, + enableRefreshToken: preferences.app.enableRefreshToken ?? false, formatToken, }), ); diff --git a/easyflow-ui-admin/app/src/router/access.ts b/easyflow-ui-admin/app/src/router/access.ts index a8ddc83..7925bb6 100644 --- a/easyflow-ui-admin/app/src/router/access.ts +++ b/easyflow-ui-admin/app/src/router/access.ts @@ -22,7 +22,7 @@ async function generateAccess(options: GenerateMenuAndRoutesOptions) { IFrameView, }; - return await generateAccessible(preferences.app.accessMode, { + return await generateAccessible(preferences.app.accessMode ?? 'frontend', { ...options, fetchMenuListAsync: async () => { ElMessage({ diff --git a/easyflow-ui-admin/app/src/store/auth.ts b/easyflow-ui-admin/app/src/store/auth.ts index 9dbef63..e9de50f 100644 --- a/easyflow-ui-admin/app/src/store/auth.ts +++ b/easyflow-ui-admin/app/src/store/auth.ts @@ -54,11 +54,9 @@ export const useAuthStore = defineStore('auth', () => { if (accessStore.loginExpired) { accessStore.setLoginExpired(false); } else { - onSuccess - ? await onSuccess?.() - : await router.push( - userInfo.homePath || preferences.app.defaultHomePath, - ); + const homePath = + userInfo.homePath || preferences.app.defaultHomePath || '/'; + onSuccess ? await onSuccess?.() : await router.push(homePath); } if (userInfo?.nickname) { diff --git a/easyflow-ui-admin/app/src/views/_core/authentication/login.vue b/easyflow-ui-admin/app/src/views/_core/authentication/login.vue index 5cf31e1..fe3c5ce 100644 --- a/easyflow-ui-admin/app/src/views/_core/authentication/login.vue +++ b/easyflow-ui-admin/app/src/views/_core/authentication/login.vue @@ -8,7 +8,6 @@ import { useAppConfig } from '@easyflow/hooks'; import { $t } from '@easyflow/locales'; import { preferences } from '@easyflow/preferences'; -import { api } from '#/api/request'; import { useAuthStore } from '#/store'; defineOptions({ name: 'Login' }); @@ -18,8 +17,6 @@ const authStore = useAuthStore(); const { apiURL } = useAppConfig(import.meta.env, import.meta.env.PROD); -type PlatformType = 'ding_talk' | 'wx_web'; - const title = computed(() => preferences.auth.welcomeBack); const subTitle = computed(() => preferences.auth.loginSubtitle); const formSchema = computed((): EasyFlowFormSchema[] => { @@ -91,14 +88,6 @@ function onSubmit(values: any) { console.error('初始化tac失败', error); }); } - -function getAuthUrl(platform: PlatformType) { - return api.get('/thirdAuth/getAuthUrl', { - params: { - platform, - }, - }); -}