From da04b36f09c257a46f13d8bfc8f9c05f9cafde15 Mon Sep 17 00:00:00 2001 From: Pk-web6936 <202365630+Pk-web6936@users.noreply.github.com> Date: Tue, 6 May 2025 16:27:03 +0000 Subject: [PATCH] Standard formatting and removal of redundant structures --- main.go | 2 +- sub/subController.go | 4 +- web/service/server.go | 94 +++++++++++++++++++++---------------------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/main.go b/main.go index ed30a11f..47bf4a14 100644 --- a/main.go +++ b/main.go @@ -13,10 +13,10 @@ import ( "x-ui/database" "x-ui/logger" "x-ui/sub" + "x-ui/util/crypto" "x-ui/web" "x-ui/web/global" "x-ui/web/service" - "x-ui/util/crypto" "github.com/op/go-logging" ) diff --git a/sub/subController.go b/sub/subController.go index 2f22ecab..1284b1a7 100644 --- a/sub/subController.go +++ b/sub/subController.go @@ -85,7 +85,7 @@ func (a *SUBController) subs(c *gin.Context) { // Add headers c.Writer.Header().Set("Subscription-Userinfo", header) c.Writer.Header().Set("Profile-Update-Interval", a.updateInterval) - c.Writer.Header().Set("Profile-Title", "base64:" + base64.StdEncoding.EncodeToString([]byte(a.subTitle))) + c.Writer.Header().Set("Profile-Title", "base64:"+base64.StdEncoding.EncodeToString([]byte(a.subTitle))) if a.subEncrypt { c.String(200, base64.StdEncoding.EncodeToString([]byte(result))) @@ -119,7 +119,7 @@ func (a *SUBController) subJsons(c *gin.Context) { // Add headers c.Writer.Header().Set("Subscription-Userinfo", header) c.Writer.Header().Set("Profile-Update-Interval", a.updateInterval) - c.Writer.Header().Set("Profile-Title", "base64:" + base64.StdEncoding.EncodeToString([]byte(a.subTitle))) + c.Writer.Header().Set("Profile-Title", "base64:"+base64.StdEncoding.EncodeToString([]byte(a.subTitle))) c.String(200, jsonSub) } diff --git a/web/service/server.go b/web/service/server.go index 23167fb3..4c9f000f 100644 --- a/web/service/server.go +++ b/web/service/server.go @@ -592,63 +592,63 @@ func (s *ServerService) ImportDB(file multipart.File) error { } func (s *ServerService) UpdateGeofile(fileName string) error { - files := []struct { - URL string - FileName string - }{ - {"https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat", "geoip.dat"}, - {"https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat", "geosite.dat"}, - {"https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat", "geoip_IR.dat"}, - {"https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat", "geosite_IR.dat"}, - {"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/geoip.dat", "geoip_RU.dat"}, - {"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/geosite.dat", "geosite_RU.dat"}, - } + files := []struct { + URL string + FileName string + }{ + {"https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat", "geoip.dat"}, + {"https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat", "geosite.dat"}, + {"https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat", "geoip_IR.dat"}, + {"https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat", "geosite_IR.dat"}, + {"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/geoip.dat", "geoip_RU.dat"}, + {"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/geosite.dat", "geosite_RU.dat"}, + } - downloadFile := func(url, destPath string) error { - resp, err := http.Get(url) - if err != nil { - return common.NewErrorf("Failed to download Geofile from %s: %v", url, err) - } - defer resp.Body.Close() + downloadFile := func(url, destPath string) error { + resp, err := http.Get(url) + if err != nil { + return common.NewErrorf("Failed to download Geofile from %s: %v", url, err) + } + defer resp.Body.Close() - file, err := os.Create(destPath) - if err != nil { - return common.NewErrorf("Failed to create Geofile %s: %v", destPath, err) - } - defer file.Close() + file, err := os.Create(destPath) + if err != nil { + return common.NewErrorf("Failed to create Geofile %s: %v", destPath, err) + } + defer file.Close() - _, err = io.Copy(file, resp.Body) - if err != nil { - return common.NewErrorf("Failed to save Geofile %s: %v", destPath, err) - } + _, err = io.Copy(file, resp.Body) + if err != nil { + return common.NewErrorf("Failed to save Geofile %s: %v", destPath, err) + } - return nil - } + return nil + } - var fileURL string - for _, file := range files { - if file.FileName == fileName { - fileURL = file.URL - break - } - } + var fileURL string + for _, file := range files { + if file.FileName == fileName { + fileURL = file.URL + break + } + } - if fileURL == "" { - return common.NewErrorf("File '%s' not found in the list of Geofiles", fileName) - } + if fileURL == "" { + return common.NewErrorf("File '%s' not found in the list of Geofiles", fileName) + } - destPath := fmt.Sprintf("%s/%s", config.GetBinFolderPath(), fileName) + destPath := fmt.Sprintf("%s/%s", config.GetBinFolderPath(), fileName) - if err := downloadFile(fileURL, destPath); err != nil { - return common.NewErrorf("Error downloading Geofile '%s': %v", fileName, err) - } + if err := downloadFile(fileURL, destPath); err != nil { + return common.NewErrorf("Error downloading Geofile '%s': %v", fileName, err) + } - err := s.RestartXrayService() - if err != nil { - return common.NewErrorf("Updated Geofile '%s' but Failed to start Xray: %v", fileName, err) - } + err := s.RestartXrayService() + if err != nil { + return common.NewErrorf("Updated Geofile '%s' but Failed to start Xray: %v", fileName, err) + } - return nil + return nil } func (s *ServerService) GetNewX25519Cert() (any, error) {