diff --git a/components/layout/AppLayout.tsx b/components/layout/AppLayout.tsx index 632c340..97c4745 100644 --- a/components/layout/AppLayout.tsx +++ b/components/layout/AppLayout.tsx @@ -144,6 +144,7 @@ export default function AppLayout({ process.env.NEXT_PUBLIC_OUTPUT_TYPE === "standalone" && (await deleteCookie()) router.push("/login") + window.location.reload() } const matches = useMediaQuery("(min-width: 48em)") diff --git a/components/login/index.tsx b/components/login/index.tsx index 35ffdbc..e71f153 100644 --- a/components/login/index.tsx +++ b/components/login/index.tsx @@ -187,12 +187,12 @@ export default function LoginPage({ useUserStore }: { useUserStore: any }) { setError(null) try { - let isAdmin = values.username === "admin" - let phone = values.username.startsWith("+86") - ? values.username - : `+86${values.username}` + // let isAdmin = values.username === "admin" + // let phone = values.username.startsWith("+86") + // ? values.username + // : `+86${values.username}` const params = { - account: isAdmin ? values.username : phone, + account: values.username, password: values.password, tenant: TENANT, platform: PLATFORM, diff --git a/components/login/libs/cookie.ts b/components/login/libs/cookie.ts index 3f1eace..508453f 100644 --- a/components/login/libs/cookie.ts +++ b/components/login/libs/cookie.ts @@ -1,4 +1,3 @@ -import { ResultData } from "@/api/typing" import { Login } from "@/components/login/api/types" import redis from "@/components/login/libs/redis" import { encrypt, generateKeyFromEnv } from "@/components/login/libs/session" @@ -55,7 +54,7 @@ export const handleLoginData = async (props: { } export const handleRefreshToken = async (props: { - data: ResultData + data: Login.ResLabelLogin userData: any }) => { const { userData, data } = props @@ -64,21 +63,18 @@ export const handleRefreshToken = async (props: { JSON.parse(redisKey), JSON.stringify({ ...rest, - access_token: data?.message?.access, - refresh_token: data?.message?.refresh, + user_name: data?.name, + access_token: data.token, + refresh_token: data.refresh_token, }), "EX", 172800 ) return { ...data, - message: { - ...data.message, - // access_token: "", - // refresh_token: "", - access: "", - refresh: "", - }, + token: "", + access_token: "", + refresh_token: "", } }