From d79b1782295cc8cd8f99ee3470bb622c53449462 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Fri, 3 Jul 2020 16:00:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96Ldap=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/settings.js         | 8 ++++++++
 src/i18n/langs/cn.json      | 3 ++-
 src/i18n/langs/en.json      | 3 ++-
 src/views/settings/Ldap.vue | 7 ++++---
 src/views/xpack             | 2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/api/settings.js b/src/api/settings.js
index 51b7c205b..8d75d74ba 100644
--- a/src/api/settings.js
+++ b/src/api/settings.js
@@ -51,6 +51,14 @@ export function refreshLdapUserCache() {
   })
 }
 
+export function StartLdapUserCache() {
+  return request({
+    disableFlashErrorMsg: true,
+    url: '/api/v1/settings/ldap/users/?cache_police=1',
+    method: 'get'
+  })
+}
+
 export function importLdapUser(data) {
   return request({
     disableFlashErrorMsg: true,
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 2a34a9caf..ac30557ff 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -667,7 +667,8 @@
     "testLdapLoginTitle": "测试LDAP 用户登录",
     "userGuideUrl": "用户向导URL",
     "username": "用户名",
-    "usernamePlaceholder": "请输入用户名"
+    "usernamePlaceholder": "请输入用户名",
+    "refreshLdapCache":"刷新Ldap缓存，请稍后"
   },
   "settings": {
     "setting": "设置"
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 4934c87fe..17bf914c0 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -667,7 +667,8 @@
     "testLdapLoginTitle": "Test LDAP user login",
     "userGuideUrl": "User Guide URL",
     "username": "Username",
-    "usernamePlaceholder": "Please input username"
+    "usernamePlaceholder": "Please input username",
+    "refreshLdapCache":"Refreshing Ldap cache "
   },
   "settings": {
     "setting": "Setting"
diff --git a/src/views/settings/Ldap.vue b/src/views/settings/Ldap.vue
index 9bfdbfbcc..08ce3bc20 100644
--- a/src/views/settings/Ldap.vue
+++ b/src/views/settings/Ldap.vue
@@ -69,7 +69,7 @@
 <script>
 import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm'
 import { testLdapSetting, testLdapUserLogin,
-  importLdapUser, refreshLdapUserCache } from '@/api/settings'
+  importLdapUser, refreshLdapUserCache, StartLdapUserCache } from '@/api/settings'
 import ListTable from '@/components/ListTable'
 import { IBox } from '@/components'
 
@@ -192,7 +192,8 @@ export default {
             can: true,
             callback: function() {
               refreshLdapUserCache().then(res => {
-                this.$message.success(res.msg)
+                this.$message.success(this.$t('setting.refreshLdapCache'))
+                StartLdapUserCache()
               })
             }.bind(this)
           }
@@ -242,7 +243,7 @@ export default {
     },
     handlerListTableXHRError(errMsg) {
       if (this.dialogLdapUserImport) {
-        setTimeout(this.$refs.listTable.reloadTable, 3000)
+        setTimeout(this.$refs.listTable.reloadTable, 30000)
       }
     }
   }
diff --git a/src/views/xpack b/src/views/xpack
index cfb60f09f..d247da036 160000
--- a/src/views/xpack
+++ b/src/views/xpack
@@ -1 +1 @@
-Subproject commit cfb60f09fcc75def80d1214abcd68b5cb4b1a76e
+Subproject commit d247da036f22261afa2bd89523e552cb6407327d