diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1f019498..b249622d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -97,7 +97,7 @@ jobs: cd x-ui/bin # Download dependencies - Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v25.5.16/" + Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v25.6.8/" if [ "${{ matrix.platform }}" == "amd64" ]; then wget -q ${Xray_URL}Xray-linux-64.zip unzip Xray-linux-64.zip diff --git a/DockerInit.sh b/DockerInit.sh index 2cc36fcd..292ba0d7 100755 --- a/DockerInit.sh +++ b/DockerInit.sh @@ -3,11 +3,11 @@ set -euo pipefail IFS=$'\n\t' # ------------------------------------------------------------------------------ -# DockerInit.sh download and prepare Xray binaries and geolocation databases +# DockerInit.sh � download and prepare Xray binaries and geolocation databases # ------------------------------------------------------------------------------ # Xray version -readonly XRAY_VERSION="v25.5.16" +readonly XRAY_VERSION="v25.6.8" # URL template for downloading Xray readonly XRAY_URL_TEMPLATE="https://github.com/XTLS/Xray-core/releases/download/${XRAY_VERSION}/Xray-linux-%s.zip" @@ -152,4 +152,4 @@ if [[ "${1-}" == "-h" || "${1-}" == "--help" ]]; then fi # Run main with the provided argument (if any) -main "${1-}" +main "${1-}" \ No newline at end of file diff --git a/README.ar_EG.md b/README.ar_EG.md index 99354e55..d2f6dcc3 100644 --- a/README.ar_EG.md +++ b/README.ar_EG.md @@ -23,7 +23,7 @@ ## البدء السريع ``` -$ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) +bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) ``` للحصول على الوثائق الكاملة، يرجى زيارة [ويكي المشروع](https://github.com/MHSanaei/3x-ui/wiki). @@ -53,4 +53,4 @@ $ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/instal ## النجوم عبر الزمن -[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) \ No newline at end of file +[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) diff --git a/README.es_ES.md b/README.es_ES.md index 915cc4c4..52625664 100644 --- a/README.es_ES.md +++ b/README.es_ES.md @@ -23,7 +23,7 @@ Como una versión mejorada del proyecto X-UI original, 3X-UI proporciona mayor e ## Inicio Rápido ``` -$ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) +bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) ``` Para documentación completa, visita la [Wiki del proyecto](https://github.com/MHSanaei/3x-ui/wiki). @@ -53,4 +53,4 @@ Para documentación completa, visita la [Wiki del proyecto](https://github.com/M ## Estrellas a lo Largo del Tiempo -[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) \ No newline at end of file +[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) diff --git a/README.fa_IR.md b/README.fa_IR.md index e194b663..2b2dc5ec 100644 --- a/README.fa_IR.md +++ b/README.fa_IR.md @@ -23,7 +23,7 @@ ## شروع سریع ``` -$ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) +bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) ``` برای مستندات کامل، لطفاً به [ویکی پروژه](https://github.com/MHSanaei/3x-ui/wiki) مراجعه کنید. @@ -53,4 +53,4 @@ $ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/instal ## ستاره‌ها در طول زمان -[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) \ No newline at end of file +[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) diff --git a/README.md b/README.md index a63a0fb3..7cda8370 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ As an enhanced fork of the original X-UI project, 3X-UI provides improved stabil ## Quick Start ```bash -$ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) +bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) ``` For full documentation, please visit the [project Wiki](https://github.com/MHSanaei/3x-ui/wiki). @@ -53,4 +53,4 @@ For full documentation, please visit the [project Wiki](https://github.com/MHSan ## Stargazers over Time -[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) \ No newline at end of file +[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) diff --git a/README.ru_RU.md b/README.ru_RU.md index 1bb8d611..d971f403 100644 --- a/README.ru_RU.md +++ b/README.ru_RU.md @@ -23,7 +23,7 @@ ## Быстрый старт ``` -$ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) +bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) ``` Полную документацию смотрите в [вики проекта](https://github.com/MHSanaei/3x-ui/wiki). @@ -53,4 +53,4 @@ $ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/instal ## Звезды с течением времени -[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) \ No newline at end of file +[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) diff --git a/README.zh_CN.md b/README.zh_CN.md index 133ffe0c..75e75603 100644 --- a/README.zh_CN.md +++ b/README.zh_CN.md @@ -23,7 +23,7 @@ ## 快速开始 ``` -$ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) +bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) ``` 完整文档请参阅 [项目Wiki](https://github.com/MHSanaei/3x-ui/wiki)。 @@ -53,4 +53,4 @@ $ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/instal ## 随时间变化的星标数 -[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) \ No newline at end of file +[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) diff --git a/docker-compose.yml b/docker-compose.yml index e27a735e..198df198 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,10 @@ services: - 3x-ui: - image: ghcr.io/mhsanaei/3x-ui:latest - container_name: 3x-ui - hostname: yourhostname + 3xui: + build: + context: . + dockerfile: ./Dockerfile + container_name: 3xui_app + # hostname: yourhostname <- optional volumes: - $PWD/db/:/etc/x-ui/ - $PWD/cert/:/root/cert/ diff --git a/install.sh b/install.sh index 0398285d..8fb23f3b 100644 --- a/install.sh +++ b/install.sh @@ -57,7 +57,7 @@ install_base() { ubuntu | debian | armbian) apt-get update && apt-get install -y -q wget curl tar tzdata ;; - centos | almalinux | rocky | ol) + centos | rhel | almalinux | rocky | ol) yum -y update && yum install -y -q wget curl tar tzdata ;; fedora | amzn | virtuozzo) diff --git a/web/entity/entity.go b/web/entity/entity.go index 543b80e0..889c9024 100644 --- a/web/entity/entity.go +++ b/web/entity/entity.go @@ -5,6 +5,7 @@ import ( "net" "strings" "time" + "math" "x-ui/util/common" ) @@ -78,11 +79,11 @@ func (s *AllSetting) CheckValid() error { } } - if s.WebPort <= 0 || s.WebPort > 65535 { + if s.WebPort <= 0 || s.WebPort > math.MaxUint16 { return common.NewError("web port is not a valid port:", s.WebPort) } - if s.SubPort <= 0 || s.SubPort > 65535 { + if s.SubPort <= 0 || s.SubPort > math.MaxUint16 { return common.NewError("Sub port is not a valid port:", s.SubPort) } diff --git a/web/html/login.html b/web/html/login.html index 515ea2b3..68e849f5 100644 --- a/web/html/login.html +++ b/web/html/login.html @@ -299,6 +299,12 @@ min-height: 40px; } } + + @media (max-width: 1024px) { + .title { + font-size: 1.4rem; + } + } .words-wrapper { width: 100%; @@ -617,4 +623,4 @@ }); - \ No newline at end of file + diff --git a/web/html/modals/dns_presets_modal.html b/web/html/modals/dns_presets_modal.html new file mode 100644 index 00000000..010b973a --- /dev/null +++ b/web/html/modals/dns_presets_modal.html @@ -0,0 +1,110 @@ +{{define "modals/dnsPresetsModal"}} + + + + + + + [[ dns.name ]] + [[ dns.family ? '{{ i18n "pages.xray.dns.dnsPresetFamily" }}' : 'DNS' ]] + + + + {{ i18n "install" }} + + + + + + + + + +{{end}} \ No newline at end of file diff --git a/web/html/modals/fakedns_modal.html b/web/html/modals/fakedns_modal.html deleted file mode 100644 index 8e554ac0..00000000 --- a/web/html/modals/fakedns_modal.html +++ /dev/null @@ -1,57 +0,0 @@ -{{define "modals/fakednsModal"}} - - - - - - - - - - - -{{end}} diff --git a/web/html/modals/inbound_info_modal.html b/web/html/modals/inbound_info_modal.html index 9da3fc86..c9c36398 100644 --- a/web/html/modals/inbound_info_modal.html +++ b/web/html/modals/inbound_info_modal.html @@ -433,6 +433,9 @@ + + +
diff --git a/web/html/modals/dns_modal.html b/web/html/modals/xray_dns_modal.html similarity index 55% rename from web/html/modals/dns_modal.html rename to web/html/modals/xray_dns_modal.html index e6266c06..484bd2f8 100644 --- a/web/html/modals/dns_modal.html +++ b/web/html/modals/xray_dns_modal.html @@ -6,6 +6,16 @@ + + + + + + [[ l ]] + + + - - - [[ l ]] - - - - - + + + + + + + + + + + + + + diff --git a/web/html/modals/xray_fakedns_modal.html b/web/html/modals/xray_fakedns_modal.html new file mode 100644 index 00000000..f1f4429c --- /dev/null +++ b/web/html/modals/xray_fakedns_modal.html @@ -0,0 +1,56 @@ +{{define "modals/fakednsModal"}} + + + + + + + + + + + +{{end}} \ No newline at end of file diff --git a/web/html/settings/xray/basics.html b/web/html/settings/xray/basics.html index 374cb7dd..71aa0d7c 100644 --- a/web/html/settings/xray/basics.html +++ b/web/html/settings/xray/basics.html @@ -135,7 +135,7 @@ - + - + - - - - - - - - diff --git a/web/html/xray.html b/web/html/xray.html index fc94c31a..eb99b794 100644 --- a/web/html/xray.html +++ b/web/html/xray.html @@ -128,6 +128,7 @@ {{template "modals/reverseModal"}} {{template "modals/balancerModal"}} {{template "modals/dnsModal"}} +{{template "modals/dnsPresetsModal"}} {{template "modals/fakednsModal"}} {{template "modals/warpModal"}}