admin/TaskPool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: trt to fix restore bool val #70

Browse Source
This commit is contained in:
duorameng
2026-04-18 13:04:53 +08:00
parent 1bd7082f33
commit 4b644e272e
17 changed files with 62 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controllers/agent_controller.go
+4 -4
View File
@@ -72,7 +72,7 @@ func (c *AgentController) Update(ctx *gin.Context) {
utils.NotFound(ctx, "Agent 不存在")
return
}
wasEnabled := oldAgent.Enabled
wasEnabled := utils.DerefBool(oldAgent.Enabled, true)
if err := c.agentService.Update(id, req.Name, req.Description, req.Enabled); err != nil {
utils.ServerError(ctx, err.Error())
@@ -233,7 +233,7 @@ func (c *AgentController) GetTasks(ctx *gin.Context) {
return
}
if !agent.Enabled {
if !utils.DerefBool(agent.Enabled, true) {
utils.Forbidden(ctx, "Agent 已禁用")
return
}
@@ -259,7 +259,7 @@ func (c *AgentController) ReportResult(ctx *gin.Context) {
return
}
if !agent.Enabled {
if !utils.DerefBool(agent.Enabled, true) {
utils.Forbidden(ctx, "Agent 已禁用")
return
}
@@ -393,7 +393,7 @@ func (c *AgentController) WSConnect(ctx *gin.Context) {
logger.Infof("[AgentWS] 注册成功: Agent #%s, isNew=%v", agent.ID, isNewAgent)
}
if !agent.Enabled {
if !utils.DerefBool(agent.Enabled, true) {
c.wsManager.RecordConnectFail(ip)
logger.Warnf("[AgentWS] Agent #%s 已禁用, IP=%s", agent.ID, ip)
ctx.JSON(http.StatusForbidden, gin.H{"error": "Agent 已禁用"})
internal/controllers/env_controller.go
+3 -3
View File
@@ -183,15 +183,15 @@ func (ec *EnvController) UpdateEnvVar(c *gin.Context) {
hidden := existing.Hidden
if req.Hidden != nil {
hidden = *req.Hidden
hidden = req.Hidden
}
enabled := existing.Enabled
if req.Enabled != nil {
enabled = *req.Enabled
enabled = req.Enabled
}
envVar := ec.envService.UpdateEnvVar(id, req.Name, req.Value, req.Remark, req.Type, hidden, enabled)
envVar := ec.envService.UpdateEnvVar(id, req.Name, req.Value, req.Remark, req.Type, utils.DerefBool(hidden, true), utils.DerefBool(enabled, true))
if envVar == nil {
utils.NotFound(c, "环境变量不存在")
return
internal/controllers/task_controller.go
+1 -1
View File
@@ -287,7 +287,7 @@ func (tc *TaskController) UpdateTask(c *gin.Context) {
}
} else {
// 本地任务
if task.Enabled {
if utils.DerefBool(task.Enabled, true) {
tc.executorService.AddCronTask(task)
} else {
tc.executorService.RemoveCronTask(task.ID)
internal/models/agent.go
+2 -2
View File
@@ -20,7 +20,7 @@ type Agent struct {
OS string `json:"os" gorm:"size:20"` // 操作系统
Arch string `json:"arch" gorm:"size:20"` // 架构
ForceUpdate bool `json:"force_update" gorm:"default:false"` // 强制更新标志
Enabled bool `json:"enabled" gorm:"default:true"` // 是否启用
Enabled *bool `json:"enabled" gorm:"default:true"` // 是否启用
CreatedAt LocalTime `json:"created_at"`
UpdatedAt LocalTime `json:"updated_at"`
}
@@ -37,7 +37,7 @@ type AgentToken struct {
MaxUses int `json:"max_uses" gorm:"default:0"` // 最大使用次数，0 表示无限制
UsedCount int `json:"used_count" gorm:"default:0"` // 已使用次数
ExpiresAt *LocalTime `json:"expires_at"` // 过期时间，null 表示永不过期
Enabled bool `json:"enabled" gorm:"default:true"` // 是否启用
Enabled *bool `json:"enabled" gorm:"default:true"` // 是否启用
CreatedAt LocalTime `json:"created_at"`
UpdatedAt LocalTime `json:"updated_at"`
}
internal/models/env.go
+2 -2
View File
@@ -11,8 +11,8 @@ type EnvironmentVariable struct {
Value BigText `json:"value"`
Remark string `json:"remark" gorm:"size:500"`
Type string `json:"type" gorm:"size:20;default:'normal'"`
Hidden bool `json:"hidden" gorm:"default:true"`
Enabled bool `json:"enabled" gorm:"default:true"`
Hidden *bool `json:"hidden" gorm:"default:true"`
Enabled *bool `json:"enabled" gorm:"default:true"`
UserID string `json:"user_id" gorm:"size:20;index"`
CreatedAt LocalTime `json:"created_at"`
UpdatedAt LocalTime `json:"updated_at"`
internal/models/notify_way.go
+1 -1
View File
@@ -10,7 +10,7 @@ type NotifyWay struct {
Name string `json:"name" gorm:"size:100;not null"`
Type string `json:"type" gorm:"size:50;not null;index"`
Config BigText `json:"config"`
Enabled bool `json:"enabled" gorm:"default:true;index"`
Enabled *bool `json:"enabled" gorm:"default:true;index"`
CreatedAt LocalTime `json:"created_at"`
UpdatedAt LocalTime `json:"updated_at"`
}
internal/models/task.go
+1 -1
View File
@@ -86,7 +86,7 @@ type Task struct {
RetryCount int `json:"retry_count" gorm:"default:0"` // 失败重试次数
RetryInterval int `json:"retry_interval" gorm:"default:0"` // 失败重试间隔(秒)
RandomRange int `json:"random_range" gorm:"default:0"` // 随机延迟范围(秒)
Enabled bool `json:"enabled" gorm:"default:true"`
Enabled *bool `json:"enabled" gorm:"default:true"`
RunningGo BigText `json:"running_go"` // 正在运行的 go routine id 数组 (JSON)
RuntimeEnvs []string `json:"-" gorm:"-"` // 运行时环境变量（非持久化）
RuntimeSecrets []string `json:"-" gorm:"-"` // 运行时安全机密（非持久化）
internal/models/vo/agent_vo.go
+3 -2
View File
@@ -2,6 +2,7 @@ package vo
import (
"github.com/engigu/baihu-panel/internal/models"
"github.com/engigu/baihu-panel/internal/utils"
)
// AgentVO 代理视图对象
@@ -42,7 +43,7 @@ func ToAgentVO(agent *models.Agent) *AgentVO {
OS: agent.OS,
Arch: agent.Arch,
ForceUpdate: agent.ForceUpdate,
Enabled: agent.Enabled,
Enabled: utils.DerefBool(agent.Enabled, true),
CreatedAt: agent.CreatedAt,
UpdatedAt: agent.UpdatedAt,
}
@@ -93,7 +94,7 @@ func ToAgentTokenVO(token *models.AgentToken) *AgentTokenVO {
MaxUses: token.MaxUses,
UsedCount: token.UsedCount,
ExpiresAt: token.ExpiresAt,
Enabled: token.Enabled,
Enabled: utils.DerefBool(token.Enabled, true),
CreatedAt: token.CreatedAt,
}
}
internal/models/vo/sys_vo.go
+3 -2
View File
@@ -3,6 +3,7 @@ package vo
import (
"github.com/engigu/baihu-panel/internal/constant"
"github.com/engigu/baihu-panel/internal/models"
"github.com/engigu/baihu-panel/internal/utils"
)
// UserVO 用户视图对象
@@ -58,8 +59,8 @@ func ToEnvVO(env *models.EnvironmentVariable) *EnvVO {
Value: val,
Remark: env.Remark,
Type: env.Type,
Hidden: env.Hidden,
Enabled: env.Enabled,
Hidden: utils.DerefBool(env.Hidden, true),
Enabled: utils.DerefBool(env.Enabled, true),
CreatedAt: env.CreatedAt,
UpdatedAt: env.UpdatedAt,
}
internal/models/vo/task_vo.go
+2 -1
View File
@@ -3,6 +3,7 @@ package vo
import (
"github.com/engigu/baihu-panel/internal/executor"
"github.com/engigu/baihu-panel/internal/models"
"github.com/engigu/baihu-panel/internal/utils"
)
// TaskVO 任务视图对象
@@ -53,7 +54,7 @@ func ToTaskVO(task *models.Task) *TaskVO {
Languages: task.Languages,
AgentID: task.AgentID,
RepoTaskID: task.RepoTaskID,
Enabled: task.Enabled,
Enabled: utils.DerefBool(task.Enabled, true),
RetryCount: task.RetryCount,
RetryInterval: task.RetryInterval,
RandomRange: task.RandomRange,
internal/services/agent_service.go
+7 -7
View File
@@ -54,7 +54,7 @@ func (s *AgentService) CreateToken(remark string, maxUses int, expiresAt *time.T
Remark: remark,
MaxUses: maxUses,
ExpiresAt: expires,
Enabled: true,
Enabled: utils.BoolPtr(true),
}
if err := database.DB.Create(agentToken).Error; err != nil {
@@ -85,7 +85,7 @@ func (s *AgentService) ValidateToken(token string) (*models.AgentToken, error) {
return nil, &ServiceError{Message: "无效的令牌"}
}
if !agentToken.Enabled {
if !utils.DerefBool(agentToken.Enabled, true) {
return nil, &ServiceError{Message: "令牌已禁用"}
}
@@ -147,7 +147,7 @@ func (s *AgentService) RegisterByToken(token string, machineID string, ip string
IP: ip,
Status: constant.AgentStatusOnline,
LastSeen: &now,
Enabled: true,
Enabled: utils.BoolPtr(true),
}
if err := database.DB.Create(agent).Error; err != nil {
@@ -190,7 +190,7 @@ func (s *AgentService) Register(req *models.AgentRegisterRequest, ip string) (*m
IP: ip,
Status: constant.AgentStatusOnline,
LastSeen: &now,
Enabled: true,
Enabled: utils.BoolPtr(true),
}
if err := database.DB.Create(agent).Error; err != nil {
@@ -207,7 +207,7 @@ func (s *AgentService) Update(id string, name, description string, enabled bool)
return database.DB.Model(&models.Agent{}).Where("id = ?", id).Updates(map[string]interface{}{
"name": name,
"description": description,
"enabled": enabled,
"enabled": &enabled,
}).Error
}
@@ -272,7 +272,7 @@ func (s *AgentService) Heartbeat(token, ip, version, buildTime, hostname, osType
return nil, &ServiceError{Message: "无效的 Token"}
}
if !agent.Enabled {
if !utils.DerefBool(agent.Enabled, true) {
return nil, &ServiceError{Message: "Agent 已禁用"}
}
@@ -355,7 +355,7 @@ func (s *AgentService) GetTasks(agentID string) []models.AgentTask {
Languages: []map[string]string(task.Languages),
RandomRange: task.RandomRange,
Secrets: secrets,
Enabled: task.Enabled,
Enabled: utils.DerefBool(task.Enabled, true),
}
}
internal/services/env_service.go
+7 -7
View File
@@ -30,8 +30,8 @@ func (es *EnvService) CreateEnvVar(name, value, remark, envType string, hidden,
Value: models.BigText(value),
Remark: remark,
Type: envType,
Hidden: hidden,
Enabled: enabled,
Hidden: &hidden,
Enabled: &enabled,
UserID: userID,
CreatedAt: models.Now(),
UpdatedAt: models.Now(),
@@ -99,8 +99,8 @@ func (es *EnvService) UpdateEnvVar(id string, name, value, remark, envType strin
"value": models.BigText(value),
"remark": remark,
"type": envType,
"hidden": hidden,
"enabled": enabled,
"hidden": &hidden,
"enabled": &enabled,
}
database.DB.Model(&env).Updates(updates)
return &env
@@ -224,7 +224,7 @@ func (es *EnvService) formatEnvVars(envs []models.EnvironmentVariable) []string
}
value := string(env.Value)
if !env.Enabled {
if !utils.DerefBool(env.Enabled, true) {
value = ""
}
@@ -266,13 +266,13 @@ func (es *EnvService) formatEnvVarsAndSecrets(envs []models.EnvironmentVariable)
if env.Type == constant.EnvTypeSecret {
if decValue, err := utils.Decrypt(value); err == nil {
value = decValue
if env.Enabled && value != "" {
if utils.DerefBool(env.Enabled, true) && value != "" {
secrets = append(secrets, value)
}
}
}
if !env.Enabled {
if !utils.DerefBool(env.Enabled, true) {
value = ""
}
internal/services/notification_service.go
+5 -5
View File
@@ -104,7 +104,7 @@ func (s *NotificationService) SaveChannel(channel NotifyChannel) error {
Name: channel.Name,
Type: channel.Type,
Config: models.BigText(configJSON),
Enabled: channel.Enabled,
Enabled: utils.BoolPtr(channel.Enabled),
}
return database.DB.Create(notifyWay).Error
}
@@ -114,7 +114,7 @@ func (s *NotificationService) SaveChannel(channel NotifyChannel) error {
"name": channel.Name,
"type": channel.Type,
"config": models.BigText(configJSON),
"enabled": channel.Enabled,
"enabled": &channel.Enabled,
}
return database.DB.Model(&models.NotifyWay{}).Where("id = ?", channel.ID).Updates(updates).Error
}
@@ -282,7 +282,7 @@ func (s *NotificationService) SendByChannelID(channelID string, msg *NotifyMessa
return &NotifyResult{Success: false, Error: "渠道不存在"}
}
if !notifyWay.Enabled {
if !utils.DerefBool(notifyWay.Enabled, true) {
return &NotifyResult{Success: false, Error: "渠道已禁用"}
}
@@ -295,7 +295,7 @@ func (s *NotificationService) SendByChannelID(channelID string, msg *NotifyMessa
ID: notifyWay.ID,
Name: notifyWay.Name,
Type: notifyWay.Type,
Enabled: notifyWay.Enabled,
Enabled: utils.DerefBool(notifyWay.Enabled, true),
Config: config,
}
return s.SendToChannel(ch, msg)
@@ -533,7 +533,7 @@ func (s *NotificationService) getChannelsInternal() []NotifyChannel {
ID: nw.ID,
Name: nw.Name,
Type: nw.Type,
Enabled: nw.Enabled,
Enabled: utils.DerefBool(nw.Enabled, true),
CreatedAt: nw.CreatedAt,
Config: config,
})
internal/services/tasks/executor_service.go
+3 -3
View File
@@ -370,7 +370,7 @@ func (es *ExecutorService) HandleTaskRetry(task *models.Task, req *executor.Exec
es.scheduler.EnqueueDelayed(time.Duration(task.RetryInterval)*time.Second, func() *executor.ExecutionRequest {
latestTask := es.taskService.GetTaskByID(task.ID)
if latestTask == nil || !latestTask.Enabled {
if latestTask == nil || !utils.DerefBool(latestTask.Enabled, true) {
return nil
}
@@ -536,7 +536,7 @@ func (es *ExecutorService) loadCronTasks() {
tasks := es.taskService.GetTasks()
count := 0
for _, task := range tasks {
if !task.Enabled {
if !utils.DerefBool(task.Enabled, true) {
continue
}
@@ -875,7 +875,7 @@ func (es *ExecutorService) ExecuteRemoteForScheduler(task *models.Task, logID st
if res.Error != nil || res.RowsAffected == 0 {
return nil, fmt.Errorf("Agent #%s 不存在", agentID)
}
if !agent.Enabled {
if !utils.DerefBool(agent.Enabled, true) {
return nil, fmt.Errorf("Agent #%s 已禁用", agentID)
}
if es.agentWSManager == nil {
internal/services/tasks/ql_repo_parser.go
+2 -2
View File
@@ -311,7 +311,7 @@ func ParseRepoScriptsAndAddCron(es *ExecutorService, taskID string, logWriter io
}
database.DB.Save(&existing)
if existing.Enabled && es != nil {
if utils.DerefBool(existing.Enabled, true) && es != nil {
es.AddCronTask(&existing)
}
log("[更新] 任务: %s (%s)", taskName, filename)
@@ -329,7 +329,7 @@ func ParseRepoScriptsAndAddCron(es *ExecutorService, taskID string, logWriter io
Languages: repoTask.Languages,
Timeout: repoTask.Timeout,
Config: models.BigText(defaultTaskConfig),
Enabled: true,
Enabled: utils.BoolPtr(true),
WorkDir: displayWorkDir,
SourceID: sourceID,
RepoTaskID: repoTask.ID,
internal/services/tasks/task_service.go
+2 -2
View File
@@ -44,7 +44,7 @@ func (ts *TaskService) CreateTask(name, command, schedule string, timeout int, w
Envs: models.BigText(envs),
Languages: languages,
AgentID: agentID,
Enabled: true,
Enabled: utils.BoolPtr(true),
RetryCount: retryCount,
RetryInterval: retryInterval,
RandomRange: randomRange,
@@ -113,7 +113,7 @@ func (ts *TaskService) UpdateTask(id string, name, command, schedule string, tim
task.WorkDir = workDir
task.CleanConfig = cleanConfig
task.Envs = models.BigText(envs)
task.Enabled = enabled
task.Enabled = &enabled
task.AgentID = agentID
task.Languages = languages
task.Config = models.BigText(config)
internal/utils/pointer.go
+14
View File
@@ -0,0 +1,14 @@
package utils
// BoolPtr returns a pointer to the bool value
func BoolPtr(b bool) *bool {
return &b
}
// DerefBool returns the value of the bool pointer or default if nil
func DerefBool(b *bool, defaultVal bool) bool {
if b == nil {
return defaultVal
}
return *b
}