diff --git a/internal/plugin/fail2ban/init.go b/internal/apps/fail2ban/init.go similarity index 91% rename from internal/plugin/fail2ban/init.go rename to internal/apps/fail2ban/init.go index 2b1f641f..d0fab733 100644 --- a/internal/plugin/fail2ban/init.go +++ b/internal/apps/fail2ban/init.go @@ -3,12 +3,12 @@ package fail2ban import ( "github.com/go-chi/chi/v5" - "github.com/TheTNB/panel/pkg/pluginloader" + "github.com/TheTNB/panel/pkg/apploader" "github.com/TheTNB/panel/pkg/types" ) func init() { - pluginloader.Register(&types.Plugin{ + apploader.Register(&types.Plugin{ Slug: "fail2ban", Name: "Fail2ban", Description: "Fail2ban 扫描系统日志文件并从中找出多次尝试失败的IP地址,将该IP地址加入防火墙的拒绝访问列表中", diff --git a/internal/plugin/fail2ban/request.go b/internal/apps/fail2ban/request.go similarity index 100% rename from internal/plugin/fail2ban/request.go rename to internal/apps/fail2ban/request.go diff --git a/internal/plugin/fail2ban/service.go b/internal/apps/fail2ban/service.go similarity index 100% rename from internal/plugin/fail2ban/service.go rename to internal/apps/fail2ban/service.go diff --git a/internal/apps/init.go b/internal/apps/init.go new file mode 100644 index 00000000..d3a6fda1 --- /dev/null +++ b/internal/apps/init.go @@ -0,0 +1,13 @@ +package apps + +import ( + "github.com/go-chi/chi/v5" + + _ "github.com/TheTNB/panel/internal/apps/fail2ban" + _ "github.com/TheTNB/panel/internal/apps/openresty" + "github.com/TheTNB/panel/pkg/apploader" +) + +func Boot(r chi.Router) { + apploader.Boot(r) +} diff --git a/internal/plugin/openresty/init.go b/internal/apps/openresty/init.go similarity index 90% rename from internal/plugin/openresty/init.go rename to internal/apps/openresty/init.go index b03226ec..0e591ce6 100644 --- a/internal/plugin/openresty/init.go +++ b/internal/apps/openresty/init.go @@ -3,12 +3,12 @@ package openresty import ( "github.com/go-chi/chi/v5" - "github.com/TheTNB/panel/pkg/pluginloader" + "github.com/TheTNB/panel/pkg/apploader" "github.com/TheTNB/panel/pkg/types" ) func init() { - pluginloader.Register(&types.Plugin{ + apploader.Register(&types.Plugin{ Order: -100, Slug: "openresty", Name: "OpenResty", diff --git a/internal/plugin/openresty/service.go b/internal/apps/openresty/service.go similarity index 100% rename from internal/plugin/openresty/service.go rename to internal/apps/openresty/service.go diff --git a/internal/bootstrap/http.go b/internal/bootstrap/http.go index a9dd876d..6de46f3b 100644 --- a/internal/bootstrap/http.go +++ b/internal/bootstrap/http.go @@ -6,9 +6,9 @@ import ( "github.com/go-chi/chi/v5" + "github.com/TheTNB/panel/internal/apps" "github.com/TheTNB/panel/internal/http/middleware" "github.com/TheTNB/panel/internal/panel" - "github.com/TheTNB/panel/internal/plugin" "github.com/TheTNB/panel/internal/route" ) @@ -20,7 +20,7 @@ func initHttp() { // add route route.Http(panel.Http) - plugin.Boot(panel.Http) + apps.Boot(panel.Http) server := &http.Server{ Addr: panel.Conf.MustString("http.address"), diff --git a/internal/data/plugin.go b/internal/data/plugin.go index 6cfe201c..436503da 100644 --- a/internal/data/plugin.go +++ b/internal/data/plugin.go @@ -7,7 +7,7 @@ import ( "github.com/TheTNB/panel/internal/biz" "github.com/TheTNB/panel/internal/job" "github.com/TheTNB/panel/internal/panel" - "github.com/TheTNB/panel/pkg/pluginloader" + "github.com/TheTNB/panel/pkg/apploader" "github.com/TheTNB/panel/pkg/types" ) @@ -22,7 +22,7 @@ func NewPluginRepo() biz.PluginRepo { } func (r *pluginRepo) All() []*types.Plugin { - return pluginloader.All() + return apploader.All() } func (r *pluginRepo) Installed() ([]*biz.Plugin, error) { @@ -36,7 +36,7 @@ func (r *pluginRepo) Installed() ([]*biz.Plugin, error) { } func (r *pluginRepo) Get(slug string) (*types.Plugin, error) { - return pluginloader.Get(slug) + return apploader.Get(slug) } func (r *pluginRepo) GetInstalled(slug string) (*biz.Plugin, error) { diff --git a/internal/plugin/init.go b/internal/plugin/init.go deleted file mode 100644 index 9ae3e9fe..00000000 --- a/internal/plugin/init.go +++ /dev/null @@ -1,13 +0,0 @@ -package plugin - -import ( - "github.com/go-chi/chi/v5" - - _ "github.com/TheTNB/panel/internal/plugin/fail2ban" - _ "github.com/TheTNB/panel/internal/plugin/openresty" - "github.com/TheTNB/panel/pkg/pluginloader" -) - -func Boot(r chi.Router) { - pluginloader.Boot(r) -} diff --git a/pkg/pluginloader/plugin.go b/pkg/apploader/plugin.go similarity index 93% rename from pkg/pluginloader/plugin.go rename to pkg/apploader/plugin.go index 73291242..a50775cb 100644 --- a/pkg/pluginloader/plugin.go +++ b/pkg/apploader/plugin.go @@ -1,5 +1,5 @@ -// Package pluginloader 面板插件加载器 -package pluginloader +// Package apploader 面板应用加载器 +package apploader import ( "cmp"