From 4cb67fd1c3129b83f3750f863caba081453f42b1 Mon Sep 17 00:00:00 2001 From: Alireza Ahmadi Date: Sun, 10 Dec 2023 12:57:39 +0100 Subject: [xray] show xray errors #1300 --- web/service/xraySettings.go | 28 ---------------------------- web/service/xray_setting.go | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 web/service/xraySettings.go create mode 100644 web/service/xray_setting.go (limited to 'web/service') diff --git a/web/service/xraySettings.go b/web/service/xraySettings.go deleted file mode 100644 index 4550bde2..00000000 --- a/web/service/xraySettings.go +++ /dev/null @@ -1,28 +0,0 @@ -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 -} diff --git a/web/service/xray_setting.go b/web/service/xray_setting.go new file mode 100644 index 00000000..4550bde2 --- /dev/null +++ b/web/service/xray_setting.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