From 232c22c8ae2d9875b3ad7907513fe2c24751b8fc Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Thu, 20 Jan 2022 10:47:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=BA=94=E7=94=A8=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89redis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppChangeAuthPlanList.vue                 |  4 +-
 src/views/perms/const.js                      | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/AppChangeAuthPlanList.vue b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/AppChangeAuthPlanList.vue
index 5cafdbba6..a59e74324 100644
--- a/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/AppChangeAuthPlanList.vue
+++ b/src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/AppChangeAuthPlanList.vue
@@ -6,7 +6,7 @@
 import { GenericListTable } from '@/layout/components'
 import { DetailFormatter } from '@/components/TableFormatters'
 import { openTaskPage } from '@/utils/jms'
-import { DATABASE } from '@/views/perms/const'
+import { AppPlanDatabase } from '@/views/perms/const'
 
 export default {
   name: 'AppChangeAuthPlanList',
@@ -126,7 +126,7 @@ export default {
               type: option.name.toLowerCase()
             }})
           },
-          dropdown: DATABASE
+          dropdown: AppPlanDatabase
         }
       }
     }
diff --git a/src/views/perms/const.js b/src/views/perms/const.js
index f9fb44019..e851e9725 100644
--- a/src/views/perms/const.js
+++ b/src/views/perms/const.js
@@ -97,6 +97,45 @@ export const DATABASE = [
   }
 ]
 
+export const AppPlanDatabase = [
+  {
+    name: MYSQL,
+    title: i18n.t(`applications.applicationsType.${MYSQL}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: true,
+    group: i18n.t('applications.RDBProtocol')
+  },
+  {
+    name: ORACLE,
+    title: i18n.t(`applications.applicationsType.${ORACLE}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: POSTGRESQL,
+    title: i18n.t(`applications.applicationsType.${POSTGRESQL}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: MARIADB,
+    title: i18n.t(`applications.applicationsType.${MARIADB}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  },
+  {
+    name: SQLSERVER,
+    title: i18n.t(`applications.applicationsType.${SQLSERVER}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: hasLicence
+  }
+]
+
 export const KUBERNETES = 'k8s'
 export const CLOUD_CATEGORY = 'cloud'
 

From ac14e5964d6058eeefcba81a9f5b906faf146a55 Mon Sep 17 00:00:00 2001
From: Michael Bai <baijiangjie@gmail.com>
Date: Thu, 20 Jan 2022 11:44:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=94=A8=E6=88=B7MFA=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=8C=89=E9=92=AE=E8=A2=AB=E7=A6=81=E7=94=A8=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/i18n/langs/en.json                          | 2 +-
 src/userviews/users/UserProfile/ProfileInfo.vue | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 43c28f0f2..e13ef6d3d 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -652,7 +652,7 @@
     "Assets": "Assets",
     "Audits": "Audits",
     "BatchCommand": "Batch Command",
-    "BatchCommandLog": "Batch Command Log",
+    "BatchCommandLog": "Batch Command Logs",
     "CeleryTaskLog": "Celery task log",
     "CommandExecutions": "CommandExecutions ",
     "CommandFilterCreate": "Command filter create",
diff --git a/src/userviews/users/UserProfile/ProfileInfo.vue b/src/userviews/users/UserProfile/ProfileInfo.vue
index 5777e7028..7a98b6758 100644
--- a/src/userviews/users/UserProfile/ProfileInfo.vue
+++ b/src/userviews/users/UserProfile/ProfileInfo.vue
@@ -115,8 +115,7 @@ export default {
           title: this.$t('users.SetMFA'),
           attrs: {
             type: 'primary',
-            label: this.$t('common.Setting'),
-            disabled: this.object.mfa_force_enabled
+            label: this.$t('common.Setting')
           },
           callbacks: {
             click: function() {