diff --git a/.github/workflows/build-base-image.yml b/.github/workflows/build-base-image.yml
index 28a2e35d3f..3f8dd31e6e 100644
--- a/.github/workflows/build-base-image.yml
+++ b/.github/workflows/build-base-image.yml
@@ -15,8 +15,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Lock Pull Request
+        run: |
+          curl -X POST -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+          -d '{"state":"pending", "description":"Action running, merge disabled", "context":"Lock PR"}' \
+          "https://api.github.com/repos/${{ github.repository }}/statuses/${{ github.sha }}"
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -59,3 +64,9 @@ jobs:
           git push
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Unlock Pull Request
+        run: |
+          curl -X POST -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+          -d '{"state":"success", "description":"Action running, merge disabled", "context":"Lock PR"}' \
+          "https://api.github.com/repos/${{ github.repository }}/statuses/${{ github.sha }}"
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 33addda888..2017994103 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -31,7 +31,7 @@ jobs:
           tag: ${{ steps.get_version.outputs.TAG }}
       - uses: actions/setup-node@v2
         with:
-          node-version: '16.20'
+          node-version: '20.15'
       - name: Install dependencies
         run: yarn install
       - name: Build web
diff --git a/src/assets/img/icons/cisco.png b/src/assets/img/icons/cisco.png
index 9ce6827e99..9162ae4fff 100644
Binary files a/src/assets/img/icons/cisco.png and b/src/assets/img/icons/cisco.png differ
diff --git a/src/assets/img/icons/clickhouse.png b/src/assets/img/icons/clickhouse.png
index cf4a0a5b67..2f4604218b 100644
Binary files a/src/assets/img/icons/clickhouse.png and b/src/assets/img/icons/clickhouse.png differ
diff --git a/src/assets/img/icons/db2.png b/src/assets/img/icons/db2.png
index c7c8bcda75..9c916f0b69 100644
Binary files a/src/assets/img/icons/db2.png and b/src/assets/img/icons/db2.png differ
diff --git a/src/assets/img/icons/gateway.png b/src/assets/img/icons/gateway.png
index 2ca2415270..e492fc3296 100644
Binary files a/src/assets/img/icons/gateway.png and b/src/assets/img/icons/gateway.png differ
diff --git a/src/assets/img/icons/general.png b/src/assets/img/icons/general.png
index f6dc155684..3760e80753 100644
Binary files a/src/assets/img/icons/general.png and b/src/assets/img/icons/general.png differ
diff --git a/src/assets/img/icons/h3c.png b/src/assets/img/icons/h3c.png
new file mode 100644
index 0000000000..a76041f811
Binary files /dev/null and b/src/assets/img/icons/h3c.png differ
diff --git a/src/assets/img/icons/linux.png b/src/assets/img/icons/linux.png
index 0967cbe1ba..1e21304038 100644
Binary files a/src/assets/img/icons/linux.png and b/src/assets/img/icons/linux.png differ
diff --git a/src/assets/img/icons/mariadb.png b/src/assets/img/icons/mariadb.png
index cca0b5941a..93dcdd007c 100644
Binary files a/src/assets/img/icons/mariadb.png and b/src/assets/img/icons/mariadb.png differ
diff --git a/src/assets/img/icons/mysql.png b/src/assets/img/icons/mysql.png
index 982c7edfc6..b50287503d 100644
Binary files a/src/assets/img/icons/mysql.png and b/src/assets/img/icons/mysql.png differ
diff --git a/src/assets/img/icons/oracle.png b/src/assets/img/icons/oracle.png
index 003041b33f..27c45e55ff 100644
Binary files a/src/assets/img/icons/oracle.png and b/src/assets/img/icons/oracle.png differ
diff --git a/src/assets/img/icons/other.png b/src/assets/img/icons/other.png
index 312678ad2c..85a4db8fbb 100644
Binary files a/src/assets/img/icons/other.png and b/src/assets/img/icons/other.png differ
diff --git a/src/assets/img/icons/private.png b/src/assets/img/icons/private.png
index ecb0cc1e7b..25a61f3458 100644
Binary files a/src/assets/img/icons/private.png and b/src/assets/img/icons/private.png differ
diff --git a/src/assets/img/icons/unix.png b/src/assets/img/icons/unix.png
index 30fbcb4c1a..1846f26e81 100644
Binary files a/src/assets/img/icons/unix.png and b/src/assets/img/icons/unix.png differ
diff --git a/src/assets/img/icons/vmware.png b/src/assets/img/icons/vmware.png
index 61da1658cd..50f0dbfbc1 100644
Binary files a/src/assets/img/icons/vmware.png and b/src/assets/img/icons/vmware.png differ
diff --git a/src/assets/img/icons/windows.png b/src/assets/img/icons/windows.png
index d34b295eaf..9f48418566 100644
Binary files a/src/assets/img/icons/windows.png and b/src/assets/img/icons/windows.png differ
diff --git a/src/components/Apps/AssetSelect/index.vue b/src/components/Apps/AssetSelect/index.vue
index 9a418f5f99..aaad143916 100644
--- a/src/components/Apps/AssetSelect/index.vue
+++ b/src/components/Apps/AssetSelect/index.vue
@@ -37,6 +37,10 @@ export default {
       type: String,
       default: '/api/v1/assets/assets/'
     },
