diff options
| author | MHSanaei <ho3ein.sanaei@gmail.com> | 2023-07-27 10:36:27 +0300 |
|---|---|---|
| committer | MHSanaei <ho3ein.sanaei@gmail.com> | 2023-07-27 10:36:27 +0300 |
| commit | c2b1fb485534ad1c0be5a3ba65761751526d29e5 (patch) | |
| tree | ad4f3291262d06d459e932430d8ad1b0b08a7c5e /web/service | |
| parent | 09807b39aa971ce2f4ea3fc84a4e54766d08fefd (diff) | |
because of #815 now we can use XTLS/Xray-core
change MHSanaei/Xray-core to XTLS/Xray-core
Diffstat (limited to 'web/service')
| -rw-r--r-- | web/service/server.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/web/service/server.go b/web/service/server.go index c5f4e264..3de5f3ff 100644 --- a/web/service/server.go +++ b/web/service/server.go @@ -224,7 +224,7 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status { } func (s *ServerService) GetXrayVersions() ([]string, error) { - url := "https://api.github.com/repos/MHSanaei/Xray-core/releases" + url := "https://api.github.com/repos/XTLS/Xray-core/releases" resp, err := http.Get(url) if err != nil { return nil, err @@ -243,14 +243,17 @@ func (s *ServerService) GetXrayVersions() ([]string, error) { if err != nil { return nil, err } - versions := make([]string, 0, len(releases)) + var versions []string for _, release := range releases { - versions = append(versions, release.TagName) + if release.TagName >= "v1.7.5" { + versions = append(versions, release.TagName) + } } return versions, nil } func (s *ServerService) StopXrayService() (string error) { + err := s.xrayService.StopXray() if err != nil { logger.Error("stop xray failed:", err) @@ -261,6 +264,7 @@ func (s *ServerService) StopXrayService() (string error) { } func (s *ServerService) RestartXrayService() (string error) { + s.xrayService.StopXray() defer func() { err := s.xrayService.RestartXray(true) @@ -289,7 +293,7 @@ func (s *ServerService) downloadXRay(version string) (string, error) { } fileName := fmt.Sprintf("Xray-%s-%s.zip", osName, arch) - url := fmt.Sprintf("https://github.com/MHSanaei/Xray-core/releases/download/%s/%s", version, fileName) + url := fmt.Sprintf("https://github.com/XTLS/Xray-core/releases/download/%s/%s", version, fileName) resp, err := http.Get(url) if err != nil { return "", err @@ -370,10 +374,6 @@ func (s *ServerService) UpdateXray(version string) error { if err != nil { return err } - err = copyZipFile("iran.dat", xray.GetIranPath()) - if err != nil { - return err - } return nil } @@ -417,6 +417,7 @@ func (s *ServerService) GetConfigJson() (interface{}, error) { if err != nil { return nil, err } + return jsonData, nil } |
