From b5ae580d12b31a8a0db44894aab149870e23ef45 Mon Sep 17 00:00:00 2001 From: Hamidreza Ghavami <70919649+hamid-gh98@users.noreply.github.com> Date: Sun, 14 May 2023 01:41:18 +0430 Subject: [PATCH 1/3] Update '/xui/API' to new path '/panel/api' --- web/controller/api.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/web/controller/api.go b/web/controller/api.go index 333d4f36..607dd83a 100644 --- a/web/controller/api.go +++ b/web/controller/api.go @@ -14,7 +14,7 @@ func NewAPIController(g *gin.RouterGroup) *APIController { } func (a *APIController) initRouter(g *gin.RouterGroup) { - g = g.Group("/xui/API/inbounds") + g = g.Group("/panel/api/inbounds") g.Use(a.checkLogin) g.GET("/list", a.getAllInbounds) @@ -35,21 +35,27 @@ func (a *APIController) initRouter(g *gin.RouterGroup) { a.inboundController = NewInboundController(g) } + func (a *APIController) getAllInbounds(c *gin.Context) { a.inboundController.getInbounds(c) } + func (a *APIController) getSingleInbound(c *gin.Context) { a.inboundController.getInbound(c) } + func (a *APIController) getClientTraffics(c *gin.Context) { a.inboundController.getClientTraffics(c) } + func (a *APIController) addInbound(c *gin.Context) { a.inboundController.addInbound(c) } + func (a *APIController) delInbound(c *gin.Context) { a.inboundController.delInbound(c) } + func (a *APIController) updateInbound(c *gin.Context) { a.inboundController.updateInbound(c) } @@ -61,24 +67,31 @@ func (a *APIController) getClientIps(c *gin.Context) { func (a *APIController) clearClientIps(c *gin.Context) { a.inboundController.clearClientIps(c) } + func (a *APIController) addInboundClient(c *gin.Context) { a.inboundController.addInboundClient(c) } + func (a *APIController) delInboundClient(c *gin.Context) { a.inboundController.delInboundClient(c) } + func (a *APIController) updateInboundClient(c *gin.Context) { a.inboundController.updateInboundClient(c) } + func (a *APIController) resetClientTraffic(c *gin.Context) { a.inboundController.resetClientTraffic(c) } + func (a *APIController) resetAllTraffics(c *gin.Context) { a.inboundController.resetAllTraffics(c) } + func (a *APIController) resetAllClientTraffics(c *gin.Context) { a.inboundController.resetAllClientTraffics(c) } + func (a *APIController) delDepletedClients(c *gin.Context) { a.inboundController.delDepletedClients(c) } From c2c61cdd5b9f5b0545253e36d1663f2c19cff16e Mon Sep 17 00:00:00 2001 From: Hamidreza Ghavami <70919649+hamid-gh98@users.noreply.github.com> Date: Sun, 14 May 2023 01:42:08 +0430 Subject: [PATCH 2/3] Add Redirect Middleware for Router --- web/web.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/web/web.go b/web/web.go index 6304d327..849e4beb 100644 --- a/web/web.go +++ b/web/web.go @@ -147,6 +147,27 @@ func (s *Server) getHtmlTemplate(funcMap template.FuncMap) (*template.Template, return t, nil } +func redirectMiddleware() gin.HandlerFunc { + return func(c *gin.Context) { + // Redirect from old '/xui' path to '/panel' + path := c.Request.URL.Path + redirects := map[string]string{ + "/panel/API": "/panel/api", + "/xui/API": "/panel/api", + "/xui": "/panel", + } + for from, to := range redirects { + if strings.HasPrefix(path, from) { + newPath := to + path[len(from):] + c.Redirect(http.StatusMovedPermanently, newPath) + c.Abort() + return + } + } + c.Next() + } +} + func (s *Server) initRouter() (*gin.Engine, error) { if config.IsDebug() { gin.SetMode(gin.DebugMode) @@ -203,6 +224,9 @@ func (s *Server) initRouter() (*gin.Engine, error) { engine.StaticFS(basePath+"assets", http.FS(&wrapAssetsFS{FS: assetsFS})) } + // Apply the redirect middleware (`/xui` to `/panel`) + engine.Use(redirectMiddleware()) + g := engine.Group(basePath) s.index = controller.NewIndexController(g) From 96263797316f7beab11821ca55ab689113e71ebe Mon Sep 17 00:00:00 2001 From: Hamidreza Ghavami <70919649+hamid-gh98@users.noreply.github.com> Date: Sun, 14 May 2023 01:42:29 +0430 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 006ef464..88bfedd4 100644 --- a/README.md +++ b/README.md @@ -187,7 +187,7 @@ Reference syntax: ## API routes - `/login` with `PUSH` user data: `{username: '', password: ''}` for login -- `/xui/API/inbounds` base for following actions: +- `/panel/api/inbounds` base for following actions: | Method | Path | Action | | :----: | ---------------------------------- | ------------------------------------------- |