From 2a8da2ba3cbfbf7ac46e5ba7ba071588f3f2d8b5 Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Mon, 4 Dec 2023 19:20:46 +0100
Subject: separate xray page #1286

---
 web/service/setting.go      | 11 ++++++++++-
 web/service/xraySettings.go | 28 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 web/service/xraySettings.go

(limited to 'web/service')

diff --git a/web/service/setting.go b/web/service/setting.go
index b1565e1f..933fff1b 100644
--- a/web/service/setting.go
+++ b/web/service/setting.go
@@ -70,7 +70,7 @@ func (s *SettingService) GetDefaultJsonConfig() (interface{}, error) {
 func (s *SettingService) GetAllSetting() (*entity.AllSetting, error) {
 	db := database.GetDB()
 	settings := make([]*model.Setting, 0)
-	err := db.Model(model.Setting{}).Find(&settings).Error
+	err := db.Model(model.Setting{}).Not("key = ?", "xrayTemplateConfig").Find(&settings).Error
 	if err != nil {
 		return nil, err
 	}
@@ -426,3 +426,12 @@ func (s *SettingService) UpdateAllSetting(allSetting *entity.AllSetting) error {
 	}
 	return common.Combine(errs...)
 }
+
+func (s *SettingService) GetDefaultXrayConfig() (interface{}, error) {
+	var jsonData interface{}
+	err := json.Unmarshal([]byte(xrayTemplateConfig), &jsonData)
+	if err != nil {
+		return nil, err
+	}
+	return jsonData, nil
+}
diff --git a/web/service/xraySettings.go b/web/service/xraySettings.go
new file mode 100644
index 00000000..4550bde2
--- /dev/null
+++ b/web/service/xraySettings.go
@@ -0,0 +1,28 @@
+package service
+
+import (
+	_ "embed"
+	"encoding/json"
+	"x-ui/util/common"
+	"x-ui/xray"
+)
+
+type XraySettingService struct {
+	SettingService
+}
+
+func (s *XraySettingService) SaveXraySetting(newXraySettings string) error {
+	if err := s.CheckXrayConfig(newXraySettings); err != nil {
+		return err
+	}
+	return s.SettingService.saveSetting("xrayTemplateConfig", newXraySettings)
+}
+
+func (s *XraySettingService) CheckXrayConfig(XrayTemplateConfig string) error {
+	xrayConfig := &xray.Config{}
+	err := json.Unmarshal([]byte(XrayTemplateConfig), xrayConfig)
+	if err != nil {
+		return common.NewError("xray template config invalid:", err)
+	}
+	return nil
+}
-- 
cgit v1.2.3