Merge branch 'main'

Author: fesiong

config/constant.go

@@ -1,6 +1,6 @@
 package config
 
-const Version = "3.5.3"
+const Version = "3.5.4"
 const Trial = false
 const VersionType = ""
 

provider/archive.go

@@ -1635,7 +1635,7 @@ func (w *Website) SaveArchiveCategories(archiveId int64, categoryIds []uint) err
 func (w *Website) GetArchiveRelations(archiveId int64) []*model.Archive {
 	var relations []*model.Archive
 	var relationIds []int64
-	w.DB.WithContext(w.Ctx()).Model(&model.ArchiveRelation{}).Group("archive_id").Where("`archive_id` = ?", archiveId).Pluck("relation_id", &relationIds)
+	w.DB.WithContext(w.Ctx()).Model(&model.ArchiveRelation{}).Where("`archive_id` = ?", archiveId).Pluck("relation_id", &relationIds)
 	if len(relationIds) > 0 {
 		w.DB.WithContext(w.Ctx()).Model(&model.Archive{}).Where("`id` IN (?)", relationIds).Find(&relations)
 		for i := range relations {

provider/timefactor.go

@@ -172,7 +172,7 @@ func (w *Website) TimeReleaseArchives(setting *config.PluginTimeFactor) {
 	if len(setting.CategoryIds) > 0 {
 		db = db.Where("category_id NOT IN (?)", setting.CategoryIds)
 	}
-	var draft *model.ArchiveDraft
+	var draft model.ArchiveDraft
 	// 一次最多读取1个
 	var maxId int64
 	var minId int64