From 721e7e46a3ce12ddc1b4d2cb5e0c04ff4741c725 Mon Sep 17 00:00:00 2001 From: xing Date: Tue, 20 Sep 2022 22:37:31 +0800 Subject: [PATCH] interface -> any --- actions/common/common.go | 10 +++++----- actions/index.go | 8 ++++---- models/model.go | 26 +++++++++++++------------- route/route.go | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/actions/common/common.go b/actions/common/common.go index 2387bf6..8c7f5f7 100644 --- a/actions/common/common.go +++ b/actions/common/common.go @@ -92,7 +92,7 @@ func getMonthPost(args ...any) ([]models.WpPosts, error) { } return models.Find[models.WpPosts](where, "ID", "", models.SqlBuilder{{"post_date", "asc"}}, - nil, 0, []interface{}{"post"}, []interface{}{"publish"}, + nil, 0, []any{"post"}, []any{"publish"}, ) } @@ -121,12 +121,12 @@ func getPostContext(t time.Time) (prev, next models.WpPosts, err error) { {"post_date", ">", t.Format("2006-01-02 15:04:05")}, {"post_status", "in", ""}, {"post_type", "post"}, - }, "ID,post_title,post_password", nil, []interface{}{"publish", "private"}) + }, "ID,post_title,post_password", nil, []any{"publish", "private"}) prev, err = models.FirstOne[models.WpPosts](models.SqlBuilder{ {"post_date", "<", t.Format("2006-01-02 15:04:05")}, {"post_status", "in", ""}, {"post_type", "post"}, - }, "ID,post_title", models.SqlBuilder{{"post_date", "desc"}}, []interface{}{"publish", "private"}) + }, "ID,post_title", models.SqlBuilder{{"post_date", "desc"}}, []any{"publish", "private"}) if err == sql.ErrNoRows { err = nil } @@ -143,7 +143,7 @@ func GetPostFromCache(Id uint64) (r models.WpPosts) { func QueryAndSetPostCache(postIds []models.WpPosts) (err error) { var all []uint64 - var needQuery []interface{} + var needQuery []any for _, wpPosts := range postIds { all = append(all, wpPosts.Id) if _, ok := PostsCache.Load(wpPosts.Id); !ok { @@ -214,7 +214,7 @@ func Categories(ctx context.Context) []models.WpTermsMy { } func categories(...any) (terms []models.WpTermsMy, err error) { - var in = []interface{}{"category"} + var in = []any{"category"} terms, err = models.Find[models.WpTermsMy](models.SqlBuilder{ {"tt.count", ">", "0", "int"}, {"tt.taxonomy", "in", ""}, diff --git a/actions/index.go b/actions/index.go index 8657d50..c7e3b94 100644 --- a/actions/index.go +++ b/actions/index.go @@ -31,8 +31,8 @@ type indexHandle struct { orderBy models.SqlBuilder order string join models.SqlBuilder - postType []interface{} - status []interface{} + postType []any + status []any header string paginationStep int } @@ -52,8 +52,8 @@ func newIndexHandle(ctx *gin.Context) *indexHandle { }, orderBy: models.SqlBuilder{}, join: models.SqlBuilder{}, - postType: []interface{}{"post"}, - status: []interface{}{"publish"}, + postType: []any{"post"}, + status: []any{"publish"}, } } func (h *indexHandle) setTitleLR(l, r string) { diff --git a/models/model.go b/models/model.go index 2a3c956..1ba2b43 100644 --- a/models/model.go +++ b/models/model.go @@ -16,7 +16,7 @@ type Model interface { } type ParseWhere interface { - ParseWhere(in ...[]interface{}) (string, []interface{}) + ParseWhere(in ...[]any) (string, []any) } type SqlBuilder [][]string @@ -38,7 +38,7 @@ func (w SqlBuilder) parseField(ss []string, s *strings.Builder) { } } -func (w SqlBuilder) parseIn(ss []string, s *strings.Builder, c *int, args *[]interface{}, in [][]interface{}) (t bool) { +func (w SqlBuilder) parseIn(ss []string, s *strings.Builder, c *int, args *[]any, in [][]any) (t bool) { if ss[1] == "in" && len(in) > 0 { s.WriteString(" (") for _, p := range in[*c] { @@ -55,7 +55,7 @@ func (w SqlBuilder) parseIn(ss []string, s *strings.Builder, c *int, args *[]int return t } -func (w SqlBuilder) parseType(ss []string, args *[]interface{}) { +func (w SqlBuilder) parseType(ss []string, args *[]any) { if len(ss) == 4 && ss[3] == "int" { i, _ := strconv.Atoi(ss[2]) *args = append(*args, i) @@ -67,9 +67,9 @@ func (w SqlBuilder) parseType(ss []string, args *[]interface{}) { } } -func (w SqlBuilder) ParseWhere(in ...[]interface{}) (string, []interface{}) { +func (w SqlBuilder) ParseWhere(in ...[]any) (string, []any) { var s strings.Builder - args := make([]interface{}, 0, len(w)) + args := make([]any, 0, len(w)) c := 0 for _, ss := range w { if len(ss) == 2 { @@ -163,7 +163,7 @@ func (w SqlBuilder) parseJoin() string { return s.String() } -func SimplePagination[T Model](where ParseWhere, fields, group string, page, pageSize int, order SqlBuilder, join SqlBuilder, in ...[]interface{}) (r []T, total int, err error) { +func SimplePagination[T Model](where ParseWhere, fields, group string, page, pageSize int, order SqlBuilder, join SqlBuilder, in ...[]any) (r []T, total int, err error) { var rr T w, args := where.ParseWhere(in...) n := struct { @@ -221,7 +221,7 @@ func FindOneById[T Model](id int) (T, error) { return r, nil } -func FirstOne[T Model](where ParseWhere, fields string, order SqlBuilder, in ...[]interface{}) (T, error) { +func FirstOne[T Model](where ParseWhere, fields string, order SqlBuilder, in ...[]any) (T, error) { var r T w, args := where.ParseWhere(in...) tp := "select %s from %s %s %s" @@ -233,7 +233,7 @@ func FirstOne[T Model](where ParseWhere, fields string, order SqlBuilder, in ... return r, nil } -func LastOne[T Model](where ParseWhere, fields string, in ...[]interface{}) (T, error) { +func LastOne[T Model](where ParseWhere, fields string, in ...[]any) (T, error) { var r T w, args := where.ParseWhere(in...) tp := "select %s from %s %s order by %s desc limit 1" @@ -245,7 +245,7 @@ func LastOne[T Model](where ParseWhere, fields string, in ...[]interface{}) (T, return r, nil } -func SimpleFind[T Model](where ParseWhere, fields string, in ...[]interface{}) ([]T, error) { +func SimpleFind[T Model](where ParseWhere, fields string, in ...[]any) ([]T, error) { var r []T var rr T w, args := where.ParseWhere(in...) @@ -258,7 +258,7 @@ func SimpleFind[T Model](where ParseWhere, fields string, in ...[]interface{}) ( return r, nil } -func Select[T Model](sql string, params ...interface{}) ([]T, error) { +func Select[T Model](sql string, params ...any) ([]T, error) { var r []T var rr T sql = strings.Replace(sql, "{table}", rr.Table(), -1) @@ -269,10 +269,10 @@ func Select[T Model](sql string, params ...interface{}) ([]T, error) { return r, nil } -func Find[T Model](where ParseWhere, fields, group string, order SqlBuilder, join SqlBuilder, limit int, in ...[]interface{}) (r []T, err error) { +func Find[T Model](where ParseWhere, fields, group string, order SqlBuilder, join SqlBuilder, limit int, in ...[]any) (r []T, err error) { var rr T w := "" - var args []interface{} + var args []any if where != nil { w, args = where.ParseWhere(in...) } @@ -295,7 +295,7 @@ func Find[T Model](where ParseWhere, fields, group string, order SqlBuilder, joi return } -func Get[T Model](sql string, params ...interface{}) (r T, err error) { +func Get[T Model](sql string, params ...any) (r T, err error) { sql = strings.Replace(sql, "{table}", r.Table(), -1) err = db.Db.Get(&r, sql, params...) return diff --git a/route/route.go b/route/route.go index efa6096..22c30b1 100644 --- a/route/route.go +++ b/route/route.go @@ -18,10 +18,10 @@ func SetupRouter() *gin.Engine { // gin.DisableConsoleColor() r := gin.Default() r.HTMLRender = templates.NewFsTemplate(template.FuncMap{ - "unescaped": func(s string) interface{} { + "unescaped": func(s string) any { return template.HTML(s) }, - "dateCh": func(t time.Time) interface{} { + "dateCh": func(t time.Time) any { return t.Format("2006年 01月 02日") }, }).SetTemplate()