diff --git a/README.md b/README.md index 100745c..cf1ad92 100644 --- a/README.md +++ b/README.md @@ -224,13 +224,3 @@ GoFilm-main -## JetBrains 开源证书 - -感谢Jetbrains提供的免费开源许可, GoLang 和 WebStorm 为编程开发带来了良好的体验. - - - -JetBrains Logo (Main) logo. - - - diff --git a/server/model/system/Search.go b/server/model/system/Search.go index aad2b0b..8056193 100644 --- a/server/model/system/Search.go +++ b/server/model/system/Search.go @@ -399,7 +399,7 @@ func GetMovieListByPid(pid int64, page *Page) []MovieBasicInfo { page.PageCount = int((page.Total + page.PageSize - 1) / page.PageSize) // 进行具体的信息查询 var s []SearchInfo - if err := db.Mdb.Limit(page.PageSize).Offset((page.Current-1)*page.PageSize).Where("pid", pid).Order("year DESC, update_stamp DESC").Find(&s).Error; err != nil { + if err := db.Mdb.Limit(page.PageSize).Offset((page.Current-1)*page.PageSize).Where("pid", pid).Order("update_stamp DESC").Find(&s).Error; err != nil { log.Println(err) return nil } @@ -421,7 +421,7 @@ func GetMovieListByCid(cid int64, page *Page) []MovieBasicInfo { page.PageCount = int((page.Total + page.PageSize - 1) / page.PageSize) // 进行具体的信息查询 var s []SearchInfo - if err := db.Mdb.Limit(page.PageSize).Offset((page.Current-1)*page.PageSize).Where("cid", cid).Order("year DESC, update_stamp DESC").Find(&s).Error; err != nil { + if err := db.Mdb.Limit(page.PageSize).Offset((page.Current-1)*page.PageSize).Where("cid", cid).Order("update_stamp DESC").Find(&s).Error; err != nil { log.Println(err) return nil } @@ -462,7 +462,7 @@ func SearchFilmKeyword(keyword string, page *Page) []SearchInfo { page.PageCount = int((page.Total + page.PageSize - 1) / page.PageSize) // 2. 获取满足条件的数据 db.Mdb.Limit(page.PageSize).Offset((page.Current-1)*page.PageSize). - Where("name LIKE ?", fmt.Sprint(`%`, keyword, `%`)).Or("sub_title LIKE ?", fmt.Sprint(`%`, keyword, `%`)).Order("year DESC, update_stamp DESC").Find(&searchList) + Where("name LIKE ?", fmt.Sprintf(`%%%s%%`, keyword)).Or("sub_title LIKE ?", fmt.Sprintf(`%%%s%%`, keyword)).Order("year DESC, update_stamp DESC").Find(&searchList) return searchList } @@ -677,13 +677,13 @@ func GetMovieListBySort(t int, pid int64, page *Page) []MovieBasicInfo { switch t { case 0: // 最新上映 (上映时间) - qw.Order("year DESC, release_stamp DESC") + qw.Order("release_stamp DESC") case 1: // 排行榜 (暂定为热度排行) - qw.Order("year DESC, hits DESC") + qw.Order("hits DESC") case 2: // 最近更新 (更新时间) - qw.Order("year DESC, update_stamp DESC") + qw.Order("update_stamp DESC") } if err := qw.Find(&sl).Error; err != nil { log.Println(err)