refactor(jobs): 将任务配置移至config包并统一配置加载

- 将JobConfig结构体定义从jobs/types.go移动到config/config.go
- 修改所有任务构造函数使用config.JobConfig类型参数
- 更新任务初始化逻辑从config.Conf.Jobs读取配置
- 修正product_category_repository.go中的SQL字段名拼写错误
- 更新README.md文档说明新的配置方式

Author: dengmengmian

config/config.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"time"
 
 	"github.com/fsnotify/fsnotify"
 	"github.com/spf13/viper"
@@ -29,6 +30,7 @@ type config struct {
 	Jwt        *JwtConfig       `mapstructure:"jwt" json:"jwt"`
 	RateLimit  *RateLimitConfig `mapstructure:"rate-limit" json:"rateLimit"`
 	UploadFile *UploadFile      `mapstructure:"upload-file" json:"uploadFile"`
+	Jobs       *JobsConfig      `mapstructure:"jobs" json:"jobs"`
 }
 
 // 设置读取配置信息
@@ -120,3 +122,17 @@ type UploadFile struct {
 	Bucket    string `mapstructure:"bucket" json:"bucket"`
 	Endpoint  string `mapstructure:"endpoint" json:"endpoint"`
 }
+
+type JobsConfig struct {
+	Enabled bool                 `mapstructure:"enabled" json:"enabled"`
+	List    map[string]JobConfig `mapstructure:"list" json:"list"`
+}
+
+type JobConfig struct {
+	Name        string        `mapstructure:"name" json:"name"`
+	Description string        `mapstructure:"description" json:"description"`
+	Schedule    string        `mapstructure:"schedule" json:"schedule"`
+	Enabled     bool          `mapstructure:"enabled" json:"enabled"`
+	Timeout     time.Duration `mapstructure:"timeout" json:"timeout"`
+	RetryCount  int           `mapstructure:"retry-count" json:"retryCount"`
+}

config/config.tmp.yml

@@ -97,3 +97,24 @@ upload-file:
 baidu:
   # 百度推送Token (请填写您的百度推送Token)
   push-token: your_baidu_push_token_here
+
+# 定时任务配置
+jobs:
+  # 全局启用开关
+  enabled: true
+  # 任务列表
+  list:
+    sitemap:
+      name: sitemap
+      description: "生成站点地图"
+      schedule: "@every 1h" # 1小时执行一次
+      enabled: true
+      timeout: 300s # 5分钟超时
+      retry-count: 3
+    example:
+      name: example
+      description: "示例任务"
+      schedule: "@every 30s"
+      enabled: false
+      timeout: 60s
+      retry-count: 1

internal/app/jobs/README.md

