From ef97df09cbed47fecb54ab5970f179ea18863ebb Mon Sep 17 00:00:00 2001
From: jiangweidong <80373698+fit2cloud-jiangweidong@users.noreply.github.com>
Date: Tue, 28 Dec 2021 18:16:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=20Redis=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9A=84=E7=BA=B3=E7=AE=A1=20(#1246)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 支持 Redis 数据库的纳管

* feat: 支持Redis数据库的纳管, 将redis_acl协议合并到redis协议中
---
 src/components/DataActions/index.vue                  |  2 +-
 src/i18n/langs/cn.json                                |  7 ++++++-
 src/i18n/langs/en.json                                |  7 ++++++-
 .../applications/DatabaseApp/DatabaseAppList.vue      |  9 ++++++++-
 .../SystemUserCreateUpdate/CommonUser/database.vue    |  4 ++--
 .../SystemUserCreateUpdate/CommonUser/index.vue       |  1 +
 .../SystemUser/SystemUserCreateUpdate/fields.js       |  2 ++
 .../SystemUser/SystemUserList/CommonUserList.vue      |  9 ++++++++-
 src/views/perms/const.js                              | 11 ++++++++++-
 9 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/components/DataActions/index.vue b/src/components/DataActions/index.vue
index c09fda5fa..1d88919d6 100644
--- a/src/components/DataActions/index.vue
+++ b/src/components/DataActions/index.vue
@@ -15,7 +15,7 @@
         </el-button>
         <el-dropdown-menu slot="dropdown">
           <template v-for="option in action.dropdown">
-            <div v-if="option.group" :key="'group:'+option.name" class="dropdown-menu-title">
+            <div v-if="option.group" :key="'group:'+option.name" class="dropdown-menu-title" style="width:130px">
               {{ option.group }}
             </div>
             <el-dropdown-item
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 65725b943..cab64ba97 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -45,6 +45,7 @@
       "vmware_client":"Vmware Client",
       "custom":"Custom",
       "mysql": "MySQL",
+      "redis": "Redis",
       "oracle": "Oracle",
       "postgresql": "PostgreSQL",
       "mariadb": "MariaDB",
@@ -88,7 +89,9 @@
     "cluster": "集群",
     "kubernetes":"Kubernetes",
     "clusterHelpTextMessage": "例如：https://172.16.8.8:8443",
-    "DBInfo": "数据库信息"
+    "DBInfo": "数据库信息",
+    "RDBProtocol": "关系型数据库协议",
+    "NoSQLProtocol": "非关系型数据库协议"
   },
   "assets": {
     "AppList": "应用列表",
@@ -228,6 +231,8 @@
     "ipDomain": "IP(域名)",
     "HostProtocol": "主机协议",
     "DatabaseProtocol": "数据库协议",
+    "RDBProtocol": "关系型数据库协议",
+    "NoSQLProtocol": "非关系型数据库协议",
     "OtherProtocol": "其它协议",
     "PasswordOrToken": "密码 / 令牌"
   },
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index a006e75fe..193add9bd 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -40,6 +40,7 @@
       "vmware_client":"Vmware Client",
       "custom":"Custom",
       "mysql": "MySQL",
+      "redis": "Redis",
       "oracle": "Oracle",
       "postgresql": "PostgreSQL",
       "mariadb": "MariaDB",
@@ -83,7 +84,9 @@
     "cluster": "Cluster",
     "kubernetes":"Kubernetes",
     "clusterHelpTextMessage": "Tips: https://172.16.8.8:8443",
-    "DBInfo": "Database Info"
+    "DBInfo": "Database Info",
+    "RDBProtocol": "RDS Protocol",
+    "NoSQLProtocol": "NoSQL Protocol"
   },
   "assets": {
     "AppList": "Application list",
@@ -222,6 +225,8 @@
     "ipDomain": "IP(Domain)",
     "HostProtocol": "Host Protocol",
     "DatabaseProtocol": "Database Protocol",
+    "RDBProtocol": "RDS Protocol",
+    "NoSQLProtocol": "NoSQL Protocol",
     "OtherProtocol": "Other Protocol",
     "PasswordOrToken": "Password / Token"
   },
