fix(project): fix bug

This commit is contained in:
zhangheng
2026-02-24 15:34:05 +08:00
parent 8389a9bfcd
commit 52b1a627e1
12 changed files with 49 additions and 203 deletions

View File

@@ -5,6 +5,7 @@ import { useRouter } from "next/navigation"
import { APP, PLATFORM, TENANT } from "@/components/login/libs/common"
import { APP_ID, APP_SECRECT } from "./util"
import { fetchFeishuLogin, getUserPermission } from "../api"
import { usePermissionStore } from "@/components/label/store/auth"
const HeaderIcon = DigitalIcon
@@ -21,6 +22,8 @@ const FeishuAutoLogin = ({ useUserStore }: { useUserStore: any }) => {
const { setUserInfo, refreshToken } = useUserStore()
const router = useRouter()
const { setUserPermissionInfo } = usePermissionStore()
const autoLogin = useCallback(
(
fingerprint: any,
@@ -60,8 +63,13 @@ const FeishuAutoLogin = ({ useUserStore }: { useUserStore: any }) => {
access_token: info.access_token || "",
refresh_token: info.refresh_token || "",
})
const permission = await getUserPermission()
console.log(permission)
const { message: permissionRes } = await getUserPermission()
const { uid, name } = permissionRes
setUserPermissionInfo({
user_id: uid,
user_name: name,
detailInfo: permissionRes,
})
window.location.href = "/"
} catch (err) {
console.log(err)
@@ -74,7 +82,7 @@ const FeishuAutoLogin = ({ useUserStore }: { useUserStore: any }) => {
})
})
},
[refreshToken]
[refreshToken, setUserPermissionInfo]
)
const isFeishu = useCallback(() => !!(window.h5sdk && window.tt), [])

View File

@@ -10,6 +10,7 @@ import {
getQueryVariable,
} from "@/components/login/libs/common"
import { fetchFeishuLogin, getUserPermission } from "../api"
import { usePermissionStore } from "@/components/label/store/auth"
const QrLogin = ({ useUserStore }: { useUserStore: any }) => {
const fingerprint = useLoginStore.getState().fingerprint
@@ -38,6 +39,8 @@ const QrLogin = ({ useUserStore }: { useUserStore: any }) => {
const { setUserInfo, refreshToken } = useUserStore()
const { setUserPermissionInfo } = usePermissionStore()
const feishuLogin = useCallback(async () => {
try {
const params = {
@@ -57,13 +60,24 @@ const QrLogin = ({ useUserStore }: { useUserStore: any }) => {
access_token: info.access_token || "",
refresh_token: info.refresh_token || "",
})
const permission = await getUserPermission()
console.log(permission)
const { message: permissionRes } = await getUserPermission()
const { uid, name } = permissionRes
setUserPermissionInfo({
user_id: uid,
user_name: name,
detailInfo: permissionRes,
})
window.location.href = "/"
} catch (err) {
console.log(err)
}
}, [fingerprint, redirect_url, refreshToken, setUserInfo])
}, [
fingerprint,
redirect_url,
refreshToken,
setUserInfo,
setUserPermissionInfo,
])
useEffect(() => {
if (times === 1) {

View File

@@ -44,6 +44,7 @@ import LightBgImage from "./resource/images/light-login-bg.png"
import loginBg2Dark from "./resource/images/login-bg2-dark.png"
import loginBg2Light from "./resource/images/login-bg2-light.png"
import LogoDigImage from "./resource/images/logo-dig.png"
import { usePermissionStore } from "../label/store/auth"
const HeaderIcon = DigitalIcon
@@ -55,6 +56,8 @@ export default function LoginPage({ useUserStore }: { useUserStore: any }) {
const [loading, setLoading] = useState(false)
const [error, setError] = useState<string | null>(null)
const { setUserPermissionInfo } = usePermissionStore()
const [isClient, setIsClient] = useState(false)
useEffect(() => {
setIsClient(true)
@@ -209,8 +212,13 @@ export default function LoginPage({ useUserStore }: { useUserStore: any }) {
access_token: info.access_token || "",
refresh_token: info.refresh_token || "",
})
const permission = await getUserPermission()
console.log(permission)
const { message: permissionRes } = await getUserPermission()
const { uid, name } = permissionRes
setUserPermissionInfo({
user_id: uid,
user_name: name,
detailInfo: permissionRes,
})
window.location.href = "/"
} catch (error) {
if (error) {
@@ -302,8 +310,13 @@ export default function LoginPage({ useUserStore }: { useUserStore: any }) {
access_token: info.access_token || "",
refresh_token: info.refresh_token || "",
})
const permission = await getUserPermission()
console.log(permission)
const { message: permissionRes } = await getUserPermission()
const { uid, name } = permissionRes
setUserPermissionInfo({
user_id: uid,
user_name: name,
detailInfo: permissionRes,
})
window.location.href = "/"
} catch (err) {
const message = err instanceof Error ? err.message : "登录失败,请重试"