diff --git a/src/api/settings.js b/src/api/settings.js index 433220fbf..7d75efa0d 100644 --- a/src/api/settings.js +++ b/src/api/settings.js @@ -14,3 +14,34 @@ export function testEmailSetting(data) { data: data }) } + +export function testLdapSetting(data) { + return request({ + url: '/api/v1/settings/ldap/testing/config/', + method: 'post', + data: data + }) +} + +export function testLdapUserLogin(data) { + return request({ + url: '/api/v1/settings/ldap/testing/login/', + method: 'post', + data: data + }) +} + +export function refreshLdapUserCache() { + return request({ + url: '/api/v1/settings/ldap/cache/refresh/', + method: 'get' + }) +} + +export function importLdapUser(data) { + return request({ + url: '/api/v1/settings/ldap/users/import/', + method: 'post', + data: data + }) +} diff --git a/src/components/ListTable/index.vue b/src/components/ListTable/index.vue index 4e262b6cb..517e58c9c 100644 --- a/src/components/ListTable/index.vue +++ b/src/components/ListTable/index.vue @@ -2,7 +2,7 @@
- +
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js index 8826c4f07..2fd344868 100644 --- a/src/i18n/langs/cn.js +++ b/src/i18n/langs/cn.js @@ -587,6 +587,18 @@ const cn = { 'securityPasswordSpecialChar': '必须包含特殊字符', 'Hostname': '主机名', 'emailTest': '测试连接', + 'ldapConnectTest': '测试连接', + 'ldapLoginTest': '测试登录', + 'ldapBulkImport': '一键导入', + 'password': '密码', + 'username': '用户名', + 'usernamePlaceholder': '请输入用户名', + 'passwordPlaceholder': '请输入密码', + 'refreshLdapUser': '刷新缓存', + 'testLdapLoginTitle': '测试LDAP 用户登录', + 'testLdapLoginSubtitle': '请先提交LDAP配置再进行测试登录', + 'importLdapUserTitle': 'LDAP 用户列表', + 'importLdapUserTip': '请先提交LDAP配置再进行导入', helpText: { 'siteUrl': 'eg: http://jumpserver.abc.com:8080', 'userGuideUrl': '用户第一次登录,修改profile后重定向到地址', diff --git a/src/i18n/langs/en.js b/src/i18n/langs/en.js index 8d7e4e7da..5bf4c43cc 100644 --- a/src/i18n/langs/en.js +++ b/src/i18n/langs/en.js @@ -396,6 +396,18 @@ const en = { 'securityPasswordSpecialChar': 'Must contain special characters', 'Hostname': 'Hostname', 'emailTest': 'Test connection', + 'ldapConnectTest': 'Test connection', + 'ldapLoginTest': 'Test login', + 'ldapBulkImport': 'Bulk import', + 'password': 'Password', + 'username': 'Username', + 'usernamePlaceholder': 'Please input username', + 'passwordPlaceholder': 'Please input password', + 'refreshLdapUser': 'Refresh cache', + 'testLdapLoginTitle': 'Test LDAP user login', + 'testLdapLoginSubtitle': 'Save the configuration before testing the login', + 'importLdapUserTitle': 'LDAP user list', + 'importLdapUserTip': 'Please submit the LDAP configuration before import', helpText: { 'siteUrl': 'eg: http://jumpserver.abc.com:8080', 'userGuideUrl': 'User first login update profile done redirect to it', diff --git a/src/views/settings/Ldap.vue b/src/views/settings/Ldap.vue index 0d516c35d..b33b9100e 100644 --- a/src/views/settings/Ldap.vue +++ b/src/views/settings/Ldap.vue @@ -1,22 +1,80 @@