github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2026-01-29 21:28:52 +00:00
Code Issues Projects Releases Wiki Activity

fix: LDAP用户导入会超时

Browse Source
This commit is contained in:
wangruidong
2024-02-22 11:26:42 +08:00
committed by Bryan
parent dc8f237fec
commit 9d999a7119
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/views/settings/Auth/Ldap/ImportDialog.vue
View File

@@ -49,8 +49,6 @@ import { DEFAULT_ORG_ID, SYSTEM_ORG_ID } from '@/utils/org'
import ListTable from '@/components/Table/ListTable/index.vue'
import Dialog from '@/components/Dialog/index.vue'
import Select2 from '@/components/Form/FormFields/Select2.vue'
import { importLdapUser } from '@/api/settings'
import { getErrorResponseMsg } from '@/utils/common'
export default {
name: 'ImportDialog',
@@ -154,14 +152,7 @@ export default {
this.$message.error(this.$tc('setting.unselectedOrg'))
this.dialogLdapUserImportLoginStatus = false
} else {
importLdapUser(data).then(res => {
this.$message.success(res.msg)
}).catch(error => {
const errorMessage = getErrorResponseMsg(error) || this.$t('common.imExport.ImportFail')
this.$message.error(errorMessage)
}).finally(() => {
this.dialogLdapUserImportLoginStatus = false
})
this.importLdapUser(data)
}
},
importAllUserClick() {
@@ -175,14 +166,24 @@ export default {
this.$message.error(this.$tc('setting.unselectedOrg'))
this.dialogLdapUserImportLoginStatus = false
} else {
importLdapUser(data).then(res => {
this.$message.success(res.msg)
}).catch(error => {
const errorMessage = getErrorResponseMsg(error) || this.$t('common.imExport.ImportFail')
this.$message.error(errorMessage)
}).finally(() => {
this.dialogLdapUserImportAllLoginStatus = false
})
this.importLdapUser(data)
}
},
importLdapUser(data) {
this.enableWS()
this.ws.onopen = (e) => {
this.ws.send(JSON.stringify({ msg_type: 'import_user', ...data }))
}
this.ws.onmessage = (e) => {
const data = JSON.parse(e.data)
if (data.ok) {
this.$message.success(data.msg)
this.$refs.listTable.reloadTable()
} else {
this.$message.error(data.msg) || this.$t('common.imExport.ImportFail')
}
this.dialogLdapUserImportLoginStatus = false
this.dialogLdapUserImportAllLoginStatus = false
}
},
enableWS() {