@@ -93,25 +93,20 @@ func InitJobs() error {
 
 ### 3. 配置任务
 
-在 `config.go` 中添加任务配置：
-
-```go
-func DefaultJobsConfig() *JobsConfig {
-    return &JobsConfig{
-        Enabled: true,
-        Jobs: map[string]JobConfig{
-            // ... 其他任务配置 ...
-            "my_custom": {
-                Name:        "my_custom",
-                Description: "我的自定义任务",
-                Schedule:    "@every 30s",
-                Enabled:     true,
-                Timeout:     2 * time.Minute,
-                RetryCount:  3,
-            },
-        },
-    }
-}
+在配置文件 `config/config.yml` (或 `config.local.yml`) 中添加任务配置：
+
+```yaml
+jobs:
+  enabled: true
+  list:
+    # ... 其他任务配置 ...
+    my_custom:
+      name: "my_custom"
+      description: "我的自定义任务"
+      schedule: "@every 30s"
+      enabled: true
+      timeout: 120s
+      retry-count: 3
 ```
 
 ## API 接口

internal/app/jobs/base_job.go

@@ -7,6 +7,7 @@ package jobs
 
 import (
 	"context"
+	"gotribe-admin/config"
 	"time"
 )
 
@@ -22,14 +23,14 @@ type BaseJob struct {
 }
 
 // NewBaseJob 创建基础任务
-func NewBaseJob(config JobConfig, executor func(ctx context.Context) error) *BaseJob {
+func NewBaseJob(jobConfig config.JobConfig, executor func(ctx context.Context) error) *BaseJob {
 	return &BaseJob{
-		name:        config.Name,
-		description: config.Description,
-		schedule:    config.Schedule,
-		enabled:     config.Enabled,
-		timeout:     config.Timeout,
-		retryCount:  config.RetryCount,
+		name:        jobConfig.Name,
+		description: jobConfig.Description,
+		schedule:    jobConfig.Schedule,
+		enabled:     jobConfig.Enabled,
+		timeout:     jobConfig.Timeout,
+		retryCount:  jobConfig.RetryCount,
 		executor:    executor,
 	}
 }

internal/app/jobs/config.go

@@ -7,32 +7,28 @@ package jobs
 
 import (
 	"time"
-)
 
-// JobsConfig 任务配置
-type JobsConfig struct {
-	Enabled bool                 `yaml:"enabled" json:"enabled"`
-	Jobs    map[string]JobConfig `yaml:"jobs" json:"jobs"`
-}
+	"gotribe-admin/config"
+)
 
 // DefaultJobsConfig 默认任务配置
-func DefaultJobsConfig() *JobsConfig {
-	return &JobsConfig{
-		Enabled: true,
-		Jobs: map[string]JobConfig{
+func DefaultJobsConfig() *config.JobsConfig {
+	return &config.JobsConfig{
+		Enabled: false,
+		List: map[string]config.JobConfig{
 			"sitemap": {
 				Name:        "sitemap",
 				Description: "生成站点地图",
-				Schedule:    "@every 1m", // 改为24小时执行一次
-				Enabled:     true,
+				Schedule:    "@every 1h",
+				Enabled:     false,
 				Timeout:     5 * time.Minute,
 				RetryCount:  3,
 			},
 			"example": {
 				Name:        "example",
 				Description: "示例任务",
 				Schedule:    "@every 30s",
-				Enabled:     false, // 默认禁用
+				Enabled:     false,
 				Timeout:     1 * time.Minute,
 				RetryCount:  1,
 			},
@@ -41,17 +37,20 @@ func DefaultJobsConfig() *JobsConfig {
 }
 
 // GetJobConfig 获取任务配置
-func (c *JobsConfig) GetJobConfig(jobName string) (JobConfig, bool) {
-	config, exists := c.Jobs[jobName]
-	return config, exists
+func GetJobConfig(c *config.JobsConfig, jobName string) (config.JobConfig, bool) {
+	if c == nil || c.List == nil {
+		return config.JobConfig{}, false
+	}
+	conf, exists := c.List[jobName]
+	return conf, exists
 }
 
 // IsJobEnabled 检查任务是否启用
-func (c *JobsConfig) IsJobEnabled(jobName string) bool {
-	if !c.Enabled {
+func IsJobEnabled(c *config.JobsConfig, jobName string) bool {
+	if c == nil || !c.Enabled {
 		return false
 	}
 
-	config, exists := c.GetJobConfig(jobName)
-	return exists && config.Enabled
+	conf, exists := GetJobConfig(c, jobName)
+	return exists && conf.Enabled
 }

internal/app/jobs/example_job.go

@@ -9,6 +9,7 @@ import (
 	"context"
 	"time"
 
+	"gotribe-admin/config"
 	"gotribe-admin/internal/pkg/common"
 )
 
@@ -18,9 +19,9 @@ type ExampleJob struct {
 }
 
 // NewExampleJob 创建示例任务
-func NewExampleJob(config JobConfig) *ExampleJob {
+func NewExampleJob(jobConfig config.JobConfig) *ExampleJob {
 	job := &ExampleJob{}
-	job.BaseJob = NewBaseJob(config, job.execute)
+	job.BaseJob = NewBaseJob(jobConfig, job.execute)
 	return job
 }
 

internal/app/jobs/init.go

@@ -6,19 +6,23 @@
 package jobs
 
 import (
+	"gotribe-admin/config"
 	"gotribe-admin/internal/pkg/common"
 )
 
 // InitJobs 初始化所有任务
 func InitJobs() error {
 	common.Log.Info("Initializing jobs...")
 
-	// 获取默认配置
-	config := DefaultJobsConfig()
+	// 获取配置
+	jobsConfig := config.Conf.Jobs
+	if jobsConfig == nil {
+		jobsConfig = DefaultJobsConfig()
+	}
 
 	// 注册站点地图任务
-	if config.IsJobEnabled("sitemap") {
-		sitemapConfig, _ := config.GetJobConfig("sitemap")
+	if IsJobEnabled(jobsConfig, "sitemap") {
+		sitemapConfig, _ := GetJobConfig(jobsConfig, "sitemap")
 		sitemapJob := NewSitemapJob(sitemapConfig)
 		if err := RegisterJob(sitemapJob); err != nil {
 			common.Log.Errorf("Failed to register sitemap job: %v", err)
@@ -27,8 +31,8 @@ func InitJobs() error {
 	}
 
 	// 注册示例任务
-	if config.IsJobEnabled("example") {
-		exampleConfig, _ := config.GetJobConfig("example")
+	if IsJobEnabled(jobsConfig, "example") {
+		exampleConfig, _ := GetJobConfig(jobsConfig, "example")
 		exampleJob := NewExampleJob(exampleConfig)
 		if err := RegisterJob(exampleJob); err != nil {
 			common.Log.Errorf("Failed to register example job: %v", err)

internal/app/jobs/sitemap_job.go

@@ -8,6 +8,7 @@ package jobs
 import (
 	"context"
 
+	"gotribe-admin/config"
 	"gotribe-admin/internal/app/repository"
 	"gotribe-admin/internal/pkg/common"
 	"gotribe-admin/internal/pkg/model"
@@ -21,9 +22,9 @@ type SitemapJob struct {
 }
 
 // NewSitemapJob 创建站点地图任务
-func NewSitemapJob(config JobConfig) *SitemapJob {
+func NewSitemapJob(jobConfig config.JobConfig) *SitemapJob {
 	job := &SitemapJob{}
-	job.BaseJob = NewBaseJob(config, job.execute)
+	job.BaseJob = NewBaseJob(jobConfig, job.execute)
 	return job
 }
 

internal/app/jobs/types.go

@@ -57,15 +57,7 @@ type Job interface {
 	IsEnabled() bool
 }
 
-// JobConfig 任务配置
-type JobConfig struct {
-	Name        string        `yaml:"name" json:"name"`
-	Description string        `yaml:"description" json:"description"`
-	Schedule    string        `yaml:"schedule" json:"schedule"`
-	Enabled     bool          `yaml:"enabled" json:"enabled"`
-	Timeout     time.Duration `yaml:"timeout" json:"timeout"`
-	RetryCount  int           `yaml:"retry_count" json:"retry_count"`
-}
+// JobConfig definition moved to config package
 
 // JobManager 任务管理器接口
 type JobManager interface {

internal/app/repository/product_category_repository.go

@@ -72,7 +72,7 @@ func (cr ProductCategoryRepository) CreateProductCategory(productCategory *model
 
 // 更新分类
 func (cr ProductCategoryRepository) UpdateProductCategoryByID(productCategoryID string, productCategory *model.ProductCategory) error {
-	err := common.DB.Model(productCategory).Where("productCategory_id = ?", productCategoryID).Updates(productCategory).Error
+	err := common.DB.Model(productCategory).Where("product_category_id = ?", productCategoryID).Updates(productCategory).Error
 	return err
 }