diff --git a/src/views/applications/DatabaseApp/DatabaseAppList.vue b/src/views/applications/DatabaseApp/DatabaseAppList.vue
index ac3cf04f3..66bd021bd 100644
--- a/src/views/applications/DatabaseApp/DatabaseAppList.vue
+++ b/src/views/applications/DatabaseApp/DatabaseAppList.vue
@@ -79,7 +79,8 @@ export default {
             {
               name: 'MySQL',
               title: 'MySQL',
-              has: true
+              has: true,
+              group: this.$t('assets.RDBProtocol')
             },
             {
               name: 'PostgreSQL',
@@ -101,6 +102,12 @@ export default {
               name: 'SQLServer',
               title: 'SQLServer',
               has: this.$store.getters.hasValidLicense
+            },
+            {
+              name: 'Redis',
+              title: 'Redis',
+              has: true,
+              group: this.$t('assets.NoSQLProtocol')
             }
           ]
         }
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/database.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/database.vue
index b63947a76..c86f9b612 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/database.vue
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/database.vue
@@ -25,8 +25,8 @@ export default {
         auto_push: false
       },
       fields: [
-        [this.$t('common.Basic'), ['name', 'login_mode', 'username', 'priority', 'protocol']],
-        [this.$t('common.Auth'), ['password']],
+        [this.$t('common.Basic'), ['name', 'username', 'priority', 'protocol']],
+        [this.$t('common.Auth'), ['login_mode', 'password']],
         [this.$t('common.Command filter'), ['cmd_filters']],
         [this.$t('common.Other'), ['comment']]
       ],
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue
index 985a407cd..9fb5d5bc3 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/CommonUser/index.vue
@@ -47,6 +47,7 @@ export default {
         case 'postgresql':
         case 'mariadb':
         case 'sqlserver':
+        case 'redis':
           return Database
         case 'k8s':
           return K8S
diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js b/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
index fbf5cb0b8..5af6cd0ad 100644
--- a/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
+++ b/src/views/assets/SystemUser/SystemUserCreateUpdate/fields.js
@@ -31,6 +31,8 @@ function getFields() {
         this.fieldsMeta.username.rules[0].required = false
       } else if (form.username_same_with_user) {
         this.fieldsMeta.username.rules[0].required = false
+      } else if (form.protocol === 'redis') {
+        this.fieldsMeta.username.rules[0].required = false
       } else {
         this.fieldsMeta.username.rules[0].required = true
       }
diff --git a/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue b/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue
index 8fd7a8acd..252d51639 100644
--- a/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue
+++ b/src/views/assets/SystemUser/SystemUserList/CommonUserList.vue
@@ -105,7 +105,7 @@ export default {
               title: 'MySQL',
               type: 'primary',
               has: true,
-              group: this.$t('assets.DatabaseProtocol')
+              group: this.$t('assets.RDBProtocol')
             },
             {
               name: 'PostgreSQL',
@@ -131,6 +131,13 @@ export default {
               type: 'primary',
               has: this.$store.getters.hasValidLicense
             },
+            {
+              name: 'Redis',
+              title: 'Redis',
+              type: 'primary',
+              has: true,
+              group: this.$t('assets.NoSQLProtocol')
+            },
             {
               name: 'K8S',
               title: 'K8S',
diff --git a/src/views/perms/const.js b/src/views/perms/const.js
index 633a54224..f9fb44019 100644
--- a/src/views/perms/const.js
+++ b/src/views/perms/const.js
@@ -43,6 +43,7 @@ export const REMOTE_APP = [
 ]
 
 export const MYSQL = 'mysql'
+export const REDIS = 'redis'
 export const ORACLE = 'oracle'
 export const POSTGRESQL = 'postgresql'
 export const MARIADB = 'mariadb'
@@ -56,7 +57,7 @@ export const DATABASE = [
     type: 'primary',
     category: DATABASE_CATEGORY,
     has: true,
-    group: i18n.t('applications.Database')
+    group: i18n.t('applications.RDBProtocol')
   },
   {
     name: ORACLE,
@@ -85,6 +86,14 @@ export const DATABASE = [
     type: 'primary',
     category: DATABASE_CATEGORY,
     has: hasLicence
+  },
+  {
+    name: REDIS,
+    title: i18n.t(`applications.applicationsType.${REDIS}`),
+    type: 'primary',
+    category: DATABASE_CATEGORY,
+    has: true,
+    group: i18n.t('applications.NoSQLProtocol')
   }
 ]