修改包名

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/internal/theme"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints"
+	"github.com/fthvgb1/wp-go/app/theme"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
 	"github.com/gin-gonic/gin"
 )
 

app/cmd/main.go

@@ -3,17 +3,18 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/fthvgb1/wp-go/internal/cmd/cachemanager"
-	"github.com/fthvgb1/wp-go/internal/cmd/reload"
-	"github.com/fthvgb1/wp-go/internal/cmd/route"
-	"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/db"
-	"github.com/fthvgb1/wp-go/internal/pkg/logs"
-	"github.com/fthvgb1/wp-go/internal/plugins"
-	"github.com/fthvgb1/wp-go/internal/theme"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/app/cmd/cachemanager"
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
+	"github.com/fthvgb1/wp-go/app/cmd/route"
+	"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/db"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/plugins"
+	"github.com/fthvgb1/wp-go/app/plugins/wphandle"
+	"github.com/fthvgb1/wp-go/app/theme"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/fthvgb1/wp-go/model"
 	"log"
 	"os"
@@ -74,6 +75,7 @@ func initConf(c string) (err error) {
 	if err != nil {
 		return
 	}
+	wphandle.LoadPlugins()
 	return
 }
 
@@ -114,6 +116,7 @@ func reloads() {
 	logs.IfError(err, "获取网站设置WpOption失败")
 	err = wpconfig.InitTerms()
 	logs.IfError(err, "获取WpTerms表失败")
+	wphandle.LoadPlugins()
 	reload.Reload()
 	flushCache()
 	log.Println("reload complete")

app/cmd/route/route.go

@@ -1,14 +1,14 @@
 package route
 
 import (
-	"github.com/fthvgb1/wp-go/internal/actions"
-	"github.com/fthvgb1/wp-go/internal/cmd/reload"
-	"github.com/fthvgb1/wp-go/internal/middleware"
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
-	"github.com/fthvgb1/wp-go/internal/static"
-	"github.com/fthvgb1/wp-go/internal/theme"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/app/actions"
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
+	"github.com/fthvgb1/wp-go/app/middleware"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints"
+	"github.com/fthvgb1/wp-go/app/static"
+	"github.com/fthvgb1/wp-go/app/theme"
+	"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/internal/pkg/config"
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
+	"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/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
 	"github.com/fthvgb1/wp-go/model"
 	"time"
 )

app/pkg/config/config.go

@@ -19,6 +19,8 @@ type Config struct {
 	Mysql              Mysql     `yaml:"mysql" json:"mysql"`
 	Mail               Mail      `yaml:"mail" json:"mail"`
 	CacheTime          CacheTime `yaml:"cacheTime" json:"cacheTime"`
+	PluginPath         string    `yaml:"pluginPath" json:"pluginPath"`
+	ExternScript       []string  `json:"externScript" yaml:"externScript"`
 	DigestWordCount    int       `yaml:"digestWordCount" json:"digestWordCount,omitempty"`
 	DigestAllowTag     string    `yaml:"digestAllowTag" json:"digestAllowTag"`
 	MaxRequestSleepNum int64     `yaml:"maxRequestSleepNum" json:"maxRequestSleepNum,omitempty"`

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/plugins/comment.go

@@ -1,10 +1,10 @@
 package plugins
 
 import (
+	"github.com/fthvgb1/wp-go/app/pkg/models"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/fthvgb1/wp-go/helper/slice"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"github.com/gin-gonic/gin"
 	"net/url"
 	"strconv"

app/plugins/digest.go

@@ -3,11 +3,11 @@ package plugins
 import (
 	"context"
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/cmd/cachemanager"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
 	"github.com/fthvgb1/wp-go/cache"
 	"github.com/fthvgb1/wp-go/helper"
-	"github.com/fthvgb1/wp-go/internal/cmd/cachemanager"
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
 	"github.com/fthvgb1/wp-go/plugin/digest"
 	"regexp"
 	"strings"

app/plugins/gravatar.go

@@ -2,9 +2,9 @@ package plugins
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/fthvgb1/wp-go/helper/number"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"net/url"
 	"strings"
 )

app/plugins/wphandle/enlightjs/enlighterjs.go

@@ -2,12 +2,12 @@ package enlightjs
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/phphelper"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/fthvgb1/wp-go/helper/maps"
-	"github.com/fthvgb1/wp-go/internal/phphelper"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
-	"github.com/fthvgb1/wp-go/internal/pkg/logs"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"github.com/goccy/go-json"
 )
 

app/plugins/wphandle/handle.go

@@ -0,0 +1,69 @@
+package wphandle
+
+import (
+	"errors"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/plugins/wphandle/enlightjs"
+	"github.com/fthvgb1/wp-go/app/plugins/wphandle/hiddenlogin"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
+	str "github.com/fthvgb1/wp-go/helper/strings"
+	"github.com/fthvgb1/wp-go/safety"
+	"path/filepath"
+	"plugin"
+)
+
+var plugins = func() *safety.Map[string, func(*wp.Handle)] {
+	m := safety.NewMap[string, func(*wp.Handle)]()
+	m.Store("Enlightjs", enlightjs.EnlighterJS)
+	m.Store("HiddenLogin", hiddenlogin.HiddenLogin)
+	return m
+}()
+
+func RegisterPlugin(name string, fn func(*wp.Handle)) {
+	plugins.Store(name, fn)
+}
+
+func UsePlugins(h *wp.Handle, calls ...string) {
+	calls = append(calls, config.GetConfig().Plugins...)
+	for _, call := range calls {
+		call = str.FirstUpper(call)
+		if fn, ok := plugins.Load(call); ok {
+			fn(h)
+		}
+	}
+}
+
+func LoadPlugins() {
+	dirPath := config.GetConfig().PluginPath
+	if dirPath == "" {
+		return
+	}
+	glob, err := filepath.Glob(filepath.Join(dirPath, "*.so"))
+	if err != nil {
+		logs.Error(err, "读取插件目录错误", dirPath)
+		return
+	}
+	for _, entry := range glob {
+		f := filepath.Join(dirPath, entry)
+		p, err := plugin.Open(f)
+		if err != nil {
+			logs.Error(err, "读取插件错误", f)
+			continue
+		}
+		name := filepath.Ext(entry)
+		name = str.FirstUpper(entry[0 : len(entry)-len(name)])
+		pl, err := p.Lookup(name)
+		if err != nil {
+			logs.Error(err, "插件lookup错误", f)
+			continue
+		}
+		plu, ok := pl.(func(*wp.Handle))
+		if !ok {
+			logs.Error(errors.New("switch func(*wp.Handle) fail"), "插件转换错误", f)
+			continue
+		}
+		RegisterPlugin(name, plu)
+	}
+
+}

app/plugins/wphandle/hiddenlogin/hiddenlogin.go

@@ -1,9 +1,9 @@
 package hiddenlogin
 
 import (
+	"github.com/fthvgb1/wp-go/app/pkg/constraints/widgets"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
 )
 
 func HiddenLogin(h *wp.Handle) {

app/plugins/wphandle/tests/tt.go

@@ -2,8 +2,8 @@ package tests
 
 import (
 	"fmt"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
 )
 
 func Tt(h *wp.Handle) {

app/plugins/wpposts/posts.go

@@ -2,7 +2,7 @@ package wpposts
 
 import (
 	"fmt"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
 )
 
 func PasswordProjectTitle(post *models.Posts) {

app/theme/hook.go

@@ -1,8 +1,8 @@
 package theme
 
 import (
-	"github.com/fthvgb1/wp-go/internal/theme/twentyfifteen"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
+	"github.com/fthvgb1/wp-go/app/theme/twentyfifteen"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
 )
 
 var themeMap = map[string]func(*wp.Handle){}

app/theme/templateFuncs.go

@@ -1,8 +1,8 @@
 package theme
 
 import (
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"html/template"
 	"time"
 )

app/theme/theme.go

@@ -1,10 +1,10 @@
 package theme
 
 import (
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
-	"github.com/fthvgb1/wp-go/internal/theme/twentyfifteen"
-	"github.com/fthvgb1/wp-go/internal/theme/twentyseventeen"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
+	"github.com/fthvgb1/wp-go/app/theme/twentyfifteen"
+	"github.com/fthvgb1/wp-go/app/theme/twentyseventeen"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 )
 
 func InitTheme() {

app/theme/twentyfifteen/colorschemecss.go

@@ -2,8 +2,8 @@ package twentyfifteen
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
 	"github.com/fthvgb1/wp-go/helper/slice"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
 	"strconv"
 	"strings"
 )

app/theme/twentyfifteen/custombackground.go

@@ -2,10 +2,10 @@ package twentyfifteen
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
 	"github.com/fthvgb1/wp-go/helper"
 	"github.com/fthvgb1/wp-go/helper/maps"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
 )
 
 var postx = map[string]string{

app/theme/twentyfifteen/customheader.go

@@ -1,10 +1,10 @@
 package twentyfifteen
 
 import (
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/cmd/reload"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
 )
 
 var style = `<style type="text/css" id="twentyfifteen-header-css">`

app/theme/twentyfifteen/twentyfifteen.go

@@ -3,16 +3,16 @@ package twentyfifteen
 import (
 	"embed"
 	"encoding/json"
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
-	"github.com/fthvgb1/wp-go/internal/pkg/logs"
-	"github.com/fthvgb1/wp-go/internal/plugins"
-	"github.com/fthvgb1/wp-go/internal/plugins/wphandle"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
-	"github.com/fthvgb1/wp-go/internal/theme/wp/components"
-	"github.com/fthvgb1/wp-go/internal/theme/wp/components/widget"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints/widgets"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/plugins"
+	"github.com/fthvgb1/wp-go/app/plugins/wphandle"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
+	"github.com/fthvgb1/wp-go/app/theme/wp/components"
+	"github.com/fthvgb1/wp-go/app/theme/wp/components/widget"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"strings"
 )
 

app/theme/twentyseventeen/colorscheme.go

@@ -2,10 +2,10 @@ package twentyseventeen
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/fthvgb1/wp-go/helper/number"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
 )
 
 func colorScheme(h *wp.Handle) (r string) {

app/theme/twentyseventeen/customheader.go

@@ -2,7 +2,7 @@ package twentyseventeen
 
 import (
 	"fmt"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
 )
 
 func customHeader(h *wp.Handle) (r string) {

app/theme/twentyseventeen/script.go

@@ -2,9 +2,9 @@ package twentyseventeen
 
 import (
 	"fmt"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 )
 
 func pushScripts(h *wp.Handle) {

app/theme/twentyseventeen/twentyseventeen.go

@@ -4,20 +4,20 @@ import (
 	"embed"
 	"encoding/json"
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
+	"github.com/fthvgb1/wp-go/app/pkg/config"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints/widgets"
+	"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/wphandle"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
+	"github.com/fthvgb1/wp-go/app/theme/wp/components"
+	"github.com/fthvgb1/wp-go/app/theme/wp/components/widget"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	"github.com/fthvgb1/wp-go/helper"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/cmd/reload"
-	"github.com/fthvgb1/wp-go/internal/pkg/config"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
-	"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/wphandle"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
-	"github.com/fthvgb1/wp-go/internal/theme/wp/components"
-	"github.com/fthvgb1/wp-go/internal/theme/wp/components/widget"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"github.com/gin-gonic/gin"
 	"strings"
 )

app/theme/wp/calclass.go

@@ -2,13 +2,13 @@ package wp
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/pkg/cache"
+	"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/number"
 	"github.com/fthvgb1/wp-go/helper/slice"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/pkg/cache"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"strconv"
 	"strings"
 )

app/theme/wp/components.go

@@ -1,11 +1,11 @@
 package wp
 
 import (
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints"
 	"github.com/fthvgb1/wp-go/helper/maps"
 	"github.com/fthvgb1/wp-go/helper/slice"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/cmd/reload"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
 	"strings"
 )
 

app/theme/wp/components/block.go

@@ -1,10 +1,10 @@
 package components
 
 import (
+	"github.com/fthvgb1/wp-go/app/theme/wp"
+	"github.com/fthvgb1/wp-go/app/theme/wp/components/block"
+	"github.com/fthvgb1/wp-go/app/wpconfig"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
-	"github.com/fthvgb1/wp-go/internal/theme/wp/components/block"
-	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"strings"
 )
 

app/theme/wp/components/block/category.go

@@ -4,17 +4,17 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
+	"github.com/fthvgb1/wp-go/app/pkg/cache"
+	constraints2 "github.com/fthvgb1/wp-go/app/pkg/constraints"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints/widgets"
+	"github.com/fthvgb1/wp-go/app/pkg/logs"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
+	"github.com/fthvgb1/wp-go/app/theme/wp/components/widget"
 	"github.com/fthvgb1/wp-go/helper/maps"
 	"github.com/fthvgb1/wp-go/helper/number"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/cmd/reload"
-	"github.com/fthvgb1/wp-go/internal/pkg/cache"
-	constraints2 "github.com/fthvgb1/wp-go/internal/pkg/constraints"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
-	"github.com/fthvgb1/wp-go/internal/pkg/logs"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
-	"github.com/fthvgb1/wp-go/internal/theme/wp/components/widget"
 	"strings"
 )
 

app/theme/wp/components/widget/archive.go

@@ -2,14 +2,14 @@ package widget
 
 import (
 	"fmt"
+	"github.com/fthvgb1/wp-go/app/cmd/reload"
+	"github.com/fthvgb1/wp-go/app/pkg/cache"
+	"github.com/fthvgb1/wp-go/app/pkg/constraints/widgets"
+	"github.com/fthvgb1/wp-go/app/pkg/models"
+	"github.com/fthvgb1/wp-go/app/theme/wp"
 	"github.com/fthvgb1/wp-go/helper/maps"
 	"github.com/fthvgb1/wp-go/helper/slice"
 	str "github.com/fthvgb1/wp-go/helper/strings"
-	"github.com/fthvgb1/wp-go/internal/cmd/reload"
-	"github.com/fthvgb1/wp-go/internal/pkg/cache"
-	"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
-	"github.com/fthvgb1/wp-go/internal/pkg/models"
-	"github.com/fthvgb1/wp-go/internal/theme/wp"
 	"strings"
 )