diff --git a/README.md b/README.md
index af70651a..e8974fc3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # 🌈mayfly-go
 
 ### 介绍
-简单基于DDD(领域驱动设计)分层架构实现的web版 **linux、数据库（mysql）、redis、mongo统一管理操作平台**
+简单基于DDD(领域驱动设计)分层架构实现的web版 **linux、数据库（mysql postgres）、redis(单机 集群)、mongo统一管理操作平台**
 
 
 ### 开发语言与主要框架
diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json
index 657a204c..9f08c35d 100644
--- a/mayfly_go_web/package.json
+++ b/mayfly_go_web/package.json
@@ -13,7 +13,7 @@
     "countup.js": "^2.0.7",
     "cropperjs": "^1.5.11",
     "echarts": "^5.3.3",
-    "element-plus": "^2.2.8",
+    "element-plus": "^2.2.9",
     "jsoneditor": "^9.9.0",
     "lodash": "^4.17.21",
     "mitt": "^3.0.0",
diff --git a/mayfly_go_web/src/views/ops/db/DbEdit.vue b/mayfly_go_web/src/views/ops/db/DbEdit.vue
index 95a56889..6823e7cc 100644
--- a/mayfly_go_web/src/views/ops/db/DbEdit.vue
+++ b/mayfly_go_web/src/views/ops/db/DbEdit.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
-        <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :close-on-click-modal="false" :destroy-on-close="true" width="35%">
-            <el-form :model="form" ref="dbForm" :rules="rules" label-width="85px">
+        <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :close-on-click-modal="false" :destroy-on-close="true" width="38%">
+            <el-form :model="form" ref="dbForm" :rules="rules" label-width="95px">
                 <el-form-item prop="projectId" label="项目:" required>
                     <el-select style="width: 100%" v-model="form.projectId" placeholder="请选择项目" @change="changeProject" filterable>
                         <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
@@ -19,6 +19,7 @@
                 <el-form-item prop="type" label="类型:" required>
                     <el-select style="width: 100%" v-model="form.type" placeholder="请选择数据库类型">
                         <el-option key="item.id" label="mysql" value="mysql"> </el-option>
+                        <el-option key="item.id" label="postgres" value="postgres"> </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item prop="host" label="host:" required>
@@ -39,6 +40,9 @@
                         autocomplete="new-password"
                     ></el-input>
                 </el-form-item>
+                <el-form-item prop="params" label="连接参数:">
+                    <el-input v-model="form.params" placeholder="其他连接参数，形如: key1=value1&key2=value2"></el-input>
+                </el-form-item>
                 <el-form-item prop="database" label="数据库名:" required>
                     <el-tag
                         v-for="db in databaseList"
