From 4ac9f02d6a1c56eedaf8148ebd0ecee8916be48b Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Tue, 26 Dec 2023 22:31:51 +0800
Subject: [PATCH] refactor: code review

---
 mayfly_go_web/src/common/useRequest.ts        |   1 +
 mayfly_go_web/src/theme/app.scss              |   2 +-
 .../db/component/sqleditor/DbSqlEditor.vue    |   2 +-
 .../src/views/ops/mongo/MongoDataOp.vue       | 231 +++++++++---------
 .../src/views/ops/redis/DataOperation.vue     |   2 +-
 .../views/system/resource/ResourceList.vue    |   3 +-
 .../views/system/role/AccountAllocation.vue   |   5 +-
 server/internal/db/dbm/db_type.go             |   2 +-
 server/internal/db/dbm/dialect_mysql.go       |   3 +-
 server/internal/db/dbm/metasql/mysql_meta.sql |   8 +
 server/internal/sys/application/config.go     |  23 +-
 11 files changed, 142 insertions(+), 140 deletions(-)

diff --git a/mayfly_go_web/src/common/useRequest.ts b/mayfly_go_web/src/common/useRequest.ts
index 4844934e..08b9e869 100644
--- a/mayfly_go_web/src/common/useRequest.ts
+++ b/mayfly_go_web/src/common/useRequest.ts
@@ -25,6 +25,7 @@ const useCustomFetch = createFetch({
                 headers.set('Authorization', token);
                 headers.set('ClientId', getClientId());
             }
+            headers.set('Content-Type', 'application/json');
             options.headers = headers;
 
             return { options };
diff --git a/mayfly_go_web/src/theme/app.scss b/mayfly_go_web/src/theme/app.scss
index 937157cf..ff03eff4 100644
--- a/mayfly_go_web/src/theme/app.scss
+++ b/mayfly_go_web/src/theme/app.scss
@@ -71,7 +71,7 @@ body,
 
     .layout-main {
         box-sizing: border-box;
-        padding: 8px 10px;
+        padding: 10px 10px;
         overflow-x: hidden;
         width: 100%;
         background-color: var(--bg-main-color);
diff --git a/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue b/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
index bccc2c7d..0e64eee9 100644
--- a/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
+++ b/mayfly_go_web/src/views/ops/db/component/sqleditor/DbSqlEditor.vue
@@ -276,7 +276,7 @@ const onRemoveTab = (targetId: number) => {
 const resizeTableHeight = (e: any) => {
     const vh = window.innerHeight;
     state.editorSize = e[0].size;
-    const plitpaneHeight = vh - 223;
+    const plitpaneHeight = vh - 233;
     const editorHeight = plitpaneHeight * (state.editorSize / 100);
     state.tableDataHeight = plitpaneHeight - editorHeight - 40 + 'px';
 };
diff --git a/mayfly_go_web/src/views/ops/mongo/MongoDataOp.vue b/mayfly_go_web/src/views/ops/mongo/MongoDataOp.vue
index 94e61982..8636eee8 100644
--- a/mayfly_go_web/src/views/ops/mongo/MongoDataOp.vue
+++ b/mayfly_go_web/src/views/ops/mongo/MongoDataOp.vue
@@ -1,131 +1,128 @@
 <template>
-    <div>
-        <el-row>
-            <Splitpanes class="default-theme">
-                <Pane size="20" max-size="30">
-                    <tag-tree :resource-type="TagResourceTypeEnum.Mongo.value" :tag-path-node-type="NodeTypeTagPath">
-                        <template #prefix="{ data }">
-                            <span v-if="data.type.value == MongoNodeType.Mongo">
-                                <el-popover :show-after="500" placement="right-start" title="mongo实例信息" trigger="hover" :width="250">
-                                    <template #reference>
-                                        <SvgIcon name="iconfont icon-op-mongo" :size="18" />
-                                    </template>
-                                    <template #default>
-                                        <el-descriptions :column="1" size="small">
-                                            <el-descriptions-item label="名称">
-                                                {{ data.params.name }}
-                                            </el-descriptions-item>
-                                            <el-descriptions-item label="链接">
-                                                {{ data.params.uri }}
-                                            </el-descriptions-item>
-                                        </el-descriptions>
-                                    </template>
-                                </el-popover>
-                            </span>
+    <div class="flex-all-center">
+        <Splitpanes class="default-theme">
+            <Pane size="20" max-size="30">
+                <tag-tree :resource-type="TagResourceTypeEnum.Mongo.value" :tag-path-node-type="NodeTypeTagPath">
+                    <template #prefix="{ data }">
+                        <span v-if="data.type.value == MongoNodeType.Mongo">
+                            <el-popover :show-after="500" placement="right-start" title="mongo实例信息" trigger="hover" :width="250">
+                                <template #reference>
+                                    <SvgIcon name="iconfont icon-op-mongo" :size="18" />
+                                </template>
+                                <template #default>
+                                    <el-descriptions :column="1" size="small">
+                                        <el-descriptions-item label="名称">
+                                            {{ data.params.name }}
+                                        </el-descriptions-item>
+                                        <el-descriptions-item label="链接">
+                                            {{ data.params.uri }}
+                                        </el-descriptions-item>
+                                    </el-descriptions>
+                                </template>
+                            </el-popover>
+                        </span>
 
-                            <SvgIcon v-if="data.type.value == MongoNodeType.Dbs" name="Coin" color="#67c23a" />
+                        <SvgIcon v-if="data.type.value == MongoNodeType.Dbs" name="Coin" color="#67c23a" />
 
-                            <SvgIcon
-                                v-if="data.type.value == MongoNodeType.Coll || data.type.value == MongoNodeType.CollMenu"
-                                name="Document"
-                                class="color-primary"
-                            />
-                        </template>
+                        <SvgIcon
+                            v-if="data.type.value == MongoNodeType.Coll || data.type.value == MongoNodeType.CollMenu"
+                            name="Document"
+                            class="color-primary"
+                        />
+                    </template>
 
-                        <template #label="{ data }">
-                            <span v-if="data.type.value == MongoNodeType.Dbs">
-                                {{ data.params.database }}
-                                <span style="color: #8492a6; font-size: 13px"> [{{ formatByteSize(data.params.size) }}] </span>
-                            </span>
+                    <template #label="{ data }">
+                        <span v-if="data.type.value == MongoNodeType.Dbs">
+                            {{ data.params.database }}
+                            <span style="color: #8492a6; font-size: 13px"> [{{ formatByteSize(data.params.size) }}] </span>
+                        </span>
 
-                            <span v-else>{{ data.label }}</span>
-                        </template>
-                    </tag-tree>
-                </Pane>
+                        <span v-else>{{ data.label }}</span>
+                    </template>
+                </tag-tree>
+            </Pane>
 
-                <Pane>
-                    <div class="mongo-data-tab card pd5">
-                        <el-row v-if="nowColl">
-                            <el-descriptions class="w100" :column="10" size="small" border>
-                                <!-- <el-descriptions-item label-align="right" label="tag">xxx</el-descriptions-item> -->
+            <Pane>
+                <div class="mongo-data-tab card pd5 w100">
+                    <el-row v-if="nowColl">
+                        <el-descriptions class="w100" :column="10" size="small" border>
+                            <!-- <el-descriptions-item label-align="right" label="tag">xxx</el-descriptions-item> -->
 
-                                <el-descriptions-item label="ns" label-align="right">
-                                    {{ nowColl.stats?.ns }}
-                                </el-descriptions-item>
-                                <el-descriptions-item label="count" label-align="right">
-                                    {{ nowColl.stats?.count }}
-                                </el-descriptions-item>
-                                <el-descriptions-item label="avgObjSize" label-align="right">
-                                    {{ formatByteSize(nowColl.stats?.avgObjSize) }}
-                                </el-descriptions-item>
-                                <el-descriptions-item label="size" label-align="right">
-                                    {{ formatByteSize(nowColl.stats?.size) }}
-                                </el-descriptions-item>
-                                <el-descriptions-item label="totalSize" label-align="right">
-                                    {{ formatByteSize(nowColl.stats?.totalSize) }}
-                                </el-descriptions-item>
-                                <el-descriptions-item label="storageSize" label-align="right">
-                                    {{ formatByteSize(nowColl.stats?.storageSize) }}
-                                </el-descriptions-item>
-                                <el-descriptions-item label="freeStorageSize" label-align="right">
-                                    {{ formatByteSize(nowColl.stats?.freeStorageSize) }}
-                                </el-descriptions-item>
-                            </el-descriptions>
-                        </el-row>
+                            <el-descriptions-item label="ns" label-align="right">
+                                {{ nowColl.stats?.ns }}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="count" label-align="right">
+                                {{ nowColl.stats?.count }}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="avgObjSize" label-align="right">
+                                {{ formatByteSize(nowColl.stats?.avgObjSize) }}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="size" label-align="right">
+                                {{ formatByteSize(nowColl.stats?.size) }}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="totalSize" label-align="right">
+                                {{ formatByteSize(nowColl.stats?.totalSize) }}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="storageSize" label-align="right">
+                                {{ formatByteSize(nowColl.stats?.storageSize) }}
+                            </el-descriptions-item>
+                            <el-descriptions-item label="freeStorageSize" label-align="right">
+                                {{ formatByteSize(nowColl.stats?.freeStorageSize) }}
+                            </el-descriptions-item>
+                        </el-descriptions>
+                    </el-row>
 
-                        <el-row type="flex">
-                            <el-tabs @tab-remove="removeDataTab" class="w100 ml5" v-model="state.activeName">
-                                <el-tab-pane closable v-for="dt in state.dataTabs" :key="dt.key" :label="dt.label" :name="dt.key">
+                    <el-row type="flex">
+                        <el-tabs @tab-remove="removeDataTab" class="w100 ml5" v-model="state.activeName">
+                            <el-tab-pane closable v-for="dt in state.dataTabs" :key="dt.key" :label="dt.label" :name="dt.key">
+                                <el-row>
+                                    <el-col :span="2">
+                                        <div class="mt5">
+                                            <el-link @click="findCommand(state.activeName)" icon="refresh" :underline="false" class=""> </el-link>
+                                            <el-divider direction="vertical" border-style="dashed" />
+                                            <el-link v-auth="perms.saveData" @click="onEditDoc(null)" type="primary" icon="plus" :underline="false"> </el-link>
+                                        </div>
+                                    </el-col>
+                                    <el-col :span="22">
+                                        <el-input
+                                            ref="findParamInputRef"
+                                            v-model="dt.findParamStr"
+                                            placeholder="点击输入相应查询条件"
+                                            @focus="showFindDialog(dt.key)"
+                                        >
+                                            <template #prepend>查询参数</template>
+                                        </el-input>
+                                    </el-col>
+                                </el-row>
+                                <el-scrollbar class="mongo-data-tab-data">
                                     <el-row>
-                                        <el-col :span="2">
-                                            <div class="mt5">
-                                                <el-link @click="findCommand(state.activeName)" icon="refresh" :underline="false" class=""> </el-link>
-                                                <el-divider direction="vertical" border-style="dashed" />
-                                                <el-link v-auth="perms.saveData" @click="onEditDoc(null)" type="primary" icon="plus" :underline="false">
-                                                </el-link>
-                                            </div>
-                                        </el-col>
-                                        <el-col :span="22">
-                                            <el-input
-                                                ref="findParamInputRef"
-                                                v-model="dt.findParamStr"
-                                                placeholder="点击输入相应查询条件"
-                                                @focus="showFindDialog(dt.key)"
-                                            >
-                                                <template #prepend>查询参数</template>
-                                            </el-input>
+                                        <el-col :span="6" v-for="item in dt.datas" :key="item">
+                                            <el-card :body-style="{ padding: '0px', position: 'relative' }">
+                                                <el-input type="textarea" v-model="item.value" :rows="10" />
+                                                <div style="padding: 3px; float: right" class="mr5 mongo-doc-btns">
+                                                    <div>
+                                                        <el-link @click="onEditDoc(item)" :underline="false" type="success" icon="MagicStick"></el-link>
+
+                                                        <el-divider direction="vertical" border-style="dashed" />
+
+                                                        <el-popconfirm @confirm="onDeleteDoc(item.value)" title="确定删除该文档?" width="160">
+                                                            <template #reference>
+                                                                <el-link v-auth="perms.delData" :underline="false" type="danger" icon="DocumentDelete">
+                                                                </el-link>
+                                                            </template>
+                                                        </el-popconfirm>
+                                                    </div>
+                                                </div>
+                                            </el-card>
                                         </el-col>
                                     </el-row>
-                                    <el-scrollbar class="mongo-data-tab-data">
-                                        <el-row>
-                                            <el-col :span="6" v-for="item in dt.datas" :key="item">
-                                                <el-card :body-style="{ padding: '0px', position: 'relative' }">
-                                                    <el-input type="textarea" v-model="item.value" :rows="10" />
-                                                    <div style="padding: 3px; float: right" class="mr5 mongo-doc-btns">
-                                                        <div>
-                                                            <el-link @click="onEditDoc(item)" :underline="false" type="success" icon="MagicStick"></el-link>
-
-                                                            <el-divider direction="vertical" border-style="dashed" />
-
-                                                            <el-popconfirm @confirm="onDeleteDoc(item.value)" title="确定删除该文档?" width="160">
-                                                                <template #reference>
-                                                                    <el-link v-auth="perms.delData" :underline="false" type="danger" icon="DocumentDelete">
-                                                                    </el-link>
-                                                                </template>
-                                                            </el-popconfirm>
-                                                        </div>
-                                                    </div>
-                                                </el-card>
-                                            </el-col>
-                                        </el-row>
-                                    </el-scrollbar>
-                                </el-tab-pane>
-                            </el-tabs>
-                        </el-row>
-                    </div>
-                </Pane>
-            </Splitpanes>
-        </el-row>
+                                </el-scrollbar>
+                            </el-tab-pane>
+                        </el-tabs>
+                    </el-row>
+                </div>
+            </Pane>
+        </Splitpanes>
 
         <el-dialog width="600px" title="find参数" v-model="findDialog.visible">
             <el-form label-width="auto">
diff --git a/mayfly_go_web/src/views/ops/redis/DataOperation.vue b/mayfly_go_web/src/views/ops/redis/DataOperation.vue
index 0bf40a79..d583f58b 100644
--- a/mayfly_go_web/src/views/ops/redis/DataOperation.vue
+++ b/mayfly_go_web/src/views/ops/redis/DataOperation.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="redis-data-op">
+    <div class="redis-data-op flex-all-center">
         <Splitpanes class="default-theme">
             <Pane size="20" max-size="30">
                 <tag-tree :resource-type="TagResourceTypeEnum.Redis.value" :tag-path-node-type="NodeTypeTagPath">
diff --git a/mayfly_go_web/src/views/system/resource/ResourceList.vue b/mayfly_go_web/src/views/system/resource/ResourceList.vue
index cbb4b265..778f32da 100644
--- a/mayfly_go_web/src/views/system/resource/ResourceList.vue
+++ b/mayfly_go_web/src/views/system/resource/ResourceList.vue
@@ -14,7 +14,7 @@
             <el-tree
                 ref="resourceTreeRef"
                 class="none-select"
-                :indent="38"
+                :indent="24"
                 node-key="id"
                 :props="props"
                 :data="data"
@@ -422,4 +422,3 @@ const info = async (data: any) => {
     user-select: none;
 }
 </style>
-@/components/contextmenu
diff --git a/mayfly_go_web/src/views/system/role/AccountAllocation.vue b/mayfly_go_web/src/views/system/role/AccountAllocation.vue
index e91fc9c3..ee5b68e6 100755
--- a/mayfly_go_web/src/views/system/role/AccountAllocation.vue
+++ b/mayfly_go_web/src/views/system/role/AccountAllocation.vue
@@ -56,10 +56,7 @@ const props = defineProps({
 const emit = defineEmits(['update:visible', 'cancel', 'val-change']);
 
 const perms = {
-    addAccount: 'account:add',
-    delAccount: 'account:del',
     saveAccountRole: 'account:saveRoles',
-    changeAccountStatus: 'account:changeStatus',
 };
 
 const searchItems = [SearchItem.input('name', '姓名'), SearchItem.input('username', '用户名')];
@@ -72,7 +69,7 @@ const columns = [
 ];
 
 // 该用户拥有的的操作列按钮权限
-const actionBtns = hasPerms([perms.addAccount, perms.saveAccountRole, perms.changeAccountStatus]);
+const actionBtns = hasPerms([perms.saveAccountRole]);
 const actionColumn = TableColumn.new('action', '操作').isSlot().fixedRight().setMinWidth(80).noShowOverflowTooltip().alignCenter();
 
 const pageTableRef: Ref<any> = ref(null);
diff --git a/server/internal/db/dbm/db_type.go b/server/internal/db/dbm/db_type.go
index b346f373..58c5bf00 100644
--- a/server/internal/db/dbm/db_type.go
+++ b/server/internal/db/dbm/db_type.go
@@ -19,7 +19,7 @@ const (
 func (dbType DbType) MetaDbName() string {
 	switch dbType {
 	case DbTypeMysql:
-		return "information_schema"
+		return "mysql"
 	case DbTypePostgres:
 		return "postgres"
 	case DM:
diff --git a/server/internal/db/dbm/dialect_mysql.go b/server/internal/db/dbm/dialect_mysql.go
index 0304a730..37122fdd 100644
--- a/server/internal/db/dbm/dialect_mysql.go
+++ b/server/internal/db/dbm/dialect_mysql.go
@@ -34,6 +34,7 @@ func getMysqlDB(d *DbInfo) (*sql.DB, error) {
 // ---------------------------------- mysql元数据 -----------------------------------
 const (
 	MYSQL_META_FILE      = "metasql/mysql_meta.sql"
+	MYSQL_DBS            = "MYSQL_DBS"
 	MYSQL_TABLE_INFO_KEY = "MYSQL_TABLE_INFO"
 	MYSQL_INDEX_INFO_KEY = "MYSQL_INDEX_INFO"
 	MYSQL_COLUMN_MA_KEY  = "MYSQL_COLUMN_MA"
@@ -55,7 +56,7 @@ func (md *MysqlDialect) GetDbServer() (*DbServer, error) {
 }
 
 func (md *MysqlDialect) GetDbNames() ([]string, error) {
-	_, res, err := md.dc.Query("SELECT SCHEMA_NAME AS dbname FROM SCHEMATA")
+	_, res, err := md.dc.Query(GetLocalSql(MYSQL_META_FILE, MYSQL_DBS))
 	if err != nil {
 		return nil, err
 	}
diff --git a/server/internal/db/dbm/metasql/mysql_meta.sql b/server/internal/db/dbm/metasql/mysql_meta.sql
index c3b5e484..9428eaf3 100644
--- a/server/internal/db/dbm/metasql/mysql_meta.sql
+++ b/server/internal/db/dbm/metasql/mysql_meta.sql
@@ -1,3 +1,11 @@
+--MYSQL_DBS 数据库名信息
+SELECT
+	SCHEMA_NAME AS dbname
+FROM
+	information_schema.SCHEMATA
+WHERE
+	SCHEMA_NAME NOT IN ('mysql', 'information_schema', 'performance_schema')
+---------------------------------------
 --MYSQL_TABLE_INFO 表详细信息
 SELECT
   table_name tableName,
diff --git a/server/internal/sys/application/config.go b/server/internal/sys/application/config.go
index 4e261448..3244774d 100644
--- a/server/internal/sys/application/config.go
+++ b/server/internal/sys/application/config.go
@@ -44,19 +44,18 @@ func (a *configAppImpl) GetPageList(condition *entity.Config, pageParam *model.P
 
 func (a *configAppImpl) Save(ctx context.Context, config *entity.Config) error {
 	if config.Id == 0 {
-		if err := a.Insert(ctx, config); err != nil {
-			return err
-		}
-	} else {
-		oldConfig := a.GetConfig(config.Key)
-		if oldConfig.Permission != "all" && !strings.Contains(oldConfig.Permission, config.Modifier) {
-			return errorx.NewBiz("您无权修改该配置")
-		}
-
-		if err := a.UpdateById(ctx, config); err != nil {
-			return err
-		}
+		return a.Insert(ctx, config)
 	}
+
+	oldConfig := a.GetConfig(config.Key)
+	if oldConfig.Permission != "all" && !strings.Contains(oldConfig.Permission, config.Modifier) {
+		return errorx.NewBiz("您无权修改该配置")
+	}
+
+	if err := a.UpdateById(ctx, config); err != nil {
+		return err
+	}
+
 	cache.Del(SysConfigKeyPrefix + config.Key)
 	return nil
 }