From 625da92f10373cff623f01bb3a43282510bed793 Mon Sep 17 00:00:00 2001 From: xing Date: Thu, 4 May 2023 20:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {internal => app}/actions/comment.go | 10 ++++---- {internal => app}/actions/feed.go | 2 +- {internal => app}/actions/login.go | 4 ++-- {internal => app}/actions/themehook.go | 6 ++--- {internal => app}/cmd/cachemanager/flush.go | 0 {internal => app}/cmd/main.go | 24 +++++++++---------- {internal => app}/cmd/reload/reload.go | 0 {internal => app}/cmd/route/route.go | 16 ++++++------- {internal => app}/mail/mail.go | 2 +- {internal => app}/mail/mail_test.go | 2 +- {internal => app}/middleware/flowLimit.go | 0 {internal => app}/middleware/iplimit.go | 0 {internal => app}/middleware/searchlimit.go | 4 ++-- {internal => app}/middleware/sendmail.go | 8 +++---- .../middleware/staticFileCache.go | 2 +- .../middleware/validateservername.go | 4 ++-- {internal => app}/phphelper/phpass.go | 0 {internal => app}/phphelper/unserialize.go | 0 {internal => app}/pkg/cache/cache.go | 10 ++++---- {internal => app}/pkg/cache/comments.go | 4 ++-- {internal => app}/pkg/cache/feed.go | 10 ++++---- {internal => app}/pkg/cache/postmeta.go | 0 {internal => app}/pkg/cache/posts.go | 6 ++--- {internal => app}/pkg/cache/users.go | 4 ++-- {internal => app}/pkg/config/config.go | 0 .../pkg/config/validationtraslaor.go | 0 .../pkg/constraints/blocks/blocks.go | 0 {internal => app}/pkg/constraints/const.go | 0 .../pkg/constraints/widgets/constraints.go | 0 {internal => app}/pkg/dao/comments.go | 2 +- {internal => app}/pkg/dao/common.go | 6 ++--- {internal => app}/pkg/dao/postmeta.go | 8 +++---- {internal => app}/pkg/dao/posts.go | 4 ++-- {internal => app}/pkg/dao/users.go | 2 +- {internal => app}/pkg/db/db.go | 2 +- {internal => app}/pkg/logs/log.go | 2 +- {internal => app}/pkg/models/wp_comments.go | 0 {internal => app}/pkg/models/wp_options.go | 0 {internal => app}/pkg/models/wp_postmeta.go | 0 {internal => app}/pkg/models/wp_posts.go | 0 .../pkg/models/wp_term_taxonomy.go | 0 {internal => app}/pkg/models/wp_terms.go | 0 {internal => app}/pkg/models/wp_users.go | 0 {internal => app}/wpconfig/options.go | 4 ++-- {internal => app}/wpconfig/term.go | 2 +- {internal => app}/wpconfig/thememods.go | 8 +++---- {internal => app}/wpconfig/themesupport.go | 0 47 files changed, 79 insertions(+), 79 deletions(-) rename {internal => app}/actions/comment.go (96%) rename {internal => app}/actions/feed.go (97%) rename {internal => app}/actions/login.go (89%) rename {internal => app}/actions/themehook.go (76%) rename {internal => app}/cmd/cachemanager/flush.go (100%) rename {internal => app}/cmd/main.go (82%) rename {internal => app}/cmd/reload/reload.go (100%) rename {internal => app}/cmd/route/route.go (88%) rename {internal => app}/mail/mail.go (95%) rename {internal => app}/mail/mail_test.go (94%) rename {internal => app}/middleware/flowLimit.go (100%) rename {internal => app}/middleware/iplimit.go (100%) rename {internal => app}/middleware/searchlimit.go (76%) rename {internal => app}/middleware/sendmail.go (95%) rename {internal => app}/middleware/staticFileCache.go (90%) rename {internal => app}/middleware/validateservername.go (86%) rename {internal => app}/phphelper/phpass.go (100%) rename {internal => app}/phphelper/unserialize.go (100%) rename {internal => app}/pkg/cache/cache.go (94%) rename {internal => app}/pkg/cache/comments.go (91%) rename {internal => app}/pkg/cache/feed.go (95%) rename {internal => app}/pkg/cache/postmeta.go (100%) rename {internal => app}/pkg/cache/posts.go (94%) rename {internal => app}/pkg/cache/users.go (88%) rename {internal => app}/pkg/config/config.go (100%) rename {internal => app}/pkg/config/validationtraslaor.go (100%) rename {internal => app}/pkg/constraints/blocks/blocks.go (100%) rename {internal => app}/pkg/constraints/const.go (100%) rename {internal => app}/pkg/constraints/widgets/constraints.go (100%) rename {internal => app}/pkg/dao/comments.go (97%) rename {internal => app}/pkg/dao/common.go (92%) rename {internal => app}/pkg/dao/postmeta.go (89%) rename {internal => app}/pkg/dao/posts.go (98%) rename {internal => app}/pkg/dao/users.go (94%) rename {internal => app}/pkg/db/db.go (96%) rename {internal => app}/pkg/logs/log.go (96%) rename {internal => app}/pkg/models/wp_comments.go (100%) rename {internal => app}/pkg/models/wp_options.go (100%) rename {internal => app}/pkg/models/wp_postmeta.go (100%) rename {internal => app}/pkg/models/wp_posts.go (100%) rename {internal => app}/pkg/models/wp_term_taxonomy.go (100%) rename {internal => app}/pkg/models/wp_terms.go (100%) rename {internal => app}/pkg/models/wp_users.go (100%) rename {internal => app}/wpconfig/options.go (94%) rename {internal => app}/wpconfig/term.go (95%) rename {internal => app}/wpconfig/thememods.go (96%) rename {internal => app}/wpconfig/themesupport.go (100%) diff --git a/internal/actions/comment.go b/app/actions/comment.go similarity index 96% rename from internal/actions/comment.go rename to app/actions/comment.go index c9c4a41..f90511d 100644 --- a/internal/actions/comment.go +++ b/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" diff --git a/internal/actions/feed.go b/app/actions/feed.go similarity index 97% rename from internal/actions/feed.go rename to app/actions/feed.go index 640a88d..0cc3172 100644 --- a/internal/actions/feed.go +++ b/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" diff --git a/internal/actions/login.go b/app/actions/login.go similarity index 89% rename from internal/actions/login.go rename to app/actions/login.go index 4b86317..5d12631 100644 --- a/internal/actions/login.go +++ b/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" diff --git a/internal/actions/themehook.go b/app/actions/themehook.go similarity index 76% rename from internal/actions/themehook.go rename to app/actions/themehook.go index 6e0cb63..e11bfdb 100644 --- a/internal/actions/themehook.go +++ b/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" ) diff --git a/internal/cmd/cachemanager/flush.go b/app/cmd/cachemanager/flush.go similarity index 100% rename from internal/cmd/cachemanager/flush.go rename to app/cmd/cachemanager/flush.go diff --git a/internal/cmd/main.go b/app/cmd/main.go similarity index 82% rename from internal/cmd/main.go rename to app/cmd/main.go index 57d0c67..57ae5ef 100644 --- a/internal/cmd/main.go +++ b/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/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/plugins/wphandle" - "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" diff --git a/internal/cmd/reload/reload.go b/app/cmd/reload/reload.go similarity index 100% rename from internal/cmd/reload/reload.go rename to app/cmd/reload/reload.go diff --git a/internal/cmd/route/route.go b/app/cmd/route/route.go similarity index 88% rename from internal/cmd/route/route.go rename to app/cmd/route/route.go index 5e0833c..0f2d5df 100644 --- a/internal/cmd/route/route.go +++ b/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" diff --git a/internal/mail/mail.go b/app/mail/mail.go similarity index 95% rename from internal/mail/mail.go rename to app/mail/mail.go index 45dc867..5d7972e 100644 --- a/internal/mail/mail.go +++ b/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" diff --git a/internal/mail/mail_test.go b/app/mail/mail_test.go similarity index 94% rename from internal/mail/mail_test.go rename to app/mail/mail_test.go index 76fbf32..ac1200c 100644 --- a/internal/mail/mail_test.go +++ b/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" ) diff --git a/internal/middleware/flowLimit.go b/app/middleware/flowLimit.go similarity index 100% rename from internal/middleware/flowLimit.go rename to app/middleware/flowLimit.go diff --git a/internal/middleware/iplimit.go b/app/middleware/iplimit.go similarity index 100% rename from internal/middleware/iplimit.go rename to app/middleware/iplimit.go diff --git a/internal/middleware/searchlimit.go b/app/middleware/searchlimit.go similarity index 76% rename from internal/middleware/searchlimit.go rename to app/middleware/searchlimit.go index 6c1b7e6..8be4ac2 100644 --- a/internal/middleware/searchlimit.go +++ b/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" ) diff --git a/internal/middleware/sendmail.go b/app/middleware/sendmail.go similarity index 95% rename from internal/middleware/sendmail.go rename to app/middleware/sendmail.go index f9bfdb5..bdf8f13 100644 --- a/internal/middleware/sendmail.go +++ b/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" diff --git a/internal/middleware/staticFileCache.go b/app/middleware/staticFileCache.go similarity index 90% rename from internal/middleware/staticFileCache.go rename to app/middleware/staticFileCache.go index 993325b..3e2fb33 100644 --- a/internal/middleware/staticFileCache.go +++ b/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" ) diff --git a/internal/middleware/validateservername.go b/app/middleware/validateservername.go similarity index 86% rename from internal/middleware/validateservername.go rename to app/middleware/validateservername.go index ac7fadd..270fa3e 100644 --- a/internal/middleware/validateservername.go +++ b/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" diff --git a/internal/phphelper/phpass.go b/app/phphelper/phpass.go similarity index 100% rename from internal/phphelper/phpass.go rename to app/phphelper/phpass.go diff --git a/internal/phphelper/unserialize.go b/app/phphelper/unserialize.go similarity index 100% rename from internal/phphelper/unserialize.go rename to app/phphelper/unserialize.go diff --git a/internal/pkg/cache/cache.go b/app/pkg/cache/cache.go similarity index 94% rename from internal/pkg/cache/cache.go rename to app/pkg/cache/cache.go index 2a8378d..cf37edf 100644 --- a/internal/pkg/cache/cache.go +++ b/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" ) diff --git a/internal/pkg/cache/comments.go b/app/pkg/cache/comments.go similarity index 91% rename from internal/pkg/cache/comments.go rename to app/pkg/cache/comments.go index 2883fec..4d832d1 100644 --- a/internal/pkg/cache/comments.go +++ b/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" ) diff --git a/internal/pkg/cache/feed.go b/app/pkg/cache/feed.go similarity index 95% rename from internal/pkg/cache/feed.go rename to app/pkg/cache/feed.go index bd03c36..6c742e8 100644 --- a/internal/pkg/cache/feed.go +++ b/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" diff --git a/internal/pkg/cache/postmeta.go b/app/pkg/cache/postmeta.go similarity index 100% rename from internal/pkg/cache/postmeta.go rename to app/pkg/cache/postmeta.go diff --git a/internal/pkg/cache/posts.go b/app/pkg/cache/posts.go similarity index 94% rename from internal/pkg/cache/posts.go rename to app/pkg/cache/posts.go index cc8480d..654acb9 100644 --- a/internal/pkg/cache/posts.go +++ b/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" ) diff --git a/internal/pkg/cache/users.go b/app/pkg/cache/users.go similarity index 88% rename from internal/pkg/cache/users.go rename to app/pkg/cache/users.go index 0678436..860200f 100644 --- a/internal/pkg/cache/users.go +++ b/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" ) diff --git a/internal/pkg/config/config.go b/app/pkg/config/config.go similarity index 100% rename from internal/pkg/config/config.go rename to app/pkg/config/config.go diff --git a/internal/pkg/config/validationtraslaor.go b/app/pkg/config/validationtraslaor.go similarity index 100% rename from internal/pkg/config/validationtraslaor.go rename to app/pkg/config/validationtraslaor.go diff --git a/internal/pkg/constraints/blocks/blocks.go b/app/pkg/constraints/blocks/blocks.go similarity index 100% rename from internal/pkg/constraints/blocks/blocks.go rename to app/pkg/constraints/blocks/blocks.go diff --git a/internal/pkg/constraints/const.go b/app/pkg/constraints/const.go similarity index 100% rename from internal/pkg/constraints/const.go rename to app/pkg/constraints/const.go diff --git a/internal/pkg/constraints/widgets/constraints.go b/app/pkg/constraints/widgets/constraints.go similarity index 100% rename from internal/pkg/constraints/widgets/constraints.go rename to app/pkg/constraints/widgets/constraints.go diff --git a/internal/pkg/dao/comments.go b/app/pkg/dao/comments.go similarity index 97% rename from internal/pkg/dao/comments.go rename to app/pkg/dao/comments.go index 551489d..1948443 100644 --- a/internal/pkg/dao/comments.go +++ b/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" ) diff --git a/internal/pkg/dao/common.go b/app/pkg/dao/common.go similarity index 92% rename from internal/pkg/dao/common.go rename to app/pkg/dao/common.go index f0cae1f..40a34be 100644 --- a/internal/pkg/dao/common.go +++ b/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" ) diff --git a/internal/pkg/dao/postmeta.go b/app/pkg/dao/postmeta.go similarity index 89% rename from internal/pkg/dao/postmeta.go rename to app/pkg/dao/postmeta.go index 3f98b6a..1e80793 100644 --- a/internal/pkg/dao/postmeta.go +++ b/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" ) diff --git a/internal/pkg/dao/posts.go b/app/pkg/dao/posts.go similarity index 98% rename from internal/pkg/dao/posts.go rename to app/pkg/dao/posts.go index e35f33e..6eaaa03 100644 --- a/internal/pkg/dao/posts.go +++ b/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" diff --git a/internal/pkg/dao/users.go b/app/pkg/dao/users.go similarity index 94% rename from internal/pkg/dao/users.go rename to app/pkg/dao/users.go index d4a933f..9642978 100644 --- a/internal/pkg/dao/users.go +++ b/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" ) diff --git a/internal/pkg/db/db.go b/app/pkg/db/db.go similarity index 96% rename from internal/pkg/db/db.go rename to app/pkg/db/db.go index 4b67f2a..50995ad 100644 --- a/internal/pkg/db/db.go +++ b/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" diff --git a/internal/pkg/logs/log.go b/app/pkg/logs/log.go similarity index 96% rename from internal/pkg/logs/log.go rename to app/pkg/logs/log.go index 3b08629..b637c22 100644 --- a/internal/pkg/logs/log.go +++ b/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" diff --git a/internal/pkg/models/wp_comments.go b/app/pkg/models/wp_comments.go similarity index 100% rename from internal/pkg/models/wp_comments.go rename to app/pkg/models/wp_comments.go diff --git a/internal/pkg/models/wp_options.go b/app/pkg/models/wp_options.go similarity index 100% rename from internal/pkg/models/wp_options.go rename to app/pkg/models/wp_options.go diff --git a/internal/pkg/models/wp_postmeta.go b/app/pkg/models/wp_postmeta.go similarity index 100% rename from internal/pkg/models/wp_postmeta.go rename to app/pkg/models/wp_postmeta.go diff --git a/internal/pkg/models/wp_posts.go b/app/pkg/models/wp_posts.go similarity index 100% rename from internal/pkg/models/wp_posts.go rename to app/pkg/models/wp_posts.go diff --git a/internal/pkg/models/wp_term_taxonomy.go b/app/pkg/models/wp_term_taxonomy.go similarity index 100% rename from internal/pkg/models/wp_term_taxonomy.go rename to app/pkg/models/wp_term_taxonomy.go diff --git a/internal/pkg/models/wp_terms.go b/app/pkg/models/wp_terms.go similarity index 100% rename from internal/pkg/models/wp_terms.go rename to app/pkg/models/wp_terms.go diff --git a/internal/pkg/models/wp_users.go b/app/pkg/models/wp_users.go similarity index 100% rename from internal/pkg/models/wp_users.go rename to app/pkg/models/wp_users.go diff --git a/internal/wpconfig/options.go b/app/wpconfig/options.go similarity index 94% rename from internal/wpconfig/options.go rename to app/wpconfig/options.go index 0e1a638..f3e02bb 100644 --- a/internal/wpconfig/options.go +++ b/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" diff --git a/internal/wpconfig/term.go b/app/wpconfig/term.go similarity index 95% rename from internal/wpconfig/term.go rename to app/wpconfig/term.go index 94f3c13..68d3df9 100644 --- a/internal/wpconfig/term.go +++ b/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" ) diff --git a/internal/wpconfig/thememods.go b/app/wpconfig/thememods.go similarity index 96% rename from internal/wpconfig/thememods.go rename to app/wpconfig/thememods.go index a4f4067..ac0dc55 100644 --- a/internal/wpconfig/thememods.go +++ b/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" diff --git a/internal/wpconfig/themesupport.go b/app/wpconfig/themesupport.go similarity index 100% rename from internal/wpconfig/themesupport.go rename to app/wpconfig/themesupport.go