@@ -116,6 +120,7 @@ export default defineComponent({
                 port: 3306,
                 username: null,
                 password: null,
+                params: null,
                 database: '',
                 project: null,
                 projectId: null,
@@ -173,13 +178,6 @@ export default defineComponent({
                         trigger: ['change', 'blur'],
                     },
                 ],
-                // password: [
-                //     {
-                //         required: true,
-                //         message: '请输入密码',
-                //         trigger: ['change', 'blur'],
-                //     },
-                // ],
                 database: [
                     {
                         required: true,
diff --git a/mayfly_go_web/src/views/ops/db/DbList.vue b/mayfly_go_web/src/views/ops/db/DbList.vue
index d8842d33..c83818d4 100644
--- a/mayfly_go_web/src/views/ops/db/DbList.vue
+++ b/mayfly_go_web/src/views/ops/db/DbList.vue
@@ -20,15 +20,15 @@
                         </el-radio>
                     </template>
                 </el-table-column>
-                <el-table-column prop="project" label="项目" min-width="100"></el-table-column>
+                <el-table-column prop="project" label="项目" min-width="100" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="env" label="环境" min-width="100"></el-table-column>
-                <el-table-column prop="name" label="名称" min-width="200"></el-table-column>
-                <el-table-column min-width="160" label="host:port">
+                <el-table-column prop="name" label="名称" min-width="160" show-overflow-tooltip></el-table-column>
+                <el-table-column min-width="170" label="host:port" show-overflow-tooltip>
                     <template #default="scope">
                         {{ `${scope.row.host}:${scope.row.port}` }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="type" label="类型" min-width="80"></el-table-column>
+                <el-table-column prop="type" label="类型" min-width="90"></el-table-column>
                 <el-table-column prop="database" label="数据库" min-width="160">
                     <template #default="scope">
                         <el-tag
@@ -224,6 +224,7 @@
                 <el-table-column prop="columnName" label="列名" show-overflow-tooltip> </el-table-column>
                 <el-table-column prop="seqInIndex" label="列序列号" show-overflow-tooltip> </el-table-column>
                 <el-table-column prop="indexType" label="类型"> </el-table-column>
+                <el-table-column prop="indexComment" label="备注" min-width="230" show-overflow-tooltip> </el-table-column>
             </el-table>
         </el-dialog>
 
diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue
index 8217f420..84e1f12d 100644
--- a/mayfly_go_web/src/views/ops/db/SqlExec.vue
+++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue
@@ -276,6 +276,7 @@ export default defineComponent({
             dbs: [], // 数据库实例列表
             databaseList: [], // 数据库实例拥有的数据库列表，1数据库实例  -> 多数据库
             db: '', // 当前操作的数据库
+            dbType: '',
             tables: [],
             dbId: null, // 当前选中操作的数据库实例
             tableName: '',
@@ -622,7 +623,9 @@ export default defineComponent({
          */
         const changeDbInstance = (dbId: any) => {
             state.db = '';
-            state.databaseList = (state.dbs.find((e: any) => e.id == dbId) as any).database.split(' ');
+            const dbInfo = state.dbs.find((e: any) => e.id == dbId) as any;
+            state.dbType = dbInfo.type;
+            state.databaseList = dbInfo.database.split(' ');
             clearDb();
         };
 
@@ -788,16 +791,21 @@ export default defineComponent({
          * 获取默认查询语句
          */
         const getDefaultSelectSql = (tableName: string, where: string = '', orderBy: string = '', pageNum: number = 1) => {
-            return `SELECT * FROM \`${tableName}\` ${where ? 'WHERE ' + where : ''} ${orderBy ? orderBy : ''} LIMIT ${
-                (pageNum - 1) * state.defalutLimit
-            }, ${state.defalutLimit}`;
+            const baseSql = `SELECT * FROM ${tableName} ${where ? 'WHERE ' + where : ''} ${orderBy ? orderBy : ''}`;
+            if (state.dbType == 'mysql') {
+                 return `${baseSql} LIMIT ${(pageNum - 1) * state.defalutLimit}, ${state.defalutLimit};`
+            }
+            if (state.dbType == 'postgres') {
+                return `${baseSql} OFFSET ${(pageNum - 1) * state.defalutLimit} LIMIT ${state.defalutLimit};`
+            }
+            return baseSql;
         };
 
         /**
          * 获取默认查询统计语句
          */
         const getDefaultCountSql = (tableName: string, where: string = '') => {
-            return `SELECT COUNT(*) count FROM \`${tableName}\` ${where ? 'WHERE ' + where : ''}`;
+            return `SELECT COUNT(*) count FROM ${tableName} ${where ? 'WHERE ' + where : ''}`;
         };
 
         /**
@@ -819,7 +827,7 @@ export default defineComponent({
             const tableName = state.activeName;
             const sortType = sort.order == 'descending' ? 'DESC' : 'ASC';
 
-            const orderBy = `ORDER BY \`${sort.prop}\` ${sortType}`;
+            const orderBy = `ORDER BY ${sort.prop} ${sortType}`;
             state.dataTabs[state.activeName].orderBy = orderBy;
 
             onRefresh(tableName);
diff --git a/mayfly_go_web/src/views/ops/machine/ScriptEdit.vue b/mayfly_go_web/src/views/ops/machine/ScriptEdit.vue
index 0f469a24..d584876e 100644
--- a/mayfly_go_web/src/views/ops/machine/ScriptEdit.vue
+++ b/mayfly_go_web/src/views/ops/machine/ScriptEdit.vue
@@ -25,7 +25,7 @@
                 </el-form-item>
 
                 <el-form-item prop="params" label="参数">
-                    <el-input v-model.trim="form.params" placeholder="参数数组json，若无可不填"></el-input>
+                    <el-input v-model="form.params" placeholder="参数数组json，若无可不填"></el-input>
                 </el-form-item>
 
                 <el-form-item prop="script" label="内容" id="content">
diff --git a/mayfly_go_web/src/views/ops/redis/DataOperation.vue b/mayfly_go_web/src/views/ops/redis/DataOperation.vue
index aa378a20..480043b0 100644
--- a/mayfly_go_web/src/views/ops/redis/DataOperation.vue
+++ b/mayfly_go_web/src/views/ops/redis/DataOperation.vue
@@ -31,7 +31,7 @@
                                 ></el-input>
                             </el-form-item>
                             <el-form-item label="count" label-width="60px">
-                                <el-input placeholder="count" style="width: 62px" v-model="scanParam.count"></el-input>
+                                <el-input placeholder="count" style="width: 62px" v-model.number="scanParam.count"></el-input>
                             </el-form-item>
                             <el-form-item>
                                 <el-button @click="searchKey()" type="success" icon="search" plain></el-button>
@@ -92,7 +92,7 @@ import { toRefs, reactive, defineComponent } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import ProjectEnvSelect from '../component/ProjectEnvSelect.vue';
 import DataEdit from './DataEdit.vue';
-import { isTrue, notNull } from '@/common/assert';
+import { isTrue, notBlank, notNull } from '@/common/assert';
 
 export default defineComponent({
     name: 'DataOperation',
@@ -103,18 +103,15 @@ export default defineComponent({
     setup() {
         const state = reactive({
             loading: false,
-            cluster: 0,
             redisList: [],
             query: {
                 envId: 0,
             },
             scanParam: {
                 id: null,
-                cluster: 0,
                 match: null,
                 count: 10,
-                cursor: 0,
-                prevCursor: null,
+                cursor: {},
             },
             valueDialog: {
                 visible: false,
@@ -151,31 +148,33 @@ export default defineComponent({
             }
         };
 
-        const changeRedis = () => {
-            resetScanParam();
+        const changeRedis = (id: number) => {
+            resetScanParam(id);
             state.keys = [];
             state.dbsize = 0;
             searchKey();
         };
 
-        const scan = () => {
+        const scan = async () => {
             isTrue(state.scanParam.id != null, '请先选择redis');
+            notBlank(state.scanParam.count, 'count不能为空');
             isTrue(state.scanParam.count < 20001, 'count不能超过20000');
 
             state.loading = true;
-            state.scanParam.cluster = state.cluster == 0 ? 0 : 1;
 
-            redisApi.scan.request(state.scanParam).then((res) => {
+            try {
+                const res = await redisApi.scan.request(state.scanParam);
                 state.keys = res.keys;
                 state.dbsize = res.dbSize;
                 state.scanParam.cursor = res.cursor;
+            } finally {
                 state.loading = false;
-            });
+            }
         };
 
-        const searchKey = () => {
-            state.scanParam.cursor = 0;
-            scan();
+        const searchKey = async () => {
+            state.scanParam.cursor = {};
+            await scan();
         };
 
         const clearRedis = () => {
@@ -193,10 +192,17 @@ export default defineComponent({
             }
         };
 
-        const resetScanParam = () => {
-            state.scanParam.match = null;
-            state.scanParam.cursor = 0;
+        const resetScanParam = (id: number = 0) => {
             state.scanParam.count = 10;
+            if (id != 0) {
+                const redis: any = state.redisList.find((x: any) => x.id == id);
+                // 集群模式count设小点，因为后端会从所有master节点scan一遍然后合并结果
+                if (redis && redis.mode == 'cluster') {
+                    state.scanParam.count = 5;
+                }
+            }
+            state.scanParam.match = null;
+            state.scanParam.cursor = {};
         };
 
         const getValue = async (row: any) => {
@@ -204,11 +210,9 @@ export default defineComponent({
             const key = row.key;
 
             let res: any;
-            const id = state.cluster == 0 ? state.scanParam.id : state.cluster;
             const reqParam = {
-                cluster: state.cluster,
                 key: row.key,
-                id,
+                id: state.scanParam.id,
             };
             switch (type) {
                 case 'string':
@@ -260,29 +264,27 @@ export default defineComponent({
         };
 
         const del = (key: string) => {
-            ElMessageBox.confirm(`此操作将删除对应的key , 是否继续?`, '提示', {
+            ElMessageBox.confirm(`确定删除[ ${key} ] 该key?`, '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning',
             })
                 .then(() => {
-                    let id = state.cluster == 0 ? state.scanParam.id : state.cluster;
                     redisApi.delKey
                         .request({
-                            cluster: state.cluster,
                             key,
-                            id,
+                            id: state.scanParam.id,
                         })
                         .then(() => {
                             ElMessage.success('删除成功！');
-                            scan();
+                            searchKey();
                         });
                 })
                 .catch(() => {});
         };
 
         const ttlConveter = (ttl: any) => {
-            if (ttl == -1) {
+            if (ttl == -1 || ttl == 0) {
                 return '永久';
             }
             if (!ttl) {
diff --git a/mayfly_go_web/src/views/ops/redis/RedisEdit.vue b/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
index 0f373802..58b31476 100644
--- a/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
+++ b/mayfly_go_web/src/views/ops/redis/RedisEdit.vue
@@ -13,8 +13,14 @@
                         <el-option v-for="item in envs" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item prop="mode" label="mode:" required>
+                    <el-select style="width: 100%" v-model="form.mode" placeholder="请选择模式">
+                        <el-option label="standalone" value="standalone"> </el-option>
+                        <el-option label="cluster" value="cluster"> </el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item prop="host" label="host:" required>
-                    <el-input v-model.trim="form.host" placeholder="请输入host:port" auto-complete="off"></el-input>
+                    <el-input v-model.trim="form.host" placeholder="请输入host:port，集群模式用','分割" auto-complete="off" type="textarea"></el-input>
                 </el-form-item>
                 <el-form-item prop="password" label="密码:">
                     <el-input
@@ -28,6 +34,9 @@
                 <el-form-item prop="db" label="库号:" required>
                     <el-input v-model.number="form.db" placeholder="请输入库号"></el-input>
                 </el-form-item>
+                <el-form-item prop="remark" label="备注:">
+                    <el-input v-model.trim="form.remark" auto-complete="off" type="textarea"></el-input>
+                </el-form-item>
             </el-form>
 
             <template #footer>
@@ -71,12 +80,14 @@ export default defineComponent({
             form: {
                 id: null,
                 name: null,
+                mode: "standalone",
                 host: null,
                 password: null,
                 project: null,
                 projectId: null,
                 envId: null,
                 env: null,
+                remark: "",
             },
             btnLoading: false,
             rules: {
@@ -108,6 +119,13 @@ export default defineComponent({
                         trigger: ['change', 'blur'],
                     },
                 ],
+                mode: [
+                    {
+                        required: true,
+                        message: '请输入模式',
+                        trigger: ['change', 'blur'],
+                    },
+                ],
             },
         });
 
diff --git a/mayfly_go_web/src/views/ops/redis/RedisList.vue b/mayfly_go_web/src/views/ops/redis/RedisList.vue
index 84e7d573..78855062 100644
--- a/mayfly_go_web/src/views/ops/redis/RedisList.vue
+++ b/mayfly_go_web/src/views/ops/redis/RedisList.vue
@@ -5,16 +5,12 @@
             <el-button type="primary" icon="edit" :disabled="currentId == null" @click="editRedis(false)" plain>编辑</el-button>
             <el-button type="danger" icon="delete" :disabled="currentId == null" @click="deleteRedis" plain>删除</el-button>
             <div style="float: right">
-                <!-- <el-input placeholder="host"  style="width: 140px" v-model="query.host" @clear="search" plain clearable></el-input>
-                <el-select v-model="params.clusterId"  clearable placeholder="集群选择">
-                    <el-option v-for="item in clusters" :key="item.id" :value="item.id" :label="item.name"></el-option>
-                </el-select> -->
                 <el-select v-model="query.projectId" placeholder="请选择项目" filterable clearable>
                     <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
                 </el-select>
                 <el-button class="ml5" @click="search" type="success" icon="search"></el-button>
             </div>
-            <el-table :data="redisTable" style="width: 100%" @current-change="choose" stripe>
+            <el-table :data="redisTable" @current-change="choose" stripe>
                 <el-table-column label="选择" width="60px">
                     <template #default="scope">
                         <el-radio v-model="currentId" :label="scope.row.id">
@@ -22,19 +18,23 @@
                         </el-radio>
                     </template>
                 </el-table-column>
-                <el-table-column prop="project" label="项目" width></el-table-column>
-                <el-table-column prop="env" label="环境" width></el-table-column>
-                <el-table-column prop="host" label="host:port" width></el-table-column>
-                <el-table-column prop="createTime" label="创建时间">
+                <el-table-column prop="project" label="项目" min-width="100"></el-table-column>
+                <el-table-column prop="env" label="环境" min-width="100"></el-table-column>
+                <el-table-column prop="host" label="host:port" min-width="150" show-overflow-tooltip> </el-table-column>
+                <el-table-column prop="mode" label="mode" min-width="100"></el-table-column>
+                <el-table-column prop="remark" label="备注" min-width="100"></el-table-column>
+                <el-table-column prop="createTime" label="创建时间" min-width="160">
                     <template #default="scope">
                         {{ $filters.dateFormat(scope.row.createTime) }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="creator" label="创建人"></el-table-column>
-                <el-table-column label="操作" width>
+                <el-table-column prop="creator" label="创建人" min-width="100"></el-table-column>
+                <el-table-column label="更多" min-width="130" fixed="right">
                     <template #default="scope">
-                        <el-button type="primary" @click="info(scope.row)" icon="tickets" plain size="small">info</el-button>
-                        <!-- <el-button type="success" @click="manage(scope.row)" :ref="scope.row"  plain>数据管理</el-button> -->
+                        <el-link v-if="scope.row.mode == 'standalone'" type="primary" @click="info(scope.row)" :underline="false">单机信息</el-link>
+                        <el-link @click="onShowClusterInfo(scope.row)" v-if="scope.row.mode == 'cluster'" type="success" :underline="false"
+                            >集群信息</el-link
+                        >
                     </template>
                 </el-table-column>
             </el-table>
@@ -52,6 +52,84 @@
 
         <info v-model:visible="infoDialog.visible" :title="infoDialog.title" :info="infoDialog.info"></info>
 
+        <el-dialog width="1000px" title="集群信息" v-model="clusterInfoDialog.visible">
+            <el-input type="textarea" :autosize="{ minRows: 12, maxRows: 12 }" v-model="clusterInfoDialog.info"> </el-input>
+
+            <el-divider content-position="left">节点信息</el-divider>
+            <el-table :data="clusterInfoDialog.nodes" stripe size="small" border>
+                <el-table-column prop="nodeId" label="nodeId" min-width="300">
+                    <template #header>
+                        nodeId
+                        <el-tooltip class="box-item" effect="dark" content="节点id" placement="top">
+                            <el-icon><question-filled /></el-icon>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="ip" label="ip" min-width="180">
+                    <template #header>
+                        ip
+                        <el-tooltip
+                            class="box-item"
+                            effect="dark"
+                            content="ip:port1@port2：port1指redis服务器与客户端通信的端口，port2则是集群内部节点间通信的端口"
+                            placement="top"
+                        >
+                            <el-icon><question-filled /></el-icon>
+                        </el-tooltip>
+                    </template>
+                    <template #default="scope">
+                        <el-tag
+                            @click="info({ id: clusterInfoDialog.redisId, ip: scope.row.ip })"
+                            effect="plain"
+                            type="success"
+                            size="small"
+                            style="cursor: pointer"
+                            >{{ scope.row.ip }}</el-tag
+                        >
+                    </template>
+                </el-table-column>
+                <el-table-column prop="flags" label="flags" min-width="110"></el-table-column>
+                <el-table-column prop="masterSlaveRelation" label="masterSlaveRelation" min-width="300">
+                    <template #header>
+                        masterSlaveRelation
+                        <el-tooltip
+                            class="box-item"
+                            effect="dark"
+                            content="如果节点是slave，并且已知master节点，则为master节点ID；否则为符号'-'"
+                            placement="top"
+                        >
+                            <el-icon><question-filled /></el-icon>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="pingSent" label="pingSent" min-width="130" show-overflow-tooltip>
+                    <template #default="scope">
+                        {{ scope.row.pingSent == 0 ? 0 : new Date(parseInt(scope.row.pingSent)).toLocaleString() }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="pongRecv" label="pongRecv" min-width="130" show-overflow-tooltip>
+                    <template #default="scope">
+                        {{ scope.row.pongRecv == 0 ? 0 : new Date(parseInt(scope.row.pongRecv)).toLocaleString() }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="configEpoch" label="configEpoch" min-width="130">
+                    <template #header>
+                        configEpoch
+                        <el-tooltip
+                            class="box-item"
+                            effect="dark"
+                            content="节点的epoch值（如果该节点是从节点，则为其主节点的epoch值）。每当节点发生失败切换时，都会创建一个新的，独特的，递增的epoch。"
+                            placement="top"
+                        >
+                            <el-icon><question-filled /></el-icon>
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="linkState" label="linkState" min-width="100"></el-table-column>
+                <el-table-column prop="slot" label="slot" min-width="100"></el-table-column>
+            </el-table>
+        </el-dialog>
+
         <redis-edit
             @val-change="valChange"
             :projects="projects"
@@ -92,6 +170,12 @@ export default defineComponent({
             redisInfo: {
                 url: '',
             },
+            clusterInfoDialog: {
+                visible: false,
+                redisId: 0,
+                info: '',
+                nodes: [],
+            },
             clusters: [
                 {
                     id: 0,
@@ -134,12 +218,6 @@ export default defineComponent({
             state.currentData = item;
         };
 
-        // connect() {
-        //   Req.post('/open/redis/connect', this.form, res => {
-        //     this.redisInfo = res
-        //   })
-        // }
-
         const deleteRedis = async () => {
             try {
                 await ElMessageBox.confirm(`确定删除该redis?`, '提示', {
@@ -155,12 +233,23 @@ export default defineComponent({
             } catch (err) {}
         };
 
-        const info = (redis: any) => {
-            redisApi.redisInfo.request({ id: redis.id }).then((res: any) => {
-                state.infoDialog.info = res;
-                state.infoDialog.title = `'${redis.host}' info`;
-                state.infoDialog.visible = true;
-            });
+        const info = async (redis: any) => {
+            var host = redis.host;
+            if (redis.ip) {
+                host = redis.ip.split('@')[0];
+            }
+            const res = await redisApi.redisInfo.request({ id: redis.id, host });
+            state.infoDialog.info = res;
+            state.infoDialog.title = `'${host}' info`;
+            state.infoDialog.visible = true;
+        };
+
+        const onShowClusterInfo = async (redis: any) => {
+            const ci = await redisApi.clusterInfo.request({ id: redis.id });
+            state.clusterInfoDialog.info = ci.clusterInfo;
+            state.clusterInfoDialog.nodes = ci.clusterNodes;
+            state.clusterInfoDialog.redisId = redis.id;
+            state.clusterInfoDialog.visible = true;
         };
 
         const search = async () => {
@@ -192,6 +281,7 @@ export default defineComponent({
             handlePageChange,
             choose,
             info,
+            onShowClusterInfo,
             deleteRedis,
             editRedis,
             valChange,
diff --git a/mayfly_go_web/src/views/ops/redis/api.ts b/mayfly_go_web/src/views/ops/redis/api.ts
index 4b32e801..0a419cce 100644
--- a/mayfly_go_web/src/views/ops/redis/api.ts
+++ b/mayfly_go_web/src/views/ops/redis/api.ts
@@ -3,10 +3,11 @@ import Api from '@/common/Api';
 export const redisApi = {
     redisList : Api.create("/redis", 'get'),
     redisInfo: Api.create("/redis/{id}/info", 'get'),
+    clusterInfo: Api.create("/redis/{id}/cluster-info", 'get'),
     saveRedis: Api.create("/redis", 'post'),
     delRedis: Api.create("/redis/{id}", 'delete'),
     // 获取权限列表
-    scan: Api.create("/redis/{id}/scan/{cursor}/{count}", 'get'),
+    scan: Api.create("/redis/{id}/scan", 'post'),
     getStringValue: Api.create("/redis/{id}/string-value", 'get'),
     saveStringValue: Api.create("/redis/{id}/string-value", 'post'),
     getHashValue: Api.create("/redis/{id}/hash-value", 'get'),
diff --git a/mayfly_go_web/src/views/system/account/AccountEdit.vue b/mayfly_go_web/src/views/system/account/AccountEdit.vue
index 83ea094e..fcb2160b 100755
--- a/mayfly_go_web/src/views/system/account/AccountEdit.vue
+++ b/mayfly_go_web/src/views/system/account/AccountEdit.vue
@@ -3,7 +3,7 @@
         <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :show-close="false" width="35%" :destroy-on-close="true">
             <el-form :model="form" ref="accountForm" :rules="rules" label-width="85px">
                 <el-form-item prop="username" label="用户名:" required>
-                    <el-input :disabled="edit" v-model.trim="form.username" placeholder="请输入账号用户名" auto-complete="off"></el-input>
+                    <el-input :disabled="edit" v-model.trim="form.username" placeholder="请输入账号用户名，密码默认与账号名一致" auto-complete="off"></el-input>
                 </el-form-item>
                 <!-- <el-form-item prop="password" label="密码:" required>
                     <el-input type="password" v-model.trim="form.password" placeholder="请输入密码" autocomplete="new-password"></el-input>
diff --git a/mayfly_go_web/src/views/system/account/AccountList.vue b/mayfly_go_web/src/views/system/account/AccountList.vue
index 69fd0f5c..268f9401 100755
--- a/mayfly_go_web/src/views/system/account/AccountList.vue
+++ b/mayfly_go_web/src/views/system/account/AccountList.vue
@@ -2,7 +2,7 @@
     <div class="role-list">
         <el-card>
             <el-button v-auth="'account:add'" type="primary" icon="plus" @click="editAccount(true)">添加</el-button>
-            <el-button v-auth="'account:update'" :disabled="chooseId == null" @click="editAccount(false)" type="primary" icon="edit">编辑</el-button>
+            <!-- <el-button v-auth="'account:update'" :disabled="chooseId == null" @click="editAccount(false)" type="primary" icon="edit">编辑</el-button> -->
             <el-button v-auth="'account:saveRoles'" :disabled="chooseId == null" @click="roleEdit()" type="success" icon="setting"
                 >角色分配</el-button
             >
diff --git a/mayfly_go_web/yarn.lock b/mayfly_go_web/yarn.lock
index 5ddcfb01..8070a29f 100644
--- a/mayfly_go_web/yarn.lock
+++ b/mayfly_go_web/yarn.lock
@@ -633,10 +633,10 @@ echarts@^5.3.3:
     tslib "2.3.0"
     zrender "5.3.2"
 
-element-plus@^2.2.8:
-  version "2.2.8"
-  resolved "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.8.tgz#6bba6285c20d8bea42247977d8f605611fc2da93"
-  integrity sha512-+cubFh1rgeGcc2LeBm7hv/1BKFJre/LIIdRntm9OLaIhysCxigjEwcxk9gbVT4KsbcjmoqZUr4/mwhIhQV6mvw==
+element-plus@^2.2.9:
+  version "2.2.9"
+  resolved "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.9.tgz#f0366dfb2048d614813926274cb443f17e5fdef2"
+  integrity sha512-jYbL0JkCdv95rkT6trZJjCAizLPySa0qcd2cgq+57SKQnCZAcNDDq4GbTuFRnNavdoeCJnuM3HIficTIUpsMOQ==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.0.6"
diff --git a/server/config.yml b/server/config.yml
index 37b7dd07..17fd6778 100644
--- a/server/config.yml
+++ b/server/config.yml
@@ -1,6 +1,6 @@
 app:
   name: mayfly-go
-  version: 1.0.0
+  version: 1.2.0
   
 server:
   # debug release test
@@ -29,10 +29,6 @@ jwt:
   # 过期时间单位分钟
   expire-time: 1440
 
-redis:
-  host: 127.0.0.1
-  port: 6379
-
 mysql:
   host: localhost:3306
   username: root
diff --git a/server/go.mod b/server/go.mod
index 72eb2f16..f84db1f8 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -5,8 +5,9 @@ go 1.18
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible // jwt
 	github.com/gin-gonic/gin v1.8.1
-	github.com/go-redis/redis v6.15.9+incompatible
+	github.com/go-redis/redis/v8 v8.11.5
 	github.com/gorilla/websocket v1.5.0
+	github.com/lib/pq v1.10.6
 	github.com/mojocn/base64Captcha v1.3.5 // 验证码
 	github.com/pkg/sftp v1.13.4
 	github.com/robfig/cron/v3 v3.0.1 // 定时任务
@@ -21,6 +22,8 @@ require (
 )
 
 require (
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
@@ -39,8 +42,6 @@ require (
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/onsi/ginkgo v1.16.5 // indirect
-	github.com/onsi/gomega v1.18.1 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/ugorji/go/codec v1.2.7 // indirect
@@ -49,10 +50,11 @@ require (
 	github.com/xdg-go/stringprep v1.0.2 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 	golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect
-	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
 	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
 	golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
 	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
diff --git a/server/internal/devops/api/db.go b/server/internal/devops/api/db.go
index d17ac792..6c5c1e3b 100644
--- a/server/internal/devops/api/db.go
+++ b/server/internal/devops/api/db.go
@@ -184,13 +184,15 @@ func (d *Db) DumpSql(rc *ctx.ReqCtx) {
 	// 是否需要导出数据
 	needData := dumpType == "2" || dumpType == "3"
 
+	dbInstance := d.DbApp.GetDbInstance(dbId, db)
+	biz.ErrIsNilAppendErr(d.ProjectApp.CanAccess(rc.LoginAccount.Id, dbInstance.ProjectId), "%s")
+
 	now := time.Now()
 	filename := fmt.Sprintf("%s.%s.sql", db, now.Format("200601021504"))
 	g.Header("Content-Type", "application/octet-stream")
 	g.Header("Content-Disposition", "attachment; filename="+filename)
 
 	rc.ReqParam = fmt.Sprintf("数据库id: %d -- %s", dbId, db)
-	dbInstance := d.DbApp.GetDbInstance(dbId, db)
 	writer := g.Writer
 	writer.WriteString("-- ----------------------------")
 	writer.WriteString("\n-- 导出平台: mayfly-go")
@@ -222,7 +224,13 @@ func (d *Db) DumpSql(rc *ctx.ReqCtx) {
 			pageNum++
 		}
 
-		sqlTmp := "SELECT * FROM %s LIMIT %d, %d"
+		var sqlTmp string
+		switch dbInstance.Type {
+		case "mysql":
+			sqlTmp = "SELECT * FROM %s LIMIT %d, %d"
+		case "postgres":
+			sqlTmp = "SELECT * FROM %s OFFSET %d LIMIT %d"
+		}
 		for index := 0; index < pageNum; index++ {
 			sql := fmt.Sprintf(sqlTmp, table, index*DEFAULT_COLUMN_SIZE, DEFAULT_COLUMN_SIZE)
 			columns, result, _ := dbInstance.SelectData(sql)
@@ -301,7 +309,7 @@ func (d *Db) HintTables(rc *ctx.ReqCtx) {
 		columnName := fmt.Sprintf("%s  [%s]", v["columnName"], v["columnType"])
 		comment := v["columnComment"]
 		// 如果字段备注不为空，则加上备注信息
-		if comment != "" {
+		if comment != nil && comment != "" {
 			columnName = fmt.Sprintf("%s[%s]", columnName, comment)
 		}
 
diff --git a/server/internal/devops/api/form/db.go b/server/internal/devops/api/form/db.go
index 869497ed..241178ba 100644
--- a/server/internal/devops/api/form/db.go
+++ b/server/internal/devops/api/form/db.go
@@ -8,6 +8,7 @@ type DbForm struct {
 	Port      int    `binding:"required" json:"port"`
 	Username  string `binding:"required" json:"username"`
 	Password  string `json:"password"`
+	Params    string `json:"params"`
 	Database  string `binding:"required" json:"database"`
 	ProjectId uint64 `binding:"required" json:"projectId"`
 	Project   string `json:"project"`
diff --git a/server/internal/devops/api/form/redis.go b/server/internal/devops/api/form/redis.go
index 02900a5e..968b6db2 100644
--- a/server/internal/devops/api/form/redis.go
+++ b/server/internal/devops/api/form/redis.go
@@ -4,6 +4,7 @@ type Redis struct {
 	Id        uint64
 	Host      string `binding:"required" json:"host"`
 	Password  string `json:"password"`
+	Mode      string `json:"mode"`
 	Db        int    `json:"db"`
 	ProjectId uint64 `binding:"required" json:"projectId"`
 	Project   string `json:"project"`
@@ -30,3 +31,9 @@ type SetValue struct {
 	KeyInfo
 	Value []interface{} `binding:"required" json:"value"`
 }
+
+type RedisScanForm struct {
+	Cursor map[string]uint64 `json:"cursor"`
+	Match  string            `json:"match"`
+	Count  int64             `json:"count"`
+}
diff --git a/server/internal/devops/api/redis.go b/server/internal/devops/api/redis.go
index 5b500042..df3fe030 100644
--- a/server/internal/devops/api/redis.go
+++ b/server/internal/devops/api/redis.go
@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"mayfly-go/internal/devops/api/form"
 	"mayfly-go/internal/devops/api/vo"
 	"mayfly-go/internal/devops/application"
@@ -11,7 +12,10 @@ import (
 	"mayfly-go/pkg/utils"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
+
+	"github.com/go-redis/redis/v8"
 )
 
 type Redis struct {
@@ -45,7 +49,40 @@ func (r *Redis) DeleteRedis(rc *ctx.ReqCtx) {
 }
 
 func (r *Redis) RedisInfo(rc *ctx.ReqCtx) {
-	res, _ := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(rc.GinCtx, "id"))).Cli.Info().Result()
+	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(rc.GinCtx, "id")))
+
+	var res string
+	var err error
+
+	ctx := context.Background()
+	if ri.Mode == "" || ri.Mode == entity.RedisModeStandalone {
+		res, err = ri.Cli.Info(ctx).Result()
+	} else if ri.Mode == entity.RedisModeCluster {
+		host := rc.GinCtx.Query("host")
+		biz.NotEmpty(host, "集群模式host信息不能为空")
+		clusterClient := ri.ClusterCli
+		var redisClient *redis.Client
+		// 遍历集群的master节点找到该redis client
+		clusterClient.ForEachMaster(ctx, func(ctx context.Context, client *redis.Client) error {
+			if host == client.Options().Addr {
+				redisClient = client
+			}
+			return nil
+		})
+		if redisClient == nil {
+			// 遍历集群的slave节点找到该redis client
+			clusterClient.ForEachSlave(ctx, func(ctx context.Context, client *redis.Client) error {
+				if host == client.Options().Addr {
+					redisClient = client
+				}
+				return nil
+			})
+		}
+		biz.NotNil(redisClient, "该实例不在该集群中")
+		res, err = redisClient.Info(ctx).Result()
+	}
+
+	biz.ErrIsNilAppendErr(err, "获取redis info失败: %s")
 
 	datas := strings.Split(res, "\r\n")
 	i := 0
@@ -81,43 +118,125 @@ func (r *Redis) RedisInfo(rc *ctx.ReqCtx) {
 	rc.ResData = parseMap
 }
 
+func (r *Redis) ClusterInfo(rc *ctx.ReqCtx) {
+	g := rc.GinCtx
+	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
+	biz.IsEquals(ri.Mode, entity.RedisModeCluster, "非集群模式")
+	info, _ := ri.ClusterCli.ClusterInfo(context.Background()).Result()
+	nodesStr, _ := ri.ClusterCli.ClusterNodes(context.Background()).Result()
+
+	nodesRes := make([]map[string]string, 0)
+	nodes := strings.Split(nodesStr, "\n")
+	for _, node := range nodes {
+		if node == "" {
+			continue
+		}
+		nodeInfos := strings.Split(node, " ")
+		node := make(map[string]string)
+		node["nodeId"] = nodeInfos[0]
+		// ip:port1@port2：port1指redis服务器与客户端通信的端口，port2则是集群内部节点间通信的端口
+		node["ip"] = nodeInfos[1]
+		node["flags"] = nodeInfos[2]
+		// 如果节点是slave，并且已知master节点，则为master节点ID；否则为符号"-"
+		node["masterSlaveRelation"] = nodeInfos[3]
+		// 最近一次发送ping的时间，这个时间是一个unix毫秒时间戳，0代表没有发送过
+		node["pingSent"] = nodeInfos[4]
+		// 最近一次收到pong的时间，使用unix时间戳表示
+		node["pongRecv"] = nodeInfos[5]
+		// 节点的epoch值（如果该节点是从节点，则为其主节点的epoch值）。每当节点发生失败切换时，都会创建一个新的，独特的，递增的epoch。
+		// 如果多个节点竞争同一个哈希槽时，epoch值更高的节点会抢夺到
+		node["configEpoch"] = nodeInfos[6]
+		// node-to-node集群总线使用的链接的状态，我们使用这个链接与集群中其他节点进行通信.值可以是 connected 和 disconnected
+		node["linkState"] = nodeInfos[7]
+		// slave节点没有插槽信息
+		if len(nodeInfos) > 8 {
+			// slot：master节点第9位为哈希槽值或者一个哈希槽范围，代表当前节点可以提供服务的所有哈希槽值。如果只是一个值,那就是只有一个槽会被使用。
+			// 如果是一个范围，这个值表示为起始槽-结束槽，节点将处理包括起始槽和结束槽在内的所有哈希槽。
+			node["slot"] = nodeInfos[8]
+		}
+		nodesRes = append(nodesRes, node)
+	}
+	rc.ResData = map[string]interface{}{
+		"clusterInfo":  info,
+		"clusterNodes": nodesRes,
+	}
+}
+
 // scan获取redis的key列表信息
 func (r *Redis) Scan(rc *ctx.ReqCtx) {
 	g := rc.GinCtx
-
 	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
 	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
 
-	keys, cursor := ri.Scan(uint64(ginx.PathParamInt(g, "cursor")), g.Query("match"), int64(ginx.PathParamInt(g, "count")))
+	form := &form.RedisScanForm{}
+	ginx.BindJsonAndValid(rc.GinCtx, form)
 
-	var keyInfoSplit []string
-	if len(keys) > 0 {
-		keyInfoLua := `
-			local result = {}
-			-- KEYS[1]为第1个参数，lua数组下标从1开始
-			local ttl = redis.call('ttl', KEYS[1]);
-			local keyType = redis.call('type', KEYS[1]);
-			for i = 1, #KEYS do
-				local ttl = redis.call('ttl', KEYS[i]);
-				local keyType = redis.call('type', KEYS[i]);
-				table.insert(result, string.format("%d,%s", ttl, keyType['ok']));
-			end;
-			return table.concat(result, ".");`
-		// 通过lua获取 ttl,type.ttl2,type2格式，以便下面切割获取ttl和type。避免多次调用ttl和type函数
-		keyInfos, _ := ri.Cli.Eval(keyInfoLua, keys).Result()
-		keyInfoSplit = strings.Split(keyInfos.(string), ".")
-	}
+	cmd := ri.GetCmdable()
+	ctx := context.Background()
 
 	kis := make([]*vo.KeyInfo, 0)
-	for i, k := range keys {
-		ttlType := strings.Split(keyInfoSplit[i], ",")
-		ttl, _ := strconv.Atoi(ttlType[0])
-		ki := &vo.KeyInfo{Key: k, Type: ttlType[1], Ttl: int64(ttl)}
-		kis = append(kis, ki)
+	var cursorRes map[string]uint64 = make(map[string]uint64)
+
+	if ri.Mode == "" || ri.Mode == entity.RedisModeStandalone {
+		redisAddr := ri.Cli.Options().Addr
+		keys, cursor := ri.Scan(form.Cursor[redisAddr], form.Match, form.Count)
+		cursorRes[redisAddr] = cursor
+
+		var keyInfoSplit []string
+		if len(keys) > 0 {
+			keyInfosLua := `local result = {}
+							-- KEYS[1]为第1个参数,lua数组下标从1开始
+							for i = 1, #KEYS do
+								local ttl = redis.call('ttl', KEYS[i]);
+								local keyType = redis.call('type', KEYS[i]);
+								table.insert(result, string.format("%d,%s", ttl, keyType['ok']));
+							end;
+							return table.concat(result, ".");`
+			// 通过lua获取 ttl,type.ttl2,type2格式，以便下面切割获取ttl和type。避免多次调用ttl和type函数
+			keyInfos, err := cmd.Eval(ctx, keyInfosLua, keys).Result()
+			biz.ErrIsNilAppendErr(err, "执行lua脚本获取key信息失败: %s")
+			keyInfoSplit = strings.Split(keyInfos.(string), ".")
+		}
+
+		for i, k := range keys {
+			ttlType := strings.Split(keyInfoSplit[i], ",")
+			ttl, _ := strconv.Atoi(ttlType[0])
+			ki := &vo.KeyInfo{Key: k, Type: ttlType[1], Ttl: int64(ttl)}
+			kis = append(kis, ki)
+		}
+	} else if ri.Mode == entity.RedisModeCluster {
+		var keys []string
+
+		mu := &sync.Mutex{}
+		// 遍历所有master节点，并执行scan命令，合并keys
+		ri.ClusterCli.ForEachMaster(ctx, func(ctx context.Context, client *redis.Client) error {
+			redisAddr := client.Options().Addr
+			ks, cursor, _ := client.Scan(ctx, form.Cursor[redisAddr], form.Match, form.Count).Result()
+			// 遍历节点的内部回调函数使用异步调用，如不加锁会导致集合并发错误
+			mu.Lock()
+			cursorRes[redisAddr] = cursor
+			keys = append(keys, ks...)
+			mu.Unlock()
+			return nil
+		})
+
+		// 因为redis集群模式执行lua脚本key必须位于同一slot中，故单机获取的方式不适合
+		// 使用lua获取key的ttl以及类型，减少网络调用
+		keyInfoLua := `local ttl = redis.call('ttl', KEYS[1]);
+					   local keyType = redis.call('type', KEYS[1]);
+					   return string.format("%d,%s", ttl, keyType['ok'])`
+		for _, k := range keys {
+			keyInfo, err := cmd.Eval(ctx, keyInfoLua, []string{k}).Result()
+			biz.ErrIsNilAppendErr(err, "执行lua脚本获取key信息失败: %s")
+			ttlType := strings.Split(keyInfo.(string), ",")
+			ttl, _ := strconv.Atoi(ttlType[0])
+			ki := &vo.KeyInfo{Key: k, Type: ttlType[1], Ttl: int64(ttl)}
+			kis = append(kis, ki)
+		}
 	}
 
-	size, _ := ri.Cli.DBSize().Result()
-	rc.ResData = &vo.Keys{Cursor: cursor, Keys: kis, DbSize: size}
+	size, _ := cmd.DBSize(context.TODO()).Result()
+	rc.ResData = &vo.Keys{Cursor: cursorRes, Keys: kis, DbSize: size}
 }
 
 func (r *Redis) DeleteKey(rc *ctx.ReqCtx) {
@@ -129,7 +248,7 @@ func (r *Redis) DeleteKey(rc *ctx.ReqCtx) {
 	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
 
 	rc.ReqParam = key
-	ri.Cli.Del(key)
+	ri.GetCmdable().Del(context.Background(), key)
 }
 
 func (r *Redis) checkKey(rc *ctx.ReqCtx) (*application.RedisInstance, string) {
@@ -145,14 +264,14 @@ func (r *Redis) checkKey(rc *ctx.ReqCtx) (*application.RedisInstance, string) {
 
 func (r *Redis) GetStringValue(rc *ctx.ReqCtx) {
 	ri, key := r.checkKey(rc)
-	str, err := ri.Cli.Get(key).Result()
+	str, err := ri.GetCmdable().Get(context.TODO(), key).Result()
 	biz.ErrIsNilAppendErr(err, "获取字符串值失败: %s")
 	rc.ResData = str
 }
 
 func (r *Redis) GetHashValue(rc *ctx.ReqCtx) {
 	ri, key := r.checkKey(rc)
-	res, err := ri.Cli.HGetAll(key).Result()
+	res, err := ri.GetCmdable().HGetAll(context.TODO(), key).Result()
 	biz.ErrIsNilAppendErr(err, "获取hash值失败: %s")
 	rc.ResData = res
 }
@@ -165,7 +284,7 @@ func (r *Redis) SetStringValue(rc *ctx.ReqCtx) {
 	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
 	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
 
-	str, err := ri.Cli.Set(keyValue.Key, keyValue.Value, time.Second*time.Duration(keyValue.Timed)).Result()
+	str, err := ri.GetCmdable().Set(context.TODO(), keyValue.Key, keyValue.Value, time.Second*time.Duration(keyValue.Timed)).Result()
 	biz.ErrIsNilAppendErr(err, "保存字符串值失败: %s")
 	rc.ResData = str
 }
@@ -178,21 +297,22 @@ func (r *Redis) SetHashValue(rc *ctx.ReqCtx) {
 	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
 	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
 
+	cmd := ri.GetCmdable()
 	key := hashValue.Key
 	// 简单处理->先删除，后新增
-	ri.Cli.Del(key)
+	cmd.Del(context.TODO(), key)
 	for _, v := range hashValue.Value {
-		res := ri.Cli.HSet(key, v["key"].(string), v["value"])
+		res := cmd.HSet(context.TODO(), key, v["key"].(string), v["value"])
 		biz.ErrIsNilAppendErr(res.Err(), "保存hash值失败: %s")
 	}
 	if hashValue.Timed != -1 {
-		ri.Cli.Expire(key, time.Second*time.Duration(hashValue.Timed))
+		cmd.Expire(context.TODO(), key, time.Second*time.Duration(hashValue.Timed))
 	}
 }
 
 func (r *Redis) GetSetValue(rc *ctx.ReqCtx) {
 	ri, key := r.checkKey(rc)
-	res, err := ri.Cli.SMembers(key).Result()
+	res, err := ri.GetCmdable().SMembers(context.TODO(), key).Result()
 	biz.ErrIsNilAppendErr(err, "获取set值失败: %s")
 	rc.ResData = res
 }
@@ -204,13 +324,14 @@ func (r *Redis) SetSetValue(rc *ctx.ReqCtx) {
 
 	ri := r.RedisApp.GetRedisInstance(uint64(ginx.PathParamInt(g, "id")))
 	biz.ErrIsNilAppendErr(r.ProjectApp.CanAccess(rc.LoginAccount.Id, ri.ProjectId), "%s")
+	cmd := ri.GetCmdable()
 
 	key := keyvalue.Key
 	// 简单处理->先删除，后新增
-	ri.Cli.Del(key)
-	ri.Cli.SAdd(key, keyvalue.Value...)
+	cmd.Del(context.TODO(), key)
+	cmd.SAdd(context.TODO(), key, keyvalue.Value...)
 
 	if keyvalue.Timed != -1 {
-		ri.Cli.Expire(key, time.Second*time.Duration(keyvalue.Timed))
+		cmd.Expire(context.TODO(), key, time.Second*time.Duration(keyvalue.Timed))
 	}
 }
diff --git a/server/internal/devops/api/vo/db.go b/server/internal/devops/api/vo/db.go
index 7e56b791..542dae85 100644
--- a/server/internal/devops/api/vo/db.go
+++ b/server/internal/devops/api/vo/db.go
@@ -9,6 +9,7 @@ type SelectDataDbVO struct {
 	Host       *string    `json:"host"`
 	Port       *int       `json:"port"`
 	Type       *string    `json:"type"`
+	Params     *string    `json:"params"`
 	Database   *string    `json:"database"`
 	Username   *string    `json:"username"`
 	ProjectId  *int64     `json:"projectId"`
diff --git a/server/internal/devops/api/vo/redis.go b/server/internal/devops/api/vo/redis.go
index b16e68a9..97fe33e3 100644
--- a/server/internal/devops/api/vo/redis.go
+++ b/server/internal/devops/api/vo/redis.go
@@ -9,6 +9,8 @@ type Redis struct {
 	Db         int        `json:"db"`
 	ProjectId  *int64     `json:"projectId"`
 	Project    *string    `json:"project"`
+	Mode       *string    `json:"mode"`
+	Remark     *string    `json:"remark"`
 	Env        *string    `json:"env"`
 	EnvId      *int64     `json:"envId"`
 	CreateTime *time.Time `json:"createTime"`
@@ -17,9 +19,9 @@ type Redis struct {
 }
 
 type Keys struct {
-	Cursor uint64     `json:"cursor"`
-	Keys   []*KeyInfo `json:"keys"`
-	DbSize int64      `json:"dbSize"`
+	Cursor map[string]uint64 `json:"cursor"`
+	Keys   []*KeyInfo        `json:"keys"`
+	DbSize int64             `json:"dbSize"`
 }
 
 type KeyInfo struct {
diff --git a/server/internal/devops/application/db_app.go b/server/internal/devops/application/db_app.go
index 828a4af7..92d5deab 100644
--- a/server/internal/devops/application/db_app.go
+++ b/server/internal/devops/application/db_app.go
@@ -17,6 +17,8 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	_ "github.com/lib/pq"
 )
 
 type Db interface {
@@ -228,10 +230,6 @@ func (d *DbInstance) SelectData(execSql string) ([]string, []map[string]interfac
 	if !isSelect && !isShow && !isExplain {
 		return nil, nil, errors.New("该sql非查询语句")
 	}
-	// 没加limit，则默认限制50条
-	if isSelect && !strings.Contains(execSql, "limit") && !strings.Contains(execSql, "LIMIT") {
-		execSql = execSql + " LIMIT 50"
-	}
 
 	rows, err := d.db.Query(execSql)
 	if err != nil {
@@ -335,8 +333,21 @@ func (d *DbInstance) Close() {
 
 // 获取dataSourceName
 func getDsn(d *entity.Db) string {
+	var dsn string
 	if d.Type == "mysql" {
-		return fmt.Sprintf("%s:%s@%s(%s:%d)/%s?timeout=8s", d.Username, d.Password, d.Network, d.Host, d.Port, d.Database)
+		dsn = fmt.Sprintf("%s:%s@%s(%s:%d)/%s?timeout=8s", d.Username, d.Password, d.Network, d.Host, d.Port, d.Database)
+		if d.Params != "" {
+			dsn = fmt.Sprintf("%s&%s", dsn, d.Params)
+		}
+		return dsn
+	}
+
+	if d.Type == "postgres" {
+		dsn = fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable", d.Host, d.Port, d.Username, d.Password, d.Database)
+		if d.Params != "" {
+			dsn = fmt.Sprintf("%s %s", dsn, strings.Join(strings.Split(d.Params, "&"), " "))
+		}
+		return dsn
 	}
 	return ""
 }
@@ -370,7 +381,7 @@ const (
 	DEFAULT_COLUMN_SIZE = 2000
 
 	// mysql 列信息元数据
-	MYSQL_COLOUMN_MA = `SELECT table_name tableName, column_name columnName, column_type columnType,
+	MYSQL_COLUMN_MA = `SELECT table_name tableName, column_name columnName, column_type columnType,
 	column_comment columnComment, column_key columnKey, extra, is_nullable nullable from information_schema.columns
 	WHERE table_name in (%s) AND table_schema = (SELECT database()) ORDER BY tableName, ordinal_position LIMIT %d, %d`
 
@@ -379,10 +390,58 @@ const (
 	WHERE table_name in (%s) AND table_schema = (SELECT database())`
 )
 
+const (
+	// postgres 表信息元数据
+	PGSQL_TABLE_MA = `SELECT obj_description(c.oid) AS "tableComment", c.relname AS "tableName" FROM pg_class c 
+	JOIN pg_namespace n ON c.relnamespace = n.oid WHERE n.nspname = (select current_schema()) AND c.reltype > 0`
+
+	PGSQL_TABLE_INFO = `SELECT obj_description(c.oid) AS "tableComment", c.relname AS "tableName" FROM pg_class c 
+	JOIN pg_namespace n ON c.relnamespace = n.oid WHERE n.nspname = (select current_schema()) AND c.reltype > 0`
+
+	PGSQL_INDEX_INFO = `SELECT indexname AS "indexName", indexdef AS "indexComment"
+	FROM pg_indexes WHERE schemaname =  (select current_schema()) AND tablename = '%s'`
+
+	PGSQL_COLUMN_MA = `SELECT
+		C.relname AS "tableName",
+		A.attname AS "columnName",
+		concat_ws ( '', t.typname, SUBSTRING ( format_type ( a.atttypid, a.atttypmod ) FROM '\(.*\)' ) ) AS "columnType",
+		d.description AS "columnComment" 
+	FROM
+		pg_attribute a LEFT JOIN pg_description d ON d.objoid = a.attrelid 
+		AND d.objsubid = A.attnum
+		LEFT JOIN pg_class c ON A.attrelid = c.oid
+		LEFT JOIN pg_namespace pn ON c.relnamespace = pn.oid
+		LEFT JOIN pg_type t ON a.atttypid = t.oid 
+	WHERE
+		A.attnum >= 0 
+		AND pn.nspname = (select current_schema())
+		AND C.relname in (%s)
+	ORDER BY
+		C.relname DESC,
+		A.attnum ASC
+	OFFSET %d LIMIT %d	
+	`
+
+	PGSQL_COLUMN_MA_COUNT = `SELECT COUNT(*) "maNum"
+	FROM
+		pg_attribute a LEFT JOIN pg_description d ON d.objoid = a.attrelid 
+		AND d.objsubid = A.attnum
+		LEFT JOIN pg_class c ON A.attrelid = c.oid
+		LEFT JOIN pg_namespace pn ON c.relnamespace = pn.oid
+		LEFT JOIN pg_type t ON a.atttypid = t.oid 
+	WHERE
+		A.attnum >= 0 
+		AND pn.nspname = (select current_schema())
+		AND C.relname in (%s)
+	`
+)
+
 func (d *DbInstance) GetTableMetedatas() []map[string]interface{} {
 	var sql string
 	if d.Type == "mysql" {
 		sql = MYSQL_TABLE_MA
+	} else if d.Type == "postgres" {
+		sql = PGSQL_TABLE_MA
 	}
 	_, res, _ := d.SelectData(sql)
 	return res
@@ -401,7 +460,10 @@ func (d *DbInstance) GetColumnMetadatas(tableNames ...string) []map[string]inter
 	var sqlTmp string
 	if d.Type == "mysql" {
 		countSqlTmp = MYSQL_COLOUMN_MA_COUNT
-		sqlTmp = MYSQL_COLOUMN_MA
+		sqlTmp = MYSQL_COLUMN_MA
+	} else if d.Type == "postgres" {
+		countSqlTmp = PGSQL_COLUMN_MA_COUNT
+		sqlTmp = PGSQL_COLUMN_MA
 	}
 
 	countSql := fmt.Sprintf(countSqlTmp, tableName)
@@ -433,6 +495,8 @@ func (d *DbInstance) GetTableInfos() []map[string]interface{} {
 	var sql string
 	if d.Type == "mysql" {
 		sql = MYSQL_TABLE_INFO
+	} else if d.Type == "postgres" {
+		sql = PGSQL_TABLE_INFO
 	}
 	_, res, _ := d.SelectData(sql)
 	return res
@@ -442,6 +506,8 @@ func (d *DbInstance) GetTableIndex(tableName string) []map[string]interface{} {
 	var sql string
 	if d.Type == "mysql" {
 		sql = fmt.Sprintf(MYSQL_INDEX_INFO, tableName)
+	} else if d.Type == "postgres" {
+		sql = fmt.Sprintf(PGSQL_INDEX_INFO, tableName)
 	}
 	_, res, _ := d.SelectData(sql)
 	return res
diff --git a/server/internal/devops/application/redis_app.go b/server/internal/devops/application/redis_app.go
index 66a52604..b833ba72 100644
--- a/server/internal/devops/application/redis_app.go
+++ b/server/internal/devops/application/redis_app.go
@@ -1,6 +1,7 @@
 package application
 
 import (
+	"context"
 	"fmt"
 	"mayfly-go/internal/devops/domain/entity"
 	"mayfly-go/internal/devops/domain/repository"
@@ -9,9 +10,10 @@ import (
 	"mayfly-go/pkg/cache"
 	"mayfly-go/pkg/global"
 	"mayfly-go/pkg/model"
+	"strings"
 	"time"
 
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 )
 
 type Redis interface {
@@ -102,24 +104,53 @@ func (r *redisAppImpl) GetRedisInstance(id uint64) *RedisInstance {
 	// 缓存不存在，则回调获取redis信息
 	re := r.GetById(id)
 	biz.NotNil(re, "redis信息不存在")
+
+	redisMode := re.Mode
+	ri := &RedisInstance{Id: id, ProjectId: re.ProjectId, Mode: redisMode}
+	if redisMode == "" || redisMode == entity.RedisModeStandalone {
+		rcli := getRedisCient(re)
+		// 测试连接
+		_, e := rcli.Ping(context.Background()).Result()
+		if e != nil {
+			rcli.Close()
+			panic(biz.NewBizErr(fmt.Sprintf("redis连接失败: %s", e.Error())))
+		}
+		ri.Cli = rcli
+	} else if redisMode == entity.RedisModeCluster {
+		ccli := getRedisClusterClient(re)
+		// 测试连接
+		_, e := ccli.Ping(context.Background()).Result()
+		if e != nil {
+			ccli.Close()
+			panic(biz.NewBizErr(fmt.Sprintf("redis集群连接失败: %s", e.Error())))
+		}
+		ri.ClusterCli = ccli
+	}
+
 	global.Log.Infof("连接redis: %s", re.Host)
-
-	rcli := redis.NewClient(&redis.Options{
-		Addr:     re.Host,
-		Password: re.Password, // no password set
-		DB:       re.Db,       // use default DB
-	})
-	// 测试连接
-	_, e := rcli.Ping().Result()
-	biz.ErrIsNilAppendErr(e, "redis连接失败: %s")
-
-	ri := &RedisInstance{Id: id, ProjectId: re.ProjectId, Cli: rcli}
 	if needCache {
 		redisCache.Put(re.Id, ri)
 	}
 	return ri
 }
 
+func getRedisCient(re *entity.Redis) *redis.Client {
+	return redis.NewClient(&redis.Options{
+		Addr:        re.Host,
+		Password:    re.Password, // no password set
+		DB:          re.Db,       // use default DB
+		DialTimeout: 8 * time.Second,
+	})
+}
+
+func getRedisClusterClient(re *entity.Redis) *redis.ClusterClient {
+	return redis.NewClusterClient(&redis.ClusterOptions{
+		Addrs:       strings.Split(re.Host, ","),
+		Password:    re.Password,
+		DialTimeout: 8 * time.Second,
+	})
+}
+
 //------------------------------------------------------------------------------
 
 // redis客户端连接缓存，30分钟内没有访问则会被关闭
@@ -127,35 +158,64 @@ var redisCache = cache.NewTimedCache(30*time.Minute, 5*time.Second).
 	WithUpdateAccessTime(true).
 	OnEvicted(func(key interface{}, value interface{}) {
 		global.Log.Info(fmt.Sprintf("删除redis连接缓存 id = %d", key))
-		value.(*RedisInstance).Cli.Close()
+		value.(*RedisInstance).Close()
 	})
 
-// redis实例
-type RedisInstance struct {
-	Id        uint64
-	ProjectId uint64
-	Cli       *redis.Client
-}
-
 // 移除redis连接缓存并关闭redis连接
 func CloseRedis(id uint64) {
 	redisCache.Delete(id)
 }
 
 func TestRedisConnection(re *entity.Redis) {
-	rcli := redis.NewClient(&redis.Options{
-		Addr:     re.Host,
-		Password: re.Password, // no password set
-		DB:       re.Db,       // use default DB
-	})
-	defer rcli.Close()
+	var cmd redis.Cmdable
+	if re.Mode == "" || re.Mode == entity.RedisModeStandalone {
+		rcli := getRedisCient(re)
+		defer rcli.Close()
+		cmd = rcli
+	} else if re.Mode == entity.RedisModeCluster {
+		ccli := getRedisClusterClient(re)
+		defer ccli.Close()
+		cmd = ccli
+	}
+
 	// 测试连接
-	_, e := rcli.Ping().Result()
+	_, e := cmd.Ping(context.Background()).Result()
 	biz.ErrIsNilAppendErr(e, "Redis连接失败: %s")
 }
 
+// redis实例
+type RedisInstance struct {
+	Id         uint64
+	ProjectId  uint64
+	Mode       string
+	Cli        *redis.Client
+	ClusterCli *redis.ClusterClient
+}
+
+// 获取命令执行接口的具体实现
+func (r *RedisInstance) GetCmdable() redis.Cmdable {
+	redisMode := r.Mode
+	if redisMode == "" || redisMode == entity.RedisModeStandalone {
+		return r.Cli
+	}
+	if r.Mode == entity.RedisModeCluster {
+		return r.ClusterCli
+	}
+	return nil
+}
+
 func (r *RedisInstance) Scan(cursor uint64, match string, count int64) ([]string, uint64) {
-	keys, newcursor, err := r.Cli.Scan(cursor, match, count).Result()
+	keys, newcursor, err := r.GetCmdable().Scan(context.Background(), cursor, match, count).Result()
 	biz.ErrIsNilAppendErr(err, "scan失败: %s")
 	return keys, newcursor
 }
+
+func (r *RedisInstance) Close() {
+	if r.Mode == entity.RedisModeStandalone {
+		r.Cli.Close()
+		return
+	}
+	if r.Mode == entity.RedisModeCluster {
+		r.ClusterCli.Close()
+	}
+}
diff --git a/server/internal/devops/domain/entity/db.go b/server/internal/devops/domain/entity/db.go
index f8af50c2..df95aa00 100644
--- a/server/internal/devops/domain/entity/db.go
+++ b/server/internal/devops/domain/entity/db.go
@@ -15,6 +15,7 @@ type Db struct {
 	Username  string `orm:"column(username)" json:"username"`
 	Password  string `orm:"column(password)" json:"-"`
 	Database  string `orm:"column(database)" json:"database"`
+	Params    string `json:"params"`
 	ProjectId uint64
 	Project   string
 	EnvId     uint64
diff --git a/server/internal/devops/domain/entity/redis.go b/server/internal/devops/domain/entity/redis.go
index 56accd4b..f58ff93f 100644
--- a/server/internal/devops/domain/entity/redis.go
+++ b/server/internal/devops/domain/entity/redis.go
@@ -8,10 +8,17 @@ type Redis struct {
 	model.Model
 
 	Host      string `orm:"column(host)" json:"host"`
+	Mode      string `json:"mode"`
 	Password  string `orm:"column(password)" json:"-"`
 	Db        int    `orm:"column(database)" json:"db"`
+	Remark    string
 	ProjectId uint64
 	Project   string
 	EnvId     uint64
 	Env       string
 }
+
+const (
+	RedisModeStandalone = "standalone"
+	RedisModeCluster    = "cluster"
+)
diff --git a/server/internal/devops/router/redis.go b/server/internal/devops/router/redis.go
index 61b310dc..025727c9 100644
--- a/server/internal/devops/router/redis.go
+++ b/server/internal/devops/router/redis.go
@@ -35,8 +35,12 @@ func InitRedisRouter(router *gin.RouterGroup) {
 			ctx.NewReqCtxWithGin(c).Handle(rs.RedisInfo)
 		})
 
+		redis.GET(":id/cluster-info", func(c *gin.Context) {
+			ctx.NewReqCtxWithGin(c).Handle(rs.ClusterInfo)
+		})
+
 		// 获取指定redis keys
-		redis.GET(":id/scan/:cursor/:count", func(c *gin.Context) {
+		redis.POST(":id/scan", func(c *gin.Context) {
 			ctx.NewReqCtxWithGin(c).Handle(rs.Scan)
 		})
 
diff --git a/server/mayfly-go.sql b/server/mayfly-go.sql
index 5ca53772..56a9308c 100644
--- a/server/mayfly-go.sql
+++ b/server/mayfly-go.sql
@@ -22,12 +22,13 @@ DROP TABLE IF EXISTS `t_db`;
 CREATE TABLE `t_db` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '数据库实例名称',
-  `host` varchar(20) COLLATE utf8mb4_bin NOT NULL,
+  `host` varchar(50) COLLATE utf8mb4_bin NOT NULL,
   `port` int(8) NOT NULL,
   `username` varchar(255) COLLATE utf8mb4_bin NOT NULL,
   `password` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL,
   `type` varchar(20) COLLATE utf8mb4_bin NOT NULL COMMENT '数据库实例类型(mysql...)',
   `database` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '数据库,空格分割多个数据库',
+  `params` varchar(125) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '其他连接参数',
   `network` varchar(8) COLLATE utf8mb4_bin DEFAULT NULL,
   `project_id` bigint(20) DEFAULT NULL,
   `project` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL,
@@ -103,7 +104,7 @@ CREATE TABLE `t_machine` (
   `project_id` bigint(20) DEFAULT NULL,
   `project_name` varchar(36) COLLATE utf8mb4_bin DEFAULT NULL,
   `name` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
-  `ip` varchar(18) COLLATE utf8mb4_bin NOT NULL,
+  `ip` varchar(36) COLLATE utf8mb4_bin NOT NULL,
   `port` int(12) NOT NULL,
   `username` varchar(12) COLLATE utf8mb4_bin NOT NULL,
   `password` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
@@ -253,9 +254,11 @@ CREATE TABLE `t_project_member` (
 DROP TABLE IF EXISTS `t_redis`;
 CREATE TABLE `t_redis` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `host` varchar(32) COLLATE utf8mb4_bin NOT NULL,
+  `host` varchar(255) COLLATE utf8mb4_bin NOT NULL,
   `password` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
   `db` int(32) DEFAULT NULL,
+  `mode` varchar(32) DEFAULT NULL,
+  `remark` varchar(125) DEFAULT NULL,
   `project_id` bigint(20) DEFAULT NULL,
   `project` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
   `env_id` bigint(20) DEFAULT NULL,
diff --git a/server/pkg/global/global.go b/server/pkg/global/global.go
index 164f910e..e0424469 100644
--- a/server/pkg/global/global.go
+++ b/server/pkg/global/global.go
@@ -1,7 +1,7 @@
 package global
 
 import (
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 	"github.com/sirupsen/logrus"
 	"gorm.io/gorm"
 )
diff --git a/server/pkg/rediscli/rediscli.go b/server/pkg/rediscli/rediscli.go
index 2b950a6b..e94bb821 100644
--- a/server/pkg/rediscli/rediscli.go
+++ b/server/pkg/rediscli/rediscli.go
@@ -1,10 +1,11 @@
 package rediscli
 
 import (
+	"context"
 	"fmt"
 	"time"
 
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 )
 
 var cli *redis.Client
@@ -19,7 +20,7 @@ func GetCli() *redis.Client {
 
 // get key value
 func Get(key string) string {
-	val, err := cli.Get(key).Result()
+	val, err := cli.Get(context.TODO(), key).Result()
 	switch {
 	case err == redis.Nil:
 		fmt.Println("key does not exist")
@@ -33,32 +34,32 @@ func Get(key string) string {
 
 // set key value
 func Set(key string, val string, expiration time.Duration) {
-	cli.Set(key, val, expiration)
+	cli.Set(context.TODO(), key, val, expiration)
 }
 
 func HSet(key string, field string, val interface{}) {
-	cli.HSet(key, field, val)
+	cli.HSet(context.TODO(), key, field, val)
 }
 
 // hget
 func HGet(key string, field string) string {
-	val, _ := cli.HGet(key, field).Result()
+	val, _ := cli.HGet(context.TODO(), key, field).Result()
 	return val
 }
 
 // hget
 func HExist(key string, field string) bool {
-	val, _ := cli.HExists(key, field).Result()
+	val, _ := cli.HExists(context.TODO(), key, field).Result()
 	return val
 }
 
 // hgetall
 func HGetAll(key string) map[string]string {
-	vals, _ := cli.HGetAll(key).Result()
+	vals, _ := cli.HGetAll(context.TODO(), key).Result()
 	return vals
 }
 
 // hdel
 func HDel(key string, fields ...string) int {
-	return int(cli.HDel(key, fields...).Val())
+	return int(cli.HDel(context.TODO(), key, fields...).Val())
 }
diff --git a/server/pkg/starter/redis.go b/server/pkg/starter/redis.go
index f9f4a9ce..16f2c490 100644
--- a/server/pkg/starter/redis.go
+++ b/server/pkg/starter/redis.go
@@ -1,11 +1,12 @@
 package starter
 
 import (
+	"context"
 	"fmt"
 	"mayfly-go/pkg/config"
 	"mayfly-go/pkg/global"
 
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 )
 
 func InitRedis() {
@@ -26,7 +27,7 @@ func ConnRedis() *redis.Client {
 		DB:       redisConf.Db,       // use default DB
 	})
 	// 测试连接
-	_, e := rdb.Ping().Result()
+	_, e := rdb.Ping(context.TODO()).Result()
 	if e != nil {
 		global.Log.Panic(fmt.Sprintf("连接redis失败! [%s:%d]", redisConf.Host, redisConf.Port))
 	}