fix: 修复钉钉登录SDK就绪超时问题,添加调试日志
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
yuliang_guo
2026-01-29 15:38:15 +08:00
parent 774d62c1ab
commit 9f6d2844bc
2 changed files with 36 additions and 7 deletions

View File

@@ -58,21 +58,42 @@ export function getDingtalkPlatform(): string {
} }
/** /**
* 等待钉钉SDK就绪 * 等待钉钉SDK就绪(带超时)
*/ */
export function waitDingtalkReady(): Promise<void> { export function waitDingtalkReady(timeout: number = 5000): Promise<void> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!window.dd) { if (!window.dd) {
reject(new Error('钉钉SDK未加载')) reject(new Error('钉钉SDK未加载'))
return return
} }
let resolved = false
// 超时处理
const timer = setTimeout(() => {
if (!resolved) {
resolved = true
console.warn('钉钉SDK就绪超时尝试继续执行')
resolve() // 超时后也尝试继续可能SDK已经就绪
}
}, timeout)
window.dd.ready(() => { window.dd.ready(() => {
if (!resolved) {
resolved = true
clearTimeout(timer)
console.log('钉钉SDK就绪')
resolve() resolve()
}
}) })
window.dd.error((err) => { window.dd.error((err) => {
if (!resolved) {
resolved = true
clearTimeout(timer)
console.error('钉钉SDK错误:', err)
reject(err) reject(err)
}
}) })
}) })
} }

View File

@@ -245,8 +245,10 @@ const handleDingtalkLoginSuccess = (response: any) => {
* 钉钉免密登录(在钉钉环境中自动触发) * 钉钉免密登录(在钉钉环境中自动触发)
*/ */
const autoDingtalkLogin = async () => { const autoDingtalkLogin = async () => {
console.log('[钉钉登录] 开始自动登录流程')
if (!dingtalkConfig.corp_id) { if (!dingtalkConfig.corp_id) {
console.warn('钉钉CorpId未配置') console.warn('[钉钉登录] CorpId未配置')
return return
} }
@@ -254,13 +256,19 @@ const autoDingtalkLogin = async () => {
try { try {
// 等待钉钉SDK就绪 // 等待钉钉SDK就绪
console.log('[钉钉登录] 等待SDK就绪...')
await waitDingtalkReady() await waitDingtalkReady()
console.log('[钉钉登录] SDK已就绪')
// 获取免登授权码 // 获取免登授权码
console.log('[钉钉登录] 获取授权码...')
const code = await getAuthCode(dingtalkConfig.corp_id) const code = await getAuthCode(dingtalkConfig.corp_id)
console.log('[钉钉登录] 授权码获取成功')
// 调用登录API // 调用登录API
console.log('[钉钉登录] 调用登录API...')
const response = await dingtalkLogin({ code }) const response = await dingtalkLogin({ code })
console.log('[钉钉登录] API响应:', response)
if (response.code === 200) { if (response.code === 200) {
handleDingtalkLoginSuccess(response) handleDingtalkLoginSuccess(response)
@@ -268,8 +276,8 @@ const autoDingtalkLogin = async () => {
ElMessage.error(response.message || '钉钉登录失败') ElMessage.error(response.message || '钉钉登录失败')
} }
} catch (error: any) { } catch (error: any) {
console.error('钉钉自动登录失败:', error) console.error('[钉钉登录] 自动登录失败:', error)
ElMessage.warning('钉钉自动登录失败,请使用账号密码登录') ElMessage.warning(error.message || '钉钉自动登录失败,请使用账号密码登录')
} finally { } finally {
dingtalkLoading.value = false dingtalkLoading.value = false
} }