From 959fdaa6de22d8d72fe71d8fc1f49bb159ec2827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Mon, 11 Sep 2023 16:54:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B7=AF=E7=94=B1=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/http/middleware/static.go | 5 ++--- routes/plugin.go | 30 +++++++++++++++--------------- routes/web.go | 27 ++++++++++++++------------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/http/middleware/static.go b/app/http/middleware/static.go index 7437c98e..87a2b865 100644 --- a/app/http/middleware/static.go +++ b/app/http/middleware/static.go @@ -2,16 +2,15 @@ package middleware import ( "github.com/gin-contrib/static" - contractshttp "github.com/goravel/framework/contracts/http" - frameworkhttp "github.com/goravel/framework/http" + "github.com/goravel/gin" "panel/app/services" ) func Static() contractshttp.Middleware { return func(ctx contractshttp.Context) { - static.Serve(services.NewSettingImpl().Get("entrance", "/"), static.LocalFile("/www/panel/public", false))(ctx.(*frameworkhttp.GinContext).Instance()) + static.Serve(services.NewSettingImpl().Get("entrance", "/"), static.LocalFile("/www/panel/public", false))(ctx.(*gin.Context).Instance()) ctx.Request().Next() } diff --git a/routes/plugin.go b/routes/plugin.go index cb5d7f43..2d253e99 100644 --- a/routes/plugin.go +++ b/routes/plugin.go @@ -24,7 +24,7 @@ import ( // Plugin 加载插件路由 func Plugin() { - facades.Route().Prefix("api/plugins/openresty").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/openresty").Middleware(middleware.Jwt()).Group(func(route route.Router) { openRestyController := openresty.NewOpenrestyController() route.Get("status", openRestyController.Status) route.Post("reload", openRestyController.Reload) @@ -37,7 +37,7 @@ func Plugin() { route.Get("errorLog", openRestyController.ErrorLog) route.Post("clearErrorLog", openRestyController.ClearErrorLog) }) - facades.Route().Prefix("api/plugins/mysql57").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/mysql57").Middleware(middleware.Jwt()).Group(func(route route.Router) { mysql57Controller := mysql57.NewMysql57Controller() route.Get("status", mysql57Controller.Status) route.Post("reload", mysql57Controller.Reload) @@ -67,7 +67,7 @@ func Plugin() { route.Post("userPassword", mysql57Controller.SetUserPassword) route.Post("userPrivileges", mysql57Controller.SetUserPrivileges) }) - facades.Route().Prefix("api/plugins/mysql80").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/mysql80").Middleware(middleware.Jwt()).Group(func(route route.Router) { mysql80Controller := mysql80.NewMysql80Controller() route.Get("status", mysql80Controller.Status) route.Post("reload", mysql80Controller.Reload) @@ -97,7 +97,7 @@ func Plugin() { route.Post("userPassword", mysql80Controller.SetUserPassword) route.Post("userPrivileges", mysql80Controller.SetUserPrivileges) }) - facades.Route().Prefix("api/plugins/postgresql15").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/postgresql15").Middleware(middleware.Jwt()).Group(func(route route.Router) { postgresql15Controller := postgresql15.NewPostgresql15Controller() route.Get("status", postgresql15Controller.Status) route.Post("reload", postgresql15Controller.Reload) @@ -124,7 +124,7 @@ func Plugin() { route.Post("deleteUser", postgresql15Controller.DeleteUser) route.Post("userPassword", postgresql15Controller.SetUserPassword) }) - facades.Route().Prefix("api/plugins/php74").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/php74").Middleware(middleware.Jwt()).Group(func(route route.Router) { php74Controller := php74.NewPhp74Controller() route.Get("status", php74Controller.Status) route.Post("reload", php74Controller.Reload) @@ -142,7 +142,7 @@ func Plugin() { route.Post("installExtension", php74Controller.InstallExtension) route.Post("uninstallExtension", php74Controller.UninstallExtension) }) - facades.Route().Prefix("api/plugins/php80").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/php80").Middleware(middleware.Jwt()).Group(func(route route.Router) { php80Controller := php80.NewPhp80Controller() route.Get("status", php80Controller.Status) route.Post("reload", php80Controller.Reload) @@ -160,7 +160,7 @@ func Plugin() { route.Post("installExtension", php80Controller.InstallExtension) route.Post("uninstallExtension", php80Controller.UninstallExtension) }) - facades.Route().Prefix("api/plugins/php81").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/php81").Middleware(middleware.Jwt()).Group(func(route route.Router) { php81Controller := php81.NewPhp81Controller() route.Get("status", php81Controller.Status) route.Post("reload", php81Controller.Reload) @@ -178,7 +178,7 @@ func Plugin() { route.Post("installExtension", php81Controller.InstallExtension) route.Post("uninstallExtension", php81Controller.UninstallExtension) }) - facades.Route().Prefix("api/plugins/php82").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/php82").Middleware(middleware.Jwt()).Group(func(route route.Router) { php82Controller := php82.NewPhp82Controller() route.Get("status", php82Controller.Status) route.Post("reload", php82Controller.Reload) @@ -196,12 +196,12 @@ func Plugin() { route.Post("installExtension", php82Controller.InstallExtension) route.Post("uninstallExtension", php82Controller.UninstallExtension) }) - facades.Route().Prefix("api/plugins/phpmyadmin").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/phpmyadmin").Middleware(middleware.Jwt()).Group(func(route route.Router) { phpMyAdminController := phpmyadmin.NewPhpMyAdminController() route.Get("info", phpMyAdminController.Info) route.Post("port", phpMyAdminController.SetPort) }) - facades.Route().Prefix("api/plugins/pureftpd").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/pureftpd").Middleware(middleware.Jwt()).Group(func(route route.Router) { pureFtpdController := pureftpd.NewPureFtpdController() route.Get("status", pureFtpdController.Status) route.Post("reload", pureFtpdController.Reload) @@ -215,7 +215,7 @@ func Plugin() { route.Get("port", pureFtpdController.GetPort) route.Post("port", pureFtpdController.SetPort) }) - facades.Route().Prefix("api/plugins/redis").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/redis").Middleware(middleware.Jwt()).Group(func(route route.Router) { redisController := redis.NewRedisController() route.Get("status", redisController.Status) route.Post("reload", redisController.Reload) @@ -226,13 +226,13 @@ func Plugin() { route.Get("config", redisController.GetConfig) route.Post("config", redisController.SaveConfig) }) - facades.Route().Prefix("api/plugins/s3fs").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/s3fs").Middleware(middleware.Jwt()).Group(func(route route.Router) { s3fsController := s3fs.NewS3fsController() route.Get("list", s3fsController.List) route.Post("add", s3fsController.Add) route.Post("delete", s3fsController.Delete) }) - facades.Route().Prefix("api/plugins/supervisor").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/supervisor").Middleware(middleware.Jwt()).Group(func(route route.Router) { supervisorController := supervisor.NewSupervisorController() route.Get("status", supervisorController.Status) route.Post("start", supervisorController.Start) @@ -255,7 +255,7 @@ func Plugin() { route.Post("addProcess", supervisorController.AddProcess) }) - facades.Route().Prefix("api/plugins/fail2ban").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/fail2ban").Middleware(middleware.Jwt()).Group(func(route route.Router) { fail2banController := fail2ban.NewFail2banController() route.Get("status", fail2banController.Status) route.Post("start", fail2banController.Start) @@ -270,7 +270,7 @@ func Plugin() { route.Post("whiteList", fail2banController.SetWhiteList) route.Get("whiteList", fail2banController.GetWhiteList) }) - facades.Route().Prefix("api/plugins/toolbox").Middleware(middleware.Jwt()).Group(func(route route.Route) { + facades.Route().Prefix("api/plugins/toolbox").Middleware(middleware.Jwt()).Group(func(route route.Router) { toolboxController := toolbox.NewToolBoxController() route.Get("dns", toolboxController.GetDNS) route.Post("dns", toolboxController.SetDNS) diff --git a/routes/web.go b/routes/web.go index 11c76661..c4e60cce 100644 --- a/routes/web.go +++ b/routes/web.go @@ -11,8 +11,9 @@ import ( func Web() { facades.Route().StaticFile("favicon.ico", "/www/panel/public/favicon.ico") - facades.Route().Prefix("api/panel").Group(func(r route.Route) { - r.Prefix("info").Group(func(r route.Route) { + facades.Route().StaticFile("favicon.ico", "/www/panel/public/favicon.ico") + facades.Route().Prefix("api/panel").Group(func(r route.Router) { + r.Prefix("info").Group(func(r route.Router) { infoController := controllers.NewInfoController() r.Get("name", infoController.Name) r.Middleware(middleware.Jwt()).Get("menu", infoController.Menu) @@ -24,19 +25,19 @@ func Web() { r.Middleware(middleware.Jwt()).Post("update", infoController.Update) r.Middleware(middleware.Jwt()).Post("restart", infoController.Restart) }) - r.Prefix("user").Group(func(r route.Route) { + r.Prefix("user").Group(func(r route.Router) { userController := controllers.NewUserController() r.Post("login", userController.Login) r.Middleware(middleware.Jwt()).Get("info", userController.Info) }) - r.Prefix("task").Middleware(middleware.Jwt()).Group(func(r route.Route) { + r.Prefix("task").Middleware(middleware.Jwt()).Group(func(r route.Router) { taskController := controllers.NewTaskController() r.Get("status", taskController.Status) r.Get("list", taskController.List) r.Get("log", taskController.Log) r.Post("delete", taskController.Delete) }) - r.Prefix("website").Middleware(middleware.Jwt()).Group(func(r route.Route) { + r.Prefix("website").Middleware(middleware.Jwt()).Group(func(r route.Router) { websiteController := controllers.NewWebsiteController() r.Get("list", websiteController.List) r.Post("add", websiteController.Add) @@ -55,7 +56,7 @@ func Web() { r.Post("resetConfig", websiteController.ResetConfig) r.Post("status", websiteController.Status) }) - r.Prefix("plugin").Middleware(middleware.Jwt()).Group(func(r route.Route) { + r.Prefix("plugin").Middleware(middleware.Jwt()).Group(func(r route.Router) { pluginController := controllers.NewPluginController() r.Get("list", pluginController.List) r.Post("install", pluginController.Install) @@ -63,7 +64,7 @@ func Web() { r.Post("update", pluginController.Update) r.Post("updateShow", pluginController.UpdateShow) }) - r.Prefix("cron").Middleware(middleware.Jwt()).Group(func(r route.Route) { + r.Prefix("cron").Middleware(middleware.Jwt()).Group(func(r route.Router) { cronController := controllers.NewCronController() r.Get("list", cronController.List) r.Get("script", cronController.Script) @@ -73,7 +74,7 @@ func Web() { r.Post("status", cronController.Status) r.Get("log", cronController.Log) }) - r.Prefix("safe").Middleware(middleware.Jwt()).Group(func(r route.Route) { + r.Prefix("safe").Middleware(middleware.Jwt()).Group(func(r route.Router) { safeController := controllers.NewSafeController() r.Get("firewallStatus", safeController.GetFirewallStatus) r.Post("firewallStatus", safeController.SetFirewallStatus) @@ -87,7 +88,7 @@ func Web() { r.Get("pingStatus", safeController.GetPingStatus) r.Post("pingStatus", safeController.SetPingStatus) }) - r.Prefix("monitor").Middleware(middleware.Jwt()).Group(func(r route.Route) { + r.Prefix("monitor").Middleware(middleware.Jwt()).Group(func(r route.Router) { monitorController := controllers.NewMonitorController() r.Post("switch", monitorController.Switch) r.Post("saveDays", monitorController.SaveDays) @@ -95,20 +96,20 @@ func Web() { r.Get("list", monitorController.List) r.Get("switchAndDays", monitorController.SwitchAndDays) }) - r.Prefix("ssh").Middleware(middleware.Jwt()).Group(func(r route.Route) { + r.Prefix("ssh").Middleware(middleware.Jwt()).Group(func(r route.Router) { sshController := controllers.NewSshController() r.Get("info", sshController.GetInfo) r.Post("info", sshController.UpdateInfo) r.Get("session", sshController.Session) }) - r.Prefix("setting").Middleware(middleware.Jwt()).Group(func(r route.Route) { + r.Prefix("setting").Middleware(middleware.Jwt()).Group(func(r route.Router) { settingController := controllers.NewSettingController() r.Get("list", settingController.List) r.Post("save", settingController.Save) }) }) - facades.Route().Fallback(func(ctx http.Context) { - ctx.Response().String(404, "not found") + facades.Route().Fallback(func(ctx http.Context) http.Response { + return ctx.Response().String(404, "not found") }) }