diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/html/xui/settings.html | 10 | ||||
| -rw-r--r-- | web/service/config.json | 1 | ||||
| -rw-r--r-- | web/service/server.go | 47 |
3 files changed, 12 insertions, 46 deletions
diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html index 47e3405d..97b91bf9 100644 --- a/web/html/xui/settings.html +++ b/web/html/xui/settings.html @@ -472,14 +472,12 @@ ips: { local: ["geoip:private"], cn: ["geoip:cn"], - ir: ["geoip:ir","ext:geoip_ch.dat:arvancloud","ext:geoip_ch.dat:derakcloud","ext:geoip_ch.dat:iranserver"], + ir: ["ext:geoip_IR.dat:ir","ext:geoip_IR.dat:arvancloud","ext:geoip_IR.dat:derakcloud","ext:geoip_IR.dat:iranserver"], ru: ["geoip:ru"], }, domains: { ads: [ - "geosite:category-ads-all", - "ext:iran.dat:ads", - "ext:geosite_ch.dat:ads" + "ext:geosite_IR.dat:category-ads-all" ], speedtest: ["geosite:speedtest"], openai: ["geosite:openai"], @@ -497,9 +495,7 @@ ir: [ "regexp:.*\\.ir$", "regexp:.*\\.xn--mgba3a4f16a$", // .ایران - "ext:iran.dat:ir", - "ext:iran.dat:other", - "geosite:category-ir" + "ext:geosite_IR.dat:ir" // have rules to bypass all .ir domains. ] }, familyProtectDNS: { diff --git a/web/service/config.json b/web/service/config.json index 57dfa323..c846d590 100644 --- a/web/service/config.json +++ b/web/service/config.json @@ -1,7 +1,6 @@ { "log": { "loglevel": "warning", - "access": "./access.log", "error": "./error.log" }, "api": { diff --git a/web/service/server.go b/web/service/server.go index a56be10d..d88fa098 100644 --- a/web/service/server.go +++ b/web/service/server.go @@ -376,50 +376,21 @@ func (s *ServerService) UpdateXray(version string) error { return err } - downloadFile := func(fileName string, url string) error { - os.Remove(fileName) - file, err := os.OpenFile(fileName, os.O_CREATE|os.O_RDWR|os.O_TRUNC, fs.ModePerm) - if err != nil { - return err - } - defer file.Close() - resp, err := http.Get(url) - if err != nil { - return err - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - return fmt.Errorf("download file failed: %s", resp.Status) - } - _, err = io.Copy(file, resp.Body) + err = copyZipFile("xray", xray.GetBinaryPath()) + if err != nil { return err } - - copyFiles := map[string]string{ - "xray": xray.GetBinaryPath(), - "geosite.dat": xray.GetGeositePath(), - "geoip.dat": xray.GetGeoipPath(), - } - - downloadFiles := map[string]string{ - xray.GetIranPath(): "https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat", - } - - for fileName, filePath := range copyFiles { - err := copyZipFile(fileName, filePath) - if err != nil { - return err - } + err = copyZipFile("geosite.dat", xray.GetGeositePath()) + if err != nil { + return err } - - for fileName, filePath := range downloadFiles { - err := downloadFile(fileName, filePath) - if err != nil { - return err - } + err = copyZipFile("geoip.dat", xray.GetGeoipPath()) + if err != nil { + return err } return nil + } func (s *ServerService) GetLogs(count string, level string, syslog string) []string { |