From f3b15727cbc36fbfb3d031dacd47d613bc210c35 Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Sat, 22 May 2021 16:57:20 +0800
Subject: [PATCH 01/33] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=9B=E5=BB=BA/=E6=9B=B4=E6=96=B0=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E7=AD=96=E7=95=A5=E9=80=89=E9=A1=B9=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/User/UserCreateUpdate.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue
index aa4e43c1a..5a614c9f5 100644
--- a/src/views/users/User/UserCreateUpdate.vue
+++ b/src/views/users/User/UserCreateUpdate.vue
@@ -59,7 +59,7 @@ export default {
         password: {
           component: UserPassword,
           hidden: (formValue) => {
-            if (formValue.password_strategy) {
+            if (formValue.password_strategy === 'custom') {
               return false
             }
             return !formValue.update_password
@@ -81,7 +81,7 @@ export default {
             }
           ],
           hidden: (formValue) => {
-            if (formValue.password_strategy) {
+            if (formValue.password_strategy === 'custom') {
               return false
             }
             return !formValue.update_password || !this.user.can_public_key_auth
@@ -148,7 +148,7 @@ export default {
   methods: {
     cleanFormValue(value) {
       const method = this.getMethod()
-      if (method === 'post' && !value.password_strategy) {
+      if (method === 'post' && value.password_strategy === 'email') {
         delete value['password']
         if (this.currentOrgIsRoot) {
           delete value['groups']

From c7c6f5ac82d3b950a322ed89cb1507b6aeb595de Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Sat, 22 May 2021 00:06:46 +0800
Subject: [PATCH 02/33] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=A8=A1=E7=89=88=E7=94=9F=E6=88=90table=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BAnumber=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E6=89=80=E5=9C=A8=E5=88=97=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ListTable/TableAction/ImportTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ListTable/TableAction/ImportTable.vue b/src/components/ListTable/TableAction/ImportTable.vue
index 450eecc6c..96ca990dd 100644
--- a/src/components/ListTable/TableAction/ImportTable.vue
+++ b/src/components/ListTable/TableAction/ImportTable.vue
@@ -207,7 +207,7 @@ export default {
           if (!d) {
             return 0
           }
-          if (!itemColData || !itemColData.length) {
+          if (typeof itemColData !== 'number' && (!itemColData || !itemColData.length)) {
             return 0
           }
           return itemColData.length

From 09a252f2827d56a2cb92ace6e778c40ab480152f Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Tue, 25 May 2021 12:51:28 +0800
Subject: [PATCH 03/33] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E7=AE=A1=E7=90=86=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                        |  2 ++
 src/router/accounts.js                        | 30 +++++++++++++++++++
 src/router/index.js                           | 12 ++++++++
 .../AssetAccount/AssetAccountList.vue         | 17 +++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 src/router/accounts.js
 create mode 100644 src/views/accounts/AssetAccount/AssetAccountList.vue

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 1a363ca73..5b3496973 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -522,6 +522,8 @@
   },
   "route": {
     "": "",
+    "Accounts": "账号管理",
+    "AssetAccount": "资产账号",
     "Ticket":"工单",
     "CommandConfirm": "命令复核",
     "AdminUserCreate": "创建管理用户",
diff --git a/src/router/accounts.js b/src/router/accounts.js
new file mode 100644
index 000000000..2ee84c8ca
--- /dev/null
+++ b/src/router/accounts.js
@@ -0,0 +1,30 @@
+import i18n from '@/i18n/i18n'
+import empty from '@/layout/empty'
+export default [
+  {
+    path: 'asset-accounts',
+    component: empty,
+    meta: { title: i18n.t('route.AssetAccount') },
+    children: [
+      {
+        path: '',
+        name: 'AssetAccountList',
+        component: () => import('@/views/accounts/AssetAccount/AssetAccountList'),
+        meta: { title: i18n.t('route.AssetAccount') }
+      }
+    ]
+  },
+  {
+    path: 'asset-accounts2',
+    component: empty,
+    meta: { title: i18n.t('route.AssetAccount') },
+    children: [
+      {
+        path: '',
+        name: 'AssetAccountList2',
+        component: () => import('@/views/accounts/AssetAccount/AssetAccountList'),
+        meta: { title: i18n.t('route.AssetAccount') }
+      }
+    ]
+  }
+]
diff --git a/src/router/index.js b/src/router/index.js
index d95d091a4..653933e2a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -37,6 +37,7 @@ import TicketsRoutes from './tickets'
 import AuditsRoutes from './audits'
 import commonRoutes from './common'
 import aclRoutes from './acl'
+import AccountRoutes from './accounts'
 
 /**
  * constantRoutes
@@ -82,6 +83,17 @@ export const allRoleRoutes = [
       }
     ]
   },
+  {
+    path: '/accounts',
+    component: Layout,
+    redirect: '/accounts/asset-accounts/',
+    name: 'Accounts',
+    meta: {
+      title: i18n.t('route.Accounts'),
+      icon: 'address-book'
+    },
+    children: AccountRoutes
+  },
   {
     path: '/users',
     component: Layout,
diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue
new file mode 100644
index 000000000..a88fc63fa
--- /dev/null
+++ b/src/views/accounts/AssetAccount/AssetAccountList.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <div>tree</div>
+    <div>asset-list</div>
+    <div>account-list</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AssetAccountList'
+}
+</script>
+
+<style scoped>
+
+</style>

From 0a19829c4ae72b9b47f559bb5b648ce948ca715c Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Wed, 26 May 2021 17:23:42 +0800
Subject: [PATCH 04/33] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E8=B4=A6=E5=8F=B7=E6=A8=A1=E5=9D=97(=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E5=AE=8C=E6=88=90=EF=BC=8C=E7=BB=86=E8=8A=82=E5=BE=85?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetUserTable/index.vue       | 38 ++++----
 src/router/accounts.js                        |  7 ++
 .../AssetAccount/AssetAccountCreate.vue       | 60 ++++++++++++
 .../AssetAccount/AssetAccountList.vue         | 97 +++++++++++++++++--
 4 files changed, 178 insertions(+), 24 deletions(-)
 create mode 100644 src/views/accounts/AssetAccount/AssetAccountCreate.vue

diff --git a/src/components/AssetUserTable/index.vue b/src/components/AssetUserTable/index.vue
index 6524a4c87..ce9e1b072 100644
--- a/src/components/AssetUserTable/index.vue
+++ b/src/components/AssetUserTable/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div>
-      <ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
+      <ListTable ref="ListTable" :table-config="iTableConfig" :header-actions="headerActions" />
       <Dialog v-if="showMFADialog" width="50" :title="this.$t('common.MFAConfirm')" :visible.sync="showMFADialog" :show-confirm="false" :show-cancel="false" :destroy-on-close="true">
         <div v-if="MFAConfirmed">
           <el-form label-position="right" label-width="80px" :model="MFAInfo">
@@ -93,6 +93,10 @@ export default {
     hasClone: {
       type: Boolean,
       default: true
+    },
+    tableConfig: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -114,36 +118,31 @@ export default {
         password: '',
         private_key: ''
       },
-      tableConfig: {
+      defaultTableConfig: {
         url: this.url,
-        columns: [
-          {
-            prop: 'hostname',
+        columns: ['hostname', 'ip', 'username', 'version', 'date_created', 'actions'],
+        columnsMeta: {
+          'hostname': {
             label: this.$t('assets.Hostname'),
             showOverflowTooltip: true
           },
-          {
-            prop: 'ip',
+          'ip': {
             label: this.$t('assets.ip'),
             width: '120px'
           },
-          {
-            prop: 'username',
+          'username': {
             label: this.$t('assets.Username'),
             showOverflowTooltip: true
           },
-          {
-            prop: 'version',
+          'version': {
             label: this.$t('assets.Version'),
             width: '70px'
           },
-          {
-            prop: 'date_created',
+          'date_created': {
             label: this.$t('assets.date_joined'),
             formatter: DateFormatter
           },
-          {
-            prop: 'id',
+          'actions': {
             label: this.$t('common.Action'),
             align: 'center',
             width: 150,
@@ -211,7 +210,7 @@ export default {
               ]
             }
           }
-        ],
+        },
         extraQuery: {
           latest: 1
         }
@@ -256,16 +255,19 @@ export default {
       const ttl = this.publicSettings.SECURITY_MFA_VERIFY_TTL
       const now = new Date()
       return !(this.MFAVerifyAt && (now - this.MFAVerifyAt) < ttl * 1000)
+    },
+    iTableConfig() {
+      return Object.assign(this.defaultTableConfig, this.tableConfig)
     }
   },
   watch: {
     url(iNew) {
-      this.$set(this.tableConfig, 'url', iNew)
+      this.$set(this.iTableConfig, 'url', iNew)
     }
   },
   mounted() {
     if (this.otherActions) {
-      const actionColumn = this.tableConfig.columns[this.tableConfig.columns.length - 1]
+      const actionColumn = this.iTableConfig.columns[this.iTableConfig.columns.length - 1]
       for (const item of this.otherActions) {
         actionColumn.formatterArgs.extraActions.push(item)
       }
diff --git a/src/router/accounts.js b/src/router/accounts.js
index 2ee84c8ca..6e66ba470 100644
--- a/src/router/accounts.js
+++ b/src/router/accounts.js
@@ -11,6 +11,13 @@ export default [
         name: 'AssetAccountList',
         component: () => import('@/views/accounts/AssetAccount/AssetAccountList'),
         meta: { title: i18n.t('route.AssetAccount') }
+      },
+      {
+        path: 'create',
+        component: () => import('@/views/accounts/AssetAccount/AssetAccountCreate'),
+        name: 'AssetAccountCreate',
+        meta: { title: i18n.t('accounts.Create'), activeMenu: '/accounts/asset-accounts/' },
+        hidden: true
       }
     ]
   },
diff --git a/src/views/accounts/AssetAccount/AssetAccountCreate.vue b/src/views/accounts/AssetAccount/AssetAccountCreate.vue
new file mode 100644
index 000000000..23fb8f9d7
--- /dev/null
+++ b/src/views/accounts/AssetAccount/AssetAccountCreate.vue
@@ -0,0 +1,60 @@
+<template>
+  <GenericCreateUpdatePage :fields="fields" :initial="initial" :fields-meta="fieldsMeta" :url="url" />
+</template>
+
+<script>
+import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
+import { UploadKey, Select2 } from '@/components'
+export default {
+  name: 'VaultCreate',
+  components: {
+    GenericCreateUpdatePage
+  },
+  data() {
+    return {
+      url: '/api/v1/assets/asset-users/',
+      initial: {
+
+      },
+      fields: [
+        [this.$t('common.Basic'), ['asset', 'username', 'password', 'private_key', 'comment']]
+      ],
+      fieldsMeta: {
+        asset: {
+          label: this.$t('perms.Asset'),
+          component: Select2,
+          el: {
+            multiple: false,
+            ajax: {
+              url: '/api/v1/assets/assets/',
+              transformOption: (item) => {
+                return { label: `${item.hostname}(${item.ip})`, value: item.id }
+              }
+            }
+          }
+        },
+        name: {
+          el: {
+            placeholder: this.$t('common.Name')
+          }
+        },
+        username: {
+          el: {
+            placeholder: this.$t('common.Username')
+          }
+        },
+        password: {
+          helpText: this.$t('common.passwordOrPassphrase')
+        },
+        private_key: {
+          component: UploadKey
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue
index a88fc63fa..8ef3aa52d 100644
--- a/src/views/accounts/AssetAccount/AssetAccountList.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountList.vue
@@ -1,14 +1,99 @@
 <template>
-  <div>
-    <div>tree</div>
-    <div>asset-list</div>
-    <div>account-list</div>
-  </div>
+  <Page>
+    <el-row>
+      <el-col :span="4">
+        <AutoDataZTree
+          ref="AUtoDataZTree"
+          :setting="treeSetting"
+        />
+      </el-col>
+      <el-col :span="12">
+        <GenericListTable
+          ref="LeftTable"
+          :header-actions="leftTable.headerActions"
+          :table-config="leftTable.tableConfig"
+          @row-click="leftTable.tableConfig.rowClick"
+        />
+      </el-col>
+      <el-col :span="8">
+        <AssetUserTable
+          ref="RightTable"
+          :url="rightTable.url"
+          :has-left-actions="true"
+          :table-config="rightTable.tableConfig"
+          :has-clone="false"
+          :has-import="false"
+        />
+      </el-col>
+    </el-row>
+  </Page>
 </template>
 
 <script>
+import Page from '@/layout/components/Page'
+import GenericListTable from '@/layout/components/GenericListTable'
+import AutoDataZTree from '@/components/AutoDataZTree/index'
+import { AssetUserTable } from '@/components'
+
 export default {
-  name: 'AssetAccountList'
+  name: 'AssetAccountList',
+  components: {
+    AutoDataZTree, GenericListTable, Page, AssetUserTable
+  },
+  data() {
+    const vm = this
+    return {
+      treeSetting: {
+        showMenu: false,
+        showRefresh: false,
+        showAssets: false,
+        url: '',
+        treeUrl: '/api/v1/assets/nodes/children/tree/',
+        callback: {
+          onSelected: function(event, treeNode) {
+            vm.leftTable.tableConfig.url = `/api/v1/assets/assets/?node_id=${treeNode.meta.node.id}`
+          }
+        }
+      },
+      leftTable: {
+        tableConfig: {
+          url: '/api/v1/assets/assets/',
+          columns: [
+            'hostname', 'ip', 'public_ip', 'admin_user_display',
+            'protocols', 'platform', 'connectivity',
+            'created_by', 'date_created', 'comment', 'org_name'
+          ],
+          columnsShow: {
+            min: ['hostname', 'ip', 'platform'],
+            default: ['hostname', 'ip', 'connectivity', 'platform']
+          },
+          columnsMeta: {
+          },
+          rowClick: function(row, column, event) {
+            vm.rightTable.url = `/api/v1/assets/asset-users/?asset_id=${row.id}&latest=1`
+          }
+        },
+        headerActions: {
+          hasLeftActions: false,
+          hasCreate: false,
+          hasExport: false,
+          hasImport: false,
+          hasBulkDelete: false,
+          hasBulkUpdate: false
+        }
+      },
+      rightTable: {
+        url: `/api/v1/assets/asset-users/?asset_id=&latest=1`,
+        tableConfig: {
+          columns: ['name', 'username', 'version', 'date_created', 'actions'],
+          columnsShow: {
+            min: ['username', 'actions'],
+            default: ['username', 'version', 'date_created', 'actions']
+          }
+        }
+      }
+    }
+  }
 }
 </script>
 

From 34a30571c1d3b21510dc7b7125af0bd0cbc45a69 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Wed, 26 May 2021 18:38:02 +0800
Subject: [PATCH 05/33] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E8=B4=A6=E5=8F=B7=E6=A8=A1=E5=9D=97(=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E5=AE=8C=E6=88=90=EF=BC=8C=E7=BB=86=E8=8A=82=E5=BE=85?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                        |  1 +
 src/router/accounts.js                        |  8 +-
 .../ApplicationAccountList.vue                | 86 +++++++++++++++++++
 3 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 src/views/accounts/ApplicationAccount/ApplicationAccountList.vue

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 5b3496973..db60f92d0 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -524,6 +524,7 @@
     "": "",
     "Accounts": "账号管理",
     "AssetAccount": "资产账号",
+    "ApplicationAccount": "应用账号",
     "Ticket":"工单",
     "CommandConfirm": "命令复核",
     "AdminUserCreate": "创建管理用户",
diff --git a/src/router/accounts.js b/src/router/accounts.js
index 6e66ba470..4ecefed88 100644
--- a/src/router/accounts.js
+++ b/src/router/accounts.js
@@ -22,15 +22,15 @@ export default [
     ]
   },
   {
-    path: 'asset-accounts2',
+    path: 'application-accounts',
     component: empty,
     meta: { title: i18n.t('route.AssetAccount') },
     children: [
       {
         path: '',
-        name: 'AssetAccountList2',
-        component: () => import('@/views/accounts/AssetAccount/AssetAccountList'),
-        meta: { title: i18n.t('route.AssetAccount') }
+        name: 'ApplicationAccountList',
+        component: () => import('@/views/accounts/ApplicationAccount/ApplicationAccountList'),
+        meta: { title: i18n.t('route.ApplicationAccount') }
       }
     ]
   }
diff --git a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
new file mode 100644
index 000000000..9d666fd79
--- /dev/null
+++ b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
@@ -0,0 +1,86 @@
+<template>
+  <Page>
+    <el-row>
+      <el-col :span="14">
+        <GenericListTable
+          ref="LeftTable"
+          :header-actions="leftTable.headerActions"
+          :table-config="leftTable.tableConfig"
+          @row-click="leftTable.tableConfig.rowClick"
+        />
+      </el-col>
+      <el-col :span="10">
+        <GenericListTable
+          ref="RightTable"
+          :header-actions="rightTable.headerActions"
+          :table-config="rightTable.tableConfig"
+        />
+      </el-col>
+    </el-row>
+  </Page>
+</template>
+
+<script>
+import Page from '@/layout/components/Page'
+import GenericListTable from '@/layout/components/GenericListTable'
+
+export default {
+  name: 'AssetAccountList',
+  components: {
+    GenericListTable, Page
+  },
+  data() {
+    const vm = this
+    return {
+      leftTable: {
+        tableConfig: {
+          url: '/api/v1/applications/applications/',
+          columns: [
+            'name', 'category_display', 'type_display', 'created_by', 'date_created', 'date_updated',
+            'comment', 'org_name'
+          ],
+          columnsShow: {
+            min: ['name'],
+            default: ['name', 'category_display', 'type_display']
+          },
+          columnsMeta: {
+          },
+          rowClick: function(row, column, event) {
+            vm.rightTable.tableConfig.url = `/api/v1/applications/application-users/?application_id=${row.id}`
+          }
+        },
+        headerActions: {
+          hasLeftActions: false,
+          hasCreate: false,
+          hasExport: false,
+          hasImport: false,
+          hasBulkDelete: false,
+          hasBulkUpdate: false
+        }
+      },
+      rightTable: {
+        tableConfig: {
+          url: `/api/v1/applications/application-users/?application_id=`,
+          columns: [
+            'name', 'username', 'username_same_with_user', 'protocol', 'login_mode',
+            'assets_amount', 'priority',
+            'created_by', 'date_created', 'date_updated', 'comment', 'org_name', 'actions'
+          ],
+          columnsShow: {
+            min: ['name', 'username', 'actions'],
+            default: ['name', 'username', 'date_created', 'actions']
+          }
+        },
+        headerActions: {
+          hasLeftActions: false,
+          hasImport: false
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

From 226f17c4fdd9038ccfff2043a175c276b514b967 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Thu, 27 May 2021 14:10:06 +0800
Subject: [PATCH 06/33] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E8=B4=A6=E5=8F=B7=EF=BC=88=E8=B5=84=E4=BA=A7=E6=A0=91?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA/=E9=9A=90=E8=97=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApplicationAccountList.vue                |  2 +-
 .../AssetAccount/AssetAccountList.vue         | 39 +++++++++++++++----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
index 9d666fd79..8a820523a 100644
--- a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
+++ b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
@@ -81,6 +81,6 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 
 </style>
diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue
index 8ef3aa52d..7a283db0b 100644
--- a/src/views/accounts/AssetAccount/AssetAccountList.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountList.vue
@@ -1,13 +1,18 @@
 <template>
   <Page>
     <el-row>
-      <el-col :span="4">
+      <el-col v-show="iShowTree" :span="iShowTree?4:0">
         <AutoDataZTree
           ref="AUtoDataZTree"
           :setting="treeSetting"
         />
       </el-col>
-      <el-col :span="12">
+      <el-col :span="iShowTree?12:14">
+        <div class="mini">
+          <div style="display:block" class="mini-button" @click="iShowTree=!iShowTree">
+            <i v-show="iShowTree" class="fa fa-angle-left fa-x" /><i v-show="!iShowTree" class="fa fa-angle-right fa-x" />
+          </div>
+        </div>
         <GenericListTable
           ref="LeftTable"
           :header-actions="leftTable.headerActions"
@@ -15,7 +20,7 @@
           @row-click="leftTable.tableConfig.rowClick"
         />
       </el-col>
-      <el-col :span="8">
+      <el-col :span="iShowTree?8:10">
         <AssetUserTable
           ref="RightTable"
           :url="rightTable.url"
@@ -34,6 +39,7 @@ import Page from '@/layout/components/Page'
 import GenericListTable from '@/layout/components/GenericListTable'
 import AutoDataZTree from '@/components/AutoDataZTree/index'
 import { AssetUserTable } from '@/components'
+import { DetailFormatter } from '@/components/TableFormatters'
 
 export default {
   name: 'AssetAccountList',
@@ -43,6 +49,7 @@ export default {
   data() {
     const vm = this
     return {
+      iShowTree: true,
       treeSetting: {
         showMenu: false,
         showRefresh: false,
@@ -68,13 +75,20 @@ export default {
             default: ['hostname', 'ip', 'connectivity', 'platform']
           },
           columnsMeta: {
+            hostname: {
+              formatter: DetailFormatter,
+              formatterArgs: {
+                route: 'AssetDetail'
+              },
+              showOverflowTooltip: true
+            }
           },
           rowClick: function(row, column, event) {
             vm.rightTable.url = `/api/v1/assets/asset-users/?asset_id=${row.id}&latest=1`
           }
         },
         headerActions: {
-          hasLeftActions: false,
+          hasLeftActions: true,
           hasCreate: false,
           hasExport: false,
           hasImport: false,
@@ -83,7 +97,7 @@ export default {
         }
       },
       rightTable: {
-        url: `/api/v1/assets/asset-users/?asset_id=&latest=1`,
+        url: `/api/v1/assets/asset-users/?hostname=ShowFirstAssetRelated&latest=1`,
         tableConfig: {
           columns: ['name', 'username', 'version', 'date_created', 'actions'],
           columnsShow: {
@@ -97,6 +111,17 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style lang="scss" scoped>
+  .mini-button{
+    width: 12px;
+    float: left;
+    text-align: center;
+    padding: 5px 0;
+    background-color: #1ab394;
+    border-color: #1ab394;
+    color: #FFFFFF;
+    border-radius: 3px;
+    line-height: 1.428;
+    cursor:pointer;
+  }
 </style>

From d3053fdf186fe3fbad7f9dc9fdf2d48b448499c5 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Thu, 27 May 2021 16:45:55 +0800
Subject: [PATCH 07/33] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E8=B4=A6=E5=8F=B7=EF=BC=88=E8=B5=84=E4=BA=A7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=80=89=E4=B8=AD=E8=A1=8C=E5=8F=8A=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E8=83=8C=E6=99=AF=E8=89=B2?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetAccount/AssetAccountList.vue         | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue
index 7a283db0b..311bab61e 100644
--- a/src/views/accounts/AssetAccount/AssetAccountList.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountList.vue
@@ -15,6 +15,7 @@
         </div>
         <GenericListTable
           ref="LeftTable"
+          class="asset-table"
           :header-actions="leftTable.headerActions"
           :table-config="leftTable.tableConfig"
           @row-click="leftTable.tableConfig.rowClick"
@@ -23,6 +24,7 @@
       <el-col :span="iShowTree?8:10">
         <AssetUserTable
           ref="RightTable"
+          class="asset-user-table"
           :url="rightTable.url"
           :has-left-actions="true"
           :table-config="rightTable.tableConfig"
@@ -49,6 +51,7 @@ export default {
   data() {
     const vm = this
     return {
+      clickedRow: {},
       iShowTree: true,
       treeSetting: {
         showMenu: false,
@@ -83,8 +86,21 @@ export default {
               showOverflowTooltip: true
             }
           },
+          tableAttrs: {
+            stripe: false, // 斑马纹表格
+            border: true, // 表格边框
+            fit: true, // 宽度自适应,
+            tooltipEffect: 'dark',
+            rowClassName({ row, rowIndex }) {
+              if (row === vm.clickedRow) {
+                return 'row-clicked'
+              }
+              return ''
+            }
+          },
           rowClick: function(row, column, event) {
             vm.rightTable.url = `/api/v1/assets/asset-users/?asset_id=${row.id}&latest=1`
+            vm.clickedRow = row
           }
         },
         headerActions: {
@@ -103,6 +119,15 @@ export default {
           columnsShow: {
             min: ['username', 'actions'],
             default: ['username', 'version', 'date_created', 'actions']
+          },
+          tableAttrs: {
+            stripe: false, // 斑马纹表格
+            border: false, // 表格边框
+            fit: true, // 宽度自适应,
+            tooltipEffect: 'dark',
+            rowClassName({ row, rowIndex }) {
+              return 'row-background-color'
+            }
           }
         }
       }
@@ -112,6 +137,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  .asset-table ::v-deep .row-clicked, .asset-user-table ::v-deep .row-background-color {
+    background-color: #f5f7fa;
+  }
   .mini-button{
     width: 12px;
     float: left;

From 91cbe97a5b684f67eb1f8a9805296129d368c639 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Fri, 28 May 2021 11:23:49 +0800
Subject: [PATCH 08/33] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E8=B4=A6=E5=8F=B7=EF=BC=88=E5=BA=94=E7=94=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=80=89=E4=B8=AD=E8=A1=8C=E3=80=81=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E8=83=8C=E6=99=AF=E8=89=B2?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApplicationAccountList.vue                | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
index 8a820523a..04c2b4e16 100644
--- a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
+++ b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
@@ -4,6 +4,7 @@
       <el-col :span="14">
         <GenericListTable
           ref="LeftTable"
+          class="application-table"
           :header-actions="leftTable.headerActions"
           :table-config="leftTable.tableConfig"
           @row-click="leftTable.tableConfig.rowClick"
@@ -12,6 +13,7 @@
       <el-col :span="10">
         <GenericListTable
           ref="RightTable"
+          class="application-user-table"
           :header-actions="rightTable.headerActions"
           :table-config="rightTable.tableConfig"
         />
@@ -23,6 +25,7 @@
 <script>
 import Page from '@/layout/components/Page'
 import GenericListTable from '@/layout/components/GenericListTable'
+import { DetailFormatter } from '@/components/TableFormatters'
 
 export default {
   name: 'AssetAccountList',
@@ -32,6 +35,7 @@ export default {
   data() {
     const vm = this
     return {
+      clickedRow: {},
       leftTable: {
         tableConfig: {
           url: '/api/v1/applications/applications/',
@@ -44,9 +48,33 @@ export default {
             default: ['name', 'category_display', 'type_display']
           },
           columnsMeta: {
+            name: {
+              formatter: DetailFormatter,
+              formatterArgs: {
+                getRoute({ row, col, cellValue }) {
+                  return {
+                    'db': 'DatabaseAppDetail', 'remote_app': 'RemoteAppDetail', 'cloud': 'KubernetesAppDetail'
+                  }[row.category]
+                }
+              },
+              showOverflowTooltip: true
+            }
+          },
+          tableAttrs: {
+            stripe: false, // 斑马纹表格
+            border: true, // 表格边框
+            fit: true, // 宽度自适应,
+            tooltipEffect: 'dark',
+            rowClassName({ row, rowIndex }) {
+              if (row === vm.clickedRow) {
+                return 'row-clicked'
+              }
+              return ''
+            }
           },
           rowClick: function(row, column, event) {
             vm.rightTable.tableConfig.url = `/api/v1/applications/application-users/?application_id=${row.id}`
+            vm.clickedRow = row
           }
         },
         headerActions: {
@@ -69,6 +97,15 @@ export default {
           columnsShow: {
             min: ['name', 'username', 'actions'],
             default: ['name', 'username', 'date_created', 'actions']
+          },
+          tableAttrs: {
+            stripe: false, // 斑马纹表格
+            border: false, // 表格边框
+            fit: true, // 宽度自适应,
+            tooltipEffect: 'dark',
+            rowClassName({ row, rowIndex }) {
+              return 'row-background-color'
+            }
           }
         },
         headerActions: {
@@ -82,5 +119,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+  .application-table ::v-deep .row-clicked, .application-user-table ::v-deep .row-background-color {
+    background-color: #f5f7fa;
+  }
 </style>

From dcb94f4aacdcaeb58860a3a226f2c26ee802525e Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Fri, 28 May 2021 11:35:18 +0800
Subject: [PATCH 09/33] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E8=B4=A6=E5=8F=B7=EF=BC=88=E6=93=8D=E4=BD=9C=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE:=20=E6=9B=B4=E6=96=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApplicationAccountList.vue                | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
index 04c2b4e16..81032cabb 100644
--- a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
+++ b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
@@ -98,6 +98,25 @@ export default {
             min: ['name', 'username', 'actions'],
             default: ['name', 'username', 'date_created', 'actions']
           },
+          columnsMeta: {
+            name: {
+              formatter: DetailFormatter,
+              formatterArgs: {
+                route: 'SystemUserDetail'
+              },
+              showOverflowTooltip: true
+            },
+            actions: {
+              formatterArgs: {
+                hasUpdate: true, // can set function(row, value)
+                hasDelete: false, // can set function(row, value)
+                hasClone: false,
+                onUpdate({ row, col }) {
+                  vm.$router.push({ name: 'SystemUserUpdate', params: { id: row.id }, query: { protocol: row.protocol }})
+                }
+              }
+            }
+          },
           tableAttrs: {
             stripe: false, // 斑马纹表格
             border: false, // 表格边框

From f053a37606ba7fdcffaab6086b52d03cdb3eac3f Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Fri, 28 May 2021 15:40:34 +0800
Subject: [PATCH 10/33] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8=20xpack/Gather?=
 =?UTF-8?q?edUser=20>=20accounts/GatheredUser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/accounts.js                        | 49 +++++++++++++++++++
 .../AssetAccount/AssetAccountList.vue         |  5 +-
 .../GatheredUser/GatheredUserList.vue         |  0
 .../GatheredUser/TaskCreateUpdate.vue         |  0
 .../GatheredUser/TaskDetail/Detail.vue        |  0
 .../TaskDetail/TaskExecutionList.vue          |  0
 .../GatheredUser/TaskDetail/index.vue         |  0
 .../GatheredUser/TaskList.vue                 |  0
 .../GatheredUser/index.vue                    |  0
 src/views/xpack/router.js                     | 49 -------------------
 10 files changed, 53 insertions(+), 50 deletions(-)
 rename src/views/{xpack => accounts}/GatheredUser/GatheredUserList.vue (100%)
 rename src/views/{xpack => accounts}/GatheredUser/TaskCreateUpdate.vue (100%)
 rename src/views/{xpack => accounts}/GatheredUser/TaskDetail/Detail.vue (100%)
 rename src/views/{xpack => accounts}/GatheredUser/TaskDetail/TaskExecutionList.vue (100%)
 rename src/views/{xpack => accounts}/GatheredUser/TaskDetail/index.vue (100%)
 rename src/views/{xpack => accounts}/GatheredUser/TaskList.vue (100%)
 rename src/views/{xpack => accounts}/GatheredUser/index.vue (100%)

diff --git a/src/router/accounts.js b/src/router/accounts.js
index 4ecefed88..85b8eaa58 100644
--- a/src/router/accounts.js
+++ b/src/router/accounts.js
@@ -33,5 +33,54 @@ export default [
         meta: { title: i18n.t('route.ApplicationAccount') }
       }
     ]
+  },
+  {
+    path: 'gathered-user',
+    component: empty,
+    redirect: '',
+    meta: { title: i18n.t('xpack.GatherUser.GatherUserList') },
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/accounts/GatheredUser/index'),
+        name: 'GatherUserListIndex',
+        meta: { title: i18n.t('xpack.GatherUser.GatherUser'), activeMenu: '/accounts/gathered-user' }
+      },
+      {
+        path: '',
+        component: () => import('@/views/accounts/GatheredUser/GatheredUserList'),
+        name: 'GatherUserList',
+        hidden: true,
+        meta: { title: i18n.t('xpack.GatherUser.GatherUserList'), activeMenu: '/accounts/gathered-user' }
+      },
+      {
+        path: 'tasks',
+        component: () => import('@/views/accounts/GatheredUser/TaskList'),
+        name: 'GatherUserTaskList',
+        meta: { title: i18n.t('xpack.GatherUser.GatherUserTaskList'), activeMenu: '/accounts/gathered-user' },
+        hidden: true
+      },
+      {
+        path: 'tasks/:id',
+        component: () => import('@/views/accounts/GatheredUser/TaskDetail/index'),
+        name: 'GatherUserTaskDetail',
+        meta: { title: i18n.t('xpack.GatherUser.GatherUserTaskDetail'), activeMenu: '/accounts/gathered-user' },
+        hidden: true
+      },
+      {
+        path: 'tasks/create',
+        component: () => import('@/views/accounts/GatheredUser/TaskCreateUpdate'),
+        name: 'GatherUserTaskCreate',
+        meta: { title: i18n.t('xpack.GatherUser.GatherUserTaskCreate'), activeMenu: '/accounts/gathered-user' },
+        hidden: true
+      },
+      {
+        path: 'tasks/:id/update',
+        component: () => import('@/views/accounts/GatheredUser/TaskCreateUpdate'),
+        name: 'GatherUserTaskUpdate',
+        meta: { title: i18n.t('xpack.GatherUser.GatherUserTaskUpdate'), action: 'update', activeMenu: '/accounts/gathered-user' },
+        hidden: true
+      }
+    ]
   }
 ]
diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue
index 311bab61e..aeca3ca94 100644
--- a/src/views/accounts/AssetAccount/AssetAccountList.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountList.vue
@@ -81,7 +81,10 @@ export default {
             hostname: {
               formatter: DetailFormatter,
               formatterArgs: {
-                route: 'AssetDetail'
+                route: 'AssetDetail',
+                routeQuery: {
+                  activeTab: 'Detail'
+                }
               },
               showOverflowTooltip: true
             }
diff --git a/src/views/xpack/GatheredUser/GatheredUserList.vue b/src/views/accounts/GatheredUser/GatheredUserList.vue
similarity index 100%
rename from src/views/xpack/GatheredUser/GatheredUserList.vue
rename to src/views/accounts/GatheredUser/GatheredUserList.vue
diff --git a/src/views/xpack/GatheredUser/TaskCreateUpdate.vue b/src/views/accounts/GatheredUser/TaskCreateUpdate.vue
similarity index 100%
rename from src/views/xpack/GatheredUser/TaskCreateUpdate.vue
rename to src/views/accounts/GatheredUser/TaskCreateUpdate.vue
diff --git a/src/views/xpack/GatheredUser/TaskDetail/Detail.vue b/src/views/accounts/GatheredUser/TaskDetail/Detail.vue
similarity index 100%
rename from src/views/xpack/GatheredUser/TaskDetail/Detail.vue
rename to src/views/accounts/GatheredUser/TaskDetail/Detail.vue
diff --git a/src/views/xpack/GatheredUser/TaskDetail/TaskExecutionList.vue b/src/views/accounts/GatheredUser/TaskDetail/TaskExecutionList.vue
similarity index 100%
rename from src/views/xpack/GatheredUser/TaskDetail/TaskExecutionList.vue
rename to src/views/accounts/GatheredUser/TaskDetail/TaskExecutionList.vue
diff --git a/src/views/xpack/GatheredUser/TaskDetail/index.vue b/src/views/accounts/GatheredUser/TaskDetail/index.vue
similarity index 100%
rename from src/views/xpack/GatheredUser/TaskDetail/index.vue
rename to src/views/accounts/GatheredUser/TaskDetail/index.vue
diff --git a/src/views/xpack/GatheredUser/TaskList.vue b/src/views/accounts/GatheredUser/TaskList.vue
similarity index 100%
rename from src/views/xpack/GatheredUser/TaskList.vue
rename to src/views/accounts/GatheredUser/TaskList.vue
diff --git a/src/views/xpack/GatheredUser/index.vue b/src/views/accounts/GatheredUser/index.vue
similarity index 100%
rename from src/views/xpack/GatheredUser/index.vue
rename to src/views/accounts/GatheredUser/index.vue
diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index ff309748f..4169fd96f 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -127,55 +127,6 @@ export default {
       name: 'InterfaceSetting',
       meta: { title: i18n.t('xpack.InterfaceSettings'), permissions: [rolec.PERM_SUPER] }
     },
-    {
-      path: 'gathered-user',
-      component: empty,
-      redirect: '',
-      meta: { title: i18n.t('xpack.GatherUser.GatherUserList') },
-      children: [
-        {
-          path: '',
-          component: () => import('@/views/xpack/GatheredUser/index'),
-          name: 'GatherUserListIndex',
-          meta: { title: i18n.t('xpack.GatherUser.GatherUser'), activeMenu: '/xpack/gathered-user' }
-        },
-        {
-          path: '',
-          component: () => import('@/views/xpack/GatheredUser/GatheredUserList'),
-          name: 'GatherUserList',
-          hidden: true,
-          meta: { title: i18n.t('xpack.GatherUser.GatherUserList'), activeMenu: '/xpack/gathered-user' }
-        },
-        {
-          path: 'tasks',
-          component: () => import('@/views/xpack/GatheredUser/TaskList'),
-          name: 'GatherUserTaskList',
-          meta: { title: i18n.t('xpack.GatherUser.GatherUserTaskList'), activeMenu: '/xpack/gathered-user' },
-          hidden: true
-        },
-        {
-          path: 'tasks/:id',
-          component: () => import('@/views/xpack/GatheredUser/TaskDetail/index'),
-          name: 'GatherUserTaskDetail',
-          meta: { title: i18n.t('xpack.GatherUser.GatherUserTaskDetail'), activeMenu: '/xpack/gathered-user' },
-          hidden: true
-        },
-        {
-          path: 'tasks/create',
-          component: () => import('@/views/xpack/GatheredUser/TaskCreateUpdate'),
-          name: 'GatherUserTaskCreate',
-          meta: { title: i18n.t('xpack.GatherUser.GatherUserTaskCreate'), activeMenu: '/xpack/gathered-user' },
-          hidden: true
-        },
-        {
-          path: 'tasks/:id/update',
-          component: () => import('@/views/xpack/GatheredUser/TaskCreateUpdate'),
-          name: 'GatherUserTaskUpdate',
-          meta: { title: i18n.t('xpack.GatherUser.GatherUserTaskUpdate'), action: 'update', activeMenu: '/xpack/gathered-user' },
-          hidden: true
-        }
-      ]
-    },
     {
       path: 'orgs',
       component: empty,

From 27b39ad91062df3b9a8313c57bf6a8b0050ab74d Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Fri, 28 May 2021 16:00:10 +0800
Subject: [PATCH 11/33] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=20xpack/vault?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xpack/Vault/VaultCreate.vue |  60 -----
 src/views/xpack/Vault/VaultList.vue   | 340 --------------------------
 src/views/xpack/router.js             |  21 --
 3 files changed, 421 deletions(-)
 delete mode 100644 src/views/xpack/Vault/VaultCreate.vue
 delete mode 100644 src/views/xpack/Vault/VaultList.vue

diff --git a/src/views/xpack/Vault/VaultCreate.vue b/src/views/xpack/Vault/VaultCreate.vue
deleted file mode 100644
index 23fb8f9d7..000000000
--- a/src/views/xpack/Vault/VaultCreate.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <GenericCreateUpdatePage :fields="fields" :initial="initial" :fields-meta="fieldsMeta" :url="url" />
-</template>
-
-<script>
-import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
-import { UploadKey, Select2 } from '@/components'
-export default {
-  name: 'VaultCreate',
-  components: {
-    GenericCreateUpdatePage
-  },
-  data() {
-    return {
-      url: '/api/v1/assets/asset-users/',
-      initial: {
-
-      },
-      fields: [
-        [this.$t('common.Basic'), ['asset', 'username', 'password', 'private_key', 'comment']]
-      ],
-      fieldsMeta: {
-        asset: {
-          label: this.$t('perms.Asset'),
-          component: Select2,
-          el: {
-            multiple: false,
-            ajax: {
-              url: '/api/v1/assets/assets/',
-              transformOption: (item) => {
-                return { label: `${item.hostname}(${item.ip})`, value: item.id }
-              }
-            }
-          }
-        },
-        name: {
-          el: {
-            placeholder: this.$t('common.Name')
-          }
-        },
-        username: {
-          el: {
-            placeholder: this.$t('common.Username')
-          }
-        },
-        password: {
-          helpText: this.$t('common.passwordOrPassphrase')
-        },
-        private_key: {
-          component: UploadKey
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style>
-
-</style>
diff --git a/src/views/xpack/Vault/VaultList.vue b/src/views/xpack/Vault/VaultList.vue
deleted file mode 100644
index cdf21c511..000000000
--- a/src/views/xpack/Vault/VaultList.vue
+++ /dev/null
@@ -1,340 +0,0 @@
-<template>
-  <div>
-    <GenericTreeListPage ref="TreeTablePage" :tree-setting="treeSetting">
-      <template #table>
-        <AssetUserTable ref="table" v-bind="assetUserConfig" />
-      </template>
-    </GenericTreeListPage>
-    <Dialog width="50" :title="this.$t('common.MFAConfirm')" :visible.sync="showMFADialog" :show-confirm="false" :show-cancel="false" :destroy-on-close="true">
-      <el-row :gutter="20">
-        <el-col :span="4">
-          <div style="line-height: 34px;text-align: center">MFA</div>
-        </el-col>
-        <el-col :span="14">
-          <el-input v-model="MFAInput" />
-          <span class="help-tips help-block">{{ $t('common.MFARequireForSecurity') }}</span>
-        </el-col>
-        <el-col :span="4">
-          <el-button size="mini" type="primary" style="line-height:20px " @click="MFAConfirm">{{ this.$t('common.Confirm') }}</el-button>
-        </el-col>
-      </el-row>
-    </Dialog>
-    <Dialog :title="$t('common.Export')" :visible.sync="showExportDialog" @confirm="handleExportConfirm()" @cancel="handleExportCancel()">
-      <el-form label-position="left" style="padding-left: 50px">
-        <el-form-item :label="this.$t('common.imExport.ExportRange')" :label-width="'100px'">
-          <el-radio v-model="exportOption" class="export-item" label="1">{{ this.$t('common.imExport.ExportAll') }}</el-radio>
-          <br>
-          <el-radio v-model="exportOption" :disabled="selectedRows.length===0" class="export-item" label="2">{{ this.$t('common.imExport.ExportOnlySelectedItems') }}</el-radio>
-          <br>
-          <!--          去掉导出搜索项-->
-          <!--          <el-radio v-model="exportOption" disabled class="export-item" label="3">{{ this.$t('common.imExport.ExportOnlyFiltered') }}</el-radio>-->
-        </el-form-item>
-      </el-form>
-    </Dialog>
-    <Dialog :title="$t('common.Import')" :visible.sync="showImportDialog" @confirm="handleImportConfirm()" @cancel="handleImportCancel()">
-      <el-form label-position="left" style="padding-left: 50px">
-        <el-form-item :label="$t('common.Import' )" :label-width="'100px'">
-          <el-radio v-model="importOption" class="export-item" label="1">{{ this.$t('common.Create') }}</el-radio>
-          <el-radio v-model="importOption" disabled class="export-item" label="2">{{ this.$t('common.Update') }}</el-radio>
-          <div style="line-height: 1.5">
-            <span v-if="importOption==='1'" class="el-upload__tip">
-              {{ this.$t('common.imExport.downloadImportTemplateMsg') }}
-              <el-link type="success" :underline="false" :href="downloadImportTempUrl">{{ this.$t('common.Download') }}</el-link>
-            </span>
-            <span v-else class="el-upload__tip">`
-              {{ this.$t('common.imExport.downloadUpdateTemplateMsg') }}
-              <el-link type="success" :underline="false" @click="downloadUpdateTempUrl">{{ this.$t('common.Download') }}</el-link>
-            </span>
-          </div>
-        </el-form-item>
-        <el-form-item :label="$t('common.Upload' )" :label-width="'100px'">
-          <el-upload
-            ref="upload"
-            action="string"
-            :http-request="handleImport"
-            list-type="text/csv"
-            :limit="1"
-            :auto-upload="false"
-            :before-upload="beforeUpload"
-          >
-            <el-button size="mini" type="default">{{ this.$t('common.SelectFile') }}</el-button>
-            <div slot="tip" :class="uploadHelpTextClass" style="line-height: 1.5">{{ this.$t('common.imExport.onlyCSVFilesTips') }}</div>
-          </el-upload>
-        </el-form-item>
-      </el-form>
-      <div v-if="errorMsg" class="error-msg error-results">
-        <ul v-if="typeof errorMsg === 'object'">
-          <li v-for="(item, index) in errorMsg" :key="item + '-' + index"> {{ item }}</li>
-        </ul>
-        <span v-else>{{ errorMsg }}</span>
-      </div>
-    </Dialog>
-  </div>
-</template>
-
-<script>
-import GenericTreeListPage from '@/layout/components/GenericTreeListPage'
-import { AssetUserTable } from '@/components'
-import Dialog from '@/components/Dialog'
-import { setUrlParam } from '@/utils/common'
-import { createSourceIdCache } from '@/api/common'
-import * as queryUtil from '@/components/DataTable/compenents/el-data-table/utils/query'
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'VaultList',
-  components: {
-    GenericTreeListPage,
-    AssetUserTable,
-    Dialog
-  },
-  data() {
-    const vm = this
-    return {
-      showImportDialog: false,
-      importOption: '1',
-      isCsv: true,
-      errorMsg: '',
-      showExportDialog: false,
-      exportOption: '1',
-      meta: {},
-      MfaExpired: 0,
-      showMFADialog: false,
-      MFAInput: '',
-      selectedRows: '',
-      assetUserConfig: {
-        hasLeftActions: true,
-        hasCreate: true,
-        hasClone: false,
-        url: '/api/v1/assets/asset-users/',
-        handleImport: function({ selectedRows }) {
-          this.selectedRows = selectedRows
-          this.dialogStatus = 'import'
-          if (!this.needMFAVerify) {
-            this.showMFADialog = false
-            this.showImportDialog = true
-          } else {
-            this.showMFADialog = true
-          }
-        }.bind(this),
-        handleExport: function({ selectedRows }) {
-          this.selectedRows = selectedRows
-          this.dialogStatus = 'export'
-          if (!this.needMFAVerify) {
-            this.showMFADialog = false
-            this.showExportDialog = true
-          } else {
-            this.showMFADialog = true
-          }
-        }.bind(this)
-      },
-      treeSetting: {
-        showMenu: false,
-        showRefresh: false,
-        showAssets: true,
-        url: '/api/v1/assets/asset-users/',
-        treeUrl: '/api/v1/assets/nodes/children/tree/?assets=1',
-        callback: {
-          onSelected: function(event, treeNode) {
-            let url = vm.assetUserConfig.url
-            if (treeNode.meta.type === 'node') {
-              const nodeId = treeNode.meta.node.id
-              url = setUrlParam(url, 'asset_id', '')
-              url = setUrlParam(url, 'node_id', nodeId)
-            } else if (treeNode.meta.type === 'asset') {
-              const assetId = treeNode.meta.asset.id
-              url = setUrlParam(url, 'node_id', '')
-              url = setUrlParam(url, 'asset_id', assetId)
-            }
-            setTimeout(() => {
-              vm.assetUserConfig.url = url
-            }, 100)
-          }
-        }
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'MFA_TTl',
-      'MFAVerifyAt',
-      'publicSettings'
-    ]),
-    needMFAVerify() {
-      if (!this.publicSettings.SECURITY_VIEW_AUTH_NEED_MFA) {
-        return false
-      }
-      const ttl = this.publicSettings.SECURITY_MFA_VERIFY_TTL
-      const now = new Date()
-      return !(this.MFAVerifyAt && (now - this.MFAVerifyAt) < ttl * 1000)
-    },
-    hasSelected() {
-      return this.selectedRows.length > 0
-    },
-    upLoadUrl() {
-      return this.url
-    },
-    downloadImportTempUrl() {
-      const baseUrl = `/api/v1/assets/asset-user-auth-infos/`
-      return baseUrl + '?format=csv&template=import&limit=1'
-    },
-    uploadHelpTextClass() {
-      const cls = ['el-upload__tip']
-      if (!this.isCsv) {
-        cls.push('error-msg')
-      }
-      return cls
-    },
-    ...mapGetters([
-      'MFAVerifyAt',
-      'MFA_TTl'
-    ])
-  },
-  methods: {
-    performUpdate(item) {
-      this.$axios.put(
-        `/api/v1/assets/asset-users/`,
-        item.file,
-        { headers: { 'Content-Type': 'text/csv' }, disableFlashErrorMsg: true }
-      ).then((data) => {
-        const msg = this.$t('common.imExport.updateSuccessMsg', { count: data.length })
-        this.onSuccess(msg)
-      }).catch(error => {
-        this.catchError(error)
-      })
-    },
-    performCreate(item) {
-      this.$axios.post(
-        `/api/v1/assets/asset-users/`,
-        item.file,
-        { headers: { 'Content-Type': 'text/csv' }, disableFlashErrorMsg: true }
-      ).then((data) => {
-        const msg = this.$t('common.imExport.createSuccessMsg', { count: data.length })
-        this.onSuccess(msg)
-      }).catch(error => {
-        this.$message.error(this.$t('common.updateErrorMsg') + ' ' + error)
-        this.catchError(error)
-      })
-    },
-    catchError(error) {
-      this.$refs.upload.clearFiles()
-      if (error.response && error.response.status === 400) {
-        const errorData = error.response.data
-        const totalErrorMsg = []
-        errorData.forEach((value, index) => {
-          if (typeof value === 'string') {
-            totalErrorMsg.push(`line ${index}. ${value}`)
-          } else {
-            const errorMsg = [`line ${index}. `]
-            for (const [k, v] of Object.entries(value)) {
-              if (v) {
-                errorMsg.push(`${k}: ${v}`)
-              }
-            }
-            if (errorMsg.length > 1) {
-              totalErrorMsg.push(errorMsg.join(' '))
-            }
-          }
-        })
-        this.errorMsg = totalErrorMsg
-      }
-    },
-    onSuccess(msg) {
-      this.errorMsg = ''
-      this.$message.success(msg)
-    },
-    handleImport(item) {
-      if (this.importOption === '1') {
-        this.performCreate(item)
-      } else {
-        this.performUpdate(item)
-      }
-    },
-    async downloadUpdateTempUrl() {
-      var resources = []
-      const data = this.selectedRows
-      for (let index = 0; index < data.length; index++) {
-        resources.push(data[index].id)
-      }
-      const spm = await createSourceIdCache(resources)
-      const baseUrl = `/api/v1/assets/asset-user-auth-infos/`
-      const url = `${baseUrl}?format=csv&template=update&spm=` + spm.spm
-      return this.downloadCsv(url)
-    },
-    async handleImportConfirm() {
-      this.$refs.upload.submit()
-      this.showImportDialog = false
-    },
-    handleImportCancel() {
-      this.showImportDialog = false
-    },
-    beforeUpload(file) {
-      this.isCsv = _.endsWith(file.name, 'csv')
-      return this.isCsv
-    },
-    downloadCsv(url) {
-      const a = document.createElement('a')
-      a.href = url
-      a.click()
-      window.URL.revokeObjectURL(url)
-    },
-    async handleExport() {
-      const url = `/api/v1/assets/asset-user-auth-infos/`
-      let query = {}
-      if (this.exportOption === '2') {
-        const resources = []
-        const data = this.selectedRows
-        for (let index = 0; index < data.length; index++) {
-          resources.push(data[index].id)
-        }
-        const spm = await createSourceIdCache(resources)
-        query['spm'] = spm.spm
-      } else if (this.exportOption === '3') {
-        const listTableRef = this.$parent.$parent.$parent.$parent
-        // console.log(listTableRef)
-        // console.log(listTableRef.dataTable)
-        query = listTableRef.dataTable.getQuery()
-        delete query['limit']
-        delete query['offset']
-      }
-      query['format'] = 'csv'
-      const queryStr =
-        (url.indexOf('?') > -1 ? '&' : '?') +
-        queryUtil.stringify(query, '=', '&')
-      return this.downloadCsv(url + queryStr)
-    },
-    async handleExportConfirm() {
-      await this.handleExport()
-      this.showExportDialog = false
-    },
-    handleExportCancel() {
-      this.showExportDialog = false
-    },
-    MFAConfirm() {
-      if (this.MFAInput.length !== 6) {
-        return this.$message.error(this.$t('common.MFAErrorMsg'))
-      }
-      this.$axios.post(
-        `/api/v1/authentication/otp/verify/`, {
-          code: this.MFAInput
-        }
-      ).then(
-        res => {
-          this.$store.dispatch('users/setMFAVerify')
-          if (this.dialogStatus === 'import') {
-            this.showMFADialog = false
-            this.showImportDialog = true
-          } else {
-            this.showMFADialog = false
-            this.showExportDialog = true
-          }
-        }
-      )
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index 4169fd96f..e9ef9a050 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -162,27 +162,6 @@ export default {
         }
       ]
     },
-    {
-      path: 'vault',
-      component: empty,
-      redirect: '',
-      meta: { },
-      children: [
-        {
-          path: '',
-          component: () => import('@/views/xpack/Vault/VaultList.vue'),
-          name: 'VaultList',
-          meta: { title: i18n.t('xpack.Vault.Vault'), activeMenu: '/xpack/vault' }
-        },
-        {
-          path: 'create',
-          component: () => import('@/views/xpack/Vault/VaultCreate'),
-          name: 'VaultCreate',
-          meta: { title: i18n.t('xpack.Vault.Create'), activeMenu: '/xpack/vault' },
-          hidden: true
-        }
-      ]
-    },
     {
       path: 'system-monitor',
       component: () => import('@/views/xpack/SystemMonitor/index.vue'),

From a1ad901b409f8cceb61a3b393f30b469debd8b8c Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Fri, 28 May 2021 16:50:40 +0800
Subject: [PATCH 12/33] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8=20xpack/Change?=
 =?UTF-8?q?AuthPlan=20>=20accounts/CahngeAuthPlan?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/accounts.js                        | 41 +++++++++++++++++++
 src/utils/common.js                           | 11 +++--
 .../ChangeAuthPlanCreateUpdate.vue            |  0
 .../ChangeAuthPlanAsset/index.vue             |  0
 .../ChangeAuthPlanExecutionInfo.vue           |  0
 .../ChangeAuthPlanExecutionTaskList.vue       |  0
 .../ChangeAuthPlanExecutionDetail/index.vue   |  0
 .../ChangeAuthPlanExecutionList.vue           |  0
 .../ChangeAuthPlanInfo.vue                    |  0
 .../ChangeAuthPlanDetail/index.vue            |  0
 .../ChangeAuthPlan/ChangeAuthPlanList.vue     |  0
 11 files changed, 48 insertions(+), 4 deletions(-)
 rename src/views/{xpack => accounts}/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue (100%)
 rename src/views/{xpack => accounts}/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue (100%)
 rename src/views/{xpack => accounts}/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionInfo.vue (100%)
 rename src/views/{xpack => accounts}/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue (100%)
 rename src/views/{xpack => accounts}/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/index.vue (100%)
 rename src/views/{xpack => accounts}/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue (100%)
 rename src/views/{xpack => accounts}/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanInfo.vue (100%)
 rename src/views/{xpack => accounts}/ChangeAuthPlan/ChangeAuthPlanDetail/index.vue (100%)
 rename src/views/{xpack => accounts}/ChangeAuthPlan/ChangeAuthPlanList.vue (100%)

diff --git a/src/router/accounts.js b/src/router/accounts.js
index 85b8eaa58..b2e9fb89a 100644
--- a/src/router/accounts.js
+++ b/src/router/accounts.js
@@ -82,5 +82,46 @@ export default [
         hidden: true
       }
     ]
+  },
+  {
+    path: 'change-auth-plan',
+    component: empty,
+    meta: { title: i18n.t('xpack.ChangeAuthPlan.ChangeAuthPlan'), activeMenu: '/accounts/change-auth-plan/plan' },
+    children: [
+      {
+        path: 'plan',
+        component: () => import('@/views/accounts/ChangeAuthPlan/ChangeAuthPlanList.vue'),
+        name: 'ChangeAuthPlanList',
+        meta: { title: i18n.t('xpack.ChangeAuthPlan.ChangeAuthPlan'), activeMenu: '/accounts/change-auth-plan/plan' }
+      },
+      {
+        path: 'plan/create',
+        component: () => import('@/views/accounts/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue'),
+        name: 'ChangeAuthPlanCreate',
+        meta: { title: i18n.t('xpack.ChangeAuthPlan.ChangeAuthPlanCreate'), activeMenu: '/accounts/change-auth-plan/plan', action: 'create' },
+        hidden: true
+      },
+      {
+        path: 'plan/:id/update',
+        component: () => import('@/views/accounts/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue'),
+        name: 'ChangeAuthPlanUpdate',
+        meta: { title: i18n.t('xpack.ChangeAuthPlan.ChangeAuthPlanUpdate'), activeMenu: '/accounts/change-auth-plan/plan', action: 'update' },
+        hidden: true
+      },
+      {
+        path: 'plan/:id',
+        component: () => import('@/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/index.vue'),
+        name: 'ChangeAuthPlanDetail',
+        meta: { title: i18n.t('xpack.ChangeAuthPlan.ChangeAuthPlan'), activeMenu: '/accounts/change-auth-plan/plan' },
+        hidden: true
+      },
+      {
+        path: 'plan-execution/:id',
+        component: () => import('@/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/index.vue'),
+        name: 'ChangeAuthPlanExecutionDetail',
+        meta: { title: i18n.t('xpack.ChangeAuthPlan.ExecutionDetail'), activeMenu: '/accounts/change-auth-plan/plan' },
+        hidden: true
+      }
+    ]
   }
 ]
diff --git a/src/utils/common.js b/src/utils/common.js
index bc67400d5..65b2ca79c 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -88,11 +88,14 @@ export function toSafeLocalDateStr(d) {
 }
 
 export function getApiPath(that) {
-  const pagePath = that.$route.path
-  const isOrgPath = pagePath.split('/').indexOf('orgs') !== -1
-  if (isOrgPath) {
-    return `/api/v1/orgs/orgs/${pagePath.split('/').pop()}/`
+  let pagePath = that.$route.path
+  const pagePathArray = pagePath.split('/')
+  if (pagePathArray.indexOf('orgs') !== -1) {
+    pagePathArray[pagePathArray.indexOf('xpack')] = 'orgs'
+  } else if (pagePathArray.indexOf('gathered-user') !== -1 || pagePathArray.indexOf('change-auth-plan') !== -1) {
+    pagePathArray[pagePathArray.indexOf('accounts')] = 'xpack'
   }
+  pagePath = pagePathArray.join('/')
   return `/api/v1${pagePath}/`
 }
 
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue
similarity index 100%
rename from src/views/xpack/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue
rename to src/views/accounts/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue
similarity index 100%
rename from src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue
rename to src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionInfo.vue b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionInfo.vue
similarity index 100%
rename from src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionInfo.vue
rename to src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionInfo.vue
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
similarity index 100%
rename from src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
rename to src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/ChangeAuthPlanExecutionTaskList.vue
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/index.vue b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/index.vue
similarity index 100%
rename from src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/index.vue
rename to src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/index.vue
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
similarity index 100%
rename from src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
rename to src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionList.vue
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanInfo.vue b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanInfo.vue
similarity index 100%
rename from src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanInfo.vue
rename to src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanInfo.vue
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/index.vue b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/index.vue
similarity index 100%
rename from src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/index.vue
rename to src/views/accounts/ChangeAuthPlan/ChangeAuthPlanDetail/index.vue
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue b/src/views/accounts/ChangeAuthPlan/ChangeAuthPlanList.vue
similarity index 100%
rename from src/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue
rename to src/views/accounts/ChangeAuthPlan/ChangeAuthPlanList.vue

From 7f118d7074223c228f3f061907e780697ec511e4 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Fri, 28 May 2021 16:53:08 +0800
Subject: [PATCH 13/33] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8=20xpack/Change?=
 =?UTF-8?q?AuthPlan=20>=20accounts/CahngeAuthPlan=202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xpack/router.js | 41 ---------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index e9ef9a050..34beaa9ae 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -10,47 +10,6 @@ export default {
   name: 'Xpack',
   meta: { title: 'X-Pack', icon: 'sitemap', licenseRequired: true },
   children: [
-    {
-      path: 'change-auth-plan',
-      component: empty,
-      meta: { title: i18n.t('xpack.ChangeAuthPlan.ChangeAuthPlan'), activeMenu: '/xpack/change-auth-plan/plan' },
-      children: [
-        {
-          path: 'plan',
-          component: () => import('@/views/xpack/ChangeAuthPlan/ChangeAuthPlanList.vue'),
-          name: 'ChangeAuthPlanList',
-          meta: { title: i18n.t('xpack.ChangeAuthPlan.ChangeAuthPlan'), activeMenu: '/xpack/change-auth-plan/plan' }
-        },
-        {
-          path: 'plan/create',
-          component: () => import('@/views/xpack/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue'),
-          name: 'ChangeAuthPlanCreate',
-          meta: { title: i18n.t('xpack.ChangeAuthPlan.ChangeAuthPlanCreate'), activeMenu: '/xpack/change-auth-plan/plan', action: 'create' },
-          hidden: true
-        },
-        {
-          path: 'plan/:id/update',
-          component: () => import('@/views/xpack/ChangeAuthPlan/ChangeAuthPlanCreateUpdate.vue'),
-          name: 'ChangeAuthPlanUpdate',
-          meta: { title: i18n.t('xpack.ChangeAuthPlan.ChangeAuthPlanUpdate'), activeMenu: '/xpack/change-auth-plan/plan', action: 'update' },
-          hidden: true
-        },
-        {
-          path: 'plan/:id',
-          component: () => import('@/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/index.vue'),
-          name: 'ChangeAuthPlanDetail',
-          meta: { title: i18n.t('xpack.ChangeAuthPlan.ChangeAuthPlan'), activeMenu: '/xpack/change-auth-plan/plan' },
-          hidden: true
-        },
-        {
-          path: 'plan-execution/:id',
-          component: () => import('@/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanExecution/ChangeAuthPlanExecutionDetail/index.vue'),
-          name: 'ChangeAuthPlanExecutionDetail',
-          meta: { title: i18n.t('xpack.ChangeAuthPlan.ExecutionDetail'), activeMenu: '/xpack/change-auth-plan/plan' },
-          hidden: true
-        }
-      ]
-    },
     {
       path: 'cloud',
       component: empty,

From f720eaf05aa9f55aa51c72308fa443584d348c4e Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Fri, 28 May 2021 17:19:35 +0800
Subject: [PATCH 14/33] =?UTF-8?q?feat:=20=E8=B4=A6=E5=8F=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97(=E5=9F=BA=E6=9C=AC=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 653933e2a..479f4c9b6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -83,17 +83,6 @@ export const allRoleRoutes = [
       }
     ]
   },
-  {
-    path: '/accounts',
-    component: Layout,
-    redirect: '/accounts/asset-accounts/',
-    name: 'Accounts',
-    meta: {
-      title: i18n.t('route.Accounts'),
-      icon: 'address-book'
-    },
-    children: AccountRoutes
-  },
   {
     path: '/users',
     component: Layout,
@@ -122,6 +111,18 @@ export const allRoleRoutes = [
     meta: { title: i18n.t('route.Applications'), icon: 'th' },
     children: ApplicationsRoute
   },
+  {
+    path: '/accounts',
+    component: Layout,
+    redirect: '/accounts/asset-accounts/',
+    name: 'Accounts',
+    meta: {
+      licenseRequired: true,
+      title: i18n.t('route.Accounts'),
+      icon: 'address-book'
+    },
+    children: AccountRoutes
+  },
   {
     path: '/perms/',
     component: Layout,

From e8335d9c7366a79de9b2f93cd3e63076d059014e Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Tue, 1 Jun 2021 17:48:36 +0800
Subject: [PATCH 15/33] =?UTF-8?q?feat:=20=E7=B3=BB=E7=BB=9F=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=AE=A2=E9=98=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SelectDialog.vue                          |  2 +-
 .../Subscription.vue                          | 52 +++++++++----------
 src/views/settings/index.vue                  |  7 +++
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/views/settings/SystemMessageSubscription/SelectDialog.vue b/src/views/settings/SystemMessageSubscription/SelectDialog.vue
index 49f4f8c86..fa3ab34f9 100644
--- a/src/views/settings/SystemMessageSubscription/SelectDialog.vue
+++ b/src/views/settings/SystemMessageSubscription/SelectDialog.vue
@@ -64,7 +64,7 @@ export default {
     const selectedUsers = this.selectedUsers.map(item => {
       return {
         id: item.id,
-        label: `${item.name}(${item.username})`
+        label: item.name
       }
     })
     setTimeout(() => {
diff --git a/src/views/settings/SystemMessageSubscription/Subscription.vue b/src/views/settings/SystemMessageSubscription/Subscription.vue
index c096276be..230669393 100644
--- a/src/views/settings/SystemMessageSubscription/Subscription.vue
+++ b/src/views/settings/SystemMessageSubscription/Subscription.vue
@@ -67,7 +67,7 @@ export default {
       }
 
       this.$axios.patch(
-        `/api/v1/notifications/system/subscriptions/${sub.id}/`,
+        `/api/v1/notifications/system-msg-subscription/${sub.id}/`,
         { receive_backends: backends }
       ).catch(err => {
         this.$log.error(err)
@@ -78,11 +78,10 @@ export default {
     onDialogSelectSubmit(userIds) {
       this.dialogVisible = false
       this.$axios.patch(
-        `/api/v1/notifications/system/subscriptions/${this.currentEditSub.id}/`,
+        `/api/v1/notifications/system-msg-subscription/${this.currentEditSub.id}/`,
         { users: userIds }
       ).then(newSub => {
-        const msgType = this.idMessageTypeMapper[newSub.id]
-        msgType.users = newSub.users
+        const msgType = this.idMessageTypeMapper[newSub.message_type]
         msgType.receivers = newSub.receivers
       }).catch(err => {
         console.log(err)
@@ -97,40 +96,37 @@ export default {
       this.receiveBackends = await this.$axios.get('/api/v1/notifications/backends/')
     },
     async initSubscriptions() {
-      const subscriptions = await this.$axios.get('/api/v1/notifications/system/subscriptions/')
+      const subscriptions = await this.$axios.get('/api/v1/notifications/system-msg-subscription/')
 
-      // 根据 app 分组
-      const appMessageTypesMapper = {}
-      subscriptions.forEach(sub => {
-        if (!(sub.message_category in appMessageTypesMapper)) {
-          appMessageTypesMapper[sub.message_category] = {
-            id: sub.message_category,
-            value: sub.message_category_label,
-            children: [sub]
-          }
-        } else {
-          appMessageTypesMapper[sub.message_category].children.push(sub)
-        }
-      })
+      const trans_subscriptions = []
 
-      // sub 改成需要的数据结构
-      for (const app of Object.values(appMessageTypesMapper)) {
-        app.children = app.children.map(sub => {
+      for (const category of subscriptions) {
+        const children = []
+        trans_subscriptions.push({
+          id: category.category,
+          value: category.category_label,
+          children: children
+        })
+
+        for (const sub of category.children) {
           const backendsChecked = {}
           this.receiveBackends.forEach(backend => {
             backendsChecked[backend.name] = sub.receive_backends.indexOf(backend.name) > -1
           })
-          const subObj = {
-            id: sub.id,
-            value: sub.message_label,
+
+          const trans_sub = {
+            id: sub.message_type,
+            value: sub.message_type_label,
             receivers: sub.receivers,
             receive_backends: backendsChecked
           }
-          this.idMessageTypeMapper[sub.id] = subObj
-          return subObj
-        })
+          children.push(trans_sub)
+
+          this.idMessageTypeMapper[trans_sub.id] = trans_sub
+        }
       }
-      this.tableData = Object.values(appMessageTypesMapper)
+
+      this.tableData = trans_subscriptions
     }
   }
 }
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index c03ae1ad5..73db1939b 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -69,6 +69,10 @@ export default {
           title: this.$t('setting.DingTalk'),
           name: 'DingTalk'
         },
+        {
+          title: this.$t('setting.SystemMessageSubscription'),
+          name: 'SystemMessageSubscription'
+        },
         {
           title: this.$t('setting.Terminal'),
           name: 'Terminal'
@@ -119,6 +123,9 @@ export default {
         case 'License':
           this.activeMenu = 'License'
           break
+        case 'SystemMessageSubscription':
+          this.activeMenu = 'SystemMessageSubscription'
+          break
         default:
           this.activeMenu = 'Basic'
           break

From 8ee39c036fcbaaacb9c82886bea0789080db8d65 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Wed, 2 Jun 2021 17:01:34 +0800
Subject: [PATCH 16/33] =?UTF-8?q?feat:=20=E8=B5=84=E4=BA=A7=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=20BackendDisplay?=
 =?UTF-8?q?=20=E5=92=8C=20Name=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApplicationAccount/ApplicationAccountList.vue     |  2 +-
 src/views/accounts/AssetAccount/AssetAccountList.vue  | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
index 81032cabb..0f37ec116 100644
--- a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
+++ b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
@@ -119,7 +119,7 @@ export default {
           },
           tableAttrs: {
             stripe: false, // 斑马纹表格
-            border: false, // 表格边框
+            border: true, // 表格边框
             fit: true, // 宽度自适应,
             tooltipEffect: 'dark',
             rowClassName({ row, rowIndex }) {
diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue
index aeca3ca94..4a4898540 100644
--- a/src/views/accounts/AssetAccount/AssetAccountList.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountList.vue
@@ -118,14 +118,19 @@ export default {
       rightTable: {
         url: `/api/v1/assets/asset-users/?hostname=ShowFirstAssetRelated&latest=1`,
         tableConfig: {
-          columns: ['name', 'username', 'version', 'date_created', 'actions'],
+          columns: ['name', 'username', 'version', 'backend', 'backend_display', 'date_created', 'actions'],
           columnsShow: {
             min: ['username', 'actions'],
-            default: ['username', 'version', 'date_created', 'actions']
+            default: ['name', 'username', 'version', 'backend_display', 'date_created', 'actions']
+          },
+          columnsMeta: {
+            name: {
+              formatter: null
+            }
           },
           tableAttrs: {
             stripe: false, // 斑马纹表格
-            border: false, // 表格边框
+            border: true, // 表格边框
             fit: true, // 宽度自适应,
             tooltipEffect: 'dark',
             rowClassName({ row, rowIndex }) {

From 73d4ec0fa5c745197f9284556870d93363266d60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Jun 2021 17:52:15 +0800
Subject: [PATCH 17/33] chore(deps): bump dns-packet from 1.3.1 to 1.3.4 (#821)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: 更新Submodule指向

* fix: 修复Build失败的问题

* fix(clone): 修复会话页面产生的clone的问题

* chore(deps): bump dns-packet from 1.3.1 to 1.3.4

Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: Orange <orangemtony@gmail.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
Co-authored-by: 老广 <ibuler@qq.com>
Co-authored-by: Eric_Lee <xplzv@126.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 79c785e4c..71733260f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3605,8 +3605,9 @@ dns-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
 
 dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
+  integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -9372,8 +9373,9 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
 
 safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-regex@^1.1.0:
   version "1.1.0"

From cc994b8ecd02a3c11b7183eb58b583f919c6ef82 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 2 Jun 2021 17:29:32 +0800
Subject: [PATCH 18/33] =?UTF-8?q?perf:=20logo=E5=92=8C=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

perf: 去掉title
---
 public/favicon.ico                    | Bin 3283 -> 0 bytes
 public/index.html                     |   1 -
 src/assets/img/logo-text.png          | Bin 7913 -> 0 bytes
 src/assets/img/logo.png               | Bin 16275 -> 0 bytes
 src/layout/components/NavBar/Logo.vue |  21 ++++++---------------
 src/settings.js                       |   3 +--
 src/store/modules/settings.js         |  17 ++++++++++-------
 src/utils/startup.js                  |  10 +++++-----
 vue.config.js                         |   3 +--
 9 files changed, 23 insertions(+), 32 deletions(-)
 delete mode 100644 public/favicon.ico
 delete mode 100644 src/assets/img/logo-text.png
 delete mode 100644 src/assets/img/logo.png

diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index 266c07166d93bc2ce155ae72d729fbaee1e60bb0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3283
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
E2gHk|TL1t6

diff --git a/public/index.html b/public/index.html
index 5a63fd379..081580329 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,7 +8,6 @@
     <meta http-equiv="Cache-control" content="no-cache">
     <meta http-equiv="Cache" content="no-cache">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
   </head>
   <body>
diff --git a/src/assets/img/logo-text.png b/src/assets/img/logo-text.png
deleted file mode 100644
index 0e27e3318fe9d039997ca50887e486feeb17dbb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7913
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
E0j7sWm;e9(

diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png
deleted file mode 100644
index f3cf2d261ad53ea64351c7c4aafa097d13061837..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16275
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
R01NdX1sPT8YDx3p{|BZASiArL

diff --git a/src/layout/components/NavBar/Logo.vue b/src/layout/components/NavBar/Logo.vue
index 08bbec43a..b85e3ee71 100644
--- a/src/layout/components/NavBar/Logo.vue
+++ b/src/layout/components/NavBar/Logo.vue
@@ -2,13 +2,10 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 v-else class="sidebar-title">{{ title }}</h1>
+        <img :src="logoSrc" class="sidebar-logo">
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img :src="logoSrc" class="sidebar-logo-text">
-        <!--        <img v-else-if="logoText" :src="logoText" class="sidebar-logo-text">-->
-        <!--        <h1 class="sidebar-title">{{ title }}</h1>-->
+        <img :src="logoTextSrc" class="sidebar-logo-text">
       </router-link>
     </transition>
   </div>
@@ -26,10 +23,6 @@ export default {
   },
   data() {
     return {
-      title: 'JumpServer',
-      logoText: require('@/assets/img/logo-text.png'),
-      logo: require('@/assets/img/logo.png'),
-      xpackData: {}
     }
   },
   computed: {
@@ -37,16 +30,14 @@ export default {
       'publicSettings'
     ]),
     // eslint-disable-next-line vue/return-in-computed-property
+    logoTextSrc() {
+      return this.publicSettings.LOGO_URLS.logo_index
+    },
     logoSrc() {
-      if (this.publicSettings.LOGO_URLS.logo_index !== '/static/img/logo_text.png') {
-        return this.publicSettings.LOGO_URLS.logo_index
-      } else {
-        return this.logoText
-      }
+      return this.publicSettings.LOGO_URLS.logo_logout
     }
   },
   created() {
-
   }
 }
 </script>
diff --git a/src/settings.js b/src/settings.js
index 1f68ff904..f3efa61eb 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,6 +1,5 @@
 module.exports = {
-
-  title: 'JumpServer',
+  title: '.',
 
   /**
    * @type {boolean} true | false
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 1d8c272a4..491bbaf3c 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -35,15 +35,18 @@ const actions = {
   getPublicSettings({ commit, state }) {
     return new Promise((resolve, reject) => {
       getPublicSettings().then(response => {
-        const link = document.querySelector("link[rel*='icon']") || document.createElement('link')
-        link.type = 'image/x-icon'
-        link.rel = 'shortcut icon'
-        link.href = response.data.LOGO_URLS.favicon
-        document.getElementsByTagName('head')[0].appendChild(link)
+        const faviconURL = response.data.LOGO_URLS.favicon
+        let link = document.querySelector("link[rel*='icon']")
+        if (!link) {
+          link = document.createElement('link')
+          link.type = 'image/x-icon'
+          link.rel = 'shortcut icon'
+          document.getElementsByTagName('head')[0].appendChild(link)
+        }
+        link.href = faviconURL
 
         // 动态修改Title
-        if (response.data.LOGIN_TITLE) { document.title = response.data.LOGIN_TITLE }
-
+        document.title = response.data.LOGIN_TITLE
         commit('SET_PUBLIC_SETTINGS', response.data)
         resolve(response)
       }).catch(error => {
diff --git a/src/utils/startup.js b/src/utils/startup.js
index 696c03ef6..cdd486582 100644
--- a/src/utils/startup.js
+++ b/src/utils/startup.js
@@ -1,4 +1,4 @@
-import getPageTitle from '@/utils/get-page-title'
+// import getPageTitle from '@/utils/get-page-title'
 import store from '@/store'
 import router from '@/router'
 import { Message } from 'element-ui'
@@ -15,9 +15,9 @@ function reject(msg) {
   return new Promise((resolve, reject) => reject(msg))
 }
 
-function setHeadTitle({ to, from, next }) {
-  document.title = getPageTitle(to.meta.title)
-}
+// function setHeadTitle({ to, from, next }) {
+//   document.title = getPageTitle(to.meta.title)
+// }
 
 async function checkLogin({ to, from, next }) {
   if (whiteList.indexOf(to.path) !== -1) {
@@ -145,7 +145,7 @@ export async function startup({ to, from, next }) {
 
   // set page title
   await getPublicSetting({ to, from, next })
-  await setHeadTitle({ to, from, next })
+  // await setHeadTitle({ to, from, next })
   await checkLogin({ to, from, next })
   await changeCurrentOrgIfNeed({ to, from, next })
   await changeCurrentRoleIfNeed({ to, from, next })
diff --git a/vue.config.js b/vue.config.js
index 419491b5c..291df6495 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,12 +4,11 @@ const defaultSettings = require('./src/settings.js')
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = /\.(js|css|json|txt|ico|svg)(\?.*)?$/i
 
-
 function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || 'JumpServer' // page title
+const name = '' // page title
 
 // If your port is set to 80,
 // use administrator privileges to execute the command line.

From 091038de95ce63613e40930d368b1a0489ad77a1 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Wed, 2 Jun 2021 18:53:29 +0800
Subject: [PATCH 19/33] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetAccount/AssetAccountList.vue         |  25 +-
 .../GatheredUser/GatheredUserList.vue         | 220 +++++++++++++-----
 2 files changed, 190 insertions(+), 55 deletions(-)

diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue
index 4a4898540..1270b179e 100644
--- a/src/views/accounts/AssetAccount/AssetAccountList.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountList.vue
@@ -41,7 +41,7 @@ import Page from '@/layout/components/Page'
 import GenericListTable from '@/layout/components/GenericListTable'
 import AutoDataZTree from '@/components/AutoDataZTree/index'
 import { AssetUserTable } from '@/components'
-import { DetailFormatter } from '@/components/TableFormatters'
+import { ChoicesFormatter, DetailFormatter } from '@/components/TableFormatters'
 
 export default {
   name: 'AssetAccountList',
@@ -87,6 +87,26 @@ export default {
                 }
               },
               showOverflowTooltip: true
+            },
+            connectivity: {
+              label: this.$t('assets.Reachable'),
+              formatter: ChoicesFormatter,
+              formatterArgs: {
+                iconChoices: {
+                  0: 'fa-times text-danger',
+                  1: 'fa-check text-primary',
+                  2: 'fa-circle text-warning'
+                },
+                typeChange: function(val) {
+                  if (!val) {
+                    return 2
+                  }
+                  return val.status
+                },
+                hasTips: true
+              },
+              width: '90px',
+              align: 'center'
             }
           },
           tableAttrs: {
@@ -125,7 +145,8 @@ export default {
           },
           columnsMeta: {
             name: {
-              formatter: null
+              formatter: null,
+              showOverflowTooltip: true
             }
           },
           tableAttrs: {
diff --git a/src/views/accounts/GatheredUser/GatheredUserList.vue b/src/views/accounts/GatheredUser/GatheredUserList.vue
index a2924f5c3..a954ef9f6 100644
--- a/src/views/accounts/GatheredUser/GatheredUserList.vue
+++ b/src/views/accounts/GatheredUser/GatheredUserList.vue
@@ -1,78 +1,192 @@
 <template>
-  <TreeTable :table-config="tableConfig" :tree-setting="treeSetting" :header-actions="headerActions" />
+  <div>
+    <el-row>
+      <el-col v-show="iShowTree" :span="iShowTree?4:0">
+        <AutoDataZTree
+          ref="AUtoDataZTree"
+          :setting="treeSetting"
+        />
+      </el-col>
+      <el-col :span="iShowTree?12:14">
+        <div class="mini">
+          <div style="display:block" class="mini-button" @click="iShowTree=!iShowTree">
+            <i v-show="iShowTree" class="fa fa-angle-left fa-x" /><i v-show="!iShowTree" class="fa fa-angle-right fa-x" />
+          </div>
+        </div>
+        <GenericListTable
+          ref="LeftTable"
+          class="asset-table"
+          :header-actions="leftTable.headerActions"
+          :table-config="leftTable.tableConfig"
+          @row-click="leftTable.tableConfig.rowClick"
+        />
+      </el-col>
+      <el-col :span="iShowTree?8:10">
+        <AssetUserTable
+          ref="RightTable"
+          class="asset-user-table"
+          :url="rightTable.url"
+          :has-left-actions="true"
+          :table-config="rightTable.tableConfig"
+          :has-clone="false"
+          :has-import="false"
+        />
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
-import TreeTable from '@/components/TreeTable'
+import GenericListTable from '@/layout/components/GenericListTable'
+import AutoDataZTree from '@/components/AutoDataZTree/index'
+import { AssetUserTable } from '@/components'
+import { ChoicesFormatter, DetailFormatter } from '@/components/TableFormatters'
 
 export default {
+  name: 'AssetAccountList',
   components: {
-    TreeTable
+    AutoDataZTree, GenericListTable, AssetUserTable
   },
   data() {
+    const vm = this
     return {
+      clickedRow: {},
+      iShowTree: true,
       treeSetting: {
         showMenu: false,
-        showRefresh: true,
-        showAssets: true,
-        url: '/api/v1/assets/gathered-users/',
-        nodeUrl: '/api/v1/assets/nodes/',
-        // ?assets=0不显示资产. =1显示资产
-        treeUrl: '/api/v1/assets/nodes/children/tree/?assets=1'
-      },
-      tableConfig: {
-        url: '/api/v1/assets/gathered-users/',
-        hasTree: true,
-        columns: [
-          'hostname', 'ip', 'username', 'date_last_login', 'present',
-          'ip_last_login', 'date_updated'
-        ],
-        columnsMeta: {
-          hostname: {
-            showOverflowTooltip: true
-          },
-          ip: {
-            width: 120
-          },
-          username: {
-            showOverflowTooltip: true
-          },
-          present: {
-            width: 80
-          },
-          ip_last_login: {
-            width: 120
+        showRefresh: false,
+        showAssets: false,
+        url: '',
+        treeUrl: '/api/v1/assets/nodes/children/tree/',
+        callback: {
+          onSelected: function(event, treeNode) {
+            vm.leftTable.tableConfig.url = `/api/v1/assets/assets/?node_id=${treeNode.meta.node.id}`
           }
         }
       },
-      headerActions: {
-        hasCreate: false,
-        hasLeftActions: false,
-        hasImport: false,
-        searchConfig: {
-          exclude: ['asset'],
-          options: [
-            {
-              label: this.$t('assets.Hostname'),
-              value: 'asset__hostname'
+      leftTable: {
+        tableConfig: {
+          url: '/api/v1/assets/assets/',
+          columns: [
+            'hostname', 'ip', 'public_ip', 'admin_user_display',
+            'protocols', 'platform', 'connectivity',
+            'created_by', 'date_created', 'comment', 'org_name'
+          ],
+          columnsShow: {
+            min: ['hostname', 'ip', 'platform'],
+            default: ['hostname', 'ip', 'connectivity', 'platform']
+          },
+          columnsMeta: {
+            hostname: {
+              formatter: DetailFormatter,
+              formatterArgs: {
+                route: 'AssetDetail',
+                routeQuery: {
+                  activeTab: 'Detail'
+                }
+              },
+              showOverflowTooltip: true
             },
-            {
-              label: 'IP',
-              value: 'asset__ip'
+            connectivity: {
+              label: this.$t('assets.Reachable'),
+              formatter: ChoicesFormatter,
+              formatterArgs: {
+                iconChoices: {
+                  0: 'fa-times text-danger',
+                  1: 'fa-check text-primary',
+                  2: 'fa-circle text-warning'
+                },
+                typeChange: function(val) {
+                  if (!val) {
+                    return 2
+                  }
+                  return val.status
+                },
+                hasTips: true
+              },
+              width: '90px',
+              align: 'center'
             }
-          ]
+          },
+          tableAttrs: {
+            stripe: false, // 斑马纹表格
+            border: true, // 表格边框
+            fit: true, // 宽度自适应,
+            tooltipEffect: 'dark',
+            rowClassName({ row, rowIndex }) {
+              if (row === vm.clickedRow) {
+                return 'row-clicked'
+              }
+              return ''
+            }
+          },
+          rowClick: function(row, column, event) {
+            vm.rightTable.url = `/api/v1/assets/gathered-users/?asset_id=${row.id}`
+            vm.clickedRow = row
+          }
+        },
+        headerActions: {
+          hasLeftActions: true,
+          hasCreate: false,
+          hasExport: false,
+          hasImport: false,
+          hasBulkDelete: false,
+          hasBulkUpdate: false
+        }
+      },
+      rightTable: {
+        url: `/api/v1/assets/gathered-users/?asset__hostname=ShowFirstAssetRelated`,
+        tableConfig: {
+          columns: [
+            'username', 'date_last_login', 'present', 'ip_last_login', 'date_updated'
+          ],
+          columnsShow: {
+            min: ['username'],
+            default: [
+              'username', 'date_last_login', 'present', 'ip_last_login', 'date_updated'
+            ]
+          },
+          columnsMeta: {
+            username: {
+              showOverflowTooltip: true
+            },
+            present: {
+              width: 80
+            },
+            ip_last_login: {
+              width: 120
+            }
+          },
+          tableAttrs: {
+            stripe: false, // 斑马纹表格
+            border: true, // 表格边框
+            fit: true, // 宽度自适应,
+            tooltipEffect: 'dark',
+            rowClassName({ row, rowIndex }) {
+              return 'row-background-color'
+            }
+          }
         }
       }
     }
-  },
-  methods: {
-    onGatherUserTasks() {
-      this.$router.push({ name: 'GatherUserTaskList' })
-    }
   }
 }
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+  .asset-table ::v-deep .row-clicked, .asset-user-table ::v-deep .row-background-color {
+    background-color: #f5f7fa;
+  }
+  .mini-button{
+    width: 12px;
+    float: left;
+    text-align: center;
+    padding: 5px 0;
+    background-color: #1ab394;
+    border-color: #1ab394;
+    color: #FFFFFF;
+    border-radius: 3px;
+    line-height: 1.428;
+    cursor:pointer;
+  }
 </style>

From 80ff4064e6a11d1c73cc936d19fe91979e4eeead Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Jun 2021 19:26:46 +0800
Subject: [PATCH 20/33] chore(deps): bump browserslist from 4.10.0 to 4.16.6
 (#820)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: 更新Submodule指向

* fix: 修复Build失败的问题

* fix(clone): 修复会话页面产生的clone的问题

* chore(deps): bump browserslist from 4.10.0 to 4.16.6

Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.10.0 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.10.0...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: Orange <orangemtony@gmail.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
Co-authored-by: 老广 <ibuler@qq.com>
Co-authored-by: Eric_Lee <xplzv@126.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 53 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 71733260f..da0600384 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2357,13 +2357,15 @@ browserify-zlib@^0.2.0:
     pako "~1.0.5"
 
 browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.8.3:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
   dependencies:
-    caniuse-lite "^1.0.30001035"
-    electron-to-chromium "^1.3.378"
-    node-releases "^1.1.52"
-    pkg-up "^3.1.0"
+    caniuse-lite "^1.0.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
+    escalade "^3.1.1"
+    node-releases "^1.1.71"
 
 bser@2.1.1:
   version "2.1.1"
@@ -2556,9 +2558,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001035:
-  version "1.0.30001035"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001219:
+  version "1.0.30001230"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71"
+  integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==
 
 capture-exit@^1.2.0:
   version "1.2.0"
@@ -2874,6 +2877,11 @@ color@^3.0.0:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
+colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
 colors@^1.1.2:
   version "1.4.0"
   resolved "https://registry.npm.taobao.org/colors/download/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
@@ -3759,9 +3767,10 @@ ejs@^2.6.1:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
 
-electron-to-chromium@^1.3.378:
-  version "1.3.379"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.379.tgz#81dc5e82a3e72bbb830d93e15bc35eda2bbc910e"
+electron-to-chromium@^1.3.723:
+  version "1.3.739"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz#f07756aa92cabd5a6eec6f491525a64fe62f98b9"
+  integrity sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -3904,6 +3913,11 @@ es6-object-assign@1.1.0:
   resolved "https://registry.npm.taobao.org/es6-object-assign/download/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
   integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -7496,11 +7510,10 @@ node-notifier@^5.2.1:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-releases@^1.1.52:
-  version "1.1.52"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9"
-  dependencies:
-    semver "^6.3.0"
+node-releases@^1.1.71:
+  version "1.1.72"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
+  integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
 
 nopt@^5.0.0:
   version "5.0.0"
@@ -8308,12 +8321,6 @@ pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-pkg-up@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
-  dependencies:
-    find-up "^3.0.0"
-
 please-upgrade-node@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"

From b51783d98fc5b4819a07adcb3389f3268dfbd97a Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Thu, 3 Jun 2021 13:10:18 +0800
Subject: [PATCH 21/33] =?UTF-8?q?feat:=20=E8=B4=A6=E5=8F=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=88=E7=BF=BB=E8=AF=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json | 3 +++
 src/router/accounts.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index cd7e931fe..d3e39975b 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -520,6 +520,9 @@
   },
   "route": {
     "": "",
+    "Accounts": "Accounts",
+    "AssetAccount": "Asset account",
+    "ApplicationAccount": "Application account",
     "Ticket": "Tickets",
     "CommandConfirm": "Command confirm",
     "AdminUserCreate": "Admin user create",
diff --git a/src/router/accounts.js b/src/router/accounts.js
index b2e9fb89a..cf7671607 100644
--- a/src/router/accounts.js
+++ b/src/router/accounts.js
@@ -16,7 +16,7 @@ export default [
         path: 'create',
         component: () => import('@/views/accounts/AssetAccount/AssetAccountCreate'),
         name: 'AssetAccountCreate',
-        meta: { title: i18n.t('accounts.Create'), activeMenu: '/accounts/asset-accounts/' },
+        meta: { title: i18n.t('common.Create'), activeMenu: '/accounts/asset-accounts/' },
         hidden: true
       }
     ]

From ef841149de9f9d876183a59e6f24535a2df5b897 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Thu, 3 Jun 2021 16:35:31 +0800
Subject: [PATCH 22/33] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=AB=99?=
 =?UTF-8?q?=E5=86=85=E4=BF=A1=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dump.rdb                                  | Bin 0 -> 92 bytes
 src/i18n/langs/cn.json                    |  10 ++++-
 src/i18n/langs/en.json                    |  10 ++++-
 src/router/users.js                       |  23 ++++++++++
 src/views/users/SiteMsg/SiteMsgDetail.vue |  52 ++++++++++++++++++++++
 src/views/users/SiteMsg/SiteMsgList.vue   |  51 +++++++++++++++++++++
 6 files changed, 142 insertions(+), 4 deletions(-)
 create mode 100644 dump.rdb
 create mode 100644 src/views/users/SiteMsg/SiteMsgDetail.vue
 create mode 100644 src/views/users/SiteMsg/SiteMsgList.vue

diff --git a/dump.rdb b/dump.rdb
new file mode 100644
index 0000000000000000000000000000000000000000..f245254c54f14efedca45ec0886227b8d9264100
GIT binary patch
literal 92
zcmWG?b@2=~Ffg$E#aWb^l3A=<mRiJWs%M~Q`HKr8kd#?ce8AxsYjR0uZt9_>>vkmk
t;wUXnP0`Iw%{_ELh@asXPhx(WZb4CMVs27S>H&uTQr4+LHPc!@0sumcB$5CC

literal 0
HcmV?d00001

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 1a363ca73..2e4a500cc 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -646,7 +646,8 @@
     "Users": "用户管理",
     "WebFTP": "文件管理",
     "WebTerminal": "Web终端",
-    "Notifications": "通知"
+    "Notifications": "通知",
+    "SiteMessageList": "站内信"
   },
   "sessions": {
     "StorageConfiguration": "存储配置",
@@ -1031,7 +1032,12 @@
     "MessageType": "消息类型",
     "Receivers": "接收人",
     "Subscription": "消息订阅",
-    "ChangeReceiver": "修改消息接收人"
+    "ChangeReceiver": "修改消息接收人",
+    "Subject": "主题",
+    "Message": "消息",
+    "DeliveryTime": "发送时间",
+    "HasRead": "是否已读",
+    "Sender": "发送人"
   },
   "xpack": {
     "Admin": "管理员",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index cd7e931fe..af48c7642 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -644,7 +644,8 @@
     "Users": "Users",
     "WebFTP": "WebFTP",
     "WebTerminal": "Web Terminal",
-    "Notifications": "Notifications"
+    "Notifications": "Notifications",
+    "SiteMessageList": "Site message"
   },
   "sessions": {
     "StorageConfiguration": "Storage configuration",
@@ -1025,7 +1026,12 @@
     "MessageType": "Message Type",
     "Receivers": "Receivers",
     "Subscription": "Subscription",
-    "ChangeReceiver": "Change Receivers"
+    "ChangeReceiver": "Change Receivers",
+    "Subject": "Subject",
+    "Message": "Message",
+    "DeliveryTime": "Delivery time",
+    "HasRead": "Has read",
+    "Sender": "Sender"
   },
   "xpack": {
     "Admin": "Admin",
diff --git a/src/router/users.js b/src/router/users.js
index 1d087c004..464a73d34 100644
--- a/src/router/users.js
+++ b/src/router/users.js
@@ -91,5 +91,28 @@ export default [
         hidden: true
       }
     ]
+  },
+  {
+    path: 'site-msg',
+    component: empty,
+    redirect: '',
+    meta: { title: i18n.t('route.SiteMessage') },
+    hidden: true,
+    children: [
+      {
+        path: '',
+        name: 'SiteMessageList',
+        component: () => import('@/views/users/SiteMsg/SiteMsgList'),
+        meta: { title: i18n.t('route.SiteMessageList'), activeMenu: '/users/users' },
+        hidden: true
+      },
+      {
+        path: ':id',
+        name: 'SiteMessageDetail',
+        component: () => import('@/views/users/SiteMsg/SiteMsgDetail'),
+        meta: { title: i18n.t('route.SiteMessageDetail'), activeMenu: '/users/users' },
+        hidden: true
+      }
+    ]
   }
 ]
diff --git a/src/views/users/SiteMsg/SiteMsgDetail.vue b/src/views/users/SiteMsg/SiteMsgDetail.vue
new file mode 100644
index 000000000..b1e4861e3
--- /dev/null
+++ b/src/views/users/SiteMsg/SiteMsgDetail.vue
@@ -0,0 +1,52 @@
+<template>
+  <DetailCard :items="message" :title="subject" />
+</template>
+
+<script>
+import DetailCard from '@/components/DetailCard'
+
+export default {
+  components: {
+    DetailCard
+  },
+  data() {
+    return {
+      subject: '',
+      message: []
+    }
+  },
+  computed: {},
+  mounted() {
+    this.$axios.get(`/api/v1/notifications/site-message/${this.$route.params.id}`).then(res => {
+      this.subject = res.subject
+      this.message = [
+        {
+          key: this.$t('notifications.Sender'),
+          value: res.sender
+        },
+        {
+          key: this.$t('notifications.DeliveryTime'),
+          value: res.date_created
+        },
+        {
+          key: this.$t('notifications.Message'),
+          value: res.message
+        }
+      ]
+      this.mark_as_read([res.id])
+    }).catch(err => {
+      console.error(err)
+    })
+  },
+  methods: {
+    mark_as_read: function(msgIds) {
+      this.$axios.patch('/api/v1/notifications/site-message/mark_as_read/', { ids: msgIds }).catch(err => {
+        console.error(err)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/src/views/users/SiteMsg/SiteMsgList.vue b/src/views/users/SiteMsg/SiteMsgList.vue
new file mode 100644
index 000000000..c6878efd1
--- /dev/null
+++ b/src/views/users/SiteMsg/SiteMsgList.vue
@@ -0,0 +1,51 @@
+<template>
+  <GenericListPage
+    ref="GenericListPage"
+    :table-config="tableConfig"
+  />
+</template>
+
+<script>
+import { GenericListPage } from '@/layout/components'
+import { DetailFormatter, BooleanFormatter } from '@/components/TableFormatters'
+
+export default {
+  components: {
+    GenericListPage
+  },
+  data() {
+    return {
+      tableConfig: {
+        url: '/api/v1/notifications/site-message/',
+        columns: [
+          'subject', 'has_read', 'sender', 'date_created'
+        ],
+        columnsMeta: {
+          subject: {
+            formatter: DetailFormatter,
+            formatterArgs: {
+              route: 'SiteMessageDetail'
+            },
+            label: this.$t('notifications.Subject')
+          },
+          has_read: {
+            label: this.$t('notifications.HasRead'),
+            formatter: BooleanFormatter
+          },
+          sender: {
+            label: this.$t('notifications.Sender')
+          },
+          date_created: {
+            label: this.$t('notifications.DeliveryTime')
+          }
+        }
+      }
+    }
+  },
+  computed: {},
+  methods: {}
+}
+</script>
+
+<style lang="less" scoped>
+</style>

From 8427cb4e2247da6c10a1a4b829210a7a77d042c5 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Mon, 7 Jun 2021 10:47:57 +0800
Subject: [PATCH 23/33] =?UTF-8?q?feat(terminal):=20=E5=8D=B1=E9=99=A9?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=8F=98=E8=89=B2=20(#825)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf: 修改命令存储创建

* feat(terminal): 危险命令变色

* perf: 去掉那个标签

Co-authored-by: ibuler <ibuler@qq.com>
---
 src/views/sessions/CommandList.vue | 44 ++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index 45902b475..277627518 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -1,16 +1,16 @@
 <template>
-  <div v-loading="loading">
-    <GenericTreeListPage
-      ref="GenericTreeListPage"
-      :table-config="tableConfig"
-      :header-actions="headerActions"
-      :tree-setting="treeSetting"
-      @TreeInitFinish="checkFirstNode"
-      @TagSearch="handleTagChange"
-      @TagFilter="handleFilterChange"
-      @TagDateChange="handleDateChange"
-    />
-  </div>
+  <GenericTreeListPage
+    ref="GenericTreeListPage"
+    v-loading="loading"
+    :table-config="tableConfig"
+    :header-actions="headerActions"
+    :tree-setting="treeSetting"
+    class="command-list-table"
+    @TreeInitFinish="checkFirstNode"
+    @TagSearch="handleTagChange"
+    @TagFilter="handleFilterChange"
+    @TagDateChange="handleDateChange"
+  />
 </template>
 
 <script>
@@ -39,6 +39,14 @@ export default {
       loading: true,
       tableConfig: {
         url: '',
+        tableAttrs: {
+          rowClassName: ({ row }) => {
+            if (row.risk_level === 5) {
+              return 'risk-command'
+            }
+            return 'command'
+          }
+        },
         columns: [
           'expandCol', 'input', 'risk_level', 'user',
           'asset', 'system_user', 'session', 'timestamp'
@@ -51,7 +59,7 @@ export default {
           expandCol: {
             type: 'expand',
             prop: 'output',
-            label: '>',
+            label: '',
             formatter: OutputExpandFormatter
           },
           risk_level: {
@@ -151,7 +159,6 @@ export default {
     }
   },
   watch: {
-
   },
   methods: {
     checkFirstNode(obj) {
@@ -203,6 +210,13 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss" scoped>
+.command-list-table >>> .risk-command {
+  background-color: oldlace;
+
+  tr {
+    color: white;
+  }
+}
 
 </style>

From 15e253804e79402796442a36e4849ac4902b6262 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 7 Jun 2021 15:47:13 +0800
Subject: [PATCH 24/33] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96msg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/components/Dialog/index.vue               |   2 +-
 src/layout/components/NavHeader/Language.vue  |  18 +-
 .../components/NavHeader/SiteMessages.vue     | 212 ++++++++++++++++++
 src/layout/components/NavHeader/index.vue     |  65 +++---
 src/main.js                                   |   9 +-
 src/router/users.js                           |  23 --
 src/views/users/SiteMsg/SiteMsgDetail.vue     |  52 -----
 src/views/users/SiteMsg/SiteMsgList.vue       |  51 -----
 yarn.lock                                     |   5 +
 10 files changed, 279 insertions(+), 159 deletions(-)
 create mode 100644 src/layout/components/NavHeader/SiteMessages.vue
 delete mode 100644 src/views/users/SiteMsg/SiteMsgDetail.vue
 delete mode 100644 src/views/users/SiteMsg/SiteMsgList.vue

diff --git a/package.json b/package.json
index aa56d6b7d..f9a85af28 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "lodash.set": "^4.3.2",
     "lodash.topairs": "^4.3.0",
     "lodash.values": "^4.3.0",
+    "moment": "^2.29.1",
     "moment-parseformat": "^3.0.0",
     "normalize.css": "7.0.0",
     "npm": "^7.8.0",
diff --git a/src/components/Dialog/index.vue b/src/components/Dialog/index.vue
index 1c569f19c..99f6f8a67 100644
--- a/src/components/Dialog/index.vue
+++ b/src/components/Dialog/index.vue
@@ -74,7 +74,7 @@ export default {
   }
 
   .dialog-footer {
-    padding-right: 50px;
+    padding-right: 20px;
   }
 
 </style>
diff --git a/src/layout/components/NavHeader/Language.vue b/src/layout/components/NavHeader/Language.vue
index 945ab13af..909babeae 100644
--- a/src/layout/components/NavHeader/Language.vue
+++ b/src/layout/components/NavHeader/Language.vue
@@ -10,7 +10,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'Language',
   data() {
@@ -47,11 +46,22 @@ export default {
     }
   },
   mounted() {
-    if (this.currentLang.code !== this.$i18n.locale) {
-      this.changeLangTo(this.currentLang)
-    }
+    this.changeLang()
+    this.changeMomentLang()
   },
   methods: {
+    changeLang() {
+      if (this.currentLang.code !== this.$i18n.locale) {
+        this.changeLangTo(this.currentLang)
+      }
+    },
+    changeMomentLang() {
+      if (this.currentLang.code.indexOf('en') > -1) {
+        this.$moment.locale('en')
+      } else {
+        this.$moment.locale('zh-cn')
+      }
+    },
     changeLangTo(item) {
       this.$i18n.locale = item.code
       localStorage.setItem('lang', item.code)
diff --git a/src/layout/components/NavHeader/SiteMessages.vue b/src/layout/components/NavHeader/SiteMessages.vue
new file mode 100644
index 000000000..2671bfeab
--- /dev/null
+++ b/src/layout/components/NavHeader/SiteMessages.vue
@@ -0,0 +1,212 @@
+<template>
+  <div>
+    <el-badge :value="10" :max="99" size="mini" type="primary">
+      <a style="color: #606266 !important; width: 30px" @click="toggleDrawer">
+        <i class="el-icon-message" style="font-size: 18px" />
+      </a>
+    </el-badge>
+    <el-drawer
+      :visible.sync="show"
+      :before-close="handleClose"
+      :modal="false"
+      title="站内信"
+      custom-class="site-msg"
+      size="25%"
+      @open="getMessages"
+    >
+      <div class="msg-list">
+        <div
+          v-for="msg of messages"
+          :key="msg.id"
+          class="msg-item"
+          @mouseover="hoverMsgId = msg.id"
+          @mouseleave="hoverMsgId = ''"
+          @click="showMsgDetail(msg)"
+        >
+          <div class="msg-item-head">
+            <span class="msg-item-head-type">{{ msg.subject }}</span>
+            <span v-if="hoverMsgId !== msg.id" class="msg-item-head-time">
+              {{ formatDate(msg.date_created) }}
+            </span>
+            <div v-else class="msg-item-read-btn" @click.stop="markAsRead">
+              <a>标记已读</a>
+            </div>
+          </div>
+          <div class="msg-item-txt">
+            {{ msg.message }}
+          </div>
+        </div>
+      </div>
+    </el-drawer>
+
+    <Dialog
+      v-if="msgDetailVisible"
+      :visible.sync="msgDetailVisible"
+      :title="''"
+      :close-on-click-modal="false"
+      :confirm-title="'标为已读'"
+      @confirm="markAsRead(currentMsg)"
+      @cancel="cancelRead"
+    >
+      <div class="msg-detail">
+        <div class="msg-detail-head">
+          <h3>{{ currentMsg.subject }}</h3>
+          <h5>
+            <span class="msg-detail-time">{{ formatDate(currentMsg.date_created) }}</span>
+          </h5>
+        </div>
+        <div class="msg-detail-txt">
+          {{ currentMsg.message }}
+        </div>
+      </div>
+    </Dialog>
+  </div>
+</template>
+
+<script>
+import { toSafeLocalDateStr } from '@/utils/common'
+import Dialog from '@/components/Dialog'
+
+export default {
+  name: 'SiteMessages',
+  components: { Dialog },
+  data() {
+    return {
+      show: false,
+      messages: [],
+      hoverMsgId: '',
+      msgDetailVisible: false,
+      currentMsg: null
+    }
+  },
+  methods: {
+    handleClose() {
+      this.show = false
+    },
+    toggleDrawer() {
+      this.show = !this.show
+    },
+    showMsgDetail(msg) {
+      this.currentMsg = msg
+      this.msgDetailVisible = true
+    },
+    getMessages() {
+      const url = '/api/v1/notifications/site-message/?offset=0&limit=15'
+      this.$axios.get(url).then(resp => {
+        this.messages = [...resp.results]
+      })
+    },
+    formatDate(s) {
+      if (!s) {
+        return ''
+      }
+      const d = new Date(s)
+      const now = new Date()
+      if (now.getTime() - d.getTime() > (3600 * 24 * 7) * 1000) {
+        return toSafeLocalDateStr(s)
+      } else {
+        return this.$moment(d).fromNow()
+      }
+    },
+    markAsRead(msg) {
+      // Todo: 调用api，标记为已读
+      this.msgDetailVisible = false
+      this.getMessages()
+    },
+    cancelRead() {
+      this.msgDetailVisible = false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.el-badge ::v-deep .el-badge__content.is-fixed{
+  top:10px;
+}
+
+.msg-list {
+  padding: 0 20px 20px;
+}
+
+>>> .site-msg .el-drawer__header {
+  border-bottom: solid 1px rgb(231, 234, 239);
+  margin-bottom: 0;
+  padding-top: 10px;
+  font-size: 16px;
+}
+
+>>> .site-msg {
+  margin-top: 50px;
+}
+
+.msg-item {
+  border-bottom: solid 1px rgb(231, 234, 239);
+  padding: 15px 0 10px;
+  position: relative;
+  border-bottom: 1px solid #ddd;
+  cursor: pointer;
+
+  &:hover {
+    background-color: #f2f2f2;
+    padding: 15px 20px 10px;
+    margin: 0 -20px;
+    border-bottom: 1px solid #fff;
+  }
+}
+
+.msg-item-head {
+  line-height: 20px;
+  color: #888;
+  font-size: 12px;
+  &:after {
+    clear: both;
+    content: ".";
+    display: block;
+    height: 0;
+    overflow: hidden;
+  }
+
+  .msg-item-head-type {
+    float: left;
+    width: 120px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: middle;
+    white-space: nowrap;
+  }
+  .msg-item-head-time {
+    float: right;
+  }
+  .msg-item-read-btn {
+    float: right;
+  }
+}
+
+.msg-item-txt {
+  overflow: hidden;
+  color: #000;
+  padding: 4px 0 0;
+  line-height: 21px;
+  max-height: 21px;
+  display: -webkit-box;
+  font-size: 12px;
+  display: block;
+}
+
+.msg-detail {
+  padding-left: 20px;
+
+  .msg-detail-time {
+    font-weight: 400;
+    font-size: 12px;
+    line-height: 1.1;
+  }
+
+  .msg-detail-txt {
+    margin-bottom: 20px;
+    line-height: 25px;
+  }
+}
+
+</style>
diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue
index 8a490108c..04182ca2c 100644
--- a/src/layout/components/NavHeader/index.vue
+++ b/src/layout/components/NavHeader/index.vue
@@ -3,30 +3,26 @@
     <div class="navbar-header">
       <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
     </div>
-    <div class="navbar-right">
-      <div class="header-item">
+    <ul class="navbar-right">
+      <li class="header-item header-icon">
+        <SiteMessages />
+      </li>
+      <li class="header-item" style="margin-left: 10px">
         <Help />
-      </div>
-      <div class="header-item">
+      </li>
+      <li class="header-item">
         <Language />
-      </div>
-      <div
-        v-if="
-          publicSettings.TICKETS_ENABLED
-            && publicSettings.XPACK_LICENSE_IS_VALID
-            && !isOrgAuditor
-        "
-        class="header-item"
-      >
+      </li>
+      <li v-if="showTickets" class="header-item">
         <Tickets />
-      </div>
-      <div class="header-item">
+      </li>
+      <li class="header-item">
         <WebTerminal />
-      </div>
-      <div class="header-item header-profile">
+      </li>
+      <li class="header-item header-profile">
         <AccountDropdown />
-      </div>
-    </div>
+      </li>
+    </ul>
   </div>
 </template>
 
@@ -34,6 +30,7 @@
 import { mapGetters } from 'vuex'
 import Hamburger from '@/components/Hamburger'
 import AccountDropdown from './AccountDropdown'
+import SiteMessages from './SiteMessages'
 import Help from './Help'
 import Language from './Language'
 import WebTerminal from './WebTerminal'
@@ -48,7 +45,8 @@ export default {
     Language,
     Help,
     Tickets,
-    WebTerminal
+    WebTerminal,
+    SiteMessages
   },
   data() {
     return {
@@ -60,13 +58,17 @@ export default {
     ]),
     isOrgAuditor() {
       return rolc.getRolesDisplay(this.currentOrgRoles).includes('OrgAuditor') || rolc.getRolesDisplay(this.currentOrgRoles).includes('Auditor')
+    },
+    showTickets() {
+      return this.publicSettings.TICKETS_ENABLED &&
+        this.publicSettings.XPACK_LICENSE_IS_VALID &&
+        !this.isOrgAuditor
     }
   },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     }
-
   }
 }
 </script>
@@ -91,12 +93,19 @@ export default {
     .navbar-right {
       float: right;
       margin-right: 10px;
-    }
 
-    .header-item {
-      line-height: 50px;
-      display: inline-block;
-      padding-right: 20px;
+      .header-item {
+        line-height: 50px;
+        display: inline-block;
+        padding-right: 10px;
+        padding-left: 10px;
+      }
+
+      .header-icon {
+        &:hover {
+          background-color: #e6e6e6;
+        }
+      }
     }
 
     .breadcrumb-container {
@@ -108,5 +117,9 @@ export default {
   .el-header {
     background-color: #ffffff;
   }
+
+  ul {
+    margin: 0;
+  }
 </style>
 
diff --git a/src/main.js b/src/main.js
index b77c4340e..9919009ca 100644
--- a/src/main.js
+++ b/src/main.js
@@ -40,8 +40,13 @@ Vue.config.productionTip = false
 import VueCookie from 'vue-cookie'
 Vue.use(VueCookie)
 window.$cookie = VueCookie
-import VueMoment from 'vue-moment'
-Vue.use(VueMoment)
+
+const moment = require('moment')
+require('moment/locale/zh-cn')
+Vue.use(require('vue-moment'), {
+  moment
+})
+
 // logger
 import VueLogger from 'vuejs-logger'
 import loggerOptions from './utils/logger'
diff --git a/src/router/users.js b/src/router/users.js
index 464a73d34..1d087c004 100644
--- a/src/router/users.js
+++ b/src/router/users.js
@@ -91,28 +91,5 @@ export default [
         hidden: true
       }
     ]
-  },
-  {
-    path: 'site-msg',
-    component: empty,
-    redirect: '',
-    meta: { title: i18n.t('route.SiteMessage') },
-    hidden: true,
-    children: [
-      {
-        path: '',
-        name: 'SiteMessageList',
-        component: () => import('@/views/users/SiteMsg/SiteMsgList'),
-        meta: { title: i18n.t('route.SiteMessageList'), activeMenu: '/users/users' },
-        hidden: true
-      },
-      {
-        path: ':id',
-        name: 'SiteMessageDetail',
-        component: () => import('@/views/users/SiteMsg/SiteMsgDetail'),
-        meta: { title: i18n.t('route.SiteMessageDetail'), activeMenu: '/users/users' },
-        hidden: true
-      }
-    ]
   }
 ]
diff --git a/src/views/users/SiteMsg/SiteMsgDetail.vue b/src/views/users/SiteMsg/SiteMsgDetail.vue
deleted file mode 100644
index b1e4861e3..000000000
--- a/src/views/users/SiteMsg/SiteMsgDetail.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-  <DetailCard :items="message" :title="subject" />
-</template>
-
-<script>
-import DetailCard from '@/components/DetailCard'
-
-export default {
-  components: {
-    DetailCard
-  },
-  data() {
-    return {
-      subject: '',
-      message: []
-    }
-  },
-  computed: {},
-  mounted() {
-    this.$axios.get(`/api/v1/notifications/site-message/${this.$route.params.id}`).then(res => {
-      this.subject = res.subject
-      this.message = [
-        {
-          key: this.$t('notifications.Sender'),
-          value: res.sender
-        },
-        {
-          key: this.$t('notifications.DeliveryTime'),
-          value: res.date_created
-        },
-        {
-          key: this.$t('notifications.Message'),
-          value: res.message
-        }
-      ]
-      this.mark_as_read([res.id])
-    }).catch(err => {
-      console.error(err)
-    })
-  },
-  methods: {
-    mark_as_read: function(msgIds) {
-      this.$axios.patch('/api/v1/notifications/site-message/mark_as_read/', { ids: msgIds }).catch(err => {
-        console.error(err)
-      })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-</style>
diff --git a/src/views/users/SiteMsg/SiteMsgList.vue b/src/views/users/SiteMsg/SiteMsgList.vue
deleted file mode 100644
index c6878efd1..000000000
--- a/src/views/users/SiteMsg/SiteMsgList.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-  <GenericListPage
-    ref="GenericListPage"
-    :table-config="tableConfig"
-  />
-</template>
-
-<script>
-import { GenericListPage } from '@/layout/components'
-import { DetailFormatter, BooleanFormatter } from '@/components/TableFormatters'
-
-export default {
-  components: {
-    GenericListPage
-  },
-  data() {
-    return {
-      tableConfig: {
-        url: '/api/v1/notifications/site-message/',
-        columns: [
-          'subject', 'has_read', 'sender', 'date_created'
-        ],
-        columnsMeta: {
-          subject: {
-            formatter: DetailFormatter,
-            formatterArgs: {
-              route: 'SiteMessageDetail'
-            },
-            label: this.$t('notifications.Subject')
-          },
-          has_read: {
-            label: this.$t('notifications.HasRead'),
-            formatter: BooleanFormatter
-          },
-          sender: {
-            label: this.$t('notifications.Sender')
-          },
-          date_created: {
-            label: this.$t('notifications.DeliveryTime')
-          }
-        }
-      }
-    }
-  },
-  computed: {},
-  methods: {}
-}
-</script>
-
-<style lang="less" scoped>
-</style>
diff --git a/yarn.lock b/yarn.lock
index 79c785e4c..638f3db30 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7324,6 +7324,11 @@ moment@^2.19.2:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.26.0.tgz#5e1f82c6bafca6e83e808b30c8705eed0dcbd39a"
   integrity sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==
 
+moment@^2.29.1:
+  version "2.29.1"
+  resolved "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz?cache=0&sync_timestamp=1601983320283&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmoment%2Fdownload%2Fmoment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M=
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"

From 96b002eccbfae385465049a9d69f315f340e9032 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Mon, 7 Jun 2021 17:09:10 +0800
Subject: [PATCH 25/33] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E5=B7=B2=E8=AF=BB=E4=B8=8Ewebsockt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NavHeader/SiteMessages.vue     | 43 ++++++++++++++++---
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/layout/components/NavHeader/SiteMessages.vue b/src/layout/components/NavHeader/SiteMessages.vue
index 2671bfeab..362311cc8 100644
--- a/src/layout/components/NavHeader/SiteMessages.vue
+++ b/src/layout/components/NavHeader/SiteMessages.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-badge :value="10" :max="99" size="mini" type="primary">
+    <el-badge :value="unread_msg_count" :max="99" size="mini" type="primary">
       <a style="color: #606266 !important; width: 30px" @click="toggleDrawer">
         <i class="el-icon-message" style="font-size: 18px" />
       </a>
@@ -28,7 +28,7 @@
             <span v-if="hoverMsgId !== msg.id" class="msg-item-head-time">
               {{ formatDate(msg.date_created) }}
             </span>
-            <div v-else class="msg-item-read-btn" @click.stop="markAsRead">
+            <div v-else class="msg-item-read-btn" @click.stop="markAsRead(msg)">
               <a>标记已读</a>
             </div>
           </div>
@@ -76,9 +76,13 @@ export default {
       messages: [],
       hoverMsgId: '',
       msgDetailVisible: false,
-      currentMsg: null
+      currentMsg: null,
+      unread_msg_count: 10
     }
   },
+  mounted() {
+    this.enableWS()
+  },
   methods: {
     handleClose() {
       this.show = false
@@ -91,9 +95,10 @@ export default {
       this.msgDetailVisible = true
     },
     getMessages() {
-      const url = '/api/v1/notifications/site-message/?offset=0&limit=15'
+      const url = '/api/v1/notifications/site-message/?offset=0&limit=15&has_read=false'
       this.$axios.get(url).then(resp => {
         this.messages = [...resp.results]
+        this.unread_msg_count = resp.count
       })
     },
     formatDate(s) {
@@ -109,12 +114,36 @@ export default {
       }
     },
     markAsRead(msg) {
-      // Todo: 调用api，标记为已读
-      this.msgDetailVisible = false
-      this.getMessages()
+      console.log(`${msg}`)
+      const url = `/api/v1/notifications/site-message/mark_as_read/`
+      this.$axios.patch(url, { ids: [msg.id] }).then(res => {
+        this.msgDetailVisible = false
+        this.getMessages()
+      }).catch(err => {
+        this.$message(err.detail)
+      })
     },
     cancelRead() {
       this.msgDetailVisible = false
+    },
+    enableWS() {
+      const scheme = document.location.protocol === 'https:' ? 'wss' : 'ws'
+      const port = document.location.port ? ':' + document.location.port : ''
+      const url = '/ws/notifications/site-msg/unread-count/'
+      const wsURL = scheme + '://' + document.location.hostname + port + url
+      this.ws = new WebSocket(wsURL)
+      this.ws.onerror = (e) => {
+        this.$messages('Connect websocket server error')
+      }
+      this.ws.onmessage = (e) => {
+        console.log(e.data)
+        const data = JSON.parse(e.data)
+        this.unread_msg_count = data.unread_count
+      }
+      this.ws.onopen = (e) => {
+        const msg = { 'refresh_every_seconds': 5 }
+        this.ws.send(JSON.stringify(msg))
+      }
     }
   }
 }

From b4fd09e30842c084529a4ed0a3daf9f02dff1aae Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Mon, 7 Jun 2021 19:40:22 +0800
Subject: [PATCH 26/33] =?UTF-8?q?=E5=8E=BB=E6=8E=89websocket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NavHeader/SiteMessages.vue     | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/layout/components/NavHeader/SiteMessages.vue b/src/layout/components/NavHeader/SiteMessages.vue
index 362311cc8..6d31b346e 100644
--- a/src/layout/components/NavHeader/SiteMessages.vue
+++ b/src/layout/components/NavHeader/SiteMessages.vue
@@ -81,7 +81,7 @@ export default {
     }
   },
   mounted() {
-    this.enableWS()
+    this.enablePullMsgCount()
   },
   methods: {
     handleClose() {
@@ -115,7 +115,7 @@ export default {
     },
     markAsRead(msg) {
       console.log(`${msg}`)
-      const url = `/api/v1/notifications/site-message/mark_as_read/`
+      const url = `/api/v1/notifications/site-message/mark-as-read/`
       this.$axios.patch(url, { ids: [msg.id] }).then(res => {
         this.msgDetailVisible = false
         this.getMessages()
@@ -126,24 +126,19 @@ export default {
     cancelRead() {
       this.msgDetailVisible = false
     },
-    enableWS() {
-      const scheme = document.location.protocol === 'https:' ? 'wss' : 'ws'
-      const port = document.location.port ? ':' + document.location.port : ''
-      const url = '/ws/notifications/site-msg/unread-count/'
-      const wsURL = scheme + '://' + document.location.hostname + port + url
-      this.ws = new WebSocket(wsURL)
-      this.ws.onerror = (e) => {
-        this.$messages('Connect websocket server error')
-      }
-      this.ws.onmessage = (e) => {
-        console.log(e.data)
-        const data = JSON.parse(e.data)
-        this.unread_msg_count = data.unread_count
-      }
-      this.ws.onopen = (e) => {
-        const msg = { 'refresh_every_seconds': 5 }
-        this.ws.send(JSON.stringify(msg))
-      }
+    pullMsgCount() {
+      const url = '/api/v1/notifications/site-message/unread-total/'
+      this.$axios.get(url).then(res => {
+        this.unread_msg_count = res.total
+      }).catch(err => {
+        this.$message(err.detail)
+      })
+    },
+    enablePullMsgCount() {
+      this.pullMsgCount()
+      setInterval(() => {
+        this.pullMsgCount()
+      }, 10000)
     }
   }
 }

From 1b3f5403dd2134cb9e522ca338215ecad5f87619 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 7 Jun 2021 20:05:36 +0800
Subject: [PATCH 27/33] =?UTF-8?q?perf:=20=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json                        |  5 +++-
 src/i18n/langs/en.json                        |  5 +++-
 .../components/NavHeader/SiteMessages.vue     | 25 +++++++++++++------
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 2e4a500cc..fd7ba853e 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -1037,7 +1037,10 @@
     "Message": "消息",
     "DeliveryTime": "发送时间",
     "HasRead": "是否已读",
-    "Sender": "发送人"
+    "Sender": "发送人",
+    "MarkAsRead": "标记已读",
+    "NoUnreadMsg": "暂无未读消息",
+    "SiteMessage": "站内信"
   },
   "xpack": {
     "Admin": "管理员",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index af48c7642..ac98b1d22 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -1031,7 +1031,10 @@
     "Message": "Message",
     "DeliveryTime": "Delivery time",
     "HasRead": "Has read",
-    "Sender": "Sender"
+    "Sender": "Sender",
+    "MarkAsRead": "Mark as read",
+    "NoUnreadMsg": "No unread messages",
+    "SiteMessage": "Site messages"
   },
   "xpack": {
     "Admin": "Admin",
diff --git a/src/layout/components/NavHeader/SiteMessages.vue b/src/layout/components/NavHeader/SiteMessages.vue
index 6d31b346e..49d62376a 100644
--- a/src/layout/components/NavHeader/SiteMessages.vue
+++ b/src/layout/components/NavHeader/SiteMessages.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-badge :value="unread_msg_count" :max="99" size="mini" type="primary">
+    <el-badge :value="unreadMsgCount" :hidden="unreadMsgCount === 0" :max="99" size="mini" type="primary">
       <a style="color: #606266 !important; width: 30px" @click="toggleDrawer">
         <i class="el-icon-message" style="font-size: 18px" />
       </a>
@@ -9,12 +9,12 @@
       :visible.sync="show"
       :before-close="handleClose"
       :modal="false"
-      title="站内信"
+      :title="$t('notifications.SiteMessage')"
       custom-class="site-msg"
       size="25%"
       @open="getMessages"
     >
-      <div class="msg-list">
+      <div v-if="unreadMsgCount !== 0" class="msg-list">
         <div
           v-for="msg of messages"
           :key="msg.id"
@@ -29,7 +29,7 @@
               {{ formatDate(msg.date_created) }}
             </span>
             <div v-else class="msg-item-read-btn" @click.stop="markAsRead(msg)">
-              <a>标记已读</a>
+              <a>{{ $t('notifications.MarkAsRead') }}</a>
             </div>
           </div>
           <div class="msg-item-txt">
@@ -37,6 +37,9 @@
           </div>
         </div>
       </div>
+      <div v-else class="no-msg">
+        {{ $t('notifications.NoUnreadMsg') }}
+      </div>
     </el-drawer>
 
     <Dialog
@@ -44,7 +47,7 @@
       :visible.sync="msgDetailVisible"
       :title="''"
       :close-on-click-modal="false"
-      :confirm-title="'标为已读'"
+      :confirm-title="$t('notifications.MarkAsRead')"
       @confirm="markAsRead(currentMsg)"
       @cancel="cancelRead"
     >
@@ -77,7 +80,7 @@ export default {
       hoverMsgId: '',
       msgDetailVisible: false,
       currentMsg: null,
-      unread_msg_count: 10
+      unreadMsgCount: 0
     }
   },
   mounted() {
@@ -98,7 +101,7 @@ export default {
       const url = '/api/v1/notifications/site-message/?offset=0&limit=15&has_read=false'
       this.$axios.get(url).then(resp => {
         this.messages = [...resp.results]
-        this.unread_msg_count = resp.count
+        this.unreadMsgCount = resp.count
       })
     },
     formatDate(s) {
@@ -129,7 +132,7 @@ export default {
     pullMsgCount() {
       const url = '/api/v1/notifications/site-message/unread-total/'
       this.$axios.get(url).then(res => {
-        this.unread_msg_count = res.total
+        this.unreadMsgCount = res.total
       }).catch(err => {
         this.$message(err.detail)
       })
@@ -233,4 +236,10 @@ export default {
   }
 }
 
+.no-msg {
+  padding-top: 20px;
+  text-align: center;
+}
+
+>>> :focus{ outline:0; }
 </style>

From 49e2c547e70d1a389425d7e0a7cb1346703dcd0e Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Tue, 8 Jun 2021 11:28:48 +0800
Subject: [PATCH 28/33] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AssetUserTable/index.vue       |   5 +-
 src/router/accounts.js                        |   7 -
 .../ApplicationAccountList.vue                | 151 +++++++++++++++---
 .../AssetAccount/AssetAccountCreate.vue       |  60 -------
 .../AssetAccount/AssetAccountList.vue         |  64 ++++----
 .../GatheredUser/GatheredUserList.vue         |  43 +++--
 6 files changed, 186 insertions(+), 144 deletions(-)
 delete mode 100644 src/views/accounts/AssetAccount/AssetAccountCreate.vue

diff --git a/src/components/AssetUserTable/index.vue b/src/components/AssetUserTable/index.vue
index ce9e1b072..5ab436116 100644
--- a/src/components/AssetUserTable/index.vue
+++ b/src/components/AssetUserTable/index.vue
@@ -257,7 +257,10 @@ export default {
       return !(this.MFAVerifyAt && (now - this.MFAVerifyAt) < ttl * 1000)
     },
     iTableConfig() {
-      return Object.assign(this.defaultTableConfig, this.tableConfig)
+      const columnsMeta = Object.assign({}, this.defaultTableConfig.columnsMeta, this.tableConfig.columnsMeta || {})
+      const config = Object.assign(this.defaultTableConfig, this.tableConfig)
+      config.columnsMeta = columnsMeta
+      return config
     }
   },
   watch: {
diff --git a/src/router/accounts.js b/src/router/accounts.js
index cf7671607..01b20ccb1 100644
--- a/src/router/accounts.js
+++ b/src/router/accounts.js
@@ -11,13 +11,6 @@ export default [
         name: 'AssetAccountList',
         component: () => import('@/views/accounts/AssetAccount/AssetAccountList'),
         meta: { title: i18n.t('route.AssetAccount') }
-      },
-      {
-        path: 'create',
-        component: () => import('@/views/accounts/AssetAccount/AssetAccountCreate'),
-        name: 'AssetAccountCreate',
-        meta: { title: i18n.t('common.Create'), activeMenu: '/accounts/asset-accounts/' },
-        hidden: true
       }
     ]
   },
diff --git a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
index 0f37ec116..27f5a80ca 100644
--- a/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
+++ b/src/views/accounts/ApplicationAccount/ApplicationAccountList.vue
@@ -1,7 +1,7 @@
 <template>
   <Page>
     <el-row>
-      <el-col :span="14">
+      <el-col :span="11">
         <GenericListTable
           ref="LeftTable"
           class="application-table"
@@ -10,7 +10,7 @@
           @row-click="leftTable.tableConfig.rowClick"
         />
       </el-col>
-      <el-col :span="10">
+      <el-col :span="13">
         <GenericListTable
           ref="RightTable"
           class="application-user-table"
@@ -19,29 +19,66 @@
         />
       </el-col>
     </el-row>
+    <Dialog v-if="showMFADialog" width="50" :title="this.$t('common.MFAConfirm')" :visible.sync="showMFADialog" :show-confirm="false" :show-cancel="false" :destroy-on-close="true">
+      <div v-if="MFAConfirmed">
+        <el-form label-position="right" label-width="80px" :model="MFAInfo">
+          <el-form-item :label="this.$t('assets.Applications')">
+            <el-input v-model="MFAInfo.application" disabled />
+          </el-form-item>
+          <el-form-item :label="this.$t('assets.Username')">
+            <el-input v-model="MFAInfo.username" disabled />
+          </el-form-item>
+          <el-form-item :label="this.$t('assets.Password')">
+            <el-input v-model="MFAInfo.password" type="password" show-password />
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-row v-else :gutter="20">
+        <el-col :span="4">
+          <div style="line-height: 34px;text-align: center">MFA</div>
+        </el-col>
+        <el-col :span="14">
+          <el-input v-model="MFAInput" />
+          <span class="help-tips help-block">{{ $t('common.MFARequireForSecurity') }}</span>
+        </el-col>
+        <el-col :span="4">
+          <el-button size="mini" type="primary" style="line-height:20px " @click="MFAConfirm">{{ this.$t('common.Confirm') }}</el-button>
+        </el-col>
+      </el-row>
+    </Dialog>
   </Page>
 </template>
 
 <script>
 import Page from '@/layout/components/Page'
 import GenericListTable from '@/layout/components/GenericListTable'
-import { DetailFormatter } from '@/components/TableFormatters'
+import { ActionsFormatter, DetailFormatter } from '@/components/TableFormatters'
+import Dialog from '@/components/Dialog'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'AssetAccountList',
   components: {
-    GenericListTable, Page
+    GenericListTable, Page, Dialog
   },
   data() {
     const vm = this
     return {
+      showMFADialog: false,
+      MFAConfirmed: false,
+      MFAInput: '',
+      MFAInfo: {
+        systemUser: '',
+        application: '',
+        username: '',
+        password: ''
+      },
       clickedRow: {},
       leftTable: {
         tableConfig: {
           url: '/api/v1/applications/applications/',
           columns: [
-            'name', 'category_display', 'type_display', 'created_by', 'date_created', 'date_updated',
-            'comment', 'org_name'
+            'name', 'category_display', 'type_display', 'comment'
           ],
           columnsShow: {
             min: ['name'],
@@ -57,7 +94,8 @@ export default {
                   }[row.category]
                 }
               },
-              showOverflowTooltip: true
+              showOverflowTooltip: true,
+              sortable: false
             }
           },
           tableAttrs: {
@@ -75,6 +113,7 @@ export default {
           rowClick: function(row, column, event) {
             vm.rightTable.tableConfig.url = `/api/v1/applications/application-users/?application_id=${row.id}`
             vm.clickedRow = row
+            vm.MFAInfo.application = row.name
           }
         },
         headerActions: {
@@ -90,9 +129,7 @@ export default {
         tableConfig: {
           url: `/api/v1/applications/application-users/?application_id=`,
           columns: [
-            'name', 'username', 'username_same_with_user', 'protocol', 'login_mode',
-            'assets_amount', 'priority',
-            'created_by', 'date_created', 'date_updated', 'comment', 'org_name', 'actions'
+            'name', 'username', 'username_same_with_user', 'protocol', 'login_mode', 'priority', 'comment', 'actions'
           ],
           columnsShow: {
             min: ['name', 'username', 'actions'],
@@ -104,26 +141,56 @@ export default {
               formatterArgs: {
                 route: 'SystemUserDetail'
               },
-              showOverflowTooltip: true
+              showOverflowTooltip: true,
+              sortable: false
+            },
+            protocol: {
+              sortable: false
+            },
+            login_mode: {
+              sortable: false
             },
             actions: {
+              label: this.$t('common.Action'),
+              align: 'center',
+              width: 150,
+              formatter: ActionsFormatter,
               formatterArgs: {
-                hasUpdate: true, // can set function(row, value)
+                hasUpdate: false, // can set function(row, value)
                 hasDelete: false, // can set function(row, value)
                 hasClone: false,
-                onUpdate({ row, col }) {
-                  vm.$router.push({ name: 'SystemUserUpdate', params: { id: row.id }, query: { protocol: row.protocol }})
-                }
+                moreActionsTitle: this.$t('common.More'),
+                extraActions: [
+                  {
+                    name: 'View',
+                    title: this.$t('common.View'),
+                    type: 'primary',
+                    callback: function(val) {
+                      this.MFAInfo.systemUser = val.row
+                      if (!this.needMFAVerify) {
+                        this.showMFADialog = true
+                        this.MFAConfirmed = true
+                        this.$axios.get(`/api/v1/assets/system-users/${this.MFAInfo.systemUser.id}/auth-info/`).then(res => {
+                          this.MFAConfirmed = true
+                          this.MFAInfo.username = res.username
+                          this.MFAInfo.password = res.password
+                        })
+                      } else {
+                        this.showMFADialog = true
+                      }
+                    }.bind(this)
+                  }
+                ]
+              }
+            },
+            tableAttrs: {
+              stripe: false, // 斑马纹表格
+              border: true, // 表格边框
+              fit: true, // 宽度自适应,
+              tooltipEffect: 'dark',
+              rowClassName({ row, rowIndex }) {
+                return 'row-background-color'
               }
-            }
-          },
-          tableAttrs: {
-            stripe: false, // 斑马纹表格
-            border: true, // 表格边框
-            fit: true, // 宽度自适应,
-            tooltipEffect: 'dark',
-            rowClassName({ row, rowIndex }) {
-              return 'row-background-color'
             }
           }
         },
@@ -133,6 +200,42 @@ export default {
         }
       }
     }
+  },
+  computed: {
+    ...mapGetters([
+      'MFA_TTl',
+      'MFAVerifyAt',
+      'publicSettings'
+    ]),
+    needMFAVerify() {
+      if (!this.publicSettings.SECURITY_VIEW_AUTH_NEED_MFA) {
+        return false
+      }
+      const ttl = this.publicSettings.SECURITY_MFA_VERIFY_TTL
+      const now = new Date()
+      return !(this.MFAVerifyAt && (now - this.MFAVerifyAt) < ttl * 1000)
+    }
+  },
+  methods: {
+    MFAConfirm() {
+      if (this.MFAInput.length !== 6) {
+        return this.$message.error(this.$t('common.MFAErrorMsg'))
+      }
+      this.$axios.post(
+        `/api/v1/authentication/otp/verify/`, {
+          code: this.MFAInput
+        }
+      ).then(
+        res => {
+          this.$store.dispatch('users/setMFAVerify')
+          this.$axios.get(`/api/v1/assets/system-users/${this.MFAInfo.systemUser.id}/auth-info/`).then(res => {
+            this.MFAConfirmed = true
+            this.MFAInfo.username = res.username
+            this.MFAInfo.password = res.password
+          })
+        }
+      )
+    }
   }
 }
 </script>
diff --git a/src/views/accounts/AssetAccount/AssetAccountCreate.vue b/src/views/accounts/AssetAccount/AssetAccountCreate.vue
deleted file mode 100644
index 23fb8f9d7..000000000
--- a/src/views/accounts/AssetAccount/AssetAccountCreate.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <GenericCreateUpdatePage :fields="fields" :initial="initial" :fields-meta="fieldsMeta" :url="url" />
-</template>
-
-<script>
-import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
-import { UploadKey, Select2 } from '@/components'
-export default {
-  name: 'VaultCreate',
-  components: {
-    GenericCreateUpdatePage
-  },
-  data() {
-    return {
-      url: '/api/v1/assets/asset-users/',
-      initial: {
-
-      },
-      fields: [
-        [this.$t('common.Basic'), ['asset', 'username', 'password', 'private_key', 'comment']]
-      ],
-      fieldsMeta: {
-        asset: {
-          label: this.$t('perms.Asset'),
-          component: Select2,
-          el: {
-            multiple: false,
-            ajax: {
-              url: '/api/v1/assets/assets/',
-              transformOption: (item) => {
-                return { label: `${item.hostname}(${item.ip})`, value: item.id }
-              }
-            }
-          }
-        },
-        name: {
-          el: {
-            placeholder: this.$t('common.Name')
-          }
-        },
-        username: {
-          el: {
-            placeholder: this.$t('common.Username')
-          }
-        },
-        password: {
-          helpText: this.$t('common.passwordOrPassphrase')
-        },
-        private_key: {
-          component: UploadKey
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style>
-
-</style>
diff --git a/src/views/accounts/AssetAccount/AssetAccountList.vue b/src/views/accounts/AssetAccount/AssetAccountList.vue
index 1270b179e..55e938c9a 100644
--- a/src/views/accounts/AssetAccount/AssetAccountList.vue
+++ b/src/views/accounts/AssetAccount/AssetAccountList.vue
@@ -7,10 +7,11 @@
           :setting="treeSetting"
         />
       </el-col>
-      <el-col :span="iShowTree?12:14">
+      <el-col :span="iShowTree?9:11">
         <div class="mini">
           <div style="display:block" class="mini-button" @click="iShowTree=!iShowTree">
-            <i v-show="iShowTree" class="fa fa-angle-left fa-x" /><i v-show="!iShowTree" class="fa fa-angle-right fa-x" />
+            <i v-show="iShowTree" class="fa fa-angle-left fa-x" />
+            <i v-show="!iShowTree" class="fa fa-angle-right fa-x" />
           </div>
         </div>
         <GenericListTable
@@ -21,12 +22,12 @@
           @row-click="leftTable.tableConfig.rowClick"
         />
       </el-col>
-      <el-col :span="iShowTree?8:10">
+      <el-col :span="iShowTree?11:13">
         <AssetUserTable
           ref="RightTable"
           class="asset-user-table"
           :url="rightTable.url"
-          :has-left-actions="true"
+          :has-left-actions="rightTable.hasLeftActions"
           :table-config="rightTable.tableConfig"
           :has-clone="false"
           :has-import="false"
@@ -41,7 +42,7 @@ import Page from '@/layout/components/Page'
 import GenericListTable from '@/layout/components/GenericListTable'
 import AutoDataZTree from '@/components/AutoDataZTree/index'
 import { AssetUserTable } from '@/components'
-import { ChoicesFormatter, DetailFormatter } from '@/components/TableFormatters'
+import { DetailFormatter } from '@/components/TableFormatters'
 
 export default {
   name: 'AssetAccountList',
@@ -69,13 +70,11 @@ export default {
         tableConfig: {
           url: '/api/v1/assets/assets/',
           columns: [
-            'hostname', 'ip', 'public_ip', 'admin_user_display',
-            'protocols', 'platform', 'connectivity',
-            'created_by', 'date_created', 'comment', 'org_name'
+            'hostname', 'ip', 'protocols', 'platform', 'comment'
           ],
           columnsShow: {
-            min: ['hostname', 'ip', 'platform'],
-            default: ['hostname', 'ip', 'connectivity', 'platform']
+            min: ['hostname', 'ip'],
+            default: ['hostname', 'ip', 'platform']
           },
           columnsMeta: {
             hostname: {
@@ -88,25 +87,8 @@ export default {
               },
               showOverflowTooltip: true
             },
-            connectivity: {
-              label: this.$t('assets.Reachable'),
-              formatter: ChoicesFormatter,
-              formatterArgs: {
-                iconChoices: {
-                  0: 'fa-times text-danger',
-                  1: 'fa-check text-primary',
-                  2: 'fa-circle text-warning'
-                },
-                typeChange: function(val) {
-                  if (!val) {
-                    return 2
-                  }
-                  return val.status
-                },
-                hasTips: true
-              },
-              width: '90px',
-              align: 'center'
+            ip: {
+              showOverflowTooltip: true
             }
           },
           tableAttrs: {
@@ -127,18 +109,20 @@ export default {
           }
         },
         headerActions: {
-          hasLeftActions: true,
+          hasLeftActions: false,
           hasCreate: false,
           hasExport: false,
           hasImport: false,
           hasBulkDelete: false,
+          hasColumnSetting: true,
+          hasRefresh: true,
           hasBulkUpdate: false
         }
       },
       rightTable: {
         url: `/api/v1/assets/asset-users/?hostname=ShowFirstAssetRelated&latest=1`,
         tableConfig: {
-          columns: ['name', 'username', 'version', 'backend', 'backend_display', 'date_created', 'actions'],
+          columns: ['name', 'username', 'version', 'backend_display', 'date_created', 'actions'],
           columnsShow: {
             min: ['username', 'actions'],
             default: ['name', 'username', 'version', 'backend_display', 'date_created', 'actions']
@@ -146,11 +130,12 @@ export default {
           columnsMeta: {
             name: {
               formatter: null,
-              showOverflowTooltip: true
+              showOverflowTooltip: true,
+              sortable: false
             }
           },
           tableAttrs: {
-            stripe: false, // 斑马纹表格
+            stripe: true, // 斑马纹表格
             border: true, // 表格边框
             fit: true, // 宽度自适应,
             tooltipEffect: 'dark',
@@ -158,7 +143,8 @@ export default {
               return 'row-background-color'
             }
           }
-        }
+        },
+        hasLeftActions: false
       }
     }
   }
@@ -169,15 +155,21 @@ export default {
   .asset-table ::v-deep .row-clicked, .asset-user-table ::v-deep .row-background-color {
     background-color: #f5f7fa;
   }
+  .asset-table {
+    & >>> .table-content {
+      margin-left: 21px;
+    }
+  }
   .mini-button{
     width: 12px;
     float: left;
+    margin-right: 10px;
     text-align: center;
-    padding: 5px 0;
+    padding: 9px 0;
     background-color: #1ab394;
     border-color: #1ab394;
     color: #FFFFFF;
-    border-radius: 3px;
+    border-radius: 5px;
     line-height: 1.428;
     cursor:pointer;
   }
diff --git a/src/views/accounts/GatheredUser/GatheredUserList.vue b/src/views/accounts/GatheredUser/GatheredUserList.vue
index a954ef9f6..6ef967467 100644
--- a/src/views/accounts/GatheredUser/GatheredUserList.vue
+++ b/src/views/accounts/GatheredUser/GatheredUserList.vue
@@ -7,10 +7,11 @@
           :setting="treeSetting"
         />
       </el-col>
-      <el-col :span="iShowTree?12:14">
+      <el-col :span="iShowTree?9:11">
         <div class="mini">
           <div style="display:block" class="mini-button" @click="iShowTree=!iShowTree">
-            <i v-show="iShowTree" class="fa fa-angle-left fa-x" /><i v-show="!iShowTree" class="fa fa-angle-right fa-x" />
+            <i v-show="iShowTree" class="fa fa-angle-left fa-x" />
+            <i v-show="!iShowTree" class="fa fa-angle-right fa-x" />
           </div>
         </div>
         <GenericListTable
@@ -21,15 +22,12 @@
           @row-click="leftTable.tableConfig.rowClick"
         />
       </el-col>
-      <el-col :span="iShowTree?8:10">
-        <AssetUserTable
+      <el-col :span="iShowTree?11:13">
+        <GenericListTable
           ref="RightTable"
           class="asset-user-table"
-          :url="rightTable.url"
-          :has-left-actions="true"
+          :header-actions="rightTable.headerActions"
           :table-config="rightTable.tableConfig"
-          :has-clone="false"
-          :has-import="false"
         />
       </el-col>
     </el-row>
@@ -39,13 +37,12 @@
 <script>
 import GenericListTable from '@/layout/components/GenericListTable'
 import AutoDataZTree from '@/components/AutoDataZTree/index'
-import { AssetUserTable } from '@/components'
 import { ChoicesFormatter, DetailFormatter } from '@/components/TableFormatters'
 
 export default {
   name: 'AssetAccountList',
   components: {
-    AutoDataZTree, GenericListTable, AssetUserTable
+    AutoDataZTree, GenericListTable
   },
   data() {
     const vm = this
@@ -121,12 +118,12 @@ export default {
             }
           },
           rowClick: function(row, column, event) {
-            vm.rightTable.url = `/api/v1/assets/gathered-users/?asset_id=${row.id}`
+            vm.rightTable.tableConfig.url = `/api/v1/assets/gathered-users/?asset_id=${row.id}`
             vm.clickedRow = row
           }
         },
         headerActions: {
-          hasLeftActions: true,
+          hasLeftActions: false,
           hasCreate: false,
           hasExport: false,
           hasImport: false,
@@ -135,8 +132,8 @@ export default {
         }
       },
       rightTable: {
-        url: `/api/v1/assets/gathered-users/?asset__hostname=ShowFirstAssetRelated`,
         tableConfig: {
+          url: `/api/v1/assets/gathered-users/?asset__hostname=ShowFirstAssetRelated`,
           columns: [
             'username', 'date_last_login', 'present', 'ip_last_login', 'date_updated'
           ],
@@ -158,7 +155,7 @@ export default {
             }
           },
           tableAttrs: {
-            stripe: false, // 斑马纹表格
+            stripe: true, // 斑马纹表格
             border: true, // 表格边框
             fit: true, // 宽度自适应,
             tooltipEffect: 'dark',
@@ -166,6 +163,14 @@ export default {
               return 'row-background-color'
             }
           }
+        },
+        headerActions: {
+          hasLeftActions: false,
+          hasCreate: false,
+          hasExport: true,
+          hasImport: false,
+          hasBulkDelete: false,
+          hasBulkUpdate: false
         }
       }
     }
@@ -177,15 +182,21 @@ export default {
   .asset-table ::v-deep .row-clicked, .asset-user-table ::v-deep .row-background-color {
     background-color: #f5f7fa;
   }
+  .asset-table {
+    & >>> .table-content {
+      margin-left: 21px;
+    }
+  }
   .mini-button{
     width: 12px;
     float: left;
+    margin-right: 10px;
     text-align: center;
-    padding: 5px 0;
+    padding: 9px 0;
     background-color: #1ab394;
     border-color: #1ab394;
     color: #FFFFFF;
-    border-radius: 3px;
+    border-radius: 5px;
     line-height: 1.428;
     cursor:pointer;
   }

From 2bb1fce49182540544b037bc700d3db3de3e39ee Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Tue, 8 Jun 2021 15:26:40 +0800
Subject: [PATCH 29/33] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0rdp=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20(#828)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf: 修改命令存储创建

* feat: 添加rdp配置

* perf: 优化xrdp显示位置

Co-authored-by: ibuler <ibuler@qq.com>
---
 src/views/settings/Basic.vue    |  3 ++-
 src/views/settings/Terminal.vue | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/settings/Basic.vue b/src/views/settings/Basic.vue
index 01f65a755..a72e5ac40 100644
--- a/src/views/settings/Basic.vue
+++ b/src/views/settings/Basic.vue
@@ -27,7 +27,8 @@ export default {
       fields: [
         [
           this.$t('common.BasicInfo'), [
-            'SITE_URL', 'USER_GUIDE_URL', 'FORGOT_PASSWORD_URL', globalOrgName
+            'SITE_URL', 'USER_GUIDE_URL',
+            'FORGOT_PASSWORD_URL', globalOrgName
           ]
         ]
       ],
diff --git a/src/views/settings/Terminal.vue b/src/views/settings/Terminal.vue
index 1a2ebfd35..bdba9e5d4 100644
--- a/src/views/settings/Terminal.vue
+++ b/src/views/settings/Terminal.vue
@@ -43,11 +43,22 @@ export default {
       url: '/api/v1/settings/setting/?category=terminal'
     }
   },
+  mounted() {
+    if (this.$store.getters.hasValidLicense) {
+      const xRDPFields = [
+        'XRDP', [
+          'TERMINAL_RDP_ADDR'
+        ]
+      ]
+      this.selectFields.splice(1, 0, xRDPFields)
+    }
+  },
   methods: {
     getMethod() {
       return 'put'
     }
   }
+
 }
 </script>
 

From 24945830985fd0c45239da6e424727845dd93b49 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:43:00 +0800
Subject: [PATCH 30/33] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96session?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=20(#830)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf: 修改命令存储创建

* perf: 优化session监控

Co-authored-by: ibuler <ibuler@qq.com>
---
 src/views/sessions/SessionList/OnlineList.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/sessions/SessionList/OnlineList.vue b/src/views/sessions/SessionList/OnlineList.vue
index cd547a21d..3245a2090 100644
--- a/src/views/sessions/SessionList/OnlineList.vue
+++ b/src/views/sessions/SessionList/OnlineList.vue
@@ -40,10 +40,6 @@ export default {
           title: this.$t('sessions.Monitor'),
           type: 'primary',
           can: (row, cellValue) => {
-            if (row.protocol === 'rdp' ||
-            row.protocol === 'vnc') {
-              return true
-            }
             return row.can_join
           },
           callback: function({ row, tableData }) {

From a13c009b37c8589f7153cce9674047fbce0ee1ac Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 9 Jun 2021 19:17:53 +0800
Subject: [PATCH 31/33] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=AB=99?=
 =?UTF-8?q?=E5=86=85=E4=BF=A1=E5=92=8Cxrdp=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

perf: 优化 can has

perf: 修改提示i18n
---
 src/components/DataActions/index.vue          |  9 +++---
 .../TableFormatters/ActionsFormatter.vue      | 31 ++++++++++++++-----
 src/i18n/langs/cn.json                        |  1 +
 src/i18n/langs/en.json                        |  1 +
 .../components/NavHeader/SiteMessages.vue     |  4 +--
 src/userviews/assets/index.vue                |  2 +-
 .../sessions/SessionList/OfflineList.vue      |  4 +--
 src/views/sessions/SessionList/OnlineList.vue | 10 ++++--
 src/views/users/User/UserList.vue             |  2 +-
 9 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/components/DataActions/index.vue b/src/components/DataActions/index.vue
index 73aa804ad..1a9f4ff6f 100644
--- a/src/components/DataActions/index.vue
+++ b/src/components/DataActions/index.vue
@@ -37,12 +37,11 @@
         class="action-item"
         @click="handleClick(action)"
       >
-        <el-tooltip v-if="action.tip" effect="dark" :content="action.tip" placement="top">
-          <i v-if="action.fa" :class="'fa ' + action.fa" />{{ action.title }}
+        <el-tooltip :disabled="!action.tip" :content="action.tip" placement="top">
+          <span>
+            <i v-if="action.fa" :class="'fa ' + action.fa" />{{ action.title }}
+          </span>
         </el-tooltip>
-        <span v-else>
-          <i v-if="action.fa" :class="'fa ' + action.fa" />{{ action.title }}
-        </span>
       </el-button>
     </template>
 
diff --git a/src/components/TableFormatters/ActionsFormatter.vue b/src/components/TableFormatters/ActionsFormatter.vue
index 96c0542c9..8eaea0666 100644
--- a/src/components/TableFormatters/ActionsFormatter.vue
+++ b/src/components/TableFormatters/ActionsFormatter.vue
@@ -144,10 +144,11 @@ export default {
       let actions = [...this.defaultActions, ...this.extraActions]
       actions = _.cloneDeep(actions)
       actions = actions.map((v) => {
-        v.has = this.cleanBoolean(v, 'has')
-        v.can = this.cleanBoolean(v, 'can')
-        v.callback = this.cleanCallback(v)
+        v.has = this.cleanBoolean(v, 'has', true)
+        v.can = this.cleanBoolean(v, 'can', true)
+        v.callback = this.cleanCallback(v, 'callback')
         v.order = v.order || 100
+        v.tip = this.cleanValue(v, 'tip')
         return v
       })
       actions = actions.filter((v) => v.has)
@@ -168,15 +169,15 @@ export default {
     }
   },
   methods: {
-    cleanBoolean(item, attr) {
+    cleanBoolean(item, attr, defaults) {
       const ok = item[attr]
       if (typeof ok !== 'function') {
-        return ok === undefined ? true : ok
+        return ok === undefined ? defaults : ok
       }
-      return ok(this.row, this.cellValue)
+      return this.cleanValue(item, attr)
     },
-    cleanCallback(item) {
-      const callback = item.callback
+    cleanCallback(item, attr) {
+      const callback = item[attr]
       const attrs = {
         reload: this.reload,
         row: this.row,
@@ -185,6 +186,20 @@ export default {
         tableData: this.tableData
       }
       return () => { return callback.bind(this)(attrs) }
+    },
+    cleanValue(item, attr) {
+      const value = item[attr]
+      if (!value || typeof value !== 'function') {
+        return value
+      }
+      const attrs = {
+        reload: this.reload,
+        row: this.row,
+        col: this.col,
+        cellValue: this.cellValue,
+        tableData: this.tableData
+      }
+      return value(attrs)
     }
   }
 }
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 85a51cf6a..4f42a6262 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -713,6 +713,7 @@
       "common": "普通"
     },
     "Monitor": "监控",
+    "XRDPNotSupport": "RDP 客户端会话, 暂不支持监控",
     "sessionMonitor": "监控",
     "TerminateTaskSendSuccessMsg": "终断任务已下发，请稍后刷新查看",
     "helpText": {
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index c859a35c4..a29f36cc8 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -712,6 +712,7 @@
     },
     "Monitor": "Monitor",
     "sessionMonitor": "Session Monitor",
+    "XRDPNotSupport": "RDP Client session not support now",
     "TerminateTaskSendSuccessMsg": "Terminate task has been send, Please check later",
     "helpText": {
       "esUrl": "Tip: If you have multiple hosts, use comma (,) to split (eg: http://www.jumpserver.a.com,http://www.jumpserver.b.com)",
diff --git a/src/layout/components/NavHeader/SiteMessages.vue b/src/layout/components/NavHeader/SiteMessages.vue
index 49d62376a..3d849ffd7 100644
--- a/src/layout/components/NavHeader/SiteMessages.vue
+++ b/src/layout/components/NavHeader/SiteMessages.vue
@@ -33,7 +33,7 @@
             </div>
           </div>
           <div class="msg-item-txt">
-            {{ msg.message }}
+            <span v-html="msg.message" />
           </div>
         </div>
       </div>
@@ -59,7 +59,7 @@
           </h5>
         </div>
         <div class="msg-detail-txt">
-          {{ currentMsg.message }}
+          <span v-html="currentMsg.message" />
         </div>
       </div>
     </Dialog>
diff --git a/src/userviews/assets/index.vue b/src/userviews/assets/index.vue
index bed525f3c..68b2cc748 100644
--- a/src/userviews/assets/index.vue
+++ b/src/userviews/assets/index.vue
@@ -117,7 +117,7 @@ export default {
                   name: 'connect',
                   fa: 'fa-terminal',
                   type: 'primary',
-                  can: (row, cellValue) => {
+                  can: ({ row, cellValue }) => {
                     return row.is_active
                   },
                   callback: function({ row, col, cellValue, reload }) {
diff --git a/src/views/sessions/SessionList/OfflineList.vue b/src/views/sessions/SessionList/OfflineList.vue
index 4850cb419..dcfcfc595 100644
--- a/src/views/sessions/SessionList/OfflineList.vue
+++ b/src/views/sessions/SessionList/OfflineList.vue
@@ -17,7 +17,7 @@ export default {
           name: 'replay',
           title: this.$t('sessions.replay'),
           type: 'warning',
-          can: (row, cellValue) => {
+          can: ({ row, cellValue }) => {
             return row.can_replay
           },
           callback: function({ row, tableData }) {
@@ -30,7 +30,7 @@ export default {
           name: 'download',
           title: this.$t('sessions.download'),
           type: 'primary',
-          can: (row, cellValue) => {
+          can: ({ row, cellValue }) => {
             return row.can_replay
           },
           callback: function({ row, tableData }) {
diff --git a/src/views/sessions/SessionList/OnlineList.vue b/src/views/sessions/SessionList/OnlineList.vue
index 3245a2090..53dabd151 100644
--- a/src/views/sessions/SessionList/OnlineList.vue
+++ b/src/views/sessions/SessionList/OnlineList.vue
@@ -19,7 +19,7 @@ export default {
           name: 'terminate',
           title: this.$t('sessions.terminate'),
           type: 'danger',
-          can: (row, cellValue) => {
+          can: ({ row, cellValue }) => {
             return row.can_terminate
           },
           callback: function({ reload, row }) {
@@ -39,9 +39,15 @@ export default {
           name: 'join',
           title: this.$t('sessions.Monitor'),
           type: 'primary',
-          can: (row, cellValue) => {
+          can: ({ row, cellValue }) => {
             return row.can_join
           },
+          tip: ({ row }) => {
+            if (row.login_from === 'RT') {
+              return this.$t('sessions.XRDPNotSupport')
+            }
+            return ''
+          },
           callback: function({ row, tableData }) {
             // 跳转到luna页面
             if (row.protocol === 'rdp' || row.protocol === 'vnc') {
diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue
index b5391cbb4..d2d5492bb 100644
--- a/src/views/users/User/UserList.vue
+++ b/src/views/users/User/UserList.vue
@@ -92,7 +92,7 @@ export default {
                   name: 'remove',
                   type: 'warning',
                   has: hasRemove,
-                  can: function(row, cellValue) {
+                  can: ({ row }) => {
                     return row.can_delete
                   },
                   callback: this.removeUserFromOrg

From 283dfc97ec9e56a53bef7c1f2751f14620d48b0c Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Thu, 10 Jun 2021 12:53:01 +0800
Subject: [PATCH 32/33] =?UTF-8?q?perf:=20=E7=B3=BB=E7=BB=9F=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E4=B8=AD=E6=B7=BB=E5=8A=A0=20xrdp=20(#834)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf: 修改命令存储创建

* perf: 系统监控中添加 xrdp

perf: gua

Co-authored-by: ibuler <ibuler@qq.com>
---
 src/views/xpack/SystemMonitor/component/MonitorCard.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/xpack/SystemMonitor/component/MonitorCard.vue b/src/views/xpack/SystemMonitor/component/MonitorCard.vue
index 45c5d59a3..99aadae17 100644
--- a/src/views/xpack/SystemMonitor/component/MonitorCard.vue
+++ b/src/views/xpack/SystemMonitor/component/MonitorCard.vue
@@ -85,9 +85,10 @@ export default {
     componentName() {
       const nameMapper = {
         koko: 'KoKo',
-        guacamole: 'Guacamole',
         omnidb: 'OmniDB',
-        lion: 'Lion'
+        guacamole: 'Guacamole',
+        lion: 'Lion',
+        xrdp: 'XRDP'
       }
       return nameMapper[this.componentMetric.type]
     }

From c15f22e05b8be70999e5b617beb4dc69e6a1ac5e Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Thu, 10 Jun 2021 12:58:25 +0800
Subject: [PATCH 33/33] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E6=9A=82=E6=97=B6=E4=B8=8D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=85=A8=E9=83=A8=E7=AB=99=E5=86=85=E4=BF=A1?=
 =?UTF-8?q?=20(#833)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf: 修改命令存储创建

* perf: 优化一下，暂时不支持查看全部站内信

Co-authored-by: ibuler <ibuler@qq.com>
---
 .../components/NavHeader/SiteMessages.vue     | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/layout/components/NavHeader/SiteMessages.vue b/src/layout/components/NavHeader/SiteMessages.vue
index 3d849ffd7..97dfa154f 100644
--- a/src/layout/components/NavHeader/SiteMessages.vue
+++ b/src/layout/components/NavHeader/SiteMessages.vue
@@ -19,13 +19,17 @@
           v-for="msg of messages"
           :key="msg.id"
           class="msg-item"
+          :class="msg.has_read ? 'msg-read' : 'msg-unread'"
           @mouseover="hoverMsgId = msg.id"
           @mouseleave="hoverMsgId = ''"
           @click="showMsgDetail(msg)"
         >
           <div class="msg-item-head">
-            <span class="msg-item-head-type">{{ msg.subject }}</span>
-            <span v-if="hoverMsgId !== msg.id" class="msg-item-head-time">
+            <span class="msg-item-head-type">
+              <i :class="msg.has_read ? 'fa-envelope-open-o' : 'fa-envelope'" class="fa msg-icon" />
+              {{ msg.subject }}
+            </span>
+            <span v-if="hoverMsgId !== msg.id || msg.has_read" class="msg-item-head-time">
               {{ formatDate(msg.date_created) }}
             </span>
             <div v-else class="msg-item-read-btn" @click.stop="markAsRead(msg)">
@@ -153,18 +157,20 @@ export default {
 }
 
 .msg-list {
-  padding: 0 20px 20px;
-}
-
->>> .site-msg .el-drawer__header {
-  border-bottom: solid 1px rgb(231, 234, 239);
-  margin-bottom: 0;
-  padding-top: 10px;
-  font-size: 16px;
+  padding: 0 25px 20px;
 }
 
 >>> .site-msg {
-  margin-top: 50px;
+  .el-drawer__header {
+    border-bottom: solid 1px rgb(231, 234, 239);
+    margin-bottom: 0;
+    padding-top: 10px;
+    font-size: 16px;
+  }
+
+  .el-drawer__body {
+    overflow-y: auto;
+  }
 }
 
 .msg-item {
@@ -180,6 +186,17 @@ export default {
     margin: 0 -20px;
     border-bottom: 1px solid #fff;
   }
+
+  .msg-icon {
+    font-size: 13px;
+    line-height: 13px;
+  }
+
+  &.msg-unread {
+    .msg-item-txt {
+      font-weight: bolder;
+    }
+  }
 }
 
 .msg-item-head {