From 4cb67fd1c3129b83f3750f863caba081453f42b1 Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Sun, 10 Dec 2023 12:57:39 +0100
Subject: [xray] show xray errors #1300

---
 web/controller/xraySetting.go  | 57 --------------------------------------
 web/controller/xray_setting.go | 63 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 57 deletions(-)
 delete mode 100644 web/controller/xraySetting.go
 create mode 100644 web/controller/xray_setting.go

(limited to 'web/controller')

diff --git a/web/controller/xraySetting.go b/web/controller/xraySetting.go
deleted file mode 100644
index a4c8b600..00000000
--- a/web/controller/xraySetting.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package controller
-
-import (
-	"x-ui/web/service"
-
-	"github.com/gin-gonic/gin"
-)
-
-type XraySettingController struct {
-	XraySettingService service.XraySettingService
-	SettingService     service.SettingService
-	InboundService     service.InboundService
-}
-
-func NewXraySettingController(g *gin.RouterGroup) *XraySettingController {
-	a := &XraySettingController{}
-	a.initRouter(g)
-	return a
-}
-
-func (a *XraySettingController) initRouter(g *gin.RouterGroup) {
-	g = g.Group("/xray")
-
-	g.POST("/", a.getXraySetting)
-	g.POST("/update", a.updateSetting)
-	g.GET("/getDefaultJsonConfig", a.getDefaultXrayConfig)
-}
-
-func (a *XraySettingController) getXraySetting(c *gin.Context) {
-	xraySetting, err := a.SettingService.GetXrayConfigTemplate()
-	if err != nil {
-		jsonMsg(c, I18nWeb(c, "pages.settings.toasts.getSettings"), err)
-		return
-	}
-	inboundTags, err := a.InboundService.GetInboundTags()
-	if err != nil {
-		jsonMsg(c, I18nWeb(c, "pages.settings.toasts.getSettings"), err)
-		return
-	}
-	xrayResponse := "{ \"xraySetting\": " + xraySetting + ", \"inboundTags\": " + inboundTags + " }"
-	jsonObj(c, xrayResponse, nil)
-}
-
-func (a *XraySettingController) updateSetting(c *gin.Context) {
-	xraySetting := c.PostForm("xraySetting")
-	err := a.XraySettingService.SaveXraySetting(xraySetting)
-	jsonMsg(c, I18nWeb(c, "pages.settings.toasts.modifySettings"), err)
-}
-
-func (a *XraySettingController) getDefaultXrayConfig(c *gin.Context) {
-	defaultJsonConfig, err := a.SettingService.GetDefaultXrayConfig()
-	if err != nil {
-		jsonMsg(c, I18nWeb(c, "pages.settings.toasts.getSettings"), err)
-		return
-	}
-	jsonObj(c, defaultJsonConfig, nil)
-}
diff --git a/web/controller/xray_setting.go b/web/controller/xray_setting.go
new file mode 100644
index 00000000..d4deacd9
--- /dev/null
+++ b/web/controller/xray_setting.go
@@ -0,0 +1,63 @@
+package controller
+
+import (
+	"x-ui/web/service"
+
+	"github.com/gin-gonic/gin"
+)
+
+type XraySettingController struct {
+	XraySettingService service.XraySettingService
+	SettingService     service.SettingService
+	InboundService     service.InboundService
+	XrayService        service.XrayService
+}
+
+func NewXraySettingController(g *gin.RouterGroup) *XraySettingController {
+	a := &XraySettingController{}
+	a.initRouter(g)
+	return a
+}
+
+func (a *XraySettingController) initRouter(g *gin.RouterGroup) {
+	g = g.Group("/xray")
+
+	g.POST("/", a.getXraySetting)
+	g.POST("/update", a.updateSetting)
+	g.GET("/getXrayResult", a.getXrayResult)
+	g.GET("/getDefaultJsonConfig", a.getDefaultXrayConfig)
+}
+
+func (a *XraySettingController) getXraySetting(c *gin.Context) {
+	xraySetting, err := a.SettingService.GetXrayConfigTemplate()
+	if err != nil {
+		jsonMsg(c, I18nWeb(c, "pages.settings.toasts.getSettings"), err)
+		return
+	}
+	inboundTags, err := a.InboundService.GetInboundTags()
+	if err != nil {
+		jsonMsg(c, I18nWeb(c, "pages.settings.toasts.getSettings"), err)
+		return
+	}
+	xrayResponse := "{ \"xraySetting\": " + xraySetting + ", \"inboundTags\": " + inboundTags + " }"
+	jsonObj(c, xrayResponse, nil)
+}
+
+func (a *XraySettingController) updateSetting(c *gin.Context) {
+	xraySetting := c.PostForm("xraySetting")
+	err := a.XraySettingService.SaveXraySetting(xraySetting)
+	jsonMsg(c, I18nWeb(c, "pages.settings.toasts.modifySettings"), err)
+}
+
+func (a *XraySettingController) getDefaultXrayConfig(c *gin.Context) {
+	defaultJsonConfig, err := a.SettingService.GetDefaultXrayConfig()
+	if err != nil {
+		jsonMsg(c, I18nWeb(c, "pages.settings.toasts.getSettings"), err)
+		return
+	}
+	jsonObj(c, defaultJsonConfig, nil)
+}
+
+func (a *XraySettingController) getXrayResult(c *gin.Context) {
+	jsonObj(c, a.XrayService.GetXrayResult(), nil)
+}
-- 
cgit v1.2.3