目录调整及项目包名调整 github=>github.com ==!........

cache/map.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github/fthvgb1/wp-go/safety"
+	"github.com/fthvgb1/wp-go/safety"
 	"sync"
 	"time"
 )

cache/slice.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github/fthvgb1/wp-go/safety"
+	"github.com/fthvgb1/wp-go/safety"
 	"sync"
 	"time"
 )

go.mod

@@ -1,22 +1,23 @@
-module github/fthvgb1/wp-go
+module github.com/fthvgb1/wp-go
 
 go 1.18
 
 require (
 	github.com/dlclark/regexp2 v1.7.0
+	github.com/elliotchance/phpserialize v1.3.3
 	github.com/gin-contrib/gzip v0.0.6
 	github.com/gin-contrib/pprof v1.4.0
 	github.com/gin-contrib/sessions v0.0.5
 	github.com/gin-gonic/gin v1.8.1
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/jmoiron/sqlx v1.3.5
+	github.com/leeqvip/gophp v1.0.0
 	github.com/soxfmr/gomail v0.0.0-20200806033254-80bf84e583f0
 	golang.org/x/crypto v0.0.0-20220924013350-4ba4fb4dd9e7
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	github.com/elliotchance/phpserialize v1.3.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
@@ -26,7 +27,6 @@ require (
 	github.com/gorilla/securecookie v1.1.1 // indirect
 	github.com/gorilla/sessions v1.2.1 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/leeqvip/gophp v1.0.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

internal/actions/comment.go

@@ -4,14 +4,14 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"github.com/fthvgb1/wp-go/cache"
+	"github.com/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/internal/mail"
+	cache2 "github.com/fthvgb1/wp-go/internal/pkg/cache"
+	"github.com/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/internal/pkg/logs"
+	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/cache"
-	"github/fthvgb1/wp-go/helper"
-	"github/fthvgb1/wp-go/internal/mail"
-	cache2 "github/fthvgb1/wp-go/internal/pkg/cache"
-	"github/fthvgb1/wp-go/internal/pkg/config"
-	"github/fthvgb1/wp-go/internal/pkg/logs"
-	"github/fthvgb1/wp-go/internal/wpconfig"
 	"io"
 	"net/http"
 	"net/url"

internal/actions/detail.go

@@ -2,14 +2,14 @@ package actions
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/helper"
+	cache2 "github.com/fthvgb1/wp-go/internal/pkg/cache"
+	"github.com/fthvgb1/wp-go/internal/pkg/logs"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/plugins"
+	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/helper"
-	cache2 "github/fthvgb1/wp-go/internal/pkg/cache"
-	"github/fthvgb1/wp-go/internal/pkg/logs"
-	"github/fthvgb1/wp-go/internal/pkg/models"
-	"github/fthvgb1/wp-go/internal/plugins"
-	"github/fthvgb1/wp-go/internal/wpconfig"
 	"math/rand"
 	"net/http"
 	"net/url"

internal/actions/feed.go

@@ -2,16 +2,16 @@ package actions
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/cache"
+	"github.com/fthvgb1/wp-go/helper"
+	cache2 "github.com/fthvgb1/wp-go/internal/pkg/cache"
+	"github.com/fthvgb1/wp-go/internal/pkg/logs"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/plugins"
+	"github.com/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/plugin/digest"
+	"github.com/fthvgb1/wp-go/rss2"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/cache"
-	"github/fthvgb1/wp-go/helper"
-	cache3 "github/fthvgb1/wp-go/internal/pkg/cache"
-	"github/fthvgb1/wp-go/internal/pkg/logs"
-	models2 "github/fthvgb1/wp-go/internal/pkg/models"
-	"github/fthvgb1/wp-go/internal/plugins"
-	"github/fthvgb1/wp-go/internal/wpconfig"
-	"github/fthvgb1/wp-go/plugin/digest"
-	"github/fthvgb1/wp-go/rss2"
 	"net/http"
 	"strconv"
 	"strings"
@@ -78,17 +78,17 @@ func Feed(c *gin.Context) {
 
 func feed(arg ...any) (xml []string, err error) {
 	c := arg[0].(*gin.Context)
-	r := cache3.RecentPosts(c, 10)
+	r := cache2.RecentPosts(c, 10)
-	ids := helper.SliceMap(r, func(t models2.Posts) uint64 {
+	ids := helper.SliceMap(r, func(t models.Posts) uint64 {
 		return t.Id
 	})
-	posts, err := cache3.GetPostsByIds(c, ids)
+	posts, err := cache2.GetPostsByIds(c, ids)
 	if err != nil {
 		return
 	}
 	rs := templateRss
 	rs.LastBuildDate = time.Now().Format(timeFormat)
-	rs.Items = helper.SliceMap(posts, func(t models2.Posts) rss2.Item {
+	rs.Items = helper.SliceMap(posts, func(t models.Posts) rss2.Item {
 		desc := "无法提供摘要。这是一篇受保护的文章。"
 		plugins.PasswordProjectTitle(&t)
 		if t.PostPassword != "" {
@@ -102,7 +102,7 @@ func feed(arg ...any) (xml []string, err error) {
 		} else if t.CommentStatus == "open" && t.CommentCount == 0 {
 			l = fmt.Sprintf("%s/p/%d#respond", wpconfig.Options.Value("siteurl"), t.Id)
 		}
-		user := cache3.GetUserById(c, t.PostAuthor)
+		user := cache2.GetUserById(c, t.PostAuthor)
 
 		return rss2.Item{
 			Title:         t.PostTitle,
@@ -158,17 +158,17 @@ func postFeed(arg ...any) (x string, err error) {
 		}
 	}
 	ID := uint64(Id)
-	maxId, err := cache3.GetMaxPostId(c)
+	maxId, err := cache2.GetMaxPostId(c)
 	logs.ErrPrintln(err, "get max post id")
 	if ID > maxId || err != nil {
 		return
 	}
-	post, err := cache3.GetPostById(c, ID)
+	post, err := cache2.GetPostById(c, ID)
 	if post.Id == 0 || err != nil {
 		return
 	}
 	plugins.PasswordProjectTitle(&post)
-	comments, err := cache3.PostComments(c, post.Id)
+	comments, err := cache2.PostComments(c, post.Id)
 	if err != nil {
 		return
 	}
@@ -195,7 +195,7 @@ func postFeed(arg ...any) (x string, err error) {
 			}
 		}
 	} else {
-		rs.Items = helper.SliceMap(comments, func(t models2.Comments) rss2.Item {
+		rs.Items = helper.SliceMap(comments, func(t models.Comments) rss2.Item {
 			return rss2.Item{
 				Title:   fmt.Sprintf("评价者：%s", t.CommentAuthor),
 				Link:    fmt.Sprintf("%s/p/%d#comment-%d", wpconfig.Options.Value("siteurl"), post.Id, t.CommentId),
@@ -228,19 +228,19 @@ func CommentsFeed(c *gin.Context) {
 
 func commentsFeed(args ...any) (r []string, err error) {
 	c := args[0].(*gin.Context)
-	commens := cache3.RecentComments(c, 10)
+	commens := cache2.RecentComments(c, 10)
 	rs := templateRss
 	rs.Title = fmt.Sprintf("\"%s\"的评论", wpconfig.Options.Value("blogname"))
 	rs.LastBuildDate = time.Now().Format(timeFormat)
 	rs.AtomLink = fmt.Sprintf("%s/comments/feed", wpconfig.Options.Value("siteurl"))
-	com, err := cache3.GetCommentByIds(c, helper.SliceMap(commens, func(t models2.Comments) uint64 {
+	com, err := cache2.GetCommentByIds(c, helper.SliceMap(commens, func(t models.Comments) uint64 {
 		return t.CommentId
 	}))
 	if nil != err {
 		return []string{}, err
 	}
-	rs.Items = helper.SliceMap(com, func(t models2.Comments) rss2.Item {
+	rs.Items = helper.SliceMap(com, func(t models.Comments) rss2.Item {
-		post, _ := cache3.GetPostById(c, t.CommentPostId)
+		post, _ := cache2.GetPostById(c, t.CommentPostId)
 		plugins.PasswordProjectTitle(&post)
 		desc := "评论受保护：要查看请输入密码。"
 		content := t.CommentContent

internal/actions/login.go

@@ -2,11 +2,11 @@ package actions
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/phpass"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/helper"
-	"github/fthvgb1/wp-go/internal/wpconfig"
-	"github/fthvgb1/wp-go/phpass"
 	"net/http"
 	"strings"
 )

internal/cmd/route/route.go

@@ -1,16 +1,16 @@
 package route
 
 import (
+	"github.com/fthvgb1/wp-go/internal/actions"
+	"github.com/fthvgb1/wp-go/internal/middleware"
+	"github.com/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/internal/static"
+	"github.com/fthvgb1/wp-go/internal/theme"
 	"github.com/gin-contrib/gzip"
 	"github.com/gin-contrib/pprof"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-contrib/sessions/cookie"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/internal/actions"
-	"github/fthvgb1/wp-go/internal/middleware"
-	"github/fthvgb1/wp-go/internal/pkg/config"
-	"github/fthvgb1/wp-go/internal/static"
-	"github/fthvgb1/wp-go/internal/templates"
 	"net/http"
 )
 
@@ -26,7 +26,7 @@ func SetupRouter() (*gin.Engine, func()) {
 		}
 	}
 
-	r.HTMLRender = templates.NewFsTemplate(templates.FuncMap()).SetTemplate()
+	r.HTMLRender = theme.NewFsTemplate(theme.FuncMap()).SetTemplate()
 	validServerName, reloadValidServerNameFn := middleware.ValidateServerNames()
 	fl, flReload := middleware.FlowLimit(c.MaxRequestSleepNum, c.MaxRequestNum, c.SleepTime)
 	r.Use(

internal/mail/mail.go

@@ -3,8 +3,8 @@ package mail
 import (
 	"crypto/tls"
 	"fmt"
+	"github.com/fthvgb1/wp-go/internal/pkg/config"
 	"github.com/soxfmr/gomail"
-	"github/fthvgb1/wp-go/internal/pkg/config"
 	"mime"
 	"path"
 )

internal/mail/mail_test.go

@@ -1,7 +1,7 @@
 package mail
 
 import (
-	"github/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/internal/pkg/config"
 	"testing"
 )
 

internal/middleware/flowLimit.go

@@ -1,9 +1,9 @@
 package middleware
 
 import (
+	"github.com/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/safety"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/helper"
-	"github/fthvgb1/wp-go/safety"
 	"net/http"
 	"strings"
 	"sync/atomic"

internal/middleware/sendmail.go

@@ -3,11 +3,11 @@ package middleware
 import (
 	"bytes"
 	"fmt"
+	"github.com/fthvgb1/wp-go/internal/mail"
+	"github.com/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/internal/pkg/logs"
+	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/internal/mail"
-	"github/fthvgb1/wp-go/internal/pkg/config"
-	"github/fthvgb1/wp-go/internal/pkg/logs"
-	"github/fthvgb1/wp-go/internal/wpconfig"
 	"io"
 	"io/ioutil"
 	"net/http"

internal/middleware/staticFileCache.go

@@ -1,8 +1,8 @@
 package middleware
 
 import (
+	"github.com/fthvgb1/wp-go/helper"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/helper"
 	"strings"
 )
 

internal/middleware/validateservername.go

@@ -1,9 +1,9 @@
 package middleware
 
 import (
+	"github.com/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/safety"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/internal/pkg/config"
-	"github/fthvgb1/wp-go/safety"
 	"net/http"
 	"strings"
 )

internal/pkg/cache/cache.go

@@ -2,11 +2,11 @@ package cache
 
 import (
 	"context"
-	"github/fthvgb1/wp-go/cache"
+	"github.com/fthvgb1/wp-go/cache"
-	"github/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/internal/pkg/config"
-	"github/fthvgb1/wp-go/internal/pkg/dao"
+	"github.com/fthvgb1/wp-go/internal/pkg/dao"
-	"github/fthvgb1/wp-go/internal/pkg/logs"
+	"github.com/fthvgb1/wp-go/internal/pkg/logs"
-	"github/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
 	"sync"
 	"time"
 )

internal/pkg/cache/comments.go

@@ -2,8 +2,8 @@ package cache
 
 import (
 	"context"
-	"github/fthvgb1/wp-go/internal/pkg/logs"
+	"github.com/fthvgb1/wp-go/internal/pkg/logs"
-	"github/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
 	"time"
 )
 

internal/pkg/cache/posts.go

@@ -3,10 +3,10 @@ package cache
 import (
 	"context"
 	"fmt"
+	"github.com/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/internal/pkg/logs"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/helper"
-	"github/fthvgb1/wp-go/internal/pkg/logs"
-	"github/fthvgb1/wp-go/internal/pkg/models"
 	"time"
 )
 

internal/pkg/cache/users.go

@@ -2,9 +2,9 @@ package cache
 
 import (
 	"context"
-	"github/fthvgb1/wp-go/internal/pkg/logs"
+	"github.com/fthvgb1/wp-go/internal/pkg/logs"
-	"github/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github/fthvgb1/wp-go/model"
+	"github.com/fthvgb1/wp-go/model"
 	"time"
 )
 

internal/pkg/config/config.go

@@ -2,7 +2,7 @@ package config
 
 import (
 	"fmt"
-	"github/fthvgb1/wp-go/safety"
+	"github.com/fthvgb1/wp-go/safety"
 	"gopkg.in/yaml.v2"
 	"os"
 	"time"

internal/pkg/dao/comments.go

@@ -2,9 +2,9 @@ package common
 
 import (
 	"context"
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
-	"github/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github/fthvgb1/wp-go/model"
+	"github.com/fthvgb1/wp-go/model"
 	"strconv"
 )
 

internal/pkg/dao/common.go

@@ -3,9 +3,9 @@ package common
 import (
 	"context"
 	"fmt"
-	models2 "github/fthvgb1/wp-go/internal/pkg/models"
+	models2 "github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/internal/wpconfig"
-	"github/fthvgb1/wp-go/model"
+	"github.com/fthvgb1/wp-go/model"
 )
 
 var TotalRaw int64

internal/pkg/dao/postmeta.go

@@ -3,10 +3,10 @@ package common
 import (
 	"context"
 	"fmt"
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
-	"github/fthvgb1/wp-go/internal/pkg/logs"
+	"github.com/fthvgb1/wp-go/internal/pkg/logs"
-	"github/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github/fthvgb1/wp-go/model"
+	"github.com/fthvgb1/wp-go/model"
 	"strconv"
 	"strings"
 )

internal/pkg/dao/posts.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
-	"github/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/internal/wpconfig"
-	"github/fthvgb1/wp-go/model"
+	"github.com/fthvgb1/wp-go/model"
 	"strings"
 	"sync/atomic"
 	"time"

internal/pkg/dao/users.go

@@ -2,8 +2,8 @@ package common
 
 import (
 	"context"
-	"github/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github/fthvgb1/wp-go/model"
+	"github.com/fthvgb1/wp-go/model"
 )
 
 func GetUserById(a ...any) (r models.Users, err error) {

internal/pkg/db/db.go

@@ -3,9 +3,9 @@ package db
 import (
 	"context"
 	"fmt"
+	"github.com/fthvgb1/wp-go/internal/pkg/config"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"
-	"github/fthvgb1/wp-go/internal/pkg/config"
 	"log"
 	"os"
 	"strconv"

internal/pkg/models/wp_postmeta.go

@@ -1,8 +1,8 @@
 package models
 
 import (
+	"github.com/fthvgb1/wp-go/helper"
 	"github.com/leeqvip/gophp"
-	"github/fthvgb1/wp-go/helper"
 )
 
 type Postmeta struct {

internal/plugins/digest.go

@@ -2,11 +2,11 @@ package plugins
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/cache"
+	"github.com/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/plugin/digest"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/cache"
-	"github/fthvgb1/wp-go/internal/pkg/config"
-	"github/fthvgb1/wp-go/internal/pkg/models"
-	"github/fthvgb1/wp-go/plugin/digest"
 	"strings"
 	"time"
 )

internal/plugins/posts.go

@@ -2,8 +2,8 @@ package plugins
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/internal/pkg/models"
 )
 
 func NewPostPlugin(ctx *gin.Context, scene uint) *Plugin[models.Posts] {

internal/theme/fs.go

@@ -1,4 +1,4 @@
-package templates
+package theme
 
 import (
 	"embed"
@@ -9,7 +9,7 @@ import (
 	"strings"
 )
 
-//go:embed *[^templatefs.go]
+//go:embed *[^.go]
 var TemplateFs embed.FS
 
 type FsTemplate struct {

internal/theme/templateFuncs.go

@@ -1,8 +1,7 @@
-package templates
+package theme
 
 import (
-	"errors"
+	"github.com/fthvgb1/wp-go/internal/wpconfig"
-	"github/fthvgb1/wp-go/internal/wpconfig"
 	"html/template"
 	"time"
 )
@@ -23,14 +22,9 @@ func FuncMap() template.FuncMap {
 	return funcs
 }
 
-func InitTemplateFunc() {
+func AddTemplateFunc(fnName string, fn any) {
-
-}
-
-func AddTemplateFunc(fnName string, fn any) error {
 	if _, ok := funcs[fnName]; ok {
-		return errors.New("a same name func exists")
+		panic("exists same name func")
 	}
 	funcs[fnName] = fn
-	return nil
 }

internal/theme/twentyseventeen/layout/base.gohtml

@@ -52,9 +52,11 @@
             </div>
 
             <footer id="colophon" class="site-footer">
+                <div class="wrap">
                     <div class="site-info">
                         <a href="https://cn.wordpress.org/" class="imprint">自豪地采用WordPress</a>
                     </div>
+                </div>
             </footer>
         </div>
 

internal/theme/twentyseventeen/twentyseventeen.go

@@ -2,13 +2,15 @@ package twentyseventeen
 
 import (
 	"github.com/elliotchance/phpserialize"
+	"github.com/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/internal/pkg/cache"
+	"github.com/fthvgb1/wp-go/internal/pkg/logs"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/plugins"
+	"github.com/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/plugin/pagination"
 	"github.com/gin-gonic/gin"
-	"github/fthvgb1/wp-go/helper"
+	"strings"
-	"github/fthvgb1/wp-go/internal/pkg/cache"
-	"github/fthvgb1/wp-go/internal/pkg/logs"
-	"github/fthvgb1/wp-go/internal/pkg/models"
-	"github/fthvgb1/wp-go/internal/plugins"
-	"github/fthvgb1/wp-go/internal/wpconfig"
 )
 
 const ThemeName = "twentyseventeen"
@@ -28,13 +30,27 @@ type ImageData struct {
 	Width        int64  `json:"width,omitempty"`
 }
 
-func Hook(c *gin.Context, h gin.H, scene int) (r string) {
+func Hook(status int, c *gin.Context, h gin.H, scene int) {
+	templ := "twentyseventeen/posts/index.gohtml"
 	if _, ok := plugins.IndexSceneMap[scene]; ok {
-		r = "twentyseventeen/posts/index.gohtml"
 		h["HeaderImage"] = getHeaderImage(c)
-	} else if _, ok := plugins.DetailSceneMap[scene]; ok {
+		p, ok := h["pagination"]
-		r = "twentyseventeen/posts/detail.gohtml"
+		if ok {
+			pp, ok := p.(pagination.ParsePagination)
+			if ok {
+				f := plugins.TwentyFifteenPagination()
+				f.PrevEle = `<a class="prev page-numbers" href="%s"><svg class="icon icon-arrow-left" aria-hidden="true" role="img"> <use href="#icon-arrow-left" xlink:href="#icon-arrow-left"></use> </svg>
+<span class="screen-reader-text">上一页</span></a>`
+				f.NextEle = strings.Replace(f.NextEle, "下一页", `<span class="screen-reader-text">下一页</span>
+<svg class="icon icon-arrow-right" aria-hidden="true" role="img"> <use href="#icon-arrow-right" xlink:href="#icon-arrow-right"></use> 
+</svg>`, 1)
+				h["pagination"] = pagination.Paginate(f, pp)
 			}
+		}
+	} else if _, ok := plugins.DetailSceneMap[scene]; ok {
+		templ = "twentyseventeen/posts/detail.gohtml"
+	}
+	c.HTML(status, templ, h)
 	return
 }
 

internal/wpconfig/options.go

@@ -2,9 +2,9 @@ package wpconfig
 
 import (
 	"context"
-	"github/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github/fthvgb1/wp-go/model"
+	"github.com/fthvgb1/wp-go/model"
-	"github/fthvgb1/wp-go/safety"
+	"github.com/fthvgb1/wp-go/safety"
 )
 
 var Options safety.Map[string, string]

internal/wpconfig/term.go

@@ -2,9 +2,9 @@ package wpconfig
 
 import (
 	"context"
-	"github/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github/fthvgb1/wp-go/model"
+	"github.com/fthvgb1/wp-go/model"
-	"github/fthvgb1/wp-go/safety"
+	"github.com/fthvgb1/wp-go/safety"
 )
 
 var Terms safety.Map[uint64, models.Terms]

model/parse.go

@@ -2,7 +2,7 @@ package model
 
 import (
 	"fmt"
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
 	"strconv"
 	"strings"
 )

model/query.go

@@ -3,7 +3,7 @@ package model
 import (
 	"context"
 	"fmt"
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
 	"math/rand"
 	"strings"
 	"time"

model/query_test.go

@@ -3,26 +3,123 @@ package model
 import (
 	"context"
 	"database/sql"
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
-	"github/fthvgb1/wp-go/internal/pkg/config"
+	_ "github.com/go-sql-driver/mysql"
-	"github/fthvgb1/wp-go/internal/pkg/db"
+	"github.com/jmoiron/sqlx"
-	models2 "github/fthvgb1/wp-go/internal/pkg/models"
 	"reflect"
 	"testing"
+	"time"
 )
 
+type post struct {
+	Id                  uint64    `gorm:"column:ID" db:"ID" json:"ID" form:"ID"`
+	PostAuthor          uint64    `gorm:"column:post_author" db:"post_author" json:"post_author" form:"post_author"`
+	PostDate            time.Time `gorm:"column:post_date" db:"post_date" json:"post_date" form:"post_date"`
+	PostDateGmt         time.Time `gorm:"column:post_date_gmt" db:"post_date_gmt" json:"post_date_gmt" form:"post_date_gmt"`
+	PostContent         string    `gorm:"column:post_content" db:"post_content" json:"post_content" form:"post_content"`
+	PostTitle           string    `gorm:"column:post_title" db:"post_title" json:"post_title" form:"post_title"`
+	PostExcerpt         string    `gorm:"column:post_excerpt" db:"post_excerpt" json:"post_excerpt" form:"post_excerpt"`
+	PostStatus          string    `gorm:"column:post_status" db:"post_status" json:"post_status" form:"post_status"`
+	CommentStatus       string    `gorm:"column:comment_status" db:"comment_status" json:"comment_status" form:"comment_status"`
+	PingStatus          string    `gorm:"column:ping_status" db:"ping_status" json:"ping_status" form:"ping_status"`
+	PostPassword        string    `gorm:"column:post_password" db:"post_password" json:"post_password" form:"post_password"`
+	PostName            string    `gorm:"column:post_name" db:"post_name" json:"post_name" form:"post_name"`
+	ToPing              string    `gorm:"column:to_ping" db:"to_ping" json:"to_ping" form:"to_ping"`
+	Pinged              string    `gorm:"column:pinged" db:"pinged" json:"pinged" form:"pinged"`
+	PostModified        time.Time `gorm:"column:post_modified" db:"post_modified" json:"post_modified" form:"post_modified"`
+	PostModifiedGmt     time.Time `gorm:"column:post_modified_gmt" db:"post_modified_gmt" json:"post_modified_gmt" form:"post_modified_gmt"`
+	PostContentFiltered string    `gorm:"column:post_content_filtered" db:"post_content_filtered" json:"post_content_filtered" form:"post_content_filtered"`
+	PostParent          uint64    `gorm:"column:post_parent" db:"post_parent" json:"post_parent" form:"post_parent"`
+	Guid                string    `gorm:"column:guid" db:"guid" json:"guid" form:"guid"`
+	MenuOrder           int       `gorm:"column:menu_order" db:"menu_order" json:"menu_order" form:"menu_order"`
+	PostType            string    `gorm:"column:post_type" db:"post_type" json:"post_type" form:"post_type"`
+	PostMimeType        string    `gorm:"column:post_mime_type" db:"post_mime_type" json:"post_mime_type" form:"post_mime_type"`
+	CommentCount        int64     `gorm:"column:comment_count" db:"comment_count" json:"comment_count" form:"comment_count"`
+}
+
+type user struct {
+	Id                uint64    `gorm:"column:ID" db:"ID" json:"ID"`
+	UserLogin         string    `gorm:"column:user_login" db:"user_login" json:"user_login"`
+	UserPass          string    `gorm:"column:user_pass" db:"user_pass" json:"user_pass"`
+	UserNicename      string    `gorm:"column:user_nicename" db:"user_nicename" json:"user_nicename"`
+	UserEmail         string    `gorm:"column:user_email" db:"user_email" json:"user_email"`
+	UserUrl           string    `gorm:"column:user_url" db:"user_url" json:"user_url"`
+	UserRegistered    time.Time `gorm:"column:user_registered" db:"user_registered" json:"user_registered"`
+	UserActivationKey string    `gorm:"column:user_activation_key" db:"user_activation_key" json:"user_activation_key"`
+	UserStatus        int       `gorm:"column:user_status" db:"user_status" json:"user_status"`
+	DisplayName       string    `gorm:"column:display_name" db:"display_name" json:"display_name"`
+}
+
+type termTaxonomy struct {
+	TermTaxonomyId uint64 `gorm:"column:term_taxonomy_id" db:"term_taxonomy_id" json:"term_taxonomy_id" form:"term_taxonomy_id"`
+	TermId         uint64 `gorm:"column:term_id" db:"term_id" json:"term_id" form:"term_id"`
+	Taxonomy       string `gorm:"column:taxonomy" db:"taxonomy" json:"taxonomy" form:"taxonomy"`
+	Description    string `gorm:"column:description" db:"description" json:"description" form:"description"`
+	Parent         uint64 `gorm:"column:parent" db:"parent" json:"parent" form:"parent"`
+	Count          int64  `gorm:"column:count" db:"count" json:"count" form:"count"`
+}
+
+type terms struct {
+	TermId    uint64 `gorm:"column:term_id" db:"term_id" json:"term_id" form:"term_id"`
+	Name      string `gorm:"column:name" db:"name" json:"name" form:"name"`
+	Slug      string `gorm:"column:slug" db:"slug" json:"slug" form:"slug"`
+	TermGroup int64  `gorm:"column:term_group" db:"term_group" json:"term_group" form:"term_group"`
+}
+
+func (t terms) PrimaryKey() string {
+	return "term_id"
+}
+func (t terms) Table() string {
+	return "wp_terms"
+}
+
+func (w termTaxonomy) PrimaryKey() string {
+	return "term_taxonomy_id"
+}
+
+func (w termTaxonomy) Table() string {
+	return "wp_term_taxonomy"
+}
+
+func (u user) Table() string {
+	return "wp_users"
+}
+
+func (u user) PrimaryKey() string {
+	return "ID"
+}
+
+func (p post) PrimaryKey() string {
+	return "ID"
+}
+
+func (p post) Table() string {
+	return "wp_posts"
+}
+
+type SqlxDb struct {
+	sqlx *sqlx.DB
+}
+
+var Db *SqlxDb
+
+func (r SqlxDb) Select(ctx context.Context, dest any, sql string, params ...any) error {
+	return r.sqlx.Select(dest, sql, params...)
+}
+
+func (r SqlxDb) Get(ctx context.Context, dest any, sql string, params ...any) error {
+	return r.sqlx.Get(dest, sql, params...)
+}
+
 var ctx = context.Background()
 
 func init() {
-	err := config.InitConfig("../config.yaml")
+	db, err := sqlx.Open("mysql", "root:root@tcp(192.168.66.47:3306)/wordpress?charset=utf8mb4&parseTime=True&loc=Local")
 	if err != nil {
 		panic(err)
 	}
-	err = db.InitDb()
+	Db = &SqlxDb{db}
-	if err != nil {
+	InitDB(Db)
-		panic(err)
-	}
-	InitDB(db.NewSqlxDb(db.Db))
 }
 func TestFind(t *testing.T) {
 	type args struct {
@@ -36,7 +133,7 @@ func TestFind(t *testing.T) {
 		in     [][]any
 	}
 	type posts struct {
-		models2.Posts
+		post
 		N int `db:"n"`
 	}
 	tests := []struct {
@@ -107,7 +204,7 @@ func TestFind(t *testing.T) {
 				in:    nil,
 			},
 			wantR: func() []posts {
-				r, err := Select[posts](ctx, "select post_status,count(*) n from "+models2.Posts{}.Table()+" where ID<1000 group by post_status having n>1")
+				r, err := Select[posts](ctx, "select post_status,count(*) n from "+post{}.Table()+" where ID<1000 group by post_status having n>1")
 				if err != nil {
 					panic(err)
 				}
@@ -152,10 +249,10 @@ func TestFind(t *testing.T) {
 				group:  "a.post_author",
 				order:  SqlBuilder{{"n", "desc"}},
 				join: SqlBuilder{
-					{"a", "left join", models2.Users{}.Table() + " b", "a.post_author=b.ID"},
+					{"a", "left join", user{}.Table() + " b", "a.post_author=b.ID"},
 					{"left join", "wp_term_relationships c", "a.Id=c.object_id"},
-					{"left join", models2.TermTaxonomy{}.Table() + " d", "c.term_taxonomy_id=d.term_taxonomy_id"},
+					{"left join", termTaxonomy{}.Table() + " d", "c.term_taxonomy_id=d.term_taxonomy_id"},
-					{"left join", models2.Terms{}.Table() + " e", "d.term_id=e.term_id"},
+					{"left join", terms{}.Table() + " e", "d.term_id=e.term_id"},
 				},
 				having: SqlBuilder{{"n", ">", "0", "int"}},
 				limit:  10,
@@ -193,7 +290,7 @@ func TestFindOneById(t *testing.T) {
 	tests := []struct {
 		name    string
 		args    args
-		want    models2.Posts
+		want    post
 		wantErr bool
 	}{
 		{
@@ -201,8 +298,8 @@ func TestFindOneById(t *testing.T) {
 			args: args{
 				1,
 			},
-			want: func() models2.Posts {
+			want: func() post {
-				r, err := Get[models2.Posts](ctx, "select * from "+models2.Posts{}.Table()+" where ID=?", 1)
+				r, err := Get[post](ctx, "select * from "+post{}.Table()+" where ID=?", 1)
 				if err != nil && err != sql.ErrNoRows {
 					panic(err)
 				} else if err == sql.ErrNoRows {
@@ -215,7 +312,7 @@ func TestFindOneById(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := FindOneById[models2.Posts](ctx, tt.args.id)
+			got, err := FindOneById[post](ctx, tt.args.id)
 			if err == sql.ErrNoRows {
 				err = nil
 			}
@@ -240,7 +337,7 @@ func TestFirstOne(t *testing.T) {
 	tests := []struct {
 		name    string
 		args    args
-		want    models2.Posts
+		want    post
 		wantErr bool
 	}{
 		{
@@ -252,8 +349,8 @@ func TestFirstOne(t *testing.T) {
 				in:     nil,
 			},
 			wantErr: false,
-			want: func() models2.Posts {
+			want: func() post {
-				r, err := Get[models2.Posts](ctx, "select * from "+models2.Posts{}.Table()+" where post_status='publish' order by ID desc limit 1")
+				r, err := Get[post](ctx, "select * from "+post{}.Table()+" where post_status='publish' order by ID desc limit 1")
 				if err != nil && err != sql.ErrNoRows {
 					panic(err)
 				} else if err == sql.ErrNoRows {
@@ -265,7 +362,7 @@ func TestFirstOne(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := FirstOne[models2.Posts](ctx, tt.args.where, tt.args.fields, tt.args.order, tt.args.in...)
+			got, err := FirstOne[post](ctx, tt.args.where, tt.args.fields, tt.args.order, tt.args.in...)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("FirstOne() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -286,7 +383,7 @@ func TestLastOne(t *testing.T) {
 	tests := []struct {
 		name    string
 		args    args
-		want    models2.Posts
+		want    post
 		wantErr bool
 	}{
 		{
@@ -298,8 +395,8 @@ func TestLastOne(t *testing.T) {
 				fields: "*",
 				in:     nil,
 			},
-			want: func() models2.Posts {
+			want: func() post {
-				r, err := Get[models2.Posts](ctx, "select * from "+models2.Posts{}.Table()+" where post_status='publish' order by  "+models2.Posts{}.PrimaryKey()+" desc limit 1")
+				r, err := Get[post](ctx, "select * from "+post{}.Table()+" where post_status='publish' order by  "+post{}.PrimaryKey()+" desc limit 1")
 				if err != nil {
 					panic(err)
 				}
@@ -309,7 +406,7 @@ func TestLastOne(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := LastOne[models2.Posts](ctx, tt.args.where, tt.args.fields, tt.args.in...)
+			got, err := LastOne[post](ctx, tt.args.where, tt.args.fields, tt.args.in...)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("LastOne() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -330,7 +427,7 @@ func TestSimpleFind(t *testing.T) {
 	tests := []struct {
 		name    string
 		args    args
-		want    []models2.Posts
+		want    []post
 		wantErr bool
 	}{
 		{
@@ -342,8 +439,8 @@ func TestSimpleFind(t *testing.T) {
 				fields: "*",
 				in:     [][]any{{1, 2}},
 			},
-			want: func() (r []models2.Posts) {
+			want: func() (r []post) {
-				r, err := Select[models2.Posts](ctx, "select * from "+models2.Posts{}.Table()+" where ID in (?,?)", 1, 2)
+				r, err := Select[post](ctx, "select * from "+post{}.Table()+" where ID in (?,?)", 1, 2)
 				if err != nil && err != sql.ErrNoRows {
 					panic(err)
 				} else if err == sql.ErrNoRows {
@@ -356,7 +453,7 @@ func TestSimpleFind(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := SimpleFind[models2.Posts](ctx, tt.args.where, tt.args.fields, tt.args.in...)
+			got, err := SimpleFind[post](ctx, tt.args.where, tt.args.fields, tt.args.in...)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("SimpleFind() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -383,7 +480,7 @@ func TestSimplePagination(t *testing.T) {
 	tests := []struct {
 		name      string
 		args      args
-		wantR     []models2.Posts
+		wantR     []post
 		wantTotal int
 		wantErr   bool
 	}{
@@ -402,8 +499,8 @@ func TestSimplePagination(t *testing.T) {
 				having:   nil,
 				in:       [][]any{helper.SliceMap[int, any](helper.RangeSlice(431, 440, 1), helper.ToAny[int])},
 			},
-			wantR: func() (r []models2.Posts) {
+			wantR: func() (r []post) {
-				r, err := Select[models2.Posts](ctx, "select * from "+models2.Posts{}.Table()+" where ID in (?,?,?,?,?)", helper.SliceMap[int, any](helper.RangeSlice(431, 435, 1), helper.ToAny[int])...)
+				r, err := Select[post](ctx, "select * from "+post{}.Table()+" where ID in (?,?,?,?,?)", helper.SliceMap[int, any](helper.RangeSlice(431, 435, 1), helper.ToAny[int])...)
 				if err != nil && err != sql.ErrNoRows {
 					panic(err)
 				} else if err == sql.ErrNoRows {
@@ -417,7 +514,7 @@ func TestSimplePagination(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			gotR, gotTotal, err := SimplePagination[models2.Posts](ctx, tt.args.where, tt.args.fields, tt.args.group, tt.args.page, tt.args.pageSize, tt.args.order, tt.args.join, tt.args.having, tt.args.in...)
+			gotR, gotTotal, err := SimplePagination[post](ctx, tt.args.where, tt.args.fields, tt.args.group, tt.args.page, tt.args.pageSize, tt.args.order, tt.args.join, tt.args.having, tt.args.in...)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("SimplePagination() error = %v, wantErr %v", err, tt.wantErr)
 				return

phpass/phpass.go

@@ -3,7 +3,7 @@ package phpass
 import (
 	"crypto/md5"
 	"fmt"
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
 	"golang.org/x/crypto/bcrypt"
 	"io"
 	"os"

plugin/digest/digest.go

@@ -2,7 +2,7 @@ package digest
 
 import (
 	"fmt"
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
 	"regexp"
 	"strings"
 	"unicode/utf8"

rss2/rss2.go

@@ -2,7 +2,7 @@ package rss2
 
 import (
 	"fmt"
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
 	"strconv"
 	"strings"
 )

safety/slice_test.go

@@ -2,7 +2,7 @@ package safety
 
 import (
 	"fmt"
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
 	"testing"
 	"time"
 )

stream/simpleMapStream.go

@@ -1,8 +1,8 @@
 package stream
 
 import (
-	"github/fthvgb1/wp-go/safety"
+	"github.com/fthvgb1/wp-go/safety"
-	"github/fthvgb1/wp-go/taskPools"
+	"github.com/fthvgb1/wp-go/taskPools"
 	"sync"
 )
 

stream/simpleMapStream_test.go

@@ -2,7 +2,7 @@ package stream
 
 import (
 	"fmt"
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
 	"reflect"
 	"strconv"
 	"testing"

stream/simpleStream.go

@@ -1,9 +1,9 @@
 package stream
 
 import (
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
-	"github/fthvgb1/wp-go/safety"
+	"github.com/fthvgb1/wp-go/safety"
-	"github/fthvgb1/wp-go/taskPools"
+	"github.com/fthvgb1/wp-go/taskPools"
 )
 
 func SimpleParallelFilterAndMap[R, T any](a SimpleSliceStream[T], fn func(T) (R, bool), c int) SimpleSliceStream[R] {

stream/simpleStream_test.go

@@ -2,7 +2,7 @@ package stream
 
 import (
 	"fmt"
-	"github/fthvgb1/wp-go/helper"
+	"github.com/fthvgb1/wp-go/helper"
 	"reflect"
 	"strconv"
 	"testing"