+    defaultPageSize: {
+      type: Number,
+      default: 10
+    },
     baseNodeUrl: {
       type: String,
       default: '/api/v1/assets/nodes/'
@@ -70,6 +74,7 @@ export default {
         value: iValue,
         multiple: true,
         clearable: true,
+        defaultPageSize: this.defaultPageSize,
         ajax: {
           url: this.baseUrl,
           transformOption: (item) => {
diff --git a/src/components/Form/AutoDataForm/utils.js b/src/components/Form/AutoDataForm/utils.js
index 5976e87515..55deadb1b0 100644
--- a/src/components/Form/AutoDataForm/utils.js
+++ b/src/components/Form/AutoDataForm/utils.js
@@ -197,22 +197,32 @@ export class FormFieldGenerator {
     return field
   }
 
-  afterGenerateField(field) {
-    field.label = toSentenceCase(field.label)
-
-    if (field.placeholder) {
-      field.el.placeholder = field.placeholder
-    }
-
+  setChoicesTips(field, fieldMeta, fieldRemoteMeta) {
     // 设置 checkbox 的 tips
-    if (field.tips && ['checkbox-group', 'radio-group'].indexOf(field.type) !== -1) {
+    if (['checkbox-group', 'radio-group'].indexOf(field.type) !== -1) {
       field.options.map(option => {
-        if (!option.tip && field.tips[option.value]) {
+        if (!option.tip && field.tips) {
           option.tip = field.tips[option.value]
         }
+        if (!option.tip) {
+          const match = option.label.match(/^(.+?)\s*\((.*?)\)$/)
+          if (match) {
+            option.label = match[1]
+            option.tip = match[2]
+          }
+        }
       })
     }
+  }
+
+  afterGenerateField(field) {
+    field.label = toSentenceCase(field.label)
+
+    if (field.placeholder) {
+      field.el.placeholder = field.placeholder
+    }
 
+    this.setChoicesTips(field)
     return field
   }
 
diff --git a/src/components/Form/FormFields/InputWithUnit.vue b/src/components/Form/FormFields/InputWithUnit.vue
index fc8c205cf9..bcd4568a2a 100644
--- a/src/components/Form/FormFields/InputWithUnit.vue
+++ b/src/components/Form/FormFields/InputWithUnit.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-input v-bind="$attrs" v-on="$listeners">
+  <el-input v-model="iValue" v-bind="$attrs" v-on="$listeners">
     <template slot="append">{{ iUnit }}</template>
   </el-input>
 </template>
@@ -15,6 +15,7 @@ export default {
   },
   data() {
     return {
+      defaultValue: 24,
       displayMapper: {
         'second': this.$t('Second'), // 'sec' is the default value of 'unit
         'min': this.$t('Minute'), // 'min' is the default value of 'unit
@@ -29,6 +30,9 @@ export default {
   computed: {
     iUnit() {
       return this.displayMapper[this.unit] || this.unit
+    },
+    iValue() {
+      return this.$attrs.value ? this.$attrs.value : this.defaultValue
     }
   }
 }
diff --git a/src/components/Form/FormFields/Select2.vue b/src/components/Form/FormFields/Select2.vue
index a4487a6dcc..f65a2315ae 100644
--- a/src/components/Form/FormFields/Select2.vue
+++ b/src/components/Form/FormFields/Select2.vue
@@ -125,16 +125,19 @@ export default {
     allowCreate: {
       type: Boolean,
       default: false
+    },
+    defaultPageSize: {
+      type: Number,
+      default: 10
     }
   },
   data() {
     const vm = this
-    const defaultPageSize = 10
     const defaultParams = {
       search: '',
       page: 1,
       hasMore: true,
-      pageSize: defaultPageSize
+      pageSize: vm.defaultPageSize
     }
     // 设置axios全局报错提示不显示
     const validateStatus = (status) => {
@@ -194,7 +197,6 @@ export default {
       }
     },
     iAjax() {
-      const defaultPageSize = 10
       const defaultMakeParams = (params) => {
         const page = params.page || 1
         const offset = (page - 1) * params.pageSize
@@ -237,7 +239,7 @@ export default {
       }
       const defaultAjax = {
         url: '',
-        pageSize: defaultPageSize,
+        pageSize: this.defaultPageSize,
         makeParams: defaultMakeParams,
         transformOption: defaultTransformOption,
         processResults: defaultProcessResults,
diff --git a/src/components/Table/ListTable/TableAction/ImportTable.vue b/src/components/Table/ListTable/TableAction/ImportTable.vue
index 1133330e3c..ea1e06ca63 100644
--- a/src/components/Table/ListTable/TableAction/ImportTable.vue
+++ b/src/components/Table/ListTable/TableAction/ImportTable.vue
@@ -44,8 +44,9 @@
 import DataTable from '@/components/Table/DataTable/index.vue'
 import { getUpdateObjURL } from '@/utils/common'
 import { sleep } from '@/utils/time'
-import { EditableInputFormatter, StatusFormatter } from '@/components/Table/TableFormatters'
+import { EditableInputFormatter } from '@/components/Table/TableFormatters'
 import { encryptPassword } from '@/utils/crypto'
+import getStatusColumnMeta from '@/components/Table/ListTable/TableAction/const'
 
 export default {
   name: 'ImportTable',
@@ -223,38 +224,7 @@ export default {
   },
   methods: {
     generateTableColumns(tableTitles, tableData) {
-      const vm = this
-      const columns = [{
-        prop: '@status',
-        label: vm.$t('Status'),
-        width: '80px',
-        align: 'center',
-        formatter: StatusFormatter,
-        formatterArgs: {
-          faChoices: {
-            ok: 'fa-check text-primary',
-            error: 'fa-times text-danger',
-            pending: 'fa-clock-o'
-          },
-          getChoicesKey(val) {
-            if (val === 'ok' || val === 'pending') {
-              return val
-            }
-            return 'error'
-          },
-          getTip(val) {
-            if (val === 'ok') {
-              return vm.$t('Success')
-            } else if (val === 'pending') {
-              return vm.$t('Pending')
-            } else if (val && val.name === 'error') {
-              return val.error
-            }
-            return ''
-          },
-          hasTips: true
-        }
-      }]
+      const columns = [{ ...getStatusColumnMeta.bind(this)().status }]
       for (const item of tableTitles) {
         const dataItemLens = tableData.map(d => {
           if (!d) {
diff --git a/src/components/Table/ListTable/TableAction/const.js b/src/components/Table/ListTable/TableAction/const.js
new file mode 100644
index 0000000000..2b326c3e77
--- /dev/null
+++ b/src/components/Table/ListTable/TableAction/const.js
@@ -0,0 +1,40 @@
+import { StatusFormatter } from '@/components/Table/TableFormatters'
+import i18n from '@/i18n/i18n'
+
+export const getStatusColumnMeta = (prop = '@status') => {
+  return {
+    status: {
+      prop: prop,
+      label: i18n.t('Status'),
+      width: '80px',
+      align: 'center',
+      formatter: StatusFormatter,
+      formatterArgs: {
+        faChoices: {
+          ok: 'fa-check text-primary',
+          error: 'fa-times text-danger',
+          pending: 'fa-clock-o'
+        },
+        getChoicesKey: (val) => {
+          if (val === 'ok' || val === 'pending') {
+            return val
+          }
+          return 'error'
+        },
+        getTip: (val) => {
+          if (val === 'ok') {
+            return i18n.t('Success')
+          } else if (val === 'pending') {
+            return i18n.t('Pending')
+          } else if ((val && val.name === 'error') || val.error !== undefined) {
+            return val.error
+          }
+          return ''
+        },
+        hasTips: true
+      }
+    }
+  }
+}
+
+export default getStatusColumnMeta
diff --git a/src/components/Table/ListTable/index.vue b/src/components/Table/ListTable/index.vue
index 26981f8d6a..4d963c4b59 100644
--- a/src/components/Table/ListTable/index.vue
+++ b/src/components/Table/ListTable/index.vue
@@ -189,22 +189,23 @@ export default {
     }
   },
   mounted() {
-    this.urlUpdated[this.tableUrl] = location.href
+    this.$set(this.urlUpdated, this.tableUrl, location.href)
   },
   deactivated() {
     this.isDeactivated = true
   },
   activated() {
-    this.isDeactivated = false
-    const preURL = this.urlUpdated[this.tableUrl]
-    if (!preURL || preURL === location.href) {
-      return
-    }
-    this.urlUpdated[this.tableUrl] = location.href
-    this.$log.debug('Reload the table get latest data: pre ', preURL, ' current: ', location.href)
-    setTimeout(() => {
+    this.$nextTick(() => {
+      this.isDeactivated = false
+      const cleanUrl = this.tableUrl.split('?')[0]
+      const preURL = this.urlUpdated[cleanUrl]
+
+      if (!preURL || preURL === location.href) return
+
+      this.$set(this.urlUpdated, this.tableUrl, location.href)
+      this.$log.debug('Reload the table get latest data: pre ', preURL, ' current: ', location.href)
       this.reloadTable()
-    }, 500)
+    })
   },
   methods: {
     handleActionInitialDone() {
diff --git a/src/components/Tree/DataZTree/index.vue b/src/components/Tree/DataZTree/index.vue
index b56d48c24a..acb94117cd 100644
--- a/src/components/Tree/DataZTree/index.vue
+++ b/src/components/Tree/DataZTree/index.vue
@@ -39,7 +39,7 @@ export default {
           showRenameBtn: false,
           drag: {
             isCopy: false,
-            isMove: true
+            isMove: !this.$store.getters.currentOrgIsRoot
           }
         },
         callback: {
diff --git a/src/components/Widgets/Announcement/index.vue b/src/components/Widgets/Announcement/index.vue
index f5bce77041..3ac0e5a7fd 100644
--- a/src/components/Widgets/Announcement/index.vue
+++ b/src/components/Widgets/Announcement/index.vue
@@ -35,13 +35,29 @@ export default {
     ]),
     announcement() {
       const ann = this.publicSettings.ANNOUNCEMENT
-      return { id: ann['ID'], subject: ann['SUBJECT'], content: ann['CONTENT'], link: ann['LINK'] }
+      return {
+        id: ann['ID'],
+        subject: ann['SUBJECT'],
+        content: ann['CONTENT'],
+        link: ann['LINK'],
+        date_start: ann['DATE_START'],
+        date_end: ann['DATE_END']
+      }
     },
     enabled() {
-      return this.publicSettings.ANNOUNCEMENT_ENABLED && (this.announcement.content || this.announcement.subject)
+      return this.publicSettings.ANNOUNCEMENT_ENABLED && (this.announcement.content || this.announcement.subject) && this.isDateValid
     },
     title() {
       return this.$t('Announcement') + ': ' + this.announcement.subject
+    },
+    isDateValid() {
+      if (this.announcement.date_start === undefined || this.announcement.date_end === undefined) {
+        return true
+      }
+      const now = new Date()
+      const start = new Date(this.announcement.date_start)
+      const end = new Date(this.announcement.date_end)
+      return now >= start && now <= end
     }
   },
   methods: {
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 048b886413..2d8e95cf87 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -33,11 +33,13 @@ export default {
         query[k] = v
       }
 
+      let key
       if (this.$route.name.toLowerCase().includes('list')) {
-        return _.trimEnd(this.$route.path, '/') + '?' + new URLSearchParams(query).toString()
+        key = _.trimEnd(this.$route.path, '/') + '?' + new URLSearchParams(query).toString()
       } else {
-        return new Date().getTime()
+        key = new Date().getTime()
       }
+      return key
     },
     chatAiEnabled() {
       return this.publicSettings?.CHAT_AI_ENABLED
diff --git a/src/layout/components/NavHeader/AccountDropdown.vue b/src/layout/components/NavHeader/AccountDropdown.vue
index a69c810732..9f924d7143 100644
--- a/src/layout/components/NavHeader/AccountDropdown.vue
+++ b/src/layout/components/NavHeader/AccountDropdown.vue
@@ -66,11 +66,15 @@ export default {
           break
         case 'logout':
           this.logout()
-          window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
           break
       }
     },
-    logout() {
+    async logout() {
+      const currentOrg = this.$store.getters.currentOrg
+      if (currentOrg.autoEnter) {
+        await this.$store.dispatch('users/setCurrentOrg', this.$store.getters.preOrg)
+      }
+      window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
     }
   }
 }
diff --git a/src/layout/components/NavHeader/SiteMessages.vue b/src/layout/components/NavHeader/SiteMessages.vue
index 7c644fa5a5..626051ff7d 100644
--- a/src/layout/components/NavHeader/SiteMessages.vue
+++ b/src/layout/components/NavHeader/SiteMessages.vue
@@ -70,7 +70,7 @@
           <span class="msg-detail-time">{{ formatDate(currentMsg.date_created) }}</span>
         </div>
         <div class="msg-detail-txt">
-          <span v-sanitize="currentMsg.content.message" />
+          <MarkDown :value="currentMsg.content.message" />
         </div>
       </div>
     </Dialog>
@@ -80,10 +80,14 @@
 <script>
 import { toSafeLocalDateStr } from '@/utils/time'
 import Dialog from '@/components/Dialog'
+import MarkDown from '@/components/Widgets/MarkDown'
 
 export default {
   name: 'SiteMessages',
-  components: { Dialog },
+  components: {
+    Dialog,
+    MarkDown
+  },
   data() {
     return {
       show: false,
diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue
index 9416c96324..f142bf32f6 100644
--- a/src/layout/components/TabPage/index.vue
+++ b/src/layout/components/TabPage/index.vue
@@ -46,7 +46,7 @@
         <el-alert v-if="helpMessage" type="success">
           <span v-sanitize="helpMessage" class="announcement-main" />
         </el-alert>
-        <transition v-if="!loading" appear mode="out-in" name="fade-transform">
+        <transition appear mode="out-in" name="fade-transform">
           <slot>
             <keep-alive>
               <component :is="computeActiveComponent" />
@@ -83,16 +83,18 @@ export default {
   },
   data() {
     return {
-      loading: true,
-      toSentenceCase: toSentenceCase
+      loading: false,
+      toSentenceCase: toSentenceCase,
+      activeTab: this.activeMenu
     }
   },
   computed: {
     iActiveMenu: {
       get() {
-        return this.activeMenu
+        return this.activeTab
       },
       set(item) {
+        this.activeTab = item
         this.$emit('update:activeMenu', item)
       }
     },
@@ -119,16 +121,13 @@ export default {
   },
   watch: {
     $route(to, from) {
-      const activeTab = to.query?.tab
-      if (activeTab && this.iActiveMenu !== activeTab) {
-        this.iActiveMenu = activeTab
-      }
+      // 好像没必要
+      // const activeTab = to.query?.tab
+      // if (activeTab && this.iActiveMenu !== activeTab) {
+      //   this.iActiveMenu = activeTab
+      // }
     }
   },
-  activated() {
-    this.iActiveMenu = this.getPropActiveTab()
-    this.loading = false
-  },
   created() {
     this.iActiveMenu = this.getPropActiveTab()
     this.loading = false
@@ -136,15 +135,8 @@ export default {
   methods: {
     handleTabClick(tab) {
       this.$emit('tab-click', tab)
-      this.$emit('update:activeMenu', tab.name)
-
+      this.iActiveMenu = tab.name
       this.$cookie.set(this.$route.path, tab.name, 1)
-
-      if (this.$router.currentRoute.query[this.$route.path]) {
-        this.$router.push({
-          query: { ...this.$route.query, [this.$route.path]: '' }
-        })
-      }
     },
     getPropActiveTab() {
       let activeTab = ''
diff --git a/src/utils/startup.js b/src/utils/startup.js
index 0f5de3aaaf..a5e368a021 100644
--- a/src/utils/startup.js
+++ b/src/utils/startup.js
@@ -24,6 +24,9 @@ async function checkLogin({ to, from, next }) {
   } catch (e) {
     Vue.$log.error(e)
     const status = e.response.status
+    if (store.getters.currentOrg.autoEnter) {
+      await store.dispatch('users/setCurrentOrg', store.getters.preOrg)
+    }
     if (status === 401 || status === 403) {
       setTimeout(() => {
         window.location = process.env.VUE_APP_LOGIN_PATH
diff --git a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate.vue b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate.vue
index 38cf578165..c0dd018fff 100644
--- a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate.vue
+++ b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate.vue
@@ -60,7 +60,7 @@ export default {
           }
         },
         reviewers: {
-          hidden: (item) => !['review', 'warning'].includes(item.action),
+          hidden: (item) => !['review', 'warning', 'notify_and_warn'].includes(item.action),
           rules: [rules.RequiredChange],
           el: {
             value: [],
diff --git a/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue
index 28a15eed4a..1d67b8f404 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue
@@ -25,17 +25,17 @@ export default {
       const platform = this.$route.query.type
       const baseFields = [[this.$t('Basic'), ['db_name']]]
       let tlsFields = ['use_ssl', 'ca_cert']
-      switch (platform) {
-        case 'redis':
-          tlsFields = tlsFields.concat(['client_cert', 'client_key'])
-          break
-        case 'mysql':
-          tlsFields = tlsFields.concat(['client_cert', 'client_key', 'allow_invalid_cert'])
-          break
-        case 'mongodb':
-          tlsFields = tlsFields.concat(['client_key', 'allow_invalid_cert'])
-          break
+      const platformFieldsMap = {
+        redis: ['client_cert', 'client_key'],
+        postgresql: ['client_cert', 'client_key', 'pg_ssl_mode'],
+        mysql: ['client_cert', 'client_key', 'allow_invalid_cert'],
+        mongodb: ['client_key', 'allow_invalid_cert']
       }
+
+      if (platformFieldsMap[platform]) {
+        tlsFields = tlsFields.concat(platformFieldsMap[platform])
+      }
+
       if (tlsFields.length > 2) {
         const secureField = [
           this.$t('Secure'), tlsFields, 2
@@ -52,7 +52,14 @@ export default {
         },
         use_ssl: {
           label: this.$t('UseSSL'),
-          component: 'el-switch'
+          component: 'el-switch',
+          on: {
+            change: ([event], updateForm) => {
+              updateForm({
+                pg_ssl_mode: event ? 'require' : 'prefer'
+              })
+            }
+          }
         },
         allow_invalid_cert: {
           label: this.$t('AllowInvalidCert'),
diff --git a/src/views/assets/Asset/AssetList/HostList.vue b/src/views/assets/Asset/AssetList/HostList.vue
index 732b3e15f0..655990a9e2 100644
--- a/src/views/assets/Asset/AssetList/HostList.vue
+++ b/src/views/assets/Asset/AssetList/HostList.vue
@@ -61,7 +61,7 @@ export default {
                       row['auto_config'].ansible_enabled &&
                       row['auto_config'].ping_enabled,
                     callback: ({ row }) => {
-                      if (row.platform.name === 'Gateway') {
+                      if (row.platform.name.startsWith('Gateway')) {
                         this.GatewayVisible = true
                         const port = row.protocols.find(item => item.name === 'ssh').port
                         if (!port) {
diff --git a/src/views/assets/Asset/AssetList/components/BaseList.vue b/src/views/assets/Asset/AssetList/components/BaseList.vue
index c480425d3a..3680787098 100644
--- a/src/views/assets/Asset/AssetList/components/BaseList.vue
+++ b/src/views/assets/Asset/AssetList/components/BaseList.vue
@@ -191,7 +191,7 @@ export default {
                     row?.auto_config?.ansible_enabled &&
                     row?.auto_config?.ping_enabled,
                   callback: ({ row }) => {
-                    if (row.platform.name === 'Gateway') {
+                    if (row.platform.name.startsWith('Gateway')) {
                       this.GatewayVisible = true
                       const port = row.protocols.find(item => item.name === 'ssh').port
                       if (!port) {
diff --git a/src/views/assets/Asset/AssetList/components/PlatformDialog.vue b/src/views/assets/Asset/AssetList/components/PlatformDialog.vue
index 8d670ec727..d241bb8999 100644
--- a/src/views/assets/Asset/AssetList/components/PlatformDialog.vue
+++ b/src/views/assets/Asset/AssetList/components/PlatformDialog.vue
@@ -22,17 +22,17 @@
               :key="platform.id"
               :span="6"
             >
-              <el-card
-                :style="{ borderLeftColor: randomBorderColor(index) }"
-                class="platform-item"
-                shadow="hover"
-                @click.native="createAsset(platform)"
-              >
-                <img :src="loadImage(platform)" alt="icon" class="asset-icon">
-                <el-tooltip :content="platform.name">
+              <el-tooltip :content="platform.name" :open-delay="1000">
+                <el-card
+                  :style="{ borderLeftColor: randomBorderColor(index) }"
+                  class="platform-item"
+                  shadow="hover"
+                  @click.native="createAsset(platform)"
+                >
+                  <img :src="loadImage(platform)" alt="icon" class="asset-icon">
                   <span class="platform-name">{{ platform.name }}</span>
-                </el-tooltip>
-              </el-card>
+                </el-card>
+              </el-tooltip>
             </el-col>
           </el-collapse-item>
         </el-collapse>
@@ -236,8 +236,8 @@ export default {
 }
 
 .asset-icon {
-  width: 1.5em;
-  height: 1.5em;
+  width: 2em;
+  height: 2em;
   vertical-align: -0.2em;
   fill: currentColor;
 }
diff --git a/src/views/assets/Asset/AssetList/index.vue b/src/views/assets/Asset/AssetList/index.vue
index 45c217c471..c8ccada5d7 100644
--- a/src/views/assets/Asset/AssetList/index.vue
+++ b/src/views/assets/Asset/AssetList/index.vue
@@ -89,14 +89,15 @@ export default {
   },
   methods: {
     handleTabClick(tab) {
-      const query = _.cloneDeep(this.$route.query)
-      const newQuery = {
-        ...query,
-        tab: tab.name
-      }
-      this.$nextTick(() => {
-        this.$router.replace({ query: newQuery })
-      })
+      // 这样不行，会闪
+      // const query = _.cloneDeep(this.$route.query)
+      // const newQuery = {
+      //   ...query,
+      //   tab: tab.name
+      // }
+      // this.$nextTick(() => {
+      //   this.$router.replace({ query: newQuery })
+      // })
     }
   }
 }
diff --git a/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue b/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue
index 0fe60d078f..788f70d49f 100644
--- a/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue
+++ b/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue
@@ -109,7 +109,7 @@ export default {
           }
         },
         {
-          title: this.$t('Timer'),
+          title: this.$t('TimerExecution'),
           attrs: {
             model: this.object.task,
             type: 'primary',
diff --git a/src/views/assets/Cloud/Account/components/TimingPanel.vue b/src/views/assets/Cloud/Account/components/TimingPanel.vue
index a89b2af24e..3d15c41965 100644
--- a/src/views/assets/Cloud/Account/components/TimingPanel.vue
+++ b/src/views/assets/Cloud/Account/components/TimingPanel.vue
@@ -73,7 +73,13 @@ export default {
           btn.loading = true
         }
       })
-      form.value.interval = parseInt(form.value.interval, 10)
+
+      if (form.value.interval && typeof form.value.interval === 'number') {
+        form.value.interval = parseInt(form.value.interval, 10)
+      } else {
+        form.value.interval = 24
+      }
+
       this.$refs.form.$refs.form.dataForm.submitForm('form', false)
     },
     handleSubmitSuccess(res) {
diff --git a/src/views/assets/Domain/DomainCreateUpdate.vue b/src/views/assets/Domain/DomainCreateUpdate.vue
index 968165145b..b1934fd821 100644
--- a/src/views/assets/Domain/DomainCreateUpdate.vue
+++ b/src/views/assets/Domain/DomainCreateUpdate.vue
@@ -30,7 +30,7 @@ export default {
               domain_enabled: true
             },
             canSelect: (row) => {
-              return row.platform?.name !== 'Gateway'
+              return !row.platform?.name.startsWith('Gateway')
             }
           }
         },
diff --git a/src/views/assets/Domain/DomainDetail/AssetList.vue b/src/views/assets/Domain/DomainDetail/AssetList.vue
index 0668c345e8..2a2a1a1feb 100644
--- a/src/views/assets/Domain/DomainDetail/AssetList.vue
+++ b/src/views/assets/Domain/DomainDetail/AssetList.vue
@@ -25,7 +25,7 @@ export default {
     return {
       tableConfig: {
         category: 'all',
-        url: `/api/v1/assets/assets/?domain=${this.$route.params.id}&exclude_platform=Gateway`,
+        url: `/api/v1/assets/assets/?domain=${this.$route.params.id}&is_gateway=0`,
         tableConfig: {
           columnsMeta: {
             actions: {
diff --git a/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue b/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue
index e772013e8d..1fd3e383ed 100644
--- a/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue
+++ b/src/views/assets/Domain/DomainDetail/GatewayCreateUpdate.vue
@@ -11,11 +11,10 @@ export default {
     BaseAssetCreateUpdate
   },
   data() {
-    const platformType = this.$route.query.platform_type
     return {
       url: '/api/v1/assets/gateways/',
       updateInitial: async(initial) => {
-        const url = `/api/v1/assets/platforms/?name=Gateway`
+        const url = `/api/v1/assets/platforms/?name__startswith=Gateway`
         const platform = await this.$axios.get(url)
         initial.platform = parseInt(platform[0].id)
         initial.domain = this.$route.query.domain
@@ -26,11 +25,11 @@ export default {
           disabled: true
         },
         platform: {
-          disabled: true,
+          helpText: this.$t('GatewayPlatformHelpText'),
           el: {
             multiple: false,
             ajax: {
-              url: `/api/v1/assets/platforms/?type=${platformType}`,
+              url: `/api/v1/assets/platforms/?name__startswith=Gateway`,
               transformOption: (item) => {
                 return { label: item.name, value: item.id }
               }
diff --git a/src/views/assets/Domain/DomainDetail/GatewayList.vue b/src/views/assets/Domain/DomainDetail/GatewayList.vue
index a2f4f5440b..baf6b93a75 100644
--- a/src/views/assets/Domain/DomainDetail/GatewayList.vue
+++ b/src/views/assets/Domain/DomainDetail/GatewayList.vue
@@ -39,7 +39,7 @@ export default {
   data() {
     return {
       tableConfig: {
-        url: `/api/v1/assets/gateways/?domain=${this.$route.params.id}&platform=Gateway`,
+        url: `/api/v1/assets/gateways/?domain=${this.$route.params.id}`,
         columnsExclude: [
           'info', 'spec_info', 'auto_config'
         ],
@@ -174,7 +174,7 @@ export default {
             name: 'GatewayAdd',
             title: this.$t('Add'),
             callback: function() {
-              this.AddGatewaySetting.AddGatewayDialogVisible = true
+              this.AddGatewaySetting.addGatewayDialogVisible = true
             }.bind(this)
           }
         ]
@@ -183,7 +183,7 @@ export default {
       cell: '',
       visible: false,
       AddGatewaySetting: {
-        AddGatewayDialogVisible: false
+        addGatewayDialogVisible: false
       }
     }
   },
diff --git a/src/views/assets/Domain/components/AddAssetDialog.vue b/src/views/assets/Domain/components/AddAssetDialog.vue
index 15a8949813..a84bf43036 100644
--- a/src/views/assets/Domain/components/AddAssetDialog.vue
+++ b/src/views/assets/Domain/components/AddAssetDialog.vue
@@ -68,7 +68,7 @@ export default {
                 domain_enabled: true
               },
               canSelect: (row) => {
-                return row.platform?.name !== 'Gateway' && this.object.assets.map(item => item.id).indexOf(row.id) === -1
+                return !row.platform?.name.startsWith('Gateway') && this.object.assets.map(item => item.id).indexOf(row.id) === -1
               }
             }
           }
diff --git a/src/views/assets/Domain/components/AddGatewayDialog.vue b/src/views/assets/Domain/components/AddGatewayDialog.vue
index 67cc4890a8..b58f14bb72 100644
--- a/src/views/assets/Domain/components/AddGatewayDialog.vue
+++ b/src/views/assets/Domain/components/AddGatewayDialog.vue
@@ -1,11 +1,11 @@
 <template>
   <Dialog
-    v-if="setting.AddGatewayDialogVisible"
+    v-if="setting.addGatewayDialogVisible"
     :destroy-on-close="true"
     :show-cancel="false"
     :show-confirm="false"
     :title="$tc('AddGatewayInDomain')"
-    :visible.sync="setting.AddGatewayDialogVisible"
+    :visible.sync="setting.addGatewayDialogVisible"
     after
     custom-class="asset-select-dialog"
     top="15vh"
@@ -31,7 +31,7 @@ export default {
     setting: {
       type: Object,
       default: () => {
-        return { AddGatewayDialogVisible: false }
+        return { addGatewayDialogVisible: false }
       }
     },
     object: {
@@ -64,7 +64,7 @@ export default {
               multiple: true,
               clearable: true,
               ajax: {
-                url: '/api/v1/assets/assets/?domain_enabled=true&platform=Gateway'
+                url: '/api/v1/assets/assets/?domain_enabled=true&is_gateway=1'
               },
               disabledValues: this.object.gateways.map(item => item.id)
             }
@@ -83,7 +83,7 @@ export default {
   },
   methods: {
     onSubmitSuccess(res) {
-      this.setting.AddGatewayDialogVisible = false
+      this.setting.addGatewayDialogVisible = false
       this.$emit('close', res)
     }
   }
diff --git a/src/views/ops/Adhoc/AdhocOpenDialog.vue b/src/views/ops/Adhoc/AdhocOpenDialog.vue
index a442732dab..230da43271 100644
--- a/src/views/ops/Adhoc/AdhocOpenDialog.vue
+++ b/src/views/ops/Adhoc/AdhocOpenDialog.vue
@@ -32,7 +32,7 @@ export default {
         width: '60%',
         tableConfig: {
           hasSelection: false,
-          url: `/api/v1/ops/adhocs/`,
+          url: `/api/v1/ops/adhocs/?only_mine=true`,
           columns: ['name', 'module', 'args', 'comment', 'actions'],
           columnsMeta: {
             name: {
diff --git a/src/views/ops/Job/JobUpdateCreate.vue b/src/views/ops/Job/JobUpdateCreate.vue
index 19d5305e65..a99c94713c 100644
--- a/src/views/ops/Job/JobUpdateCreate.vue
+++ b/src/views/ops/Job/JobUpdateCreate.vue
@@ -83,7 +83,7 @@ export default {
             multiple: false,
             value: [],
             ajax: {
-              url: '/api/v1/ops/playbooks/',
+              url: `/api/v1/ops/playbooks/?only_mine=true`,
               transformOption: (item) => {
                 return { label: item.name, value: item.id }
               }
diff --git a/src/views/ops/Template/Adhoc.vue b/src/views/ops/Template/Adhoc.vue
index 29fff770d5..af8ed91ca5 100644
--- a/src/views/ops/Template/Adhoc.vue
+++ b/src/views/ops/Template/Adhoc.vue
@@ -11,12 +11,13 @@ export default {
     GenericListTable
   },
   data() {
+    const currentUserID = this.$store.state.users.profile.id
     return {
       tableConfig: {
         url: '/api/v1/ops/adhocs/',
         columnsShow: {
           min: ['name', 'actions'],
-          default: ['name', 'module', 'args', 'comment', 'date_created', 'actions']
+          default: ['name', 'module', 'args', 'comment', 'scope', 'date_created', 'actions']
         },
         columnsMeta: {
           name: {
@@ -29,10 +30,14 @@ export default {
             formatter: ActionsFormatter,
             formatterArgs: {
               hasUpdate: true,
-              canUpdate: this.$hasPerm('ops.change_adhoc'),
+              canUpdate: ({ row }) => {
+                return this.$hasPerm('ops.change_adhoc') && row.creator === currentUserID
+              },
               updateRoute: 'AdhocUpdate',
               hasDelete: true,
-              canDelete: this.$hasPerm('ops.delete_adhoc'),
+              canDelete: ({ row }) => {
+                return this.$hasPerm('ops.delete_adhoc') && row.creator === currentUserID
+              },
               hasClone: false
             }
           }
diff --git a/src/views/ops/Template/Adhoc/AdhocUpdateCreate.vue b/src/views/ops/Template/Adhoc/AdhocUpdateCreate.vue
index ef024a9cf5..5331f12405 100644
--- a/src/views/ops/Template/Adhoc/AdhocUpdateCreate.vue
+++ b/src/views/ops/Template/Adhoc/AdhocUpdateCreate.vue
@@ -14,7 +14,7 @@ export default {
     return {
       url: '/api/v1/ops/adhocs/',
       fields: [
-        [this.$t('Basic'), ['name', 'module', 'args', 'comment']]
+        [this.$t('Basic'), ['name', 'module', 'args', 'comment', 'scope']]
       ],
       initial: {
         module: 'shell',
diff --git a/src/views/ops/Template/Playbook.vue b/src/views/ops/Template/Playbook.vue
index ce31d1ce26..7afb1d842f 100644
--- a/src/views/ops/Template/Playbook.vue
+++ b/src/views/ops/Template/Playbook.vue
@@ -16,6 +16,7 @@ export default {
     GenericListTable
   },
   data() {
+    const currentUserID = this.$store.state.users.profile.id
     return {
       createDialogVisible: false,
       uploadDialogVisible: false,
@@ -23,7 +24,7 @@ export default {
         url: '/api/v1/ops/playbooks/',
         columnsShow: {
           min: ['name', 'actions'],
-          default: ['name', 'comment', 'date_created', 'actions']
+          default: ['name', 'comment', 'scope', 'date_created', 'actions']
         },
         columnsMeta: {
           name: {
@@ -36,11 +37,16 @@ export default {
             formatter: ActionsFormatter,
             formatterArgs: {
               hasUpdate: true,
-              canUpdate: this.$hasPerm('ops.change_playbook'),
+              canUpdate: ({ row }) => {
+                return this.$hasPerm('ops.change_playbook') && row.creator === currentUserID
+              },
               updateRoute: 'PlaybookUpdate',
               hasDelete: true,
-              canDelete: this.$hasPerm('ops.delete_playbook'),
-              hasClone: false
+              canDelete: ({ row }) => {
+                return this.$hasPerm('ops.delete_playbook') && row.creator === currentUserID
+              },
+              hasClone: true,
+              cloneRoute: 'PlaybookCreate'
             }
           }
         }
diff --git a/src/views/ops/Template/Playbook/PlaybookCreateUpdate.vue b/src/views/ops/Template/Playbook/PlaybookCreateUpdate.vue
index 5aef9f36d5..ddcabed20b 100644
--- a/src/views/ops/Template/Playbook/PlaybookCreateUpdate.vue
+++ b/src/views/ops/Template/Playbook/PlaybookCreateUpdate.vue
@@ -13,7 +13,7 @@ export default {
     return {
       url: '/api/v1/ops/playbooks/',
       fields: [
-        [this.$t('Basic'), ['name', 'comment']]
+        [this.$t('Basic'), ['name', 'comment', 'scope']]
       ],
       createSuccessNextRoute: {
         name: 'Template'
diff --git a/src/views/ops/Template/Playbook/PlaybookDetail/Workspace.vue b/src/views/ops/Template/Playbook/PlaybookDetail/Workspace.vue
index 264e6641d3..c5a71c671f 100644
--- a/src/views/ops/Template/Playbook/PlaybookDetail/Workspace.vue
+++ b/src/views/ops/Template/Playbook/PlaybookDetail/Workspace.vue
@@ -2,7 +2,7 @@
   <div>
     <NewNodeDialog v-if="createDialogVisible" :visible.sync="createDialogVisible" @confirm="doCreate" />
     <TreeTable ref="TreeTable" :tree-setting="treeSetting">
-      <template slot="rMenu">
+      <template v-if="!disableEdit" slot="rMenu">
         <li id="m_create_file" class="rmenu" tabindex="-1" @click="onCreate('file')">
           {{ $tc('NewFile') }}
         </li>
@@ -62,7 +62,9 @@ export default {
     }
   },
   data() {
+    const disableEdit = this.object.creator !== this.$store.state.users.profile.id
     return {
+      disableEdit: disableEdit,
       newNode: {},
       createDialogVisible: false,
       createType: 'directory',
@@ -70,7 +72,8 @@ export default {
       closing: false,
       DataZTree: 0,
       cmOptions: {
-        mode: 'yaml'
+        mode: 'yaml',
+        readOnly: disableEdit
       },
       toolbar: {
         left: {
@@ -82,6 +85,7 @@ export default {
             el: {
               type: 'primary'
             },
+            isVisible: disableEdit,
             callback: () => {
               this.onSave()
             }
@@ -94,6 +98,7 @@ export default {
             el: {
               type: 'primary'
             },
+            isVisible: disableEdit,
             callback: () => {
               this.onReset()
             }
diff --git a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue
index 7b98fc5e21..430e036850 100644
--- a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue
@@ -76,6 +76,8 @@ export default {
           }],
           el: {
             value: [],
+            defaultPageSize: 300,
+            baseUrl: '/api/v1/assets/assets/?fields_size=mini',
             treeSetting: {
               showSearch: false,
               showRefresh: false
diff --git a/src/views/sessions/SessionList/BaseList.vue b/src/views/sessions/SessionList/BaseList.vue
index 2a7b790da8..a6b1e2a328 100644
--- a/src/views/sessions/SessionList/BaseList.vue
+++ b/src/views/sessions/SessionList/BaseList.vue
@@ -5,7 +5,7 @@
 <script type="text/jsx">
 import ListTable from '@/components/Table/ListTable'
 import { timeOffset } from '@/utils/time'
-import { ActionsFormatter, DetailFormatter } from '@/components/Table/TableFormatters'
+import { ActionsFormatter, ChoicesFormatter, DetailFormatter } from '@/components/Table/TableFormatters'
 
 export default {
   name: 'BaseList',
@@ -119,7 +119,11 @@ export default {
             }
           },
           is_locked: {
-            label: this.$t('IsLocked')
+            label: this.$t('IsLocked'),
+            formatter: ChoicesFormatter,
+            formatterArgs: {
+              showFalse: true
+            }
           },
           actions: {
             prop: 'actions',
diff --git a/src/views/settings/Auth/Ldap/HaSyncSettingDialog.vue b/src/views/settings/Auth/Ldap/HaSyncSettingDialog.vue
new file mode 100644
index 0000000000..f60734e84f
--- /dev/null
+++ b/src/views/settings/Auth/Ldap/HaSyncSettingDialog.vue
@@ -0,0 +1,103 @@
+<template>
+  <Dialog
+    :destroy-on-close="true"
+    :show-cancel="false"
+    :show-confirm="false"
+    :title="$tc('SyncSetting')"
+    top="10%"
+    v-bind="$attrs"
+    width="50%"
+    v-on="$listeners"
+  >
+    <GenericCreateUpdateForm
+      :has-detail-in-msg="false"
+      v-bind="settings"
+      @submitSuccess="onSuccess"
+    />
+  </Dialog>
+</template>
+
+<script>
+import { GenericCreateUpdateForm } from '@/layout/components'
+import { CronTab, Dialog } from '@/components'
+import Select2 from '@/components/Form/FormFields/Select2.vue'
+import { Required } from '@/components/Form/DataForm/rules'
+
+export default {
+  name: 'SyncSettingDialog',
+  components: {
+    GenericCreateUpdateForm,
+    Dialog
+  },
+  data() {
+    return {
+      settings: {
+        visible: false,
+        url: '/api/v1/settings/setting/?category=ldap_ha',
+        fields: [
+          'AUTH_LDAP_HA_SYNC_ORG_IDS', 'AUTH_LDAP_HA_SYNC_IS_PERIODIC', 'AUTH_LDAP_HA_SYNC_CRONTAB',
+          'AUTH_LDAP_HA_SYNC_INTERVAL', 'AUTH_LDAP_HA_SYNC_RECEIVERS'
+        ],
+        fieldsMeta: {
+          AUTH_LDAP_HA_SYNC_ORG_IDS: {
+            component: Select2,
+            rules: [Required],
+            el: {
+              popperClass: 'sync-setting-org',
+              multiple: true,
+              ajax: {
+                url: '/api/v1/orgs/orgs/',
+                transformOption: (item) => {
+                  return { label: item.name, value: item.id }
+                }
+              }
+            },
+            hidden: (formValue) => {
+              return !this.$hasLicense()
+            }
+          },
+          AUTH_LDAP_HA_SYNC_IS_PERIODIC: {
+            type: 'switch'
+          },
+          AUTH_LDAP_HA_SYNC_CRONTAB: {
+            component: CronTab,
+            helpTip: this.$t('CrontabOfCreateUpdatePage')
+          },
+          AUTH_LDAP_HA_SYNC_INTERVAL: {
+            helpText: this.$t('IntervalOfCreateUpdatePage')
+          },
+          AUTH_LDAP_HA_SYNC_RECEIVERS: {
+            component: Select2,
+            el: {
+              value: [],
+              multiple: true,
+              ajax: {
+                url: '/api/v1/users/users/?fields_size=mini&oid=ROOT',
+                transformOption: (item) => {
+                  return { label: item.name + '(' + item.username + ')', value: item.id }
+                }
+              }
+            }
+          }
+        },
+        submitMethod: () => 'patch',
+        cleanFormValue(value) {
+          if (value['AUTH_LDAP_HA_SYNC_INTERVAL'] === '') {
+            value['AUTH_LDAP_HA_SYNC_INTERVAL'] = null
+          }
+          return value
+        }
+      }
+    }
+  },
+  methods: {
+    onSuccess() {
+      this.$emit('update:visible', false)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/settings/Auth/Ldap/ImportDialog.vue b/src/views/settings/Auth/Ldap/ImportDialog.vue
index be3ba4b2f2..c60c5a31fa 100644
--- a/src/views/settings/Auth/Ldap/ImportDialog.vue
+++ b/src/views/settings/Auth/Ldap/ImportDialog.vue
@@ -49,6 +49,7 @@ 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 getStatusColumnMeta from '@/components/Table/ListTable/TableAction/const'
 
 export default {
   name: 'ImportDialog',
@@ -57,6 +58,12 @@ export default {
     Dialog,
     Select2
   },
+  props: {
+    category: {
+      type: String,
+      required: true
+    }
+  },
   data() {
     return {
       dialogLdapUserImportLoginStatus: false,
@@ -75,9 +82,10 @@ export default {
         }
       },
       tableConfig: {
-        url: '/api/v1/settings/ldap/users/',
-        columns: ['username', 'name', 'email', 'groups', 'existing'],
+        url: `/api/v1/settings/ldap/users/?category=${this.category}`,
+        columns: ['status', 'username', 'name', 'email', 'groups', 'existing'],
         columnsMeta: {
+          ...getStatusColumnMeta.bind(this)('status'),
           username: {
             label: this.$t('Username'),
             width: '180px'
@@ -189,7 +197,7 @@ export default {
     enableWS() {
       const scheme = document.location.protocol === 'https:' ? 'wss' : 'ws'
       const port = document.location.port ? ':' + document.location.port : ''
-      const url = '/ws/ldap/'
+      const url = `/ws/ldap/?category=${this.category}`
       const wsURL = scheme + '://' + document.location.hostname + port + url
       this.ws = new WebSocket(wsURL)
     },
diff --git a/src/views/settings/Auth/Ldap/Ldap.vue b/src/views/settings/Auth/Ldap/Ldap.vue
new file mode 100644
index 0000000000..8ac47a93f2
--- /dev/null
+++ b/src/views/settings/Auth/Ldap/Ldap.vue
@@ -0,0 +1,151 @@
+<template>
+  <IBox>
+    <GenericCreateUpdateForm v-bind="$data" />
+    <ImportDialog v-if="dialogLdapUserImport" :category="category" :visible.sync="dialogLdapUserImport" />
+    <TestLoginDialog :visible.sync="dialogTest" :category="category" />
+    <SyncSettingDialog :visible.sync="dialogSyncSetting" />
+  </IBox>
+</template>
+<script>
+import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm/index.vue'
+import ImportDialog from './ImportDialog.vue'
+import TestLoginDialog from './TestLoginDialog.vue'
+import SyncSettingDialog from './SyncSettingDialog.vue'
+import { IBox } from '@/components'
+import rules, { JsonRequired } from '@/components/Form/DataForm/rules'
+import { JsonEditor, UpdateToken } from '@/components/Form/FormFields'
+
+export default {
+  name: 'Ldap',
+  components: {
+    GenericCreateUpdateForm,
+    IBox,
+    ImportDialog,
+    TestLoginDialog,
+    SyncSettingDialog
+  },
+  data() {
+    const category = 'ldap'
+    return {
+      category: category,
+      url: `/api/v1/settings/setting/?category=${category}`,
+      dialogTest: false,
+      dialogLdapUserImport: false,
+      dialogSyncSetting: false,
+      encryptedFields: ['AUTH_LDAP_BIND_PASSWORD'],
+      fields: [
+        [
+          this.$t('Basic'),
+          [
+            'AUTH_LDAP', 'AUTH_LDAP_SERVER_URI',
+            'AUTH_LDAP_BIND_DN', 'AUTH_LDAP_BIND_PASSWORD'
+          ]
+        ],
+        [
+          this.$t('Search'),
+          [
+            'AUTH_LDAP_SEARCH_OU', 'AUTH_LDAP_SEARCH_FILTER',
+            'AUTH_LDAP_USER_ATTR_MAP'
+          ]
+        ],
+        [
+          this.$t('Other'),
+          [
+            'AUTH_LDAP_CONNECT_TIMEOUT', 'AUTH_LDAP_SEARCH_PAGED_SIZE',
+            'AUTH_LDAP_CACHE_TIMEOUT'
+          ]
+        ]
+      ],
+      fieldsMeta: {
+        AUTH_LDAP_BIND_DN: {
+          rules: [
+            rules.Required
+          ]
+        },
+        AUTH_LDAP_BIND_PASSWORD: {
+          component: UpdateToken
+        },
+        AUTH_LDAP_SEARCH_OU: {
+          rules: [
+            rules.Required
+          ]
+        },
+        AUTH_LDAP_USER_ATTR_MAP: {
+          component: JsonEditor,
+          rules: [JsonRequired]
+        }
+      },
+      hasDetailInMsg: false,
+      moreButtons: [
+        {
+          title: this.$t('LdapConnectTest'),
+          loading: false,
+          callback: function(value, form, btn) {
+            if (value['AUTH_LDAP_BIND_PASSWORD'] === undefined) {
+              value['AUTH_LDAP_BIND_PASSWORD'] = ''
+            }
+            btn.loading = true
+            this.enableWS()
+            this.ws.onopen = (e) => {
+              this.ws.send(JSON.stringify({ msg_type: 'testing_config', ...value }))
+            }
+            this.ws.onmessage = (e) => {
+              const data = JSON.parse(e.data)
+              if (data.ok) {
+                this.$message.success(data.msg)
+              } else {
+                this.$message.error(data.msg)
+              }
+              btn.loading = false
+            }
+          }.bind(this)
+        },
+        {
+          title: this.$t('LdapLoginTest'),
+          callback: function(value, form) {
+            this.dialogTest = true
+          }.bind(this)
+        },
+        {
+          title: this.$t('LdapBulkImport'),
+          callback: function(value, form) {
+            this.dialogLdapUserImport = true
+          }.bind(this)
+        },
+        {
+          title: this.$t('SyncSetting'),
+          callback: function(value, form) {
+            this.dialogSyncSetting = true
+          }.bind(this)
+        }
+      ],
+      submitMethod: () => 'patch',
+      afterGetFormValue(obj) {
+        return obj
+      },
+      cleanFormValue(data) {
+        if (data['AUTH_LDAP_BIND_PASSWORD'] === '') {
+          delete data['AUTH_LDAP_BIND_PASSWORD']
+        }
+        return data
+      }
+    }
+  },
+  methods: {
+    enableWS() {
+      const scheme = document.location.protocol === 'https:' ? 'wss' : 'ws'
+      const port = document.location.port ? ':' + document.location.port : ''
+      const url = '/ws/ldap/'
+      const wsURL = scheme + '://' + document.location.hostname + port + url
+      this.ws = new WebSocket(wsURL)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.listTable ::v-deep .table-action-right-side {
+  padding-top: 0 !important;
+}
+
+</style>
diff --git a/src/views/settings/Auth/Ldap/LdapHA.vue b/src/views/settings/Auth/Ldap/LdapHA.vue
new file mode 100644
index 0000000000..42aeac136e
--- /dev/null
+++ b/src/views/settings/Auth/Ldap/LdapHA.vue
@@ -0,0 +1,151 @@
+<template>
+  <IBox>
+    <GenericCreateUpdateForm v-bind="$data" />
+    <ImportDialog v-if="dialogLdapUserImport" :category="category" :visible.sync="dialogLdapUserImport" />
+    <TestLoginDialog :visible.sync="dialogTest" :category="category" />
+    <SyncSettingDialog :visible.sync="dialogSyncSetting" />
+  </IBox>
+</template>
+<script>
+import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm/index.vue'
+import ImportDialog from './ImportDialog.vue'
+import TestLoginDialog from './TestLoginDialog.vue'
+import SyncSettingDialog from './HaSyncSettingDialog.vue'
+import { IBox } from '@/components'
+import rules, { JsonRequired } from '@/components/Form/DataForm/rules'
+import { JsonEditor, UpdateToken } from '@/components/Form/FormFields'
+
+export default {
+  name: 'LdapHA',
+  components: {
+    GenericCreateUpdateForm,
+    IBox,
+    ImportDialog,
+    TestLoginDialog,
+    SyncSettingDialog
+  },
+  data() {
+    const category = 'ldap_ha'
+    return {
+      category: category,
+      url: `/api/v1/settings/setting/?category=${category}`,
+      dialogTest: false,
+      dialogLdapUserImport: false,
+      dialogSyncSetting: false,
+      encryptedFields: ['AUTH_LDAP_HA_BIND_PASSWORD'],
+      fields: [
+        [
+          this.$t('Basic'),
+          [
+            'AUTH_LDAP_HA', 'AUTH_LDAP_HA_SERVER_URI',
+            'AUTH_LDAP_HA_BIND_DN', 'AUTH_LDAP_HA_BIND_PASSWORD'
+          ]
+        ],
+        [
+          this.$t('Search'),
+          [
+            'AUTH_LDAP_HA_SEARCH_OU', 'AUTH_LDAP_HA_SEARCH_FILTER',
+            'AUTH_LDAP_HA_USER_ATTR_MAP'
+          ]
+        ],
+        [
+          this.$t('Other'),
+          [
+            'AUTH_LDAP_HA_CONNECT_TIMEOUT', 'AUTH_LDAP_HA_SEARCH_PAGED_SIZE',
+            'AUTH_LDAP_HA_CACHE_TIMEOUT'
+          ]
+        ]
+      ],
+      fieldsMeta: {
+        AUTH_LDAP_HA_BIND_DN: {
+          rules: [
+            rules.Required
+          ]
+        },
+        AUTH_LDAP_HA_BIND_PASSWORD: {
+          component: UpdateToken
+        },
+        AUTH_LDAP_HA_SEARCH_OU: {
+          rules: [
+            rules.Required
+          ]
+        },
+        AUTH_LDAP_HA_USER_ATTR_MAP: {
+          component: JsonEditor,
+          rules: [JsonRequired]
+        }
+      },
+      hasDetailInMsg: false,
+      moreButtons: [
+        {
+          title: this.$t('LdapConnectTest'),
+          loading: false,
+          callback: function(value, form, btn) {
+            if (value['AUTH_LDAP_HA_BIND_PASSWORD'] === undefined) {
+              value['AUTH_LDAP_HA_BIND_PASSWORD'] = ''
+            }
+            btn.loading = true
+            this.enableWS()
+            this.ws.onopen = (e) => {
+              this.ws.send(JSON.stringify({ msg_type: 'testing_config', ...value }))
+            }
+            this.ws.onmessage = (e) => {
+              const data = JSON.parse(e.data)
+              if (data.ok) {
+                this.$message.success(data.msg)
+              } else {
+                this.$message.error(data.msg)
+              }
+              btn.loading = false
+            }
+          }.bind(this)
+        },
+        {
+          title: this.$t('LdapLoginTest'),
+          callback: function(value, form) {
+            this.dialogTest = true
+          }.bind(this)
+        },
+        {
+          title: this.$t('LdapBulkImport'),
+          callback: function(value, form) {
+            this.dialogLdapUserImport = true
+          }.bind(this)
+        },
+        {
+          title: this.$t('SyncSetting'),
+          callback: function(value, form) {
+            this.dialogSyncSetting = true
+          }.bind(this)
+        }
+      ],
+      submitMethod: () => 'patch',
+      afterGetFormValue(obj) {
+        return obj
+      },
+      cleanFormValue(data) {
+        if (data['AUTH_LDAP_HA_BIND_PASSWORD'] === '') {
+          delete data['AUTH_LDAP_HA_BIND_PASSWORD']
+        }
+        return data
+      }
+    }
+  },
+  methods: {
+    enableWS() {
+      const scheme = document.location.protocol === 'https:' ? 'wss' : 'ws'
+      const port = document.location.port ? ':' + document.location.port : ''
+      const url = `/ws/ldap/?category=${this.category}`
+      const wsURL = scheme + '://' + document.location.hostname + port + url
+      this.ws = new WebSocket(wsURL)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.listTable ::v-deep .table-action-right-side {
+  padding-top: 0 !important;
+}
+
+</style>
diff --git a/src/views/settings/Auth/Ldap/TestLoginDialog.vue b/src/views/settings/Auth/Ldap/TestLoginDialog.vue
index a81cdcb629..d0e587b0c0 100644
--- a/src/views/settings/Auth/Ldap/TestLoginDialog.vue
+++ b/src/views/settings/Auth/Ldap/TestLoginDialog.vue
@@ -40,6 +40,12 @@ export default {
   components: {
     Dialog
   },
+  props: {
+    category: {
+      type: String,
+      required: true
+    }
+  },
   data() {
     return {
       testLdapLoginStatus: false,
@@ -69,7 +75,7 @@ export default {
     enableWS() {
       const scheme = document.location.protocol === 'https:' ? 'wss' : 'ws'
       const port = document.location.port ? ':' + document.location.port : ''
-      const url = '/ws/ldap/'
+      const url = `/ws/ldap/?category=${this.category}`
       const wsURL = scheme + '://' + document.location.hostname + port + url
       this.ws = new WebSocket(wsURL)
     }
diff --git a/src/views/settings/Auth/Ldap/index.vue b/src/views/settings/Auth/Ldap/index.vue
index 76d0ac74a2..8b13789179 100644
--- a/src/views/settings/Auth/Ldap/index.vue
+++ b/src/views/settings/Auth/Ldap/index.vue
@@ -1,152 +1 @@
-<template>
-  <IBox>
-    <GenericCreateUpdateForm v-bind="$data" />
-    <ImportDialog v-if="dialogLdapUserImport" :visible.sync="dialogLdapUserImport" />
-    <TestLoginDialog :visible.sync="dialogTest" />
-    <SyncSettingDialog :visible.sync="dialogSyncSetting" />
-  </IBox>
-</template>
-<script>
-import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm/index.vue'
-import ImportDialog from './ImportDialog.vue'
-import TestLoginDialog from './TestLoginDialog.vue'
-import SyncSettingDialog from './SyncSettingDialog.vue'
-import { IBox } from '@/components'
-import rules, { JsonRequired } from '@/components/Form/DataForm/rules'
-import { JsonEditor, UpdateToken } from '@/components/Form/FormFields'
 
-export default {
-  name: 'Ldap',
-  components: {
-    GenericCreateUpdateForm,
-    IBox,
-    ImportDialog,
-    TestLoginDialog,
-    SyncSettingDialog
-  },
-  data() {
-    return {
-      dialogTest: false,
-      dialogLdapUserImport: false,
-      dialogSyncSetting: false,
-      encryptedFields: ['AUTH_LDAP_BIND_PASSWORD'],
-      fields: [
-        [
-          this.$t('Basic'),
-          [
-            'AUTH_LDAP', 'AUTH_LDAP_SERVER_URI',
-            'AUTH_LDAP_BIND_DN', 'AUTH_LDAP_BIND_PASSWORD'
-          ]
-        ],
-        [
-          this.$t('Search'),
-          [
-            'AUTH_LDAP_SEARCH_OU', 'AUTH_LDAP_SEARCH_FILTER',
-            'AUTH_LDAP_USER_ATTR_MAP'
-          ]
-        ],
-        [
-          this.$t('Other'),
-          [
-            'AUTH_LDAP_CONNECT_TIMEOUT', 'AUTH_LDAP_SEARCH_PAGED_SIZE',
-            'AUTH_LDAP_CACHE_TIMEOUT'
-          ]
-        ]
-      ],
-      fieldsMeta: {
-        AUTH_LDAP_BIND_DN: {
-          rules: [
-            rules.Required
-          ]
-        },
-        AUTH_LDAP_BIND_PASSWORD: {
-          component: UpdateToken
-        },
-        AUTH_LDAP_SEARCH_OU: {
-          rules: [
-            rules.Required
-          ]
-        },
-        AUTH_LDAP_USER_ATTR_MAP: {
-          component: JsonEditor,
-          rules: [JsonRequired]
-        }
-      },
-      url: '/api/v1/settings/setting/?category=ldap',
-      hasDetailInMsg: false,
-      moreButtons: [
-        {
-          title: this.$t('LdapConnectTest'),
-          loading: false,
-          callback: function(value, form, btn) {
-            if (value['AUTH_LDAP_BIND_PASSWORD'] === undefined) {
-              value['AUTH_LDAP_BIND_PASSWORD'] = ''
-            }
-            btn.loading = true
-            this.enableWS()
-            this.ws.onopen = (e) => {
-              this.ws.send(JSON.stringify({ msg_type: 'testing_config', ...value }))
-            }
-            this.ws.onmessage = (e) => {
-              const data = JSON.parse(e.data)
-              if (data.ok) {
-                this.$message.success(data.msg)
-              } else {
-                this.$message.error(data.msg)
-              }
-              btn.loading = false
-            }
-          }.bind(this)
-        },
-        {
-          title: this.$t('LdapLoginTest'),
-          callback: function(value, form) {
-            this.dialogTest = true
-          }.bind(this)
-        },
-        {
-          title: this.$t('LdapBulkImport'),
-          callback: function(value, form) {
-            this.dialogLdapUserImport = true
-          }.bind(this)
-        },
-        {
-          title: this.$t('SyncSetting'),
-          callback: function(value, form) {
-            this.dialogSyncSetting = true
-          }.bind(this)
-        }
-      ],
-      submitMethod: () => 'patch',
-      afterGetFormValue(obj) {
-        return obj
-      },
-      cleanFormValue(data) {
-        if (data['AUTH_LDAP_BIND_PASSWORD'] === '') {
-          delete data['AUTH_LDAP_BIND_PASSWORD']
-        }
-        return data
-      }
-    }
-  },
-  mounted() {
-    // this.loading = false
-  },
-  methods: {
-    enableWS() {
-      const scheme = document.location.protocol === 'https:' ? 'wss' : 'ws'
-      const port = document.location.port ? ':' + document.location.port : ''
-      const url = '/ws/ldap/'
-      const wsURL = scheme + '://' + document.location.hostname + port + url
-      this.ws = new WebSocket(wsURL)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.listTable ::v-deep .table-action-right-side {
-  padding-top: 0 !important;
-}
-
-</style>
diff --git a/src/views/settings/Auth/index.vue b/src/views/settings/Auth/index.vue
index 87f11b9822..8dde8d8c63 100644
--- a/src/views/settings/Auth/index.vue
+++ b/src/views/settings/Auth/index.vue
@@ -8,7 +8,8 @@
 
 <script>
 import TabPage from '@/layout/components/TabPage'
-import LDAP from './Ldap'
+import LdapHA from './Ldap/LdapHA.vue'
+import LDAP from './Ldap/Ldap.vue'
 import Base from './Base'
 import Basic from './Basic'
 import CAS from './CAS'
@@ -28,6 +29,7 @@ export default {
   components: {
     TabPage,
     LDAP,
+    LdapHA,
     Base,
     Basic,
     CAS,
@@ -45,6 +47,7 @@ export default {
   },
   data() {
     let extraBackends = []
+    let ldapHABackends = []
     if (this.$store.getters.hasValidLicense) {
       extraBackends = [
         {
@@ -93,6 +96,13 @@ export default {
           key: 'AUTH_RADIUS'
         }
       ]
+      ldapHABackends = [
+        {
+          title: this.$t('LDAP HA'),
+          name: 'LdapHA',
+          key: 'AUTH_LDAP_HA'
+        }
+      ]
     }
     return {
       loading: true,
@@ -107,6 +117,7 @@ export default {
           name: 'LDAP',
           key: 'AUTH_LDAP'
         },
+        ...ldapHABackends,
         {
           title: this.$t('CAS'),
           name: 'CAS',
diff --git a/src/views/settings/Feature/Announcement.vue b/src/views/settings/Feature/Announcement.vue
index dc67cf55e6..f551c89f0c 100644
--- a/src/views/settings/Feature/Announcement.vue
+++ b/src/views/settings/Feature/Announcement.vue
@@ -33,7 +33,7 @@ export default {
         fieldsMeta: {
           ANNOUNCEMENT: {
             fields: [
-              'SUBJECT', 'CONTENT', 'LINK'
+              'SUBJECT', 'CONTENT', 'DATE_START', 'DATE_END', 'LINK'
             ],
             fieldsMeta: {
               CONTENT: {
diff --git a/src/views/settings/Task/Clean.vue b/src/views/settings/Task/Clean.vue
index 9bebb33516..e38a4ec3ea 100644
--- a/src/views/settings/Task/Clean.vue
+++ b/src/views/settings/Task/Clean.vue
@@ -32,7 +32,8 @@ export default {
           this.$t('Database'),
           [
             'JOB_EXECUTION_KEEP_DAYS',
-            'CLOUD_SYNC_TASK_EXECUTION_KEEP_DAYS'
+            'CLOUD_SYNC_TASK_EXECUTION_KEEP_DAYS',
+            'ACCOUNT_CHANGE_SECRET_RECORD_KEEP_DAYS'
           ]
         ]
       ],
diff --git a/src/views/settings/Task/TaskDetail/TaskDetail.vue b/src/views/settings/Task/TaskDetail/TaskDetail.vue
index 5e7d29d5c2..bf60acbea5 100644
--- a/src/views/settings/Task/TaskDetail/TaskDetail.vue
+++ b/src/views/settings/Task/TaskDetail/TaskDetail.vue
@@ -30,11 +30,11 @@ export default {
     detailCardItems() {
       return [
         {
-          key: this.$t('Name'),
+          key: this.$t('TaskPath'),
           value: this.object.name
         },
         {
-          key: this.$t('Comment'),
+          key: this.$t('Name'),
           value: this.object.meta.comment
         },
         {
@@ -44,6 +44,10 @@ export default {
         {
           key: this.$t('LastPublishedTime'),
           value: this.object.last_published_time
+        },
+        {
+          key: this.$t('Description'),
+          value: this.object.meta.description
         }
       ]
     }
diff --git a/src/views/users/Role/RoleDetail/index.vue b/src/views/users/Role/RoleDetail/index.vue
index 147bc03391..b523189ffa 100644
--- a/src/views/users/Role/RoleDetail/index.vue
+++ b/src/views/users/Role/RoleDetail/index.vue
@@ -32,6 +32,7 @@ export default {
       role: { name: '', comment: '', users: [] },
       config: {
         titlePrefix: scope === 'org' ? vm.$t('OrgRole') : vm.$t('SystemRole'),
+        getObjectName: (obj) => { return obj.display_name },
         url: `/api/v1/rbac/${scope}-roles`,
         activeMenu: 'RoleInfo',
         actions: {
diff --git a/src/views/users/User/UserDetail/index.vue b/src/views/users/User/UserDetail/index.vue
index 9a27da422a..c4e3ee2852 100644
--- a/src/views/users/User/UserDetail/index.vue
+++ b/src/views/users/User/UserDetail/index.vue
@@ -19,6 +19,7 @@ import AssetPermissionAsset from '@/views/perms/AssetPermission/AssetPermissionD
 import AssetPermissionDetail from '@/views/perms/AssetPermission/AssetPermissionDetail/index.vue'
 import AssetPermissionAccount from '@/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue'
 import UserAssetPermissionRules from './UserAssetPermissionRules'
+import store from '@/store'
 
 export default {
   components: {
@@ -63,7 +64,7 @@ export default {
           {
             title: this.$t('UserAclLists'),
             name: 'UserLoginAcl',
-            hidden: () => !vm.$hasPerm('acls.view_loginacl')
+            hidden: () => !vm.$hasPerm('acls.view_loginacl') || !store.getters.publicSettings.XPACK_LICENSE_IS_VALID
           },
           {
             title: this.$t('UserSession'),