From 87a5190b7d2e01678a6fbb08722e1326692f3530 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Sun, 7 May 2023 17:12:47 +0330 Subject: [PATCH] v1.4.0 --- README.md | 26 ++++++++++++--------- config/version | 2 +- web/html/xui/client_bulk_modal.html | 24 ++++++++++++++++--- web/html/xui/form/client.html | 25 +++++++++++++++++--- web/html/xui/form/protocol/dokodemo.html | 2 ++ web/html/xui/form/protocol/shadowsocks.html | 24 ++++++++++++++++--- web/html/xui/form/protocol/socks.html | 2 ++ web/html/xui/form/protocol/trojan.html | 22 +++++++++++++++-- web/html/xui/form/protocol/vless.html | 24 ++++++++++++++++--- web/html/xui/form/protocol/vmess.html | 25 +++++++++++++++++--- web/html/xui/form/stream/stream_kcp.html | 12 ++++++++-- web/html/xui/form/tls_settings.html | 4 ++-- web/html/xui/inbound_info_modal.html | 2 +- web/translation/translate.en_US.toml | 8 ++++--- web/translation/translate.fa_IR.toml | 8 ++++--- web/translation/translate.zh_Hans.toml | 8 ++++--- 16 files changed, 175 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 1e9e98df..46ae2098 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -# 3x-ui +# 3x-ui +> **Disclaimer: This project is only for personal learning and communication, please do not use it for illegal purposes, please do not use it in a production environment** [![](https://img.shields.io/github/v/release/mhsanaei/3x-ui.svg)](https://github.com/MHSanaei/3x-ui/releases) [![](https://img.shields.io/github/actions/workflow/status/mhsanaei/3x-ui/release.yml.svg)](#) @@ -6,11 +7,12 @@ [![Downloads](https://img.shields.io/github/downloads/mhsanaei/3x-ui/total.svg)](#) [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0.en.html) -> **Disclaimer: This project is only for personal learning and communication, please do not use it for illegal purposes, please do not use it in a production environment** +3x-ui panel supporting multi-protocol, **Multi-lang (English,Farsi,Chinese)** **If you think this project is helpful to you, you may wish to give a** :star2: -xray panel supporting multi-protocol, **Multi-lang (English,Farsi,Chinese)** +**Buy Me a Coffee :** + - Tron USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC` # Install & Upgrade @@ -20,10 +22,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install. ## Install custom version -To install your desired version you can add the version to the end of install command. Example for ver `v1.3.3`: +To install your desired version you can add the version to the end of install command. Example for ver `v1.4.0`: ``` -bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v1.3.3 +bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v1.4.0 ``` # SSL @@ -171,13 +173,19 @@ Reference syntax: | `POST` | `"/clientIps/:email"` | Client Ip address | | `POST` | `"/clearClientIps/:email"` | Clear Client Ip address | | `POST` | `"/addClient"` | Add Client to inbound | -| `POST` | `"/:id/delClient/:clientId"` | Delete Client by UID/Password as clientId | -| `POST` | `"/updateClient/:clientId"` | Update Client by UID/Password as clientId | +| `POST` | `"/:id/delClient/:clientId"` | Delete Client by clientId* | +| `POST` | `"/updateClient/:clientId"` | Update Client by clientId* | | `POST` | `"/:id/resetClientTraffic/:email"` | Reset Client's Traffic | | `POST` | `"/resetAllTraffics"` | Reset traffics of all inbounds | | `POST` | `"/resetAllClientTraffics/:id"` | Reset traffics of all clients in an inbound | | `POST` | `"/delDepletedClients/:id"` | Delete inbound depleted clients (-1: all) | +*- The field `clientId` should be filled by: +- `client.id` for VMESS and VLESS +- `client.password` for TROJAN +- `client.email` for Shadowsocks + + - [Postman Collection](https://gist.github.com/mehdikhody/9a862801a2e41f6b5fb6bbc7e1326044) # A Special Thanks To @@ -191,10 +199,6 @@ Reference syntax: - CentOS 8+ - Fedora 36+ -# Buy Me a Coffee - -- Tron USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC` - # Pictures ![1](./media/1.png) diff --git a/config/version b/config/version index d0149fef..e21e727f 100644 --- a/config/version +++ b/config/version @@ -1 +1 @@ -1.3.4 +1.4.0 \ No newline at end of file diff --git a/web/html/xui/client_bulk_modal.html b/web/html/xui/client_bulk_modal.html index e856c6df..709e0fac 100644 --- a/web/html/xui/client_bulk_modal.html +++ b/web/html/xui/client_bulk_modal.html @@ -33,10 +33,28 @@ {{ i18n "pages.client.clientCount" }} - - + + + Subscription + + + + + + - + + + Telegram ID + + + + + diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html index 017bd7dc..5f65756c 100644 --- a/web/html/xui/form/client.html +++ b/web/html/xui/form/client.html @@ -23,16 +23,35 @@ +
- + + + Subscription + + + + + - - + + + + Telegram ID + + + + + diff --git a/web/html/xui/form/protocol/dokodemo.html b/web/html/xui/form/protocol/dokodemo.html index f9204b8c..3e9e51ee 100644 --- a/web/html/xui/form/protocol/dokodemo.html +++ b/web/html/xui/form/protocol/dokodemo.html @@ -6,6 +6,7 @@ +
TCP+UDP @@ -13,6 +14,7 @@ UDP +
diff --git a/web/html/xui/form/protocol/shadowsocks.html b/web/html/xui/form/protocol/shadowsocks.html index c739ae10..35912d61 100644 --- a/web/html/xui/form/protocol/shadowsocks.html +++ b/web/html/xui/form/protocol/shadowsocks.html @@ -18,10 +18,28 @@ - + + + Subscription + + + + + - - + + + + Telegram ID + + + + + diff --git a/web/html/xui/form/protocol/socks.html b/web/html/xui/form/protocol/socks.html index 89cde72c..a3096d48 100644 --- a/web/html/xui/form/protocol/socks.html +++ b/web/html/xui/form/protocol/socks.html @@ -4,6 +4,7 @@ +
+
diff --git a/web/html/xui/form/protocol/trojan.html b/web/html/xui/form/protocol/trojan.html index 9c392926..983c0ba9 100644 --- a/web/html/xui/form/protocol/trojan.html +++ b/web/html/xui/form/protocol/trojan.html @@ -17,10 +17,28 @@ - + + + Subscription + + + + + - + + + Telegram ID + + + + + diff --git a/web/html/xui/form/protocol/vless.html b/web/html/xui/form/protocol/vless.html index c9547ae9..6b35c3fa 100644 --- a/web/html/xui/form/protocol/vless.html +++ b/web/html/xui/form/protocol/vless.html @@ -17,10 +17,28 @@ - + + + Subscription + + + + + - - + + + + Telegram ID + + + + + diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html index 0591d3d6..7fc9b630 100644 --- a/web/html/xui/form/protocol/vmess.html +++ b/web/html/xui/form/protocol/vmess.html @@ -18,13 +18,32 @@ +
- + + + Subscription + + + + + - - + + + + Telegram ID + + + + + diff --git a/web/html/xui/form/stream/stream_kcp.html b/web/html/xui/form/stream/stream_kcp.html index 52a930f9..07a7d600 100644 --- a/web/html/xui/form/stream/stream_kcp.html +++ b/web/html/xui/form/stream/stream_kcp.html @@ -1,7 +1,7 @@ {{define "form/streamKCP"}} - + None (Not Camouflage) SRTP (Camouflage Video Call) UTP (Camouflage BT Download) @@ -10,27 +10,35 @@ Wireguard (Camouflage Wireguard Packages) +
-
+ +
+
+
+
+
+
+
diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html index 7962acf3..e6e0bece 100644 --- a/web/html/xui/form/tls_settings.html +++ b/web/html/xui/form/tls_settings.html @@ -10,7 +10,7 @@ Reality @@ -22,7 +22,7 @@ XTLS diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/inbound_info_modal.html index 489a9a61..053e9724 100644 --- a/web/html/xui/inbound_info_modal.html +++ b/web/html/xui/inbound_info_modal.html @@ -112,7 +112,7 @@ [[ subBase + infoModal.clientSettings.subId ]] - Telegram Username + Telegram ID @[[ infoModal.clientSettings.tgId ]] diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml index 819d4d9e..57091d8a 100644 --- a/web/translation/translate.en_US.toml +++ b/web/translation/translate.en_US.toml @@ -167,8 +167,10 @@ "IPLimitlogDesc" = "IPs history log (before enabling inbound after it has been disabled by IP limit, you should clear the log)." "IPLimitlogclear" = "Clear The Log" "setDefaultCert" = "Set cert from panel" -"XTLSdec" = "Xray core needs to be 1.7.5" -"Realitydec" = "Xray core needs to be 1.8.0 or higher." +"xtlsDesc" = "Xray core needs to be 1.7.5" +"realityDesc" = "Xray core needs to be 1.8.0 or higher." +"telegramDesc" = "use Telegram ID without @ or chat IDs ( you can get it here @userinfobot )" +"subscriptionDesc" = "you can find your sub link on Details, also ou can use the same name for several configurations" [pages.client] "add" = "Add Client" @@ -236,7 +238,7 @@ "telegramToken" = "Telegram Token" "telegramTokenDesc" = "Restart the panel to take effect." "telegramChatId" = "Telegram Admin Chat IDs" -"telegramChatIdDesc" = "Multiple Chat IDs separated by comma. Restart the panel to apply changes." +"telegramChatIdDesc" = "Multiple Chat IDs separated by comma. use @userinfobot to get your Chat IDs. Restart the panel to apply changes." "telegramNotifyTime" = "Telegram bot notification time" "telegramNotifyTimeDesc" = "Use Crontab timing format. Restart the panel to apply changes." "tgNotifyBackup" = "Database Backup" diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml index c7b17121..2103048f 100644 --- a/web/translation/translate.fa_IR.toml +++ b/web/translation/translate.fa_IR.toml @@ -165,8 +165,10 @@ "IPLimitlogDesc" = "گزارش سابقه ای پی (قبل از فعال کردن ورودی پس از غیرفعال شدن توسط محدودیت ای پی، باید گزارش را پاک کنید)" "IPLimitlogclear" = "پاک کردن گزارش ها" "setDefaultCert" = "استفاده از گواهی پنل" -"XTLSdec" = "هسته Xray باید 1.7.5 باشد" -"Realitydec" = "هسته Xray باید 1.8.0 و بالاتر باشد" +"xtlsDesc" = "هسته Xray باید 1.7.5 باشد" +"realityDesc" = "هسته Xray باید 1.8.0 و بالاتر باشد" +"telegramDesc" = "از آیدی تلگرام بدون @ یا آیدی چت استفاده کنید (می توانید آن را از اینجا دریافت کنید @userinfobot)" +"subscriptionDesc" = "می توانید ساب لینک خود را در جزئیات پیدا کنید، همچنین می توانید از همین نام برای چندین کانفیگ استفاده کنید" [pages.client] "add" = "کاربر جدید" @@ -234,7 +236,7 @@ "telegramToken" = "توکن تلگرام" "telegramTokenDesc" = "پنل را مجدداً راه اندازی کنید تا اعمال شود" "telegramChatId" = "آی دی تلگرام مدیریت" -"telegramChatIdDesc" = "با استفاده از کاما میتونید چند آی دی را از هم جدا کنید. پنل را مجدداً راه اندازی کنید تا اعمال شود" +"telegramChatIdDesc" = "از @userinfobot برای دریافت شناسه های چت خود استفاده کنید. با استفاده از کاما میتونید چند آی دی را از هم جدا کنید. پنل را مجدداً راه اندازی کنید تا اعمال شود" "telegramNotifyTime" = "مدت زمان نوتیفیکیشن ربات تلگرام" "telegramNotifyTimeDesc" = "از فرمت زمان بندی لینوکس استفاده کنید . پنل را مجدداً راه اندازی کنید تا اعمال شود" "tgNotifyBackup" = "پشتیبان گیری از پایگاه داده" diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml index 29e01476..9de8a1d8 100644 --- a/web/translation/translate.zh_Hans.toml +++ b/web/translation/translate.zh_Hans.toml @@ -165,8 +165,10 @@ "IPLimitlogDesc" = "IP 历史日志 （通过IP限制禁用inbound之前，需要清空日志）" "IPLimitlogclear" = "清除日志" "setDefaultCert" = "从面板设置证书" -"XTLSdec" = "Xray核心需要1.7.5" -"Realitydec" = "Xray核心需要1.8.0及以上版本" +"xtlsDesc" = "Xray核心需要1.7.5" +"realityDesc" = "Xray核心需要1.8.0及以上版本" +"telegramDesc" = "使用不带@的电报 ID 或聊天 ID（您可以在此处获取 @userinfobot）" +"subscriptionDesc" = "您可以在详细信息上找到您的子链接，也可以对多个配置使用相同的名称" [pages.client] "add" = "添加客户端" @@ -234,7 +236,7 @@ "telegramToken" = "电报机器人TOKEN" "telegramTokenDesc" = "重启面板生效" "telegramChatId" = "以逗号分隔的多个 chatID 重启面板生效" -"telegramChatIdDesc" = "重启面板生效" +"telegramChatIdDesc" = "多个聊天 ID 以逗号分隔。使用@userinfobot 获取您的聊天 ID。重新启动面板以应用更改。" "telegramNotifyTime" = "电报机器人通知时间" "telegramNotifyTimeDesc" = "采用Crontab定时格式,重启面板生效" "tgNotifyBackup" = "数据库备份"