Skip to content

Commit 3b484f6

Browse files
committed
定时任务修改
1 parent 6acb40a commit 3b484f6

File tree

12 files changed

+15
-22
lines changed

12 files changed

+15
-22
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ node_modules/
6161

6262
# Optional npm cache directory
6363
.npm
64-
64+
.public/*
6565
# Optional eslint cache
6666
.eslintcache
6767

@@ -278,4 +278,5 @@ Icon
278278
.AppleDesktop
279279
Network Trash Folder
280280
Temporary Items
281-
.apdisk
281+
.apdisk
282+
public/*

internal/app/jobs/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func DefaultJobsConfig() *JobsConfig {
2323
"sitemap": {
2424
Name: "sitemap",
2525
Description: "生成站点地图",
26-
Schedule: "@every 1m",
26+
Schedule: "@every 1m", // 改为24小时执行一次
2727
Enabled: true,
2828
Timeout: 5 * time.Minute,
2929
RetryCount: 3,

internal/app/jobs/sitemap_job.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"gotribe-admin/internal/pkg/common"
1313
"gotribe-admin/internal/pkg/model"
1414

15-
"github.com/dengmengmian/ghelper/gconvert"
1615
"github.com/douyacun/gositemap"
1716
)
1817

@@ -43,15 +42,16 @@ func (j *SitemapJob) execute(ctx context.Context) error {
4342
st.SetPretty(true)
4443
st.SetPublicPath("public")
4544

46-
for idx, project := range projects {
45+
for _, project := range projects {
4746
// 检查上下文是否被取消
4847
select {
4948
case <-ctx.Done():
5049
return ctx.Err()
5150
default:
5251
}
5352

54-
st.SetFilename(project.ProjectID + gconvert.String(idx) + ".xml")
53+
// 使用固定的文件名,确保每次都是覆盖
54+
st.SetFilename(project.ProjectID + ".xml")
5555

5656
if err := common.DB.Model(&model.Post{}).Where("status = ? and type != ? and project_id = ?", 2, 2, project.ProjectID).Find(&posts).Error; err != nil {
5757
common.Log.Errorf("Failed to query posts for project %s: %v", project.ProjectID, err)

internal/pkg/model/column.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212

1313
type Column struct {
1414
Model
15-
ColumnID string `gorm:"type:char(10);not null;uniqueIndex:idx_column_column_id;comment:字符ID,分布式ID" json:"columnID"`
16-
ProjectID string `gorm:"type:char(10);not null;index;comment:项目ID;" json:"projectID"`
15+
ColumnID string `gorm:"type:varchar(10);not null;uniqueIndex:idx_column_column_id;comment:字符ID,分布式ID" json:"columnID"`
16+
ProjectID string `gorm:"type:varchar(10);not null;index;comment:项目ID;" json:"projectID"`
1717
Title string `gorm:"type:varchar(30);not null;comment:标题" json:"title,omitempty"`
1818
Description string `gorm:"type:varchar(300);comment:描述" json:"description,omitempty"`
1919
Icon string `gorm:"type:varchar(300);comment:图片" json:"icon,omitempty"`

internal/pkg/model/post.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
type Post struct {
1414
Model
15-
PostID string `gorm:"type:char(10);uniqueIndex;comment:唯一字符ID/分布式ID" json:"postID"`
15+
PostID string `gorm:"type:varchar(10);uniqueIndex;comment:唯一字符ID/分布式ID" json:"postID"`
1616
CategoryID string `gorm:"type:varchar(10);Index;comment:分类 ID" json:"categoryID"`
1717
ProjectID string `gorm:"type:varchar(10);Index;comment:项目 ID" json:"projectID"`
1818
ColumnID string `gorm:"type:varchar(10);Index;comment:专栏ID" json:"columnID"`

internal/pkg/model/product.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import (
1212

1313
type Product struct {
1414
Model
15-
ProductID string `gorm:"type:char(10);uniqueIndex;comment:唯一字符ID/分布式ID" json:"productID"`
15+
ProductID string `gorm:"type:varchar(10);uniqueIndex;comment:唯一字符ID/分布式ID" json:"productID"`
1616
Title string `gorm:"type:varchar(255);not null;comment:标题" json:"title"`
1717
ProductNumber string `gorm:"type:varchar(255);not null;comment:商品货号" json:"productNumber"`
1818
ProjectID string `gorm:"type:varchar(10);Index;comment:项目 ID" json:"projectID"`
1919
Description string `gorm:"not null;size:300;not null;comment:产品卖点/描述" json:"description"`
2020
Image string `gorm:"type:varchar(255);not null;comment:产品主图" json:"image"`
2121
Video string `gorm:"type:varchar(255);not null;comment:产品视频" json:"video"`
2222
BuyLimit uint `gorm:"type:smallint;not null;default:1;comment:购买限制" json:"buyLimit"`
23-
CategoryID string `gorm:"type:char(10);not null;index;comment:分类ID" json:"categoryID"`
23+
CategoryID string `gorm:"type:varchar(10);not null;index;comment:分类ID" json:"categoryID"`
2424
ProductSpec string `gorm:"type:varchar(2048);not null;comment:产品规格" json:"productSpec"`
2525
Content string `gorm:"type:text;comment:内容" json:"content"`
2626
HtmlContent string `gorm:"type:text;comment:html内容" json:"Htmlcontent"`

internal/pkg/model/project.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
type Project struct {
1414
Model
15-
ProjectID string `gorm:"type:char(10);not null;uniqueIndex:idx_project_project_id;comment:字符ID,分布式ID" json:"projectID"`
15+
ProjectID string `gorm:"type:varchar(10);not null;uniqueIndex:idx_project_project_id;comment:字符ID,分布式ID" json:"projectID"`
1616
Name string `gorm:"type:varchar(30);not null;comment:项目名" json:"name,omitempty"`
1717
Title string `gorm:"type:varchar(30);not null;comment:网站标题" json:"title,omitempty"`
1818
Description string `gorm:"type:varchar(300);comment:描述" json:"description,omitempty"`

internal/pkg/model/user.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515

1616
type User struct {
1717
Model
18-
UserID string `gorm:"type:char(10);not null;uniqueIndex;comment:字符ID,分布式 ID;" json:"user_id"`
18+
UserID string `gorm:"type:varchar(10);not null;uniqueIndex;comment:字符ID,分布式 ID;" json:"user_id"`
1919
Username string `gorm:"type:varchar(30);not null;uniqueIndex;comment:用户名" json:"username"`
20-
ProjectID string `gorm:"type:char(10);not null;index;comment:项目ID;" json:"project_id"`
20+
ProjectID string `gorm:"type:varchar(10);not null;index;comment:项目ID;" json:"project_id"`
2121
Password string `gorm:"type:varchar(255);not null;comment:密码" json:"-"`
2222
Nickname string `gorm:"type:varchar(30);not null;comment:昵称" json:"nickname"`
2323
Email string `gorm:"type:varchar(30);not null;uniqueIndex;comment:邮箱" json:"email"`

public/7mbgtx0.xml

Lines changed: 0 additions & 2 deletions
This file was deleted.

public/au2lqn 0.xml

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)