修改包名

app/actions/comment.go

@@ -5,12 +5,12 @@ import (
 	"compress/gzip"
 	"errors"
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/mail"
+	"github.com/fthvgb1/wp-go/app/pkg/cache"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/fthvgb1/wp-go/helper/slice"
-	"github.com/fthvgb1/wp-go/internal/mail"
-	"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.com/go-playground/validator/v10"
 	"io"

app/actions/feed.go

@@ -1,8 +1,8 @@
 package actions
 
 import (
+	"github.com/fthvgb1/wp-go/app/pkg/cache"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/pkg/cache"
 	"github.com/gin-gonic/gin"
 	"net/http"
 	"time"

app/actions/login.go

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

app/actions/themehook.go

@@ -1,9 +1,9 @@
 package actions
 
 import (
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints"
-	"github.com/fthvgb1/wp-go/internal/theme"
+	"github.com/fthvgb1/wp-go/app/theme"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
 	"github.com/gin-gonic/gin"
 )
 

app/cmd/main.go

@@ -3,18 +3,18 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/fthvgb1/wp-go/internal/cmd/cachemanager"
+	"github.com/fthvgb1/wp-go/app/cmd/cachemanager"
-	"github.com/fthvgb1/wp-go/internal/cmd/reload"
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
-	"github.com/fthvgb1/wp-go/internal/cmd/route"
+	"github.com/fthvgb1/wp-go/app/cmd/route"
-	"github.com/fthvgb1/wp-go/internal/mail"
+	"github.com/fthvgb1/wp-go/app/mail"
-	"github.com/fthvgb1/wp-go/internal/pkg/cache"
+	"github.com/fthvgb1/wp-go/app/pkg/cache"
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
-	"github.com/fthvgb1/wp-go/internal/pkg/db"
+	"github.com/fthvgb1/wp-go/app/pkg/db"
-	"github.com/fthvgb1/wp-go/internal/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
-	"github.com/fthvgb1/wp-go/internal/plugins"
+	"github.com/fthvgb1/wp-go/app/plugins"
-	"github.com/fthvgb1/wp-go/internal/plugins/wphandle"
+	"github.com/fthvgb1/wp-go/app/plugins/wphandle"
-	"github.com/fthvgb1/wp-go/internal/theme"
+	"github.com/fthvgb1/wp-go/app/theme"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/fthvgb1/wp-go/model"
 	"log"
 	"os"

app/cmd/route/route.go

@@ -1,14 +1,14 @@
 package route
 
 import (
-	"github.com/fthvgb1/wp-go/internal/actions"
+	"github.com/fthvgb1/wp-go/app/actions"
-	"github.com/fthvgb1/wp-go/internal/cmd/reload"
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
-	"github.com/fthvgb1/wp-go/internal/middleware"
+	"github.com/fthvgb1/wp-go/app/middleware"
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints"
-	"github.com/fthvgb1/wp-go/internal/static"
+	"github.com/fthvgb1/wp-go/app/static"
-	"github.com/fthvgb1/wp-go/internal/theme"
+	"github.com/fthvgb1/wp-go/app/theme"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/gin-contrib/gzip"
 	"github.com/gin-contrib/pprof"
 	"github.com/gin-contrib/sessions"

app/mail/mail.go

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

app/mail/mail_test.go

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

app/middleware/searchlimit.go

@@ -1,8 +1,8 @@
 package middleware
 
 import (
-	"github.com/fthvgb1/wp-go/internal/cmd/reload"
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
 	"github.com/gin-gonic/gin"
 )
 

app/middleware/sendmail.go

@@ -3,11 +3,11 @@ package middleware
 import (
 	"bytes"
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/mail"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"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"
 	"io"
 	"net/http"

app/middleware/staticFileCache.go

@@ -2,7 +2,7 @@ package middleware
 
 import (
 	"fmt"
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
 	"github.com/gin-gonic/gin"
 	"strings"
 )

app/middleware/validateservername.go

@@ -1,9 +1,9 @@
 package middleware
 
 import (
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
 	"github.com/fthvgb1/wp-go/helper/maps"
-	"github.com/fthvgb1/wp-go/internal/cmd/reload"
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
 	"github.com/gin-gonic/gin"
 	"net/http"
 	"strings"

app/pkg/cache/cache.go

@@ -2,13 +2,13 @@ package cache
 
 import (
 	"context"
+	"github.com/fthvgb1/wp-go/app/cmd/cachemanager"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/dao"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
 	"github.com/fthvgb1/wp-go/cache"
 	"github.com/fthvgb1/wp-go/helper/slice"
-	"github.com/fthvgb1/wp-go/internal/cmd/cachemanager"
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
-	"github.com/fthvgb1/wp-go/internal/pkg/dao"
-	"github.com/fthvgb1/wp-go/internal/pkg/logs"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
 	"github.com/fthvgb1/wp-go/safety"
 	"time"
 )

app/pkg/cache/comments.go

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

app/pkg/cache/feed.go

@@ -2,14 +2,14 @@ package cache
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
+	"github.com/fthvgb1/wp-go/app/plugins"
+	"github.com/fthvgb1/wp-go/app/plugins/wpposts"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/fthvgb1/wp-go/cache"
 	"github.com/fthvgb1/wp-go/helper/slice"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"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/plugins/wpposts"
-	"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"

app/pkg/cache/posts.go

@@ -3,12 +3,12 @@ package cache
 import (
 	"context"
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/fthvgb1/wp-go/helper/number"
 	"github.com/fthvgb1/wp-go/helper/slice"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/pkg/logs"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"github.com/gin-gonic/gin"
 	"time"
 )

app/pkg/cache/users.go

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

app/pkg/dao/comments.go

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

app/pkg/dao/common.go

@@ -2,10 +2,10 @@ package dao
 
 import (
 	"context"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/fthvgb1/wp-go/helper"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"github.com/fthvgb1/wp-go/model"
 )
 

app/pkg/dao/postmeta.go

@@ -2,11 +2,11 @@ package dao
 
 import (
 	"context"
+	"github.com/fthvgb1/wp-go/app/phphelper"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/fthvgb1/wp-go/helper/slice"
-	"github.com/fthvgb1/wp-go/internal/phphelper"
-	"github.com/fthvgb1/wp-go/internal/pkg/logs"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"github.com/fthvgb1/wp-go/model"
 	"strconv"
 )

app/pkg/dao/posts.go

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

app/pkg/dao/users.go

@@ -2,8 +2,8 @@ package dao
 
 import (
 	"context"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
 	"github.com/fthvgb1/wp-go/helper/slice"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
 	"github.com/fthvgb1/wp-go/model"
 )
 

app/pkg/db/db.go

@@ -2,7 +2,7 @@ package db
 
 import (
 	"context"
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
 	"github.com/fthvgb1/wp-go/model"
 	"github.com/fthvgb1/wp-go/safety"
 	_ "github.com/go-sql-driver/mysql"

app/pkg/logs/log.go

@@ -2,7 +2,7 @@ package logs
 
 import (
 	"fmt"
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
 	"github.com/fthvgb1/wp-go/safety"
 	"io"
 	"log"

app/wpconfig/options.go

@@ -2,9 +2,9 @@ package wpconfig
 
 import (
 	"context"
+	"github.com/fthvgb1/wp-go/app/phphelper"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
 	"github.com/fthvgb1/wp-go/helper/maps"
-	"github.com/fthvgb1/wp-go/internal/phphelper"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
 	"github.com/fthvgb1/wp-go/model"
 	"github.com/fthvgb1/wp-go/safety"
 	"strings"

app/wpconfig/term.go

@@ -1,7 +1,7 @@
 package wpconfig
 
 import (
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
 	"github.com/fthvgb1/wp-go/model"
 	"github.com/fthvgb1/wp-go/safety"
 )

app/wpconfig/thememods.go

@@ -4,11 +4,11 @@ import (
 	"embed"
 	"encoding/json"
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
+	"github.com/fthvgb1/wp-go/app/phphelper"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
 	"github.com/fthvgb1/wp-go/helper/maps"
-	"github.com/fthvgb1/wp-go/internal/cmd/reload"
-	"github.com/fthvgb1/wp-go/internal/phphelper"
-	"github.com/fthvgb1/wp-go/internal/pkg/logs"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
 	"github.com/fthvgb1/wp-go/safety"
 	"path/filepath"
 	"strings"