Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/MHSanaei/3x-ui.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/web/controller
diff options
context:
space:
mode:
Diffstat (limited to 'web/controller')
-rw-r--r--web/controller/api.go108
-rw-r--r--web/controller/base.go6
-rw-r--r--web/controller/inbound.go1
-rw-r--r--web/controller/index.go9
-rw-r--r--web/controller/server.go1
-rw-r--r--web/controller/setting.go1
-rw-r--r--web/controller/util.go18
7 files changed, 44 insertions, 100 deletions
diff --git a/web/controller/api.go b/web/controller/api.go
index 73c36787..6281097b 100644
--- a/web/controller/api.go
+++ b/web/controller/api.go
@@ -22,91 +22,37 @@ func (a *APIController) initRouter(g *gin.RouterGroup) {
g = g.Group("/panel/api/inbounds")
g.Use(a.checkLogin)
- g.GET("/list", a.getAllInbounds)
- g.GET("/get/:id", a.getSingleInbound)
- g.GET("/getClientTraffics/:email", a.getClientTraffics)
- g.POST("/add", a.addInbound)
- g.POST("/del/:id", a.delInbound)
- g.POST("/update/:id", a.updateInbound)
- g.POST("/clientIps/:email", a.getClientIps)
- g.POST("/clearClientIps/:email", a.clearClientIps)
- g.POST("/addClient", a.addInboundClient)
- g.POST("/:id/delClient/:clientId", a.delInboundClient)
- g.POST("/updateClient/:clientId", a.updateInboundClient)
- g.POST("/:id/resetClientTraffic/:email", a.resetClientTraffic)
- g.POST("/resetAllTraffics", a.resetAllTraffics)
- g.POST("/resetAllClientTraffics/:id", a.resetAllClientTraffics)
- g.POST("/delDepletedClients/:id", a.delDepletedClients)
- g.GET("/createbackup", a.createBackup)
- g.POST("/onlines", a.onlines)
-
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)
-}
-
-func (a *APIController) getClientIps(c *gin.Context) {
- a.inboundController.getClientIps(c)
-}
-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)
+ inboundRoutes := []struct {
+ Method string
+ Path string
+ Handler gin.HandlerFunc
+ }{
+ {"GET", "/createbackup", a.createBackup},
+ {"GET", "/list", a.inboundController.getInbounds},
+ {"GET", "/get/:id", a.inboundController.getInbound},
+ {"GET", "/getClientTraffics/:email", a.inboundController.getClientTraffics},
+ {"POST", "/add", a.inboundController.addInbound},
+ {"POST", "/del/:id", a.inboundController.delInbound},
+ {"POST", "/update/:id", a.inboundController.updateInbound},
+ {"POST", "/clientIps/:email", a.inboundController.getClientIps},
+ {"POST", "/clearClientIps/:email", a.inboundController.clearClientIps},
+ {"POST", "/addClient", a.inboundController.addInboundClient},
+ {"POST", "/:id/delClient/:clientId", a.inboundController.delInboundClient},
+ {"POST", "/updateClient/:clientId", a.inboundController.updateInboundClient},
+ {"POST", "/:id/resetClientTraffic/:email", a.inboundController.resetClientTraffic},
+ {"POST", "/resetAllTraffics", a.inboundController.resetAllTraffics},
+ {"POST", "/resetAllClientTraffics/:id", a.inboundController.resetAllClientTraffics},
+ {"POST", "/delDepletedClients/:id", a.inboundController.delDepletedClients},
+ {"POST", "/onlines", a.inboundController.onlines},
+ }
+
+ for _, route := range inboundRoutes {
+ g.Handle(route.Method, route.Path, route.Handler)
+ }
}
func (a *APIController) createBackup(c *gin.Context) {
a.Tgbot.SendBackupToAdmins()
}
-
-func (a *APIController) onlines(c *gin.Context) {
- a.inboundController.onlines(c)
-}
diff --git a/web/controller/base.go b/web/controller/base.go
index 674a195d..492fc2dc 100644
--- a/web/controller/base.go
+++ b/web/controller/base.go
@@ -2,6 +2,7 @@ package controller
import (
"net/http"
+
"x-ui/logger"
"x-ui/web/locale"
"x-ui/web/session"
@@ -9,13 +10,12 @@ import (
"github.com/gin-gonic/gin"
)
-type BaseController struct {
-}
+type BaseController struct{}
func (a *BaseController) checkLogin(c *gin.Context) {
if !session.IsLogin(c) {
if isAjax(c) {
- pureJsonMsg(c, false, I18nWeb(c, "pages.login.loginAgain"))
+ pureJsonMsg(c, http.StatusUnauthorized, false, I18nWeb(c, "pages.login.loginAgain"))
} else {
c.Redirect(http.StatusTemporaryRedirect, c.GetString("base_path"))
}
diff --git a/web/controller/inbound.go b/web/controller/inbound.go
index d613453f..7ef3245f 100644
--- a/web/controller/inbound.go
+++ b/web/controller/inbound.go
@@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"strconv"
+
"x-ui/database/model"
"x-ui/web/service"
"x-ui/web/session"
diff --git a/web/controller/index.go b/web/controller/index.go
index 9be88273..bc3c4204 100644
--- a/web/controller/index.go
+++ b/web/controller/index.go
@@ -3,6 +3,7 @@ package controller
import (
"net/http"
"time"
+
"x-ui/logger"
"x-ui/web/service"
"x-ui/web/session"
@@ -49,15 +50,15 @@ func (a *IndexController) login(c *gin.Context) {
var form LoginForm
err := c.ShouldBind(&form)
if err != nil {
- pureJsonMsg(c, false, I18nWeb(c, "pages.login.toasts.invalidFormData"))
+ pureJsonMsg(c, http.StatusOK, false, I18nWeb(c, "pages.login.toasts.invalidFormData"))
return
}
if form.Username == "" {
- pureJsonMsg(c, false, I18nWeb(c, "pages.login.toasts.emptyUsername"))
+ pureJsonMsg(c, http.StatusOK, false, I18nWeb(c, "pages.login.toasts.emptyUsername"))
return
}
if form.Password == "" {
- pureJsonMsg(c, false, I18nWeb(c, "pages.login.toasts.emptyPassword"))
+ pureJsonMsg(c, http.StatusOK, false, I18nWeb(c, "pages.login.toasts.emptyPassword"))
return
}
@@ -66,7 +67,7 @@ func (a *IndexController) login(c *gin.Context) {
if user == nil {
logger.Warningf("wrong username or password: \"%s\" \"%s\"", form.Username, form.Password)
a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 0)
- pureJsonMsg(c, false, I18nWeb(c, "pages.login.toasts.wrongUsernameOrPassword"))
+ pureJsonMsg(c, http.StatusOK, false, I18nWeb(c, "pages.login.toasts.wrongUsernameOrPassword"))
return
} else {
logger.Infof("%s login success, Ip Address: %s\n", form.Username, getRemoteIp(c))
diff --git a/web/controller/server.go b/web/controller/server.go
index 10baacb9..0eeca71c 100644
--- a/web/controller/server.go
+++ b/web/controller/server.go
@@ -5,6 +5,7 @@ import (
"net/http"
"regexp"
"time"
+
"x-ui/web/global"
"x-ui/web/service"
diff --git a/web/controller/setting.go b/web/controller/setting.go
index 64cae71b..d04969dc 100644
--- a/web/controller/setting.go
+++ b/web/controller/setting.go
@@ -3,6 +3,7 @@ package controller
import (
"errors"
"time"
+
"x-ui/web/entity"
"x-ui/web/service"
"x-ui/web/session"
diff --git a/web/controller/util.go b/web/controller/util.go
index da77189b..a32c9270 100644
--- a/web/controller/util.go
+++ b/web/controller/util.go
@@ -4,6 +4,7 @@ import (
"net"
"net/http"
"strings"
+
"x-ui/config"
"x-ui/logger"
"x-ui/web/entity"
@@ -48,18 +49,11 @@ func jsonMsgObj(c *gin.Context, msg string, obj interface{}, err error) {
c.JSON(http.StatusOK, m)
}
-func pureJsonMsg(c *gin.Context, success bool, msg string) {
- if success {
- c.JSON(http.StatusOK, entity.Msg{
- Success: true,
- Msg: msg,
- })
- } else {
- c.JSON(http.StatusOK, entity.Msg{
- Success: false,
- Msg: msg,
- })
- }
+func pureJsonMsg(c *gin.Context, statusCode int, success bool, msg string) {
+ c.JSON(statusCode, entity.Msg{
+ Success: success,
+ Msg: msg,
+ })
}
func html(c *gin.Context, name string, title string, data gin.H) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-24 22:20:24 +0300