diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3b638eab..df86a474 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -116,7 +116,7 @@ jobs: cd x-ui/bin # Download dependencies - Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v26.4.25/" + Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v26.5.9/" if [ "${{ matrix.platform }}" == "amd64" ]; then wget -q ${Xray_URL}Xray-linux-64.zip unzip Xray-linux-64.zip @@ -250,7 +250,7 @@ jobs: cd x-ui\bin # Download Xray for Windows - $Xray_URL = "https://github.com/XTLS/Xray-core/releases/download/v26.4.25/" + $Xray_URL = "https://github.com/XTLS/Xray-core/releases/download/v26.5.9/" Invoke-WebRequest -Uri "${Xray_URL}Xray-windows-64.zip" -OutFile "Xray-windows-64.zip" Expand-Archive -Path "Xray-windows-64.zip" -DestinationPath . Remove-Item "Xray-windows-64.zip" diff --git a/DockerInit.sh b/DockerInit.sh index 0e033f63..38f1619a 100755 --- a/DockerInit.sh +++ b/DockerInit.sh @@ -27,7 +27,7 @@ case $1 in esac mkdir -p build/bin cd build/bin -curl -sfLRO "https://github.com/XTLS/Xray-core/releases/download/v26.4.25/Xray-linux-${ARCH}.zip" +curl -sfLRO "https://github.com/XTLS/Xray-core/releases/download/v26.5.9/Xray-linux-${ARCH}.zip" unzip "Xray-linux-${ARCH}.zip" rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat mv xray "xray-linux-${FNAME}" diff --git a/database/db.go b/database/db.go index a5e2b66e..c92e315f 100644 --- a/database/db.go +++ b/database/db.go @@ -49,7 +49,6 @@ func Dialect() string { return db.Dialector.Name() } - const ( defaultUsername = "admin" defaultPassword = "admin" diff --git a/database/model/model.go b/database/model/model.go index 7128645e..a2ef1da3 100644 --- a/database/model/model.go +++ b/database/model/model.go @@ -16,16 +16,16 @@ type Protocol string // Protocol constants for different Xray inbound protocols const ( - VMESS Protocol = "vmess" - VLESS Protocol = "vless" - Tunnel Protocol = "tunnel" - HTTP Protocol = "http" - Trojan Protocol = "trojan" - Shadowsocks Protocol = "shadowsocks" - Mixed Protocol = "mixed" - WireGuard Protocol = "wireguard" - Hysteria Protocol = "hysteria" - Hysteria2 Protocol = "hysteria2" + VMESS Protocol = "vmess" + VLESS Protocol = "vless" + Tunnel Protocol = "tunnel" + HTTP Protocol = "http" + Trojan Protocol = "trojan" + Shadowsocks Protocol = "shadowsocks" + Mixed Protocol = "mixed" + WireGuard Protocol = "wireguard" + Hysteria Protocol = "hysteria" + Hysteria2 Protocol = "hysteria2" ) // IsHysteria returns true for both "hysteria" and "hysteria2". diff --git a/web/controller/inbound.go b/web/controller/inbound.go index 8436fd80..383121fa 100644 --- a/web/controller/inbound.go +++ b/web/controller/inbound.go @@ -371,4 +371,3 @@ func (a *InboundController) setFallbacks(c *gin.Context) { a.xrayService.SetToNeedRestart() jsonMsg(c, I18nWeb(c, "pages.inbounds.toasts.inboundUpdateSuccess"), nil) } - diff --git a/web/service/server.go b/web/service/server.go index 41c4ffea..9fc65b40 100644 --- a/web/service/server.go +++ b/web/service/server.go @@ -662,9 +662,6 @@ func (s *ServerService) GetXrayVersions() ([]string, error) { var versions []string for _, release := range releases { tagVersion := strings.TrimPrefix(release.TagName, "v") - if tagVersion == "26.5.3" { - continue - } tagParts := strings.Split(tagVersion, ".") if len(tagParts) != 3 { continue