TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-03 16:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: code review

Browse Source
This commit is contained in:
meilin.huang
2024-01-30 21:56:49 +08:00
parent 3f828cc5b0
commit ac2ceed3f9
6 changed files with 27 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/internal/db/application/db_data_sync.go
View File

@@ -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
}

2
server/internal/db/application/db_sql_exec.go
View File

@@ -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)

2
server/internal/machine/application/machine_cronjob.go
View File

@@ -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) {

2
server/pkg/config/server.go
View File

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

6
server/resources/script/sql/v1.7/v1.7.2.sql
View File

@@ -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 '备份历史删除标识';