refactor: code review

mayfly_go_web/src/views/ops/db/component/table/DbTableDataOp.vue

@@ -158,18 +158,19 @@
             @data-delete="onRefresh"
         ></db-table-data>
 
-        <el-row type="flex" class="mt5" :gutter="10" justify="end" style="user-select: none">
+        <el-row type="flex" class="mt5" :gutter="10" justify="space-between" style="user-select: none">
             <el-col :span="12">
                 <el-text
-                    style="color: var(--el-color-info-light-3); font-size: 12px; margin-top: 5px"
-                    class="is-truncated"
-                    @click="handleCopySql(sql)"
+                    id="copyValue"
+                    style="color: var(--el-color-info-light-3)"
+                    class="is-truncated font12 mt5"
+                    @click="copyToClipboard(sql)"
                     :title="sql"
                     >{{ sql }}</el-text
                 >
             </el-col>
             <el-col :span="12">
-                <el-row :gutter="10" justify="center">
+                <el-row :gutter="10" justify="left">
                     <el-link class="op-page" :underline="false" @click="pageNum = 1" :disabled="pageNum == 1" icon="DArrowLeft" title="首页" />
                     <el-link class="op-page" :underline="false" @click="pageNum = --pageNum || 1" :disabled="pageNum == 1" icon="Back" title="上一页" />
                     <div class="op-page">
@@ -183,9 +184,9 @@
                             @keydown.enter="handleSetPageNum"
                         />
                     </div>
-                    <el-link class="op-page" :underline="false" @click="++pageNum" icon="Right" />
-                    <el-link class="op-page" :underline="false" @click="handleEndPage" icon="DArrowRight" />
-                    <div style="width: 90px; margin-left: 20px" class="op-page">
+                    <el-link class="op-page" :underline="false" @click="++pageNum" :disabled="datas.length < pageSize" icon="Right" />
+                    <el-link class="op-page" :underline="false" @click="handleEndPage" :disabled="datas.length < pageSize" icon="DArrowRight" />
+                    <div style="width: 90px" class="op-page ml10">
                         <el-select size="small" :default-first-option="true" v-model="pageSize" @change="handleSizeChange">
                             <el-option
                                 style="font-size: 12px; height: 24px; line-height: 24px"
@@ -196,21 +197,13 @@
                             />
                         </el-select>
                     </div>
-                    <el-link
-                        class="op-page"
-                        style="margin-left: 20px"
-                        v-if="!state.counting"
-                        :underline="false"
-                        @click="handleCount"
-                        icon="Stopwatch"
-                        title="计数"
-                    />
-                    <el-link class="op-page" style="margin-left: 20px" v-if="state.counting" :underline="false" title="计数中...">
+                    <el-link class="op-page ml10" v-if="!state.counting" :underline="false" @click="handleCount" icon="Stopwatch" title="计数" />
+                    <el-link class="op-page ml10" v-if="state.counting" :underline="false" title="计数中...">
                         <el-icon class="is-loading">
                             <Loading />
                         </el-icon>
                     </el-link>
-                    <el-text class="op-page" style="font-size: 12px" v-if="state.showTotal">总 {{ state.total }} 条</el-text>
+                    <el-text class="op-page font12" v-if="state.showTotal">总 {{ state.total }} 条</el-text>
                 </el-row>
             </el-col>
         </el-row>
@@ -334,7 +327,7 @@ const state = reactive({
     ],
     setPageNum: 0,
     total: 0,
-    showTotal: 0,
+    showTotal: false,
     counting: false,
     selectionDatas: [] as any,
     condPopVisible: false,
@@ -459,11 +452,6 @@ const handleCount = async () => {
     state.counting = false;
 };
 
-const handleCopySql = async (sql: string) => {
-    await copyToClipboard(sql);
-    ElMessage.success('复制成功');
-};
-
 // 完整的条件,每次选中后会重置条件框内容，故需要这个变量在获取建议时将文本框内容保存
 let completeCond = '';
 // 是否存在列建议

server/internal/db/application/db_data_sync.go

@@ -5,7 +5,6 @@ import (
 	"database/sql"
 	"encoding/json"
 	"fmt"
-	"github.com/google/uuid"
 	"mayfly-go/internal/db/dbm/dbi"
 	"mayfly-go/internal/db/domain/entity"
 	"mayfly-go/internal/db/domain/repository"
@@ -19,6 +18,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/google/uuid"
 )
 
 type DataSyncTask interface {
@@ -99,14 +100,12 @@ func (app *dataSyncAppImpl) AddCronJob(taskEntity *entity.DataSyncTask) {
 
 	// 根据状态添加新的任务
 	if taskEntity.Status == entity.DataSyncTaskStatusEnable {
+		taskId := taskEntity.Id
 		scheduler.AddFunByKey(key, taskEntity.TaskCron, func() {
-			go func() {
-				taskId := taskEntity.Id
-				logx.Infof("开始执行同步任务: %d", taskId)
-				if err := app.RunCronJob(taskId); err != nil {
-					logx.Errorf("定时执行数据同步任务失败: %s", err.Error())
-				}
-			}()
+			logx.Infof("开始执行同步任务: %d", taskId)
+			if err := app.RunCronJob(taskId); err != nil {
+				logx.Errorf("定时执行数据同步任务失败: %s", err.Error())
+			}
 		})
 	}
 }
@@ -231,7 +230,7 @@ func (app *dataSyncAppImpl) doDataSync(sql string, task *entity.DataSyncTask) (*
 			// 遍历columns 取task.UpdField的字段类型
 			updFieldType = dbi.DataTypeString
 			for _, column := range columns {
-				if strings.ToLower(column.Name) == strings.ToLower(task.UpdField) {
+				if strings.EqualFold(strings.ToLower(column.Name), strings.ToLower(task.UpdField)) {
 					updFieldType = srcDialect.GetDataConverter().GetDataType(column.Type)
 					break
 				}

server/internal/db/application/db_sql_exec.go

@@ -211,7 +211,7 @@ func doUpdate(ctx context.Context, update *sqlparser.Update, execSqlReq *DbSqlEx
 	tableStr := sqlparser.String(update.TableExprs)
 	// 可能使用别名，故空格切割
 	tableName := strings.Split(tableStr, " ")[0]
-	if strings.Index(tableName, ".") > -1 {
+	if strings.Contains(tableName, ".") {
 		tableName = strings.Split(tableName, ".")[1]
 	}
 	where := sqlparser.String(update.Where)

server/internal/machine/application/machine_cronjob.go

@@ -224,7 +224,7 @@ func (m *machineCronJobAppImpl) addCronJob(mcj *entity.MachineCronJob) {
 	}
 
 	scheduler.AddFunByKey(key, mcj.Cron, func() {
-		go m.RunCronJob(key)
+		m.RunCronJob(key)
 	})
 }
 func (m *machineCronJobAppImpl) runCronJob0(mid uint64, cronJob *entity.MachineCronJob) {

server/pkg/config/server.go

@@ -19,7 +19,7 @@ func (s *Server) Default() {
 		s.Model = "release"
 	}
 	if s.Port == 0 {
-		s.Port = 8888
+		s.Port = 18888
 	}
 }
 

server/resources/script/sql/v1.7/v1.7.2.sql

@@ -2,12 +2,12 @@ INSERT INTO `t_sys_resource` (`id`, `pid`, `ui_path`, `type`, `status`, `name`,
     VALUES (161, 49, 'dbms23ax/xleaiec2/3NUXQFIO/', 2, 1, '数据库备份', 'db:backup', 1705973876, 'null', 1, 'admin', 1, 'admin', '2024-01-23 09:37:56', '2024-01-23 09:37:56', 0, NULL),
         (160, 49, 'dbms23ax/xleaiec2/ghErkTdb/', 2, 1, '数据库恢复', 'db:restore', 1705973909, 'null', 1, 'admin', 1, 'admin', '2024-01-23 09:38:29', '2024-01-23 09:38:29', 0, NULL);
 
-ALTER TABLE `mayfly-go`.`t_db_backup`
+ALTER TABLE `t_db_backup`
     ADD COLUMN `enabled_desc` varchar(64) NULL COMMENT '任务启用描述' AFTER `enabled`;
 
-ALTER TABLE `mayfly-go`.`t_db_restore`
+ALTER TABLE `t_db_restore`
     ADD COLUMN `enabled_desc` varchar(64) NULL COMMENT '任务启用描述' AFTER `enabled`;
 
-ALTER TABLE `mayfly-go`.`t_db_backup_history`
+ALTER TABLE `t_db_backup_history`
     ADD COLUMN `restoring` int(1) NOT NULL DEFAULT(0) COMMENT '备份历史恢复标识',
     ADD COLUMN `deleting` int(1) NOT NULL DEFAULT(0) COMMENT '备份历史删除标识';