bug fix - tgid #2214

v2.2.8
fix direct on json sub for ru
2024-04-03 17:02:31 +03:30 · 2024-04-02 23:50:15 +03:30 · 2024-04-02 23:43:16 +03:30 · 2024-04-02 23:41:06 +03:30 · 2024-04-02 20:06:40 +03:30 · 2024-04-02 19:54:55 +03:30
47 changed files with 3621 additions and 2533 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,6 +17,7 @@ jobs:
          - armv6
          - 386
          - armv5
+          - s390x
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout repository
@@ -40,6 +41,8 @@ jobs:
            sudo apt install gcc-i686-linux-gnu
          elif [ "${{ matrix.platform }}" == "armv5" ]; then
            sudo apt install gcc-arm-linux-gnueabi
+          elif [ "${{ matrix.platform }}" == "s390x" ]; then
+            sudo apt install gcc-s390x-linux-gnu
          fi

      - name: Build x-ui
@@ -65,6 +68,9 @@ jobs:
            export GOARCH=arm
            export GOARM=5
            export CC=arm-linux-gnueabi-gcc
+          elif [ "${{ matrix.platform }}" == "s390x" ]; then
+            export GOARCH=s390x
+            export CC=s390x-linux-gnu-gcc
          fi
          go build -o xui-release -v main.go
          
@@ -77,7 +83,7 @@ jobs:
          cd x-ui/bin
          
          # Download dependencies
-          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v1.8.9/"
+          Xray_URL="https://github.com/XTLS/Xray-core/releases/download/v1.8.10/"
          if [ "${{ matrix.platform }}" == "amd64" ]; then
            wget ${Xray_URL}Xray-linux-64.zip
            unzip Xray-linux-64.zip
@@ -102,6 +108,10 @@ jobs:
            wget ${Xray_URL}Xray-linux-arm32-v5.zip
            unzip Xray-linux-arm32-v5.zip
            rm -f Xray-linux-arm32-v5.zip
+          elif [ "${{ matrix.platform }}" == "s390x" ]; then
+            wget ${Xray_URL}Xray-linux-s390x.zip
+            unzip Xray-linux-s390x.zip
+            rm -f Xray-linux-s390x.zip
          fi
          rm -f geoip.dat geosite.dat
          wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
--- a/DockerInit.sh
+++ b/DockerInit.sh
@@ -27,7 +27,7 @@ case $1 in
 esac
 mkdir -p build/bin
 cd build/bin
-wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.9/Xray-linux-${ARCH}.zip"
+wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.10/Xray-linux-${ARCH}.zip"
 unzip "Xray-linux-${ARCH}.zip"
 rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat
 mv xray "xray-linux-${FNAME}"
--- a/README.es_ES.md
+++ b/README.es_ES.md
@@ -0,0 +1,474 @@
+# 3X-UI
+
+[Español](/README.es_ES.md) | [English](/README.md) | [Chinese](/README.zh.md)
+
+<p align="center"><a href="#"><img src="./media/3X-UI.png" alt="Image"></a></p>
+
+**Un Panel Web Avanzado • Construido sobre Xray Core**
+
+[![](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)](#)
+[![GO Version](https://img.shields.io/github/go-mod/go-version/mhsanaei/3x-ui.svg)](#)
+[![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)
+
+> **Descargo de responsabilidad:** Este proyecto es solo para aprendizaje personal y comunicación, por favor no lo uses con fines ilegales, por favor no lo uses en un entorno de producción
+
+**Si este proyecto te es útil, podrías considerar darle una**:star2:
+
+<p align="left"><a href="#"><img width="125" src="https://github.com/MHSanaei/3x-ui/assets/115543613/7aa895dd-048a-42e7-989b-afd41a74e2e1" alt="Image"></a></p>
+
+- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
+
+## Instalar y Actualizar
+
+```
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh)
+```
+
+## Instalar una Versión Personalizada
+
+Para instalar la versión deseada, agrega la versión al final del comando de instalación. Por ejemplo, ver `v2.2.8`:
+
+```
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.2.8
+```
+
+## Certificado SSL
+
+<details>
+  <summary>Haz clic para el Certificado SSL</summary>
+
+### Cloudflare
+
+El script de gestión tiene una aplicación de certificado SSL incorporada para Cloudflare. Para usar este script para colocar un certificado, necesitas lo siguiente:
+
+- Correo electrónico registrado en Cloudflare
+- Clave Global de API de Cloudflare
+- El nombre de dominio se ha resuelto en el servidor actual a través de Cloudflare
+
+**1:** Ejecuta el comando`x-ui`en la terminal, luego elige `Certificado SSL de Cloudflare`.
+
+
+### Certbot
+```
+apt-get install certbot -y
+certbot certonly --standalone --agree-tos --register-unsafely-without-email -d yourdomain.com
+certbot renew --dry-run
+```
+
+***Consejo:*** *Certbot también está integrado en el script de gestión. Puedes ejecutar el comando `x-ui` , luego elegir `Gestión de Certificados SSL`.*
+
+</details>
+
+## Instalación y Actualización Manual
+
+<details>
+  <summary>Haz clic para más detalles de la instalación manual</summary>
+
+#### Uso
+
+1. Para descargar la última versión del paquete comprimido directamente en tu servidor, ejecuta el siguiente comando:
+
+```sh
+ARCH=$(uname -m)
+case "${ARCH}" in
+  x86_64 | x64 | amd64) XUI_ARCH="amd64" ;;
+  i*86 | x86) XUI_ARCH="386" ;;
+  armv8* | armv8 | arm64 | aarch64) XUI_ARCH="arm64" ;;
+  armv7* | armv7) XUI_ARCH="armv7" ;;
+  armv6* | armv6) XUI_ARCH="armv6" ;;
+  armv5* | armv5) XUI_ARCH="armv5" ;;
+  *) XUI_ARCH="amd64" ;;
+esac
+
+
+wget https://github.com/MHSanaei/3x-ui/releases/latest/download/x-ui-linux-${XUI_ARCH}.tar.gz
+```
+
+2. Una vez que se haya descargado el paquete comprimido, ejecuta los siguientes comandos para instalar o actualizar x-ui:
+
+```sh
+ARCH=$(uname -m)
+case "${ARCH}" in
+  x86_64 | x64 | amd64) XUI_ARCH="amd64" ;;
+  i*86 | x86) XUI_ARCH="386" ;;
+  armv8* | armv8 | arm64 | aarch64) XUI_ARCH="arm64" ;;
+  armv7* | armv7) XUI_ARCH="armv7" ;;
+  armv6* | armv6) XUI_ARCH="armv6" ;;
+  armv5* | armv5) XUI_ARCH="armv5" ;;
+  *) XUI_ARCH="amd64" ;;
+esac
+
+cd /root/
+rm -rf x-ui/ /usr/local/x-ui/ /usr/bin/x-ui
+tar zxvf x-ui-linux-${XUI_ARCH}.tar.gz
+chmod +x x-ui/x-ui x-ui/bin/xray-linux-* x-ui/x-ui.sh
+cp x-ui/x-ui.sh /usr/bin/x-ui
+cp -f x-ui/x-ui.service /etc/systemd/system/
+mv x-ui/ /usr/local/
+systemctl daemon-reload
+systemctl enable x-ui
+systemctl restart x-ui
+```
+
+</details>
+
+## Instalar con Docker
+
+<details>
+  <summary>Haz clic para más detalles del Docker</summary>
+
+#### Uso
+
+1. Instala Docker:
+
+   ```sh
+   bash <(curl -sSL https://get.docker.com)
+   ```
+
+2. Clona el Repositorio del Proyecto:
+
+   ```sh
+   git clone https://github.com/MHSanaei/3x-ui.git
+   cd 3x-ui
+   ```
+
+3. Inicia el Servicio
+
+   ```sh
+   docker compose up -d
+   ```
+
+   O tambien
+
+   ```sh
+   docker run -itd \
+      -e XRAY_VMESS_AEAD_FORCED=false \
+      -v $PWD/db/:/etc/x-ui/ \
+      -v $PWD/cert/:/root/cert/ \
+      --network=host \
+      --restart=unless-stopped \
+      --name 3x-ui \
+      ghcr.io/mhsanaei/3x-ui:latest
+   ```
+
+actualizar a la última versión
+
+   ```sh
+    cd 3x-ui
+    docker compose down
+    docker compose pull 3x-ui
+    docker compose up -d
+   ```
+
+eliminar 3x-ui de docker
+
+   ```sh
+    docker stop 3x-ui
+    docker rm 3x-ui
+    cd --
+    rm -r 3x-ui
+   ```
+
+</details>
+
+
+## SO Recomendados
+
+- Ubuntu 20.04+
+- Debian 11+
+- CentOS 8+
+- Fedora 36+
+- Arch Linux
+- Manjaro
+- Armbian
+- AlmaLinux 9+
+- Rockylinux 9+
+
+## Arquitecturas y Dispositivos Compatibles
+
+<details>
+  <summary>Haz clic para detalles de arquitecturas y dispositivos compatibles</summary>
+
+Nuestra plataforma ofrece compatibilidad con una amplia gama de arquitecturas y dispositivos, garantizando flexibilidad en diversos entornos informáticos. A continuación se presentan las principales arquitecturas que admitimos:
+
+- **amd64**: Esta arquitectura predominante es la estándar para computadoras personales y servidores, y admite la mayoría de los sistemas operativos modernos sin problemas.
+
+- **x86 / i386**: Ampliamente adoptada en computadoras de escritorio y portátiles, esta arquitectura cuenta con un amplio soporte de numerosos sistemas operativos y aplicaciones, incluidos, entre otros, Windows, macOS y sistemas Linux.
+
+- **armv8 / arm64 / aarch64**: Diseñada para dispositivos móviles y embebidos contemporáneos, como teléfonos inteligentes y tabletas, esta arquitectura está ejemplificada por dispositivos como Raspberry Pi 4, Raspberry Pi 3, Raspberry Pi Zero 2/Zero 2 W, Orange Pi 3 LTS, entre otros.
+
+- **armv7 / arm / arm32**: Sirve como arquitectura para dispositivos móviles y embebidos más antiguos, y sigue siendo ampliamente utilizada en dispositivos como Orange Pi Zero LTS, Orange Pi PC Plus, Raspberry Pi 2, entre otros.
+
+- **armv6 / arm / arm32**: Orientada a dispositivos embebidos muy antiguos, esta arquitectura, aunque menos común, todavía se utiliza. Dispositivos como Raspberry Pi 1, Raspberry Pi Zero/Zero W, dependen de esta arquitectura.
+
+- **armv5 / arm / arm32**: Una arquitectura más antigua asociada principalmente con sistemas embebidos tempranos, es menos común hoy en día pero aún puede encontrarse en dispositivos heredados como versiones antiguas de Raspberry Pi y algunos teléfonos inteligentes más antiguos.
+</details>
+
+## Idiomas
+
+- Inglés
+- Farsi
+- Chino
+- Ruso
+- Vietnamita
+- Español
+- Indonesio
+- Ucraniano
+
+
+## Características
+
+- Monitoreo del Estado del Sistema
+- Búsqueda dentro de todas las reglas de entrada y clientes
+- Tema Oscuro/Claro
+- Soporta multiusuario y multiprotocolo
+- Soporta protocolos, incluyendo VMess, VLESS, Trojan, Shadowsocks, Dokodemo-door, Socks, HTTP, wireguard
+- Soporta Protocolos nativos XTLS, incluyendo RPRX-Direct, Visión, REALITY
+- Estadísticas de tráfico, límite de tráfico, límite de tiempo de vencimiento
+- Plantillas de configuración de Xray personalizables
+- Soporta acceso HTTPS al panel (dominio proporcionado por uno mismo + certificado SSL)
+- Soporta la solicitud y renovación automática de certificados SSL con un clic
+- Para elementos de configuración más avanzados, consulta el panel
+- Corrige rutas de API (la configuración del usuario se creará con la API)
+- Soporta cambiar las configuraciones por diferentes elementos proporcionados en el panel.
+- Soporta exportar/importar base de datos desde el panel
+
+
+## Configuraciones por Defecto
+
+<details>
+  <summary>Haz clic para detalles de las configuraciones por defecto</summary>
+
+  ### Información
+
+- **Puerto:** 2053
+- **Usuario y Contraseña:** Se generarán aleatoriamente si omites la modificación.
+- **Ruta de la Base de Datos:**
+  - /etc/x-ui/x-ui.db
+- **Ruta de Configuración de Xray:**
+  - /usr/local/x-ui/bin/config.json
+- **Ruta del Panel Web sin Implementar SSL:**
+  - http://ip:2053/panel
+  - http://domain:2053/panel
+- **Ruta del Panel Web con Implementación de SSL:**
+  - https://domain:2053/panel
+ 
+</details>
+
+## [Configuración WARP](https://gitlab.com/fscarmen/warp)
+
+<details>
+  <summary>Haz clic para detalles de la configuración WARP</summary>
+
+#### Uso
+
+Si deseas usar enrutamiento a WARP antes de la versión v2.1.0, sigue los pasos a continuación:
+
+**1.** Instala WARP en **Modo de Proxy SOCKS**:
+
+   ```sh
+   bash <(curl -sSL https://raw.githubusercontent.com/hamid-gh98/x-ui-scripts/main/install_warp_proxy.sh)
+   ```
+
+**2.** Si ya instalaste warp, puedes desinstalarlo usando el siguiente comando:
+
+   ```sh
+   warp u
+   ```
+
+**3.** Activa la configuración que necesites en el panel
+
+   Características de Configuración:
+
+   - Bloquear Anuncios
+   - Enrutar Google + Netflix + Spotify + OpenAI (ChatGPT) a WARP
+   - Corregir error 403 de Google
+
+</details>
+
+## Límite de IP
+
+<details>
+  <summary>Haz clic para más detalles del límite de IP</summary>
+
+#### Uso
+
+**Nota:** El Límite de IP no funcionará correctamente cuando se use IP Tunnel
+
+- Para versiones hasta `v1.6.1`:
+
+  - El límite de IP está integrado en el panel.
+
+- Para versiones `v1.7.0` y posteriores:
+
+  - Para que el Límite de IP funcione correctamente, necesitas instalar fail2ban y sus archivos requeridos siguiendo estos pasos:
+
+    1. Usa el comando `x-ui` dentro de la terminal.
+    2. Selecciona `Gestión de Límite de IP`.
+    3. Elige las opciones apropiadas según tus necesidades.
+   
+  - asegúrate de tener ./access.log en tu Configuración de Xray después de la v2.1.3 tenemos una opción para ello
+  
+  ```sh
+    "log": {
+      "access": "./access.log",
+      "dnsLog": false,
+      "loglevel": "warning"
+    },
+  ```
+
+</details>
+
+## Bot de Telegram
+
+<details>
+  <summary>Haz clic para más detalles del bot de Telegram</summary>
+
+#### Uso
+
+El panel web admite tráfico diario, inicio de sesión en el panel, copia de seguridad de la base de datos, estado del sistema, información del cliente y otras notificaciones y funciones a través del Bot de Telegram. Para usar el bot, debes establecer los parámetros relacionados con el bot en el panel, que incluyen:
+
+- Token de Telegram
+- ID de chat de administrador(es)
+- Hora de Notificación (en sintaxis cron)
+- Notificación de Fecha de Caducidad
+- Notificación de Capacidad de Tráfico
+- Copia de seguridad de la base de datos
+- Notificación de Carga de CPU
+
+
+**Sintaxis de referencia:**
+
+- `30 \* \* \* \* \*` - Notifica a los 30s de cada punto
+- `0 \*/10 \* \* \* \*` - Notifica en el primer segundo de cada 10 minutos
+- `@hourly` - Notificación por hora
+- `@daily` - Notificación diaria (00:00 de la mañana)
+- `@weekly` - Notificación semanal
+- `@every 8h` - Notifica cada 8 horas
+
+### Funcionalidades del Bot de Telegram
+
+- Reporte periódico
+- Notificación de inicio de sesión
+- Notificación de umbral de CPU
+- Umbral de Notificación para Fecha de Caducidad y Tráfico para informar con anticipación
+- Soporte para menú de reporte de cliente si el nombre de usuario de Telegram del cliente se agrega a las configuraciones de usuario
+- Soporte para reporte de tráfico de Telegram buscado con UUID (VMESS/VLESS) o Contraseña (TROJAN) - anónimamente
+- Bot basado en menú
+- Buscar cliente por correo electrónico (solo administrador)
+- Ver todas las Entradas
+- Ver estado del servidor
+- Ver clientes agotados
+- Recibir copia de seguridad bajo demanda y en informes periódicos
+- Bot multilingüe
+
+### Configuración del Bot de Telegram
+
+- Inicia [Botfather](https://t.me/BotFather) en tu cuenta de Telegram:
+    ![Botfather](./media/botfather.png)
+  
+- Crea un nuevo bot usando el comando /newbot: Te hará 2 preguntas, Un nombre y un nombre de usuario para tu bot. Ten en cuenta que el nombre de usuario debe terminar con la palabra "bot".
+    ![Create new bot](./media/newbot.png)
+
+- Inicia el bot que acabas de crear. Puedes encontrar el enlace a tu bot aquí.
+    ![token](./media/token.png)
+
+- Ingresa a tu panel y configura los ajustes del bot de Telegram como se muestra a continuación:
+![Panel Config](./media/panel-bot-config.png)
+
+Ingresa el token de tu bot en el campo de entrada número 3.
+Ingresa el ID de chat de usuario en el campo de entrada número 4. Las cuentas de Telegram con esta ID serán los administradores del bot. (Puedes ingresar más de uno, solo sepáralos con ,)
+
+- ¿Cómo obtener el ID de chat de Telegram? Usa este [bot](https://t.me/useridinfobot), Inicia el bot y te dará el ID de chat del usuario de Telegram.
+![User ID](./media/user-id.png)
+
+</details>
+
+## Rutas de API
+
+<details>
+  <summary>Haz clic para más detalles de las rutas de API</summary>
+
+#### Uso
+
+- `/login` con `POST` datos de usuario: `{username: '', password: ''}` para iniciar sesión
+- `/panel/api/inbounds` base para las siguientes acciones:
+
+| Método | Ruta                               | Acción                                                   |
+| :----: | ---------------------------------- | -------------------------------------------------------- |
+| `GET`  | `"/list"`                          | Obtener todas los Entradas                               |
+| `GET`  | `"/get/:id"`                       | Obtener Entrada con inbound.id                           |
+| `GET`  | `"/getClientTraffics/:email"`      | Obtener Tráficos del Cliente con email                   |
+| `GET`  | `"/createbackup"`                  | El bot de Telegram envía copia de seguridad a los admins |
+| `POST` | `"/add"`                           | Agregar Entrada                                          |
+| `POST` | `"/del/:id"`                       | Eliminar Entrada                                         |
+| `POST` | `"/update/:id"`                    | Actualizar Entrada                                       |
+| `POST` | `"/clientIps/:email"`              | Dirección IP del Cliente                                 |
+| `POST` | `"/clearClientIps/:email"`         | Borrar Dirección IP del Cliente                          |
+| `POST` | `"/addClient"`                     | Agregar Cliente a la Entrada                             |
+| `POST` | `"/:id/delClient/:clientId"`       | Eliminar Cliente por clientId\*                          |
+| `POST` | `"/updateClient/:clientId"`        | Actualizar Cliente por clientId\*                        |
+| `POST` | `"/:id/resetClientTraffic/:email"` | Restablecer Tráfico del Cliente                          |
+| `POST` | `"/resetAllTraffics"`              | Restablecer tráfico de todos las Entradas                |
+| `POST` | `"/resetAllClientTraffics/:id"`    | Restablecer tráfico de todos los clientes en una Entrada |
+| `POST` | `"/delDepletedClients/:id"`        | Eliminar clientes agotados de la entrada (-1: todos)     |
+| `POST` | `"/onlines"`                       | Obtener usuarios en línea (lista de correos electrónicos)|
+
+\*- El campo `clientId` debe llenarse por:
+
+- `client.id` para VMESS y VLESS
+- `client.password` para TROJAN
+- `client.email` para Shadowsocks
+
+
+- [Documentación de API](https://documenter.getpostman.com/view/16802678/2s9YkgD5jm)
+- [<img src="https://run.pstmn.io/button.svg" alt="Run In Postman" style="width: 128px; height: 32px;">](https://app.getpostman.com/run-collection/16802678-1a4c9270-ac77-40ed-959a-7aa56dc4a415?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D16802678-1a4c9270-ac77-40ed-959a-7aa56dc4a415%26entityType%3Dcollection%26workspaceId%3D2cd38c01-c851-4a15-a972-f181c23359d9)
+</details>
+
+## Variables de Entorno
+
+<details>
+  <summary>Haz clic para más detalles de las variables de entorno</summary>
+
+#### Uso
+
+| Variable       |                      Tipo                      | Predeterminado|
+| -------------- | :--------------------------------------------: | :------------ |
+| XUI_LOG_LEVEL  | `"debug"` \| `"info"` \| `"warn"` \| `"error"` | `"info"`      |
+| XUI_DEBUG      |                   `boolean`                    | `false`       |
+| XUI_BIN_FOLDER |                    `string`                    | `"bin"`       |
+| XUI_DB_FOLDER  |                    `string`                    | `"/etc/x-ui"` |
+| XUI_LOG_FOLDER |                    `string`                    | `"/var/log"`  |
+
+Ejemplo:
+
+```sh
+XUI_BIN_FOLDER="bin" XUI_DB_FOLDER="/etc/x-ui" go build main.go
+```
+
+</details>
+
+## Vista previa
+
+![1](./media/1.png)
+![2](./media/2.png)
+![3](./media/3.png)
+![4](./media/4.png)
+![5](./media/5.png)
+![6](./media/6.png)
+![7](./media/7.png)
+
+## Un agradecimiento especial a
+
+- [alireza0](https://github.com/alireza0/)
+
+## Reconocimientos
+
+- [Iran v2ray rules](https://github.com/chocolate4u/Iran-v2ray-rules) (Licencia: **GPL-3.0**): _Reglas de enrutamiento mejoradas de v2ray/xray y v2ray/xray-clients con dominios iraníes integrados y un enfoque en seguridad y bloqueo de anuncios._
+- [Vietnam Adblock rules](https://github.com/vuong2023/vn-v2ray-rules) (License: **GPL-3.0**): _Un dominio alojado en Vietnam y una lista de bloqueo con la máxima eficiencia para vietnamitas._
+
+## Estrellas a lo largo del tiempo
+
+[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg)](https://starchart.cc/MHSanaei/3x-ui)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # 3X-UI

-[English](/README.md) | [Chinese](/README.zh.md)
+[English](/README.md) | [Chinese](/README.zh.md) | [Español](/README.es_ES.md)

 <p align="center"><a href="#"><img src="./media/3X-UI.png" alt="Image"></a></p>

@@ -28,10 +28,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.

 ## Install Custom Version

-To install your desired version, add the version to the end of the installation command. e.g., ver `v2.2.6`:
+To install your desired version, add the version to the end of the installation command. e.g., ver `v2.2.8`:

 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.2.6
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.2.8
 ```

 ## SSL Certificate
@@ -79,6 +79,7 @@ case "${ARCH}" in
  armv7* | armv7) XUI_ARCH="armv7" ;;
  armv6* | armv6) XUI_ARCH="armv6" ;;
  armv5* | armv5) XUI_ARCH="armv5" ;;
+  s390x) echo 's390x' ;;
  *) XUI_ARCH="amd64" ;;
 esac

@@ -97,6 +98,7 @@ case "${ARCH}" in
  armv7* | armv7) XUI_ARCH="armv7" ;;
  armv6* | armv6) XUI_ARCH="armv6" ;;
  armv5* | armv5) XUI_ARCH="armv5" ;;
+  s390x) echo 's390x' ;;
  *) XUI_ARCH="amd64" ;;
 esac

@@ -184,7 +186,8 @@ remove 3x-ui from docker
 - Manjaro
 - Armbian
 - AlmaLinux 9+
- Rockylinux 9+
+- Rocky Linux 9+
+- Oracle Linux 8+

 ## Supported Architectures and Devices

@@ -204,6 +207,8 @@ Our platform offers compatibility with a diverse range of architectures and devi
 - **armv6 / arm / arm32**: Geared towards very old embedded devices, this architecture, while less prevalent, is still in use. Devices such as Raspberry Pi 1, Raspberry Pi Zero/Zero W, rely on this architecture.

 - **armv5 / arm / arm32**: An older architecture primarily associated with early embedded systems, it is less common today but may still be found in legacy devices like early Raspberry Pi versions and some older smartphones.
+
+- **s390x**: This architecture is commonly used in IBM mainframe computers and offers high performance and reliability for enterprise workloads.
 </details>

 ## Languages
--- a/README.zh.md
+++ b/README.zh.md
@@ -28,10 +28,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.

 ## 安装指定版本

-要安装所需的版本，请将该版本添加到安装命令的末尾。 e.g., ver `v2.2.6`:
+要安装所需的版本，请将该版本添加到安装命令的末尾。 e.g., ver `v2.2.8`:

 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.2.6
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.2.8
 ```

 ## SSL 认证
@@ -57,7 +57,7 @@ certbot certonly --standalone --agree-tos --register-unsafely-without-email -d y
 certbot renew --dry-run
 ```

-***Tip:*** *管理脚本具有Certbot。使用 `x-ui` 命令， 选择 `SSL Certificate Management`.*
+***Tip:*** *管理脚本具有 Certbot 。使用 `x-ui` 命令， 选择 `SSL Certificate Management`.*

 </details>

@@ -243,7 +243,7 @@ systemctl restart x-ui
  ### 信息

 - **端口：** 2053
- **用户名 & 密码：** It will be generated randomly if you skip modifying.
+- **用户名 & 密码：** 当您跳过设置时，此项会随机生成。
 - **数据库路径：**
  - /etc/x-ui/x-ui.db
 - **Xray 配置路径：**
@@ -392,7 +392,7 @@ Web 面板通过 Telegram Bot 支持每日流量、面板登录、数据库备

 #### 使用

- `/login` with `POST` user data: `{username: '', password: ''}` for login
+- `/login` 使用 `POST` 用户名称 & 密码： `{username: '', password: ''}` 登录
 - `/panel/api/inbounds` 以下操作的基础：

 | 方法   |  路径                               | 操作                                        |
--- a/config/version
+++ b/config/version
@@ -1 +1 @@
-2.2.6
+2.2.8
--- a/database/model/model.go
+++ b/database/model/model.go
@@ -91,7 +91,7 @@ type Client struct {
 	TotalGB    int64  `json:"totalGB" form:"totalGB"`
 	ExpiryTime int64  `json:"expiryTime" form:"expiryTime"`
 	Enable     bool   `json:"enable" form:"enable"`
-	TgID       string `json:"tgId" form:"tgId"`
+	TgID       int64  `json:"tgId" form:"tgId"`
 	SubID      string `json:"subId" form:"subId"`
 	Reset      int    `json:"reset" form:"reset"`
 }
--- a/go.mod
+++ b/go.mod
@@ -4,27 +4,27 @@ go 1.22.0

 require (
 	github.com/Calidity/gin-sessions v1.3.1
-	github.com/gin-contrib/gzip v0.0.6
+	github.com/gin-contrib/gzip v1.0.0
 	github.com/gin-gonic/gin v1.9.1
 	github.com/goccy/go-json v0.10.2
-	github.com/mymmrac/telego v0.29.1
+	github.com/mymmrac/telego v0.29.2
 	github.com/nicksnyder/go-i18n/v2 v2.4.0
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
-	github.com/pelletier/go-toml/v2 v2.1.1
+	github.com/pelletier/go-toml/v2 v2.2.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/shirou/gopsutil/v3 v3.24.2
+	github.com/shirou/gopsutil/v3 v3.24.3
 	github.com/valyala/fasthttp v1.52.0
-	github.com/xtls/xray-core v1.8.9
+	github.com/xtls/xray-core v1.8.10
 	go.uber.org/atomic v1.11.0
 	golang.org/x/text v0.14.0
 	google.golang.org/grpc v1.62.1
 	gorm.io/driver/sqlite v1.5.5
-	gorm.io/gorm v1.25.7
+	gorm.io/gorm v1.25.9
 )

 require (
 	github.com/andybalholm/brotli v1.1.0 // indirect
-	github.com/bytedance/sonic v1.11.2 // indirect
+	github.com/bytedance/sonic v1.11.3 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
@@ -53,18 +53,18 @@ require (
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-sqlite3 v1.14.22 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/onsi/ginkgo/v2 v2.16.0 // indirect
 	github.com/pires/go-proxyproto v0.7.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
-	github.com/quic-go/quic-go v0.41.0 // indirect
+	github.com/quic-go/quic-go v0.42.0 // indirect
 	github.com/refraction-networking/utls v1.6.3 // indirect
 	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
-	github.com/sagernet/sing v0.3.6 // indirect
+	github.com/sagernet/sing v0.3.8 // indirect
 	github.com/sagernet/sing-shadowsocks v0.2.6 // indirect
 	github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511 // indirect
 	github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb // indirect
@@ -72,7 +72,7 @@ require (
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fastjson v1.6.4 // indirect
@@ -82,7 +82,7 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/arch v0.6.0 // indirect
+	golang.org/x/arch v0.7.0 // indirect
 	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/mod v0.16.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -20,8 +20,8 @@ github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBT
 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
-github.com/bytedance/sonic v1.11.2 h1:ywfwo0a/3j9HR8wsYGWsIWl2mvRsI950HyoxiBERw5A=
-github.com/bytedance/sonic v1.11.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
+github.com/bytedance/sonic v1.11.3 h1:jRN+yEjakWh8aK5FzrciUHG8OFXK+4/KrAX/ysEtHAA=
+github.com/bytedance/sonic v1.11.3/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
@@ -33,7 +33,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
 github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -52,11 +51,10 @@ github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcP
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 h1:Arcl6UOIS/kgO2nW3A65HN+7CMjSDP/gofXL4CZt1V4=
 github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
-github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4=
-github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk=
+github.com/gin-contrib/gzip v1.0.0 h1:UKN586Po/92IDX6ie5CWLgMI81obiIp5nSP85T3wlTk=
+github.com/gin-contrib/gzip v1.0.0/go.mod h1:CtG7tQrPB3vIBo6Gat9FVUsis+1emjvQqd66ME5TdnE=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
@@ -66,21 +64,16 @@ github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ4
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
 github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4=
 github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
-github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -92,14 +85,12 @@ github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/
 github.com/golang/mock v1.7.0-rc.1/go.mod h1:s42URUywIqd+OcERslBJvOjepvNymP31m3q8d/GkuRs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -145,16 +136,12 @@ github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuV
 github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
@@ -162,9 +149,8 @@ github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed h1:036IscGBfJsFIg
 github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -177,8 +163,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mymmrac/telego v0.29.1 h1:nsNnK0mS18OL+unoDjDI6BVfafJBbT8Wtj7rCzEWoM8=
-github.com/mymmrac/telego v0.29.1/go.mod h1:ZLD1+L2TQRr97NPOCoN1V2w8y9kmFov33OfZ3qT8cF4=
+github.com/mymmrac/telego v0.29.2 h1:5+fQ/b8d8Ld6ihCJ0OLe1CwUdT3t1sIUl3RaSaSvRJs=
+github.com/mymmrac/telego v0.29.2/go.mod h1:BsKr+GF9BHqaVaLBwsZeDnfuJcJx2olWuDEtKm4zHMc=
 github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 github.com/nicksnyder/go-i18n/v2 v2.4.0 h1:3IcvPOAvnCKwNm0TB0dLDTuawWEj+ax/RERNC+diLMM=
@@ -192,12 +178,10 @@ github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWEr
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
-github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeBAsoHo=
+github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
 github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -208,21 +192,19 @@ github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k=
-github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA=
+github.com/quic-go/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM=
+github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
 github.com/refraction-networking/utls v1.6.3 h1:MFOfRN35sSx6K5AZNIoESsBuBxS2LCgRilRIdHb6fDc=
 github.com/refraction-networking/utls v1.6.3/go.mod h1:yil9+7qSl+gBwJqztoQseO6Pr3h62pQoY1lXiNR/FPs=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/sagernet/sing v0.3.6 h1:dsEdYLKBQlrxUfw1a92x0VdPvR1/BOxQ+HIMyaoEJsQ=
-github.com/sagernet/sing v0.3.6/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
+github.com/sagernet/sing v0.3.8 h1:gm4JKalPhydMYX2zFOTnnd4TXtM/16WFRqSjMepYQQk=
+github.com/sagernet/sing v0.3.8/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
 github.com/sagernet/sing-shadowsocks v0.2.6 h1:xr7ylAS/q1cQYS8oxKKajhuQcchd5VJJ4K4UZrrpp0s=
 github.com/sagernet/sing-shadowsocks v0.2.6/go.mod h1:j2YZBIpWIuElPFL/5sJAj470bcn/3QQ5lxZUNKLDNAM=
 github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511 h1:KanIMPX0QdEdB4R3CiimCAbxFrhB3j7h0/OvpYGVQa8=
@@ -230,8 +212,8 @@ github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511/go.mod h1:sM7Mt7uEo
 github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIOUX+osiMraVgIrMR27uMXnRJWGm1+GL8/63U=
 github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb/go.mod h1:bR6DqgcAl1zTcOX8/pE2Qkj9XO00eCNqmKb7lXP8EAg=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y=
-github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk=
+github.com/shirou/gopsutil/v3 v3.24.3 h1:eoUGJSmdfLzJ3mxIhmOAhgKEKgQkeOwKpz1NbhVnuPE=
+github.com/shirou/gopsutil/v3 v3.24.3/go.mod h1:JpND7O217xa72ewWz9zN2eIIkPWsDN/3pl0H8Qt0uwg=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -263,6 +245,7 @@ github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -280,10 +263,8 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F
 github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
-github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
-github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
+github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e h1:5QefA066A1tF8gHIiADmOVOV5LS43gt3ONnlEl3xkwI=
 github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e/go.mod h1:5t19P9LBIrNamL6AcMQOncg/r10y3Pc01AbHeMhwlpU=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
@@ -301,8 +282,8 @@ github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1Y
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/xtls/reality v0.0.0-20231112171332-de1173cf2b19 h1:capMfFYRgH9BCLd6A3Er/cH3A9Nz3CU2KwxwOQZIePI=
 github.com/xtls/reality v0.0.0-20231112171332-de1173cf2b19/go.mod h1:dm4y/1QwzjGaK17ofi0Vs6NpKAHegZky8qk6J2JJZAE=
-github.com/xtls/xray-core v1.8.9 h1:wefcON0behu4DoQvCKJYZKsJlSvNhyq2I7vC2fxLFcY=
-github.com/xtls/xray-core v1.8.9/go.mod h1:XDE4f422qJKAU3hNDSNZyWrOHvn9kF8UHVdyOzU38rc=
+github.com/xtls/xray-core v1.8.10 h1:qxae6gSteonpPI7EZyOyqw5HmRVRzmU07qs0l1GNqz4=
+github.com/xtls/xray-core v1.8.10/go.mod h1:Mc1t+kLBPE5a1EpsUNKjMLviGz3Y0XywxeEraJZAMlI=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
@@ -314,13 +295,12 @@ go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc=
-golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
+golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
 golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -339,7 +319,6 @@ golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
 golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -360,25 +339,17 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220804214406-8e32c043e418/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -386,7 +357,6 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -417,15 +387,11 @@ google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
 google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -433,13 +399,12 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/sqlite v1.5.5 h1:7MDMtUZhV065SilG62E0MquljeArQZNfJnjd9i9gx3E=
 gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATavE=
-gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A=
-gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.9 h1:wct0gxZIELDk8+ZqF/MVnHLkA1rvYlBWUMv2EdsK1g8=
+gorm.io/gorm v1.25.9/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
 gvisor.dev/gvisor v0.0.0-20231104011432-48a6d7d5bd0b h1:yqkg3pTifuKukuWanp8spDsL4irJkHF5WI0J47hU87o=
 gvisor.dev/gvisor v0.0.0-20231104011432-48a6d7d5bd0b/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk=
--- a/install.sh
+++ b/install.sh
@@ -23,7 +23,7 @@ else
 fi
 echo "The OS release is: $release"

-arch3xui() {
+arch() {
    case "$(uname -m)" in
    x86_64 | x64 | amd64) echo 'amd64' ;;
    i*86 | x86) echo '386' ;;
@@ -31,16 +31,23 @@ arch3xui() {
    armv7* | armv7 | arm) echo 'armv7' ;;
    armv6* | armv6) echo 'armv6' ;;
    armv5* | armv5) echo 'armv5' ;;
+    s390x) echo 's390x' ;;
    *) echo -e "${green}Unsupported CPU architecture! ${plain}" && rm -f install.sh && exit 1 ;;
    esac
 }

-echo "arch: $(arch3xui)"
+echo "arch: $(arch)"

 os_version=""
 os_version=$(grep -i version_id /etc/os-release | cut -d \" -f2 | cut -d . -f1)

-if [[ "${release}" == "centos" ]]; then
+if [[ "${release}" == "arch" ]]; then
+    echo "Your OS is Arch Linux"
+elif [[ "${release}" == "manjaro" ]]; then
+    echo "Your OS is Manjaro"
+elif [[ "${release}" == "armbian" ]]; then
+    echo "Your OS is Armbian"
+elif [[ "${release}" == "centos" ]]; then
    if [[ ${os_version} -lt 8 ]]; then
        echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
    fi
@@ -48,40 +55,46 @@ elif [[ "${release}" == "ubuntu" ]]; then
    if [[ ${os_version} -lt 20 ]]; then
        echo -e "${red} Please use Ubuntu 20 or higher version!${plain}\n" && exit 1
    fi
-
 elif [[ "${release}" == "fedora" ]]; then
    if [[ ${os_version} -lt 36 ]]; then
        echo -e "${red} Please use Fedora 36 or higher version!${plain}\n" && exit 1
    fi
-
 elif [[ "${release}" == "debian" ]]; then
    if [[ ${os_version} -lt 11 ]]; then
        echo -e "${red} Please use Debian 11 or higher ${plain}\n" && exit 1
    fi
-
 elif [[ "${release}" == "almalinux" ]]; then
    if [[ ${os_version} -lt 9 ]]; then
        echo -e "${red} Please use AlmaLinux 9 or higher ${plain}\n" && exit 1
    fi
-
 elif [[ "${release}" == "rocky" ]]; then
    if [[ ${os_version} -lt 9 ]]; then
-        echo -e "${red} Please use RockyLinux 9 or higher ${plain}\n" && exit 1
+        echo -e "${red} Please use Rocky Linux 9 or higher ${plain}\n" && exit 1
+    fi
+elif [[ "${release}" == "oracle" ]]; then
+    if [[ ${os_version} -lt 8 ]]; then
+        echo -e "${red} Please use Oracle Linux 8 or higher ${plain}\n" && exit 1
    fi
-elif [[ "${release}" == "arch" ]]; then
-    echo "Your OS is ArchLinux"
-elif [[ "${release}" == "manjaro" ]]; then
-    echo "Your OS is Manjaro"
-elif [[ "${release}" == "armbian" ]]; then
-    echo "Your OS is Armbian"
-
 else
-    echo -e "${red}Failed to check the OS version, please contact the author!${plain}" && exit 1
+    echo -e "${red}Your operating system is not supported by this script.${plain}\n"
+    echo "Please ensure you are using one of the following supported operating systems:"
+    echo "- Ubuntu 20.04+"
+    echo "- Debian 11+"
+    echo "- CentOS 8+"
+    echo "- Fedora 36+"
+    echo "- Arch Linux"
+    echo "- Manjaro"
+    echo "- Armbian"
+    echo "- AlmaLinux 9+"
+    echo "- Rocky Linux 9+"
+    echo "- Oracle Linux 8+"
+    exit 1
+
 fi

 install_base() {
    case "${release}" in
-    centos | almalinux | rocky)
+    centos | almalinux | rocky | oracle)
        yum -y update && yum install -y -q wget curl tar tzdata
        ;;
    fedora)
@@ -141,16 +154,16 @@ install_x-ui() {
            exit 1
        fi
        echo -e "Got x-ui latest version: ${last_version}, beginning the installation..."
-        wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch3xui).tar.gz https://github.com/MHSanaei/3x-ui/releases/download/${last_version}/x-ui-linux-$(arch3xui).tar.gz
+        wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch).tar.gz https://github.com/MHSanaei/3x-ui/releases/download/${last_version}/x-ui-linux-$(arch).tar.gz
        if [[ $? -ne 0 ]]; then
            echo -e "${red}Downloading x-ui failed, please be sure that your server can access Github ${plain}"
            exit 1
        fi
    else
        last_version=$1
-        url="https://github.com/MHSanaei/3x-ui/releases/download/${last_version}/x-ui-linux-$(arch3xui).tar.gz"
+        url="https://github.com/MHSanaei/3x-ui/releases/download/${last_version}/x-ui-linux-$(arch).tar.gz"
        echo -e "Beginning to install x-ui $1"
-        wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch3xui).tar.gz ${url}
+        wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch).tar.gz ${url}
        if [[ $? -ne 0 ]]; then
            echo -e "${red}Download x-ui $1 failed,please check the version exists ${plain}"
            exit 1
@@ -162,18 +175,18 @@ install_x-ui() {
        rm /usr/local/x-ui/ -rf
    fi

-    tar zxvf x-ui-linux-$(arch3xui).tar.gz
-    rm x-ui-linux-$(arch3xui).tar.gz -f
+    tar zxvf x-ui-linux-$(arch).tar.gz
+    rm x-ui-linux-$(arch).tar.gz -f
    cd x-ui
    chmod +x x-ui

    # Check the system's architecture and rename the file accordingly
-    if [[ $(arch3xui) == "armv5" || $(arch3xui) == "armv6" || $(arch3xui) == "armv7" ]]; then
-        mv bin/xray-linux-$(arch3xui) bin/xray-linux-arm
+    if [[ $(arch) == "armv5" || $(arch) == "armv6" || $(arch) == "armv7" ]]; then
+        mv bin/xray-linux-$(arch) bin/xray-linux-arm
        chmod +x bin/xray-linux-arm
    fi

-    chmod +x x-ui bin/xray-linux-$(arch3xui)
+    chmod +x x-ui bin/xray-linux-$(arch)
    cp -f x-ui.service /etc/systemd/system/
    wget --no-check-certificate -O /usr/bin/x-ui https://raw.githubusercontent.com/MHSanaei/3x-ui/main/x-ui.sh
    chmod +x /usr/local/x-ui/x-ui.sh
--- a/media/3X-UI.png
+++ b/media/3X-UI.png
--- a/sub/subJsonService.go
+++ b/sub/subJsonService.go
@@ -44,7 +44,6 @@ func NewSubJsonService(fragment string, mux string, rules string, subService *Su
 		defaultRules, _ := routing["rules"].([]interface{})
 		json.Unmarshal([]byte(rules), &newRules)
 		defaultRules = append(newRules, defaultRules...)
-		fmt.Printf("routing: %#v\n\nRules: %#v\n\n", routing, defaultRules)
 		routing["rules"] = defaultRules
 		configJson["routing"] = routing
 	}
@@ -128,7 +127,12 @@ func (s *SubJsonService) GetJson(subId string, host string) (string, string, err
 	}

 	// Combile outbounds
-	finalJson, _ := json.MarshalIndent(configArray, "", "  ")
+	var finalJson []byte
+	if len(configArray) == 1 {
+		finalJson, _ = json.MarshalIndent(configArray[0], "", "  ")
+	} else {
+		finalJson, _ = json.MarshalIndent(configArray, "", "  ")
+	}

 	header = fmt.Sprintf("upload=%d; download=%d; total=%d; expire=%d", traffic.Up, traffic.Down, traffic.Total, traffic.ExpiryTime/1000)
 	return string(finalJson), header, nil
@@ -187,6 +191,7 @@ func (s *SubJsonService) getConfig(inbound *model.Inbound, client model.Client,
 		}
 		newConfigJson["outbounds"] = newOutbounds
 		newConfigJson["remarks"] = s.SubService.genRemark(inbound, client.Email, extPrxy["remark"].(string))
+
 		newConfig, _ := json.MarshalIndent(newConfigJson, "", "  ")
 		newJsonArray = append(newJsonArray, newConfig)
 	}
@@ -216,6 +221,8 @@ func (s *SubJsonService) streamData(stream string) map[string]interface{} {
 		streamSettings["tcpSettings"] = s.removeAcceptProxy(streamSettings["tcpSettings"])
 	case "ws":
 		streamSettings["wsSettings"] = s.removeAcceptProxy(streamSettings["wsSettings"])
+	case "httpupgrade":
+		streamSettings["httpupgradeSettings"] = s.removeAcceptProxy(streamSettings["httpupgradeSettings"])
 	}

 	return streamSettings
--- a/sub/subService.go
+++ b/sub/subService.go
@@ -45,6 +45,10 @@ func (s *SubService) GetSubs(subId string, host string) ([]string, string, error
 		return nil, "", err
 	}

+	if len(inbounds) == 0 {
+		return nil, "", common.NewError("No inbounds found with ", subId)
+	}
+
 	s.datepicker, err = s.settingService.GetDatepicker()
 	if err != nil {
 		s.datepicker = "gregorian"
@@ -198,8 +202,13 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
 	case "ws":
 		ws, _ := stream["wsSettings"].(map[string]interface{})
 		obj["path"] = ws["path"].(string)
-		headers, _ := ws["headers"].(map[string]interface{})
-		obj["host"] = searchHost(headers)
+		obj["host"] = ws["host"].(string)
+		if headers, ok := ws["headers"].(map[string]interface{}); ok {
+			hostFromHeaders := searchHost(headers)
+			if hostFromHeaders != "" {
+				obj["host"] = hostFromHeaders
+			}
+		}
 	case "http":
 		obj["net"] = "h2"
 		http, _ := stream["httpSettings"].(map[string]interface{})
@@ -222,8 +231,13 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
 		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{})
 		obj["path"] = httpupgrade["path"].(string)
 		obj["host"] = httpupgrade["host"].(string)
+		if headers, ok := httpupgrade["headers"].(map[string]interface{}); ok {
+			hostFromHeaders := searchHost(headers)
+			if hostFromHeaders != "" {
+				obj["host"] = hostFromHeaders
+			}
+		}
 	}
-
 	security, _ := stream["security"].(string)
 	obj["tls"] = security
 	if security == "tls" {
@@ -338,8 +352,14 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 	case "ws":
 		ws, _ := stream["wsSettings"].(map[string]interface{})
 		params["path"] = ws["path"].(string)
+		params["host"] = ws["host"].(string)
 		headers, _ := ws["headers"].(map[string]interface{})
-		params["host"] = searchHost(headers)
+		if headers != nil {
+			hostFromHeaders := searchHost(headers)
+			if hostFromHeaders != "" {
+				params["host"] = hostFromHeaders
+			}
+		}
 	case "http":
 		http, _ := stream["httpSettings"].(map[string]interface{})
 		params["path"] = http["path"].(string)
@@ -353,7 +373,7 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 	case "grpc":
 		grpc, _ := stream["grpcSettings"].(map[string]interface{})
 		params["serviceName"] = grpc["serviceName"].(string)
-		params["authority"] = grpc["authority"].(string)
+		params["authority"], _ = grpc["authority"].(string)
 		if grpc["multiMode"].(bool) {
 			params["mode"] = "multi"
 		}
@@ -361,8 +381,14 @@ func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
 		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{})
 		params["path"] = httpupgrade["path"].(string)
 		params["host"] = httpupgrade["host"].(string)
+		headers, _ := httpupgrade["headers"].(map[string]interface{})
+		if headers != nil {
+			hostFromHeaders := searchHost(headers)
+			if hostFromHeaders != "" {
+				params["host"] = hostFromHeaders
+			}
+		}
 	}
-
 	security, _ := stream["security"].(string)
 	if security == "tls" {
 		params["security"] = "tls"
@@ -555,8 +581,14 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 	case "ws":
 		ws, _ := stream["wsSettings"].(map[string]interface{})
 		params["path"] = ws["path"].(string)
+		params["host"] = ws["host"].(string)
 		headers, _ := ws["headers"].(map[string]interface{})
-		params["host"] = searchHost(headers)
+		if headers != nil {
+			hostFromHeaders := searchHost(headers)
+			if hostFromHeaders != "" {
+				params["host"] = hostFromHeaders
+			}
+		}
 	case "http":
 		http, _ := stream["httpSettings"].(map[string]interface{})
 		params["path"] = http["path"].(string)
@@ -570,7 +602,7 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 	case "grpc":
 		grpc, _ := stream["grpcSettings"].(map[string]interface{})
 		params["serviceName"] = grpc["serviceName"].(string)
-		params["authority"] = grpc["authority"].(string)
+		params["authority"], _ = grpc["authority"].(string)
 		if grpc["multiMode"].(bool) {
 			params["mode"] = "multi"
 		}
@@ -578,8 +610,14 @@ func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string
 		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{})
 		params["path"] = httpupgrade["path"].(string)
 		params["host"] = httpupgrade["host"].(string)
+		headers, _ := httpupgrade["headers"].(map[string]interface{})
+		if headers != nil {
+			hostFromHeaders := searchHost(headers)
+			if hostFromHeaders != "" {
+				params["host"] = hostFromHeaders
+			}
+		}
 	}
-
 	security, _ := stream["security"].(string)
 	if security == "tls" {
 		params["security"] = "tls"
@@ -773,8 +811,14 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
 	case "ws":
 		ws, _ := stream["wsSettings"].(map[string]interface{})
 		params["path"] = ws["path"].(string)
+		params["host"] = ws["host"].(string)
 		headers, _ := ws["headers"].(map[string]interface{})
-		params["host"] = searchHost(headers)
+		if headers != nil {
+			hostFromHeaders := searchHost(headers)
+			if hostFromHeaders != "" {
+				params["host"] = hostFromHeaders
+			}
+		}
 	case "http":
 		http, _ := stream["httpSettings"].(map[string]interface{})
 		params["path"] = http["path"].(string)
@@ -788,7 +832,7 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
 	case "grpc":
 		grpc, _ := stream["grpcSettings"].(map[string]interface{})
 		params["serviceName"] = grpc["serviceName"].(string)
-		params["authority"] = grpc["authority"].(string)
+		params["authority"], _ = grpc["authority"].(string)
 		if grpc["multiMode"].(bool) {
 			params["mode"] = "multi"
 		}
@@ -796,6 +840,13 @@ func (s *SubService) genShadowsocksLink(inbound *model.Inbound, email string) st
 		httpupgrade, _ := stream["httpupgradeSettings"].(map[string]interface{})
 		params["path"] = httpupgrade["path"].(string)
 		params["host"] = httpupgrade["host"].(string)
+		headers, _ := httpupgrade["headers"].(map[string]interface{})
+		if headers != nil {
+			hostFromHeaders := searchHost(headers)
+			if hostFromHeaders != "" {
+				params["host"] = hostFromHeaders
+			}
+		}
 	}

 	security, _ := stream["security"].(string)
--- a/web/assets/css/custom.css
+++ b/web/assets/css/custom.css
@@ -36,6 +36,43 @@
    --dark-color-codemirror-line-selection: rgba(0, 135, 113, 0.3);
    --dark-color-login-background: var(--dark-color-background);
    --dark-color-login-wave: var(--dark-color-surface-200);
+    --dark-color-tooltip: rgba(61, 76, 104, 0.9);
+}
+
+html[data-theme-animations='off'] {
+    .ant-menu,
+    .ant-layout-sider,
+    .ant-card,
+    .ant-tag,
+    .ant-progress-circle > *,
+    .ant-input,
+    .ant-table-row-expand-icon,
+    .ant-switch,
+    .ant-table-thead > tr > th,
+    .ant-select-selection,
+    .ant-btn,
+    .ant-input-number,
+    .ant-input-group-addon,
+    .ant-checkbox-inner,
+    .ant-progress-bg, .ant-progress-success-bg,
+    .ant-radio-button-wrapper:not(:first-child):before,
+    .ant-radio-button-wrapper,
+    #login {
+        transition: border 0s, background 0s !important;
+    }
+
+    .ant-menu-item, .ant-menu-submenu-title,
+    .ant-alert-close-icon .anticon-close,
+    .ant-tabs-nav .ant-tabs-tab,
+    .ant-input-number-input,
+    .ant-collapse>.ant-collapse-item>.ant-collapse-header,
+    .Line-Hover {
+        transition: color 0s !important;
+    }
+
+    .wave-btn-bg {
+        transition: width 0s !important;
+    }
 }

 html[data-theme='ultra-dark'] {
@@ -69,6 +106,7 @@ html[data-theme='ultra-dark'] {
    --dark-color-codemirror-line-selection: rgba(85, 85, 85, 0.4);
    --dark-color-login-background: #0a2227;
    --dark-color-login-wave: #0f2d32;
+    --dark-color-tooltip: rgba(88, 93, 100, 0.9);
    .ant-dropdown-menu-dark {
        background-color: var(--dark-color-surface-500);
    }
@@ -143,10 +181,13 @@ html {
 style attribute {
    text-align: center;
 }
-.ant-table-tbody > tr > td,
+
 .ant-table-thead > tr > th {
+    padding: 16px 8px;
+}
+
+.ant-table-tbody > tr > td {
    padding: 12px 8px;
-    overflow-wrap: break-word;
 }
 .ant-table-thead > tr > th {
    color: rgba(0, 0, 0, 0.85);
@@ -155,10 +196,6 @@ style attribute {
    border-bottom: 1px solid #e8e8e8;
    transition: background 0.3s ease;
 }
-.ant-table-row-cell-break-word {
-    word-wrap: break-word;
-    word-break: break-word;
-}

 .ant-table table {
    width: 100%;
@@ -215,7 +252,7 @@ style attribute {
    .ant-layout-sider {
        display: none;
    }
-    .ant-card {
+    .ant-card, .ant-alert-error {
        margin: 0.5rem;
    }
    .ant-tabs {
@@ -347,6 +384,9 @@ style attribute {
    .ant-tabs {
        padding: 2rem;
    }
+    .ant-alert-error {
+        margin-inline: 0.3rem;
+    }
 }

 .fade-in-enter,
@@ -649,11 +689,17 @@ style attribute {
 .dark .ant-modal-footer,
 .dark .ant-collapse-content,
 .dark .ant-calendar-footer,
+.dark .ant-divider-horizontal.ant-divider-with-text-left:before,
+.dark .ant-divider-horizontal.ant-divider-with-text-left:after,
 .dark .ant-divider-horizontal.ant-divider-with-text-center:before,
 .dark .ant-divider-horizontal.ant-divider-with-text-center:after {
    border-top-color: var(--dark-color-surface-300);
 }

+.ant-divider-horizontal.ant-divider-with-text-left:before {
+    width: 10%;
+}
+
 .dark .ant-progress-text,
 .dark .ant-card-head,
 .dark .ant-form,
@@ -712,7 +758,6 @@ style attribute {
 .dark .ant-select-dropdown,
 .dark .ant-select-dropdown li,
 .dark .ant-select-dropdown-menu-item,
-.dark .ant-divider:not(.ant-divider-with-text-center),
 .dark .client-table-header,
 .dark .ant-select-selection--multiple .ant-select-selection__choice,
 .dark .ant-calendar-time-picker-inner {
@@ -948,10 +993,15 @@ style attribute {
    background-color: #fff;
 }

+.ant-checkbox-wrapper,
+.ant-input-group-addon,
+.ant-tabs-tab,
+.ant-input::placeholder,
+.ant-collapse-header,
 .ant-menu,
 .ant-radio-button-wrapper {
-    user-select: none;
    -webkit-user-select: none;
+    user-select: none;
 }

 .ant-calendar-date,
@@ -1065,6 +1115,7 @@ li.ant-select-dropdown-menu-item:empty:after {
    color: rgba(255, 255, 255, 0.35);
 }

+.dark .ant-divider:not(.ant-divider-with-text-center, .ant-divider-with-text-left, .ant-divider-with-text-right),
 .ant-dropdown-menu-dark,
 .dark .ant-calendar-year-panel-year:hover,
 .dark .ant-calendar-month-panel-month:hover,
@@ -1216,15 +1267,39 @@ li.ant-select-dropdown-menu-item:empty:after {
    overflow-y: auto;
 }

-.qr-bg {
+.qr-cv {
    width: 100%;
    height: 100%;
-    background-color: #fff;
+    opacity: 0.8;
+    transition: all 0.3s;
+}
+
+.qr-cv:hover {
+    opacity: 1;
+}
+
+.qr-cv:active {
+    transform: scale(0.98);
+    transition: all 0.1s;
+}
+
+.dark .qr-cv {
+    filter: invert(1);
+}
+
+.qr-bg {
+    background-color: #ffffff;
    display: flex;
    justify-content: center;
    align-content: center;
-    padding: 0.5rem;
+    padding: 0.8rem;
    border-radius: 1rem;
+    border: solid 1px #e8e8e8;
+}
+
+.dark .qr-bg {
+    background-color: var(--dark-color-surface-700);
+    border-color: var(--dark-color-surface-300);
 }

 .ant-input-group-addon:not(:first-child):not(:last-child) {
@@ -1272,7 +1347,122 @@ b, strong {
    height: 20px;
 }

-.ant-menu-theme-switch:hover {
+.ant-menu-theme-switch, .ant-menu-theme-switch:hover {
    background-color: transparent !important;
    cursor: default !important;
 }
+
+.dark .ant-tooltip-inner,
+.dark .ant-tooltip-arrow:before {
+    background-color: var(--dark-color-tooltip);
+}
+
+.ant-select-sm .ant-select-selection__rendered {
+    margin-left: 10px;
+}
+
+.ant-collapse {
+    -moz-animation: collfade 0.3s ease;
+    -webkit-animation: 0.3s collfade 0.3s ease;
+    animation:  collfade 0.3s ease;
+}
+
+@-webkit-keyframes collfade {
+    0% {
+        transform: scaleY(.8);
+        transform-origin: 0% 0%;
+        opacity: 0;
+    }
+
+    100% {
+        transform: scaleY(1);
+        transform-origin: 0% 0%;
+        opacity: 1;
+    }
+}
+
+@keyframes collfade {
+    0% {
+        transform: scaleY(.8);
+        transform-origin: 0% 0%;
+        opacity: 0;
+    }
+
+    100% {
+        transform: scaleY(1);
+        transform-origin: 0% 0%;
+        opacity: 1;
+    }
+}
+
+.ant-table-tbody>tr>td {
+	border-color: #f0f0f0;
+}
+
+.ant-table-row-expand-icon {
+    vertical-align: middle;
+    margin-inline-end: 8px;
+    position: relative;
+    transform: scale(0.9411764705882353);
+}
+
+.ant-table-row-collapsed::before {
+    transform: rotate(-180deg);
+    top: 7px;
+    inset-inline-end: 3px;
+    inset-inline-start: 3px;
+    height: 1px;
+    position: absolute;
+    background: currentcolor;
+    transition: transform 0.3s ease-out;
+    content: "";
+}
+
+.ant-table-row-collapsed::after {
+    transform: rotate(0deg);
+    top: 3px;
+    bottom: 3px;
+    inset-inline-start: 7px;
+    width: 1px;
+    position: absolute;
+    background: currentcolor;
+    transition: transform 0.3s ease-out;
+    content: "";
+}
+
+.ant-table-row-expanded::before {
+    top: 7px;
+    inset-inline-end: 3px;
+    inset-inline-start: 3px;
+    height: 1px;
+    position: absolute;
+    background: currentcolor;
+    transition: transform 0.3s ease-out;
+    content: "";
+}
+
+.ant-table-row-expanded::after {
+    top: 3px;
+    bottom: 3px;
+    inset-inline-start: 7px;
+    width: 1px;
+    transform: rotate(90deg);
+    position: absolute;
+    background: currentcolor;
+    transition: transform 0.3s ease-out;
+    content: "";
+}
+
+.ant-menu-item:active, .ant-menu-submenu-title:active {
+    background: transparent;
+}
+
+.ant-menu-theme-switch.ant-menu-item .ant-switch:not(.ant-switch-disabled):active:after, .ant-switch:not(.ant-switch-disabled):active:before {
+    width: 16px;
+}
+
+.dark .ant-select-disabled .ant-select-selection {
+    background: var(--dark-color-surface-100);
+    border-color: var(--dark-color-surface-200);
+    color: rgba(255, 255, 255, 0.25);
+}
--- a/web/assets/js/model/outbound.js
+++ b/web/assets/js/model/outbound.js
@@ -194,6 +194,7 @@ class WsStreamSettings extends CommonClass {
    static fromJson(json={}) {
        return new WsStreamSettings(
            json.path,
+            json.host,
            json.headers && !ObjectUtil.isEmpty(json.headers.Host) ? json.headers.Host : '',
        );
    }
@@ -201,6 +202,7 @@ class WsStreamSettings extends CommonClass {
    toJson() {
        return {
            path: this.path,
+            host: this.host,
            headers: ObjectUtil.isEmpty(this.host) ? undefined : {Host: this.host},
        };
    }
@@ -288,6 +290,7 @@ class HttpUpgradeStreamSettings extends CommonClass {
        return new HttpUpgradeStreamSettings(
            json.path,
            json.Host,
+            json.headers && !ObjectUtil.isEmpty(json.headers.Host) ? json.headers.Host : '',
        );
    }

@@ -295,6 +298,7 @@ class HttpUpgradeStreamSettings extends CommonClass {
        return {
            path: this.path,
            host: this.host,
+            headers: ObjectUtil.isEmpty(this.host) ? undefined : {Host: this.host},
        };
    }
 }
@@ -645,7 +649,7 @@ class Outbound extends CommonClass {
                json.path,
                json.type ? json.type : 'none');
        } else if (network === 'grpc') {
-            stream.grpc = new GrpcStreamSettings(json.path, json.type == 'multi');
+            stream.grpc = new GrpcStreamSettings(json.path, json.authority, json.type == 'multi');
        } else if (network === 'httpupgrade') {
            stream.httpupgrade = new HttpUpgradeStreamSettings(json.path,json.host);
        }
@@ -658,20 +662,22 @@ class Outbound extends CommonClass {
                json.allowInsecure);
        }

-        return new Outbound(json.ps, Protocols.VMess, new Outbound.VmessSettings(json.add, json.port, json.id), stream);
+        const port = json.port * 1;
+
+        return new Outbound(json.ps, Protocols.VMess, new Outbound.VmessSettings(json.add, port, json.id), stream);
    }

    static fromParamLink(link){
        const url = new URL(link);
-        let type = url.searchParams.get('type');
+        let type = url.searchParams.get('type') ?? 'tcp';
        let security = url.searchParams.get('security') ?? 'none';
        let stream = new StreamSettings(type, security);

-        let headerType = url.searchParams.get('headerType');
-        let host = url.searchParams.get('host');
-        let path = url.searchParams.get('path');
+        let headerType = url.searchParams.get('headerType') ?? undefined;
+        let host = url.searchParams.get('host') ?? undefined;
+        let path = url.searchParams.get('path') ?? undefined;

-        if (type === 'tcp') {
+        if (type === 'tcp' || type === 'none') {
            stream.tcp = new TcpStreamSettings(headerType ?? 'none', host, path);
        } else if (type === 'kcp') {
            stream.kcp = new KcpStreamSettings();
@@ -686,9 +692,12 @@ class Outbound extends CommonClass {
                url.searchParams.get('quicSecurity') ?? 'none',
                url.searchParams.get('key') ?? '',
                headerType ?? 'none');
-        } else if (type === 'grpc') {
-            stream.grpc = new GrpcStreamSettings(url.searchParams.get('serviceName') ?? '', url.searchParams.get('mode') == 'multi');
-        } else if (type === 'httpupgrade') {
+            } else if (type === 'grpc') {
+                stream.grpc = new GrpcStreamSettings(
+                    url.searchParams.get('serviceName') ?? '',
+                    url.searchParams.get('authority') ?? '',
+                    url.searchParams.get('mode') == 'multi');
+            } else if (type === 'httpupgrade') {
            stream.httpupgrade = new HttpUpgradeStreamSettings(path,host);
        }

@@ -709,10 +718,7 @@ class Outbound extends CommonClass {
            stream.reality = new RealityStreamSettings(pbk, fp, sni, sid, spx);
        }

-        let data = link.split('?');
-        if(data.length != 2) return null;
-
-        const regex = /([^@]+):\/\/([^@]+)@(.+):(\d+)\?(.*)$/;
+        const regex = /([^@]+):\/\/([^@]+)@(.+):(\d+)(.*)$/;
        const match = link.match(regex);

        if (!match) return null;
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -338,10 +338,11 @@ class KcpStreamSettings extends XrayCommonClass {
 }

 class WsStreamSettings extends XrayCommonClass {
-    constructor(acceptProxyProtocol=false, path='/', headers=[]) {
+    constructor(acceptProxyProtocol=false, path='/', host='', headers=[]) {
        super();
        this.acceptProxyProtocol = acceptProxyProtocol;
        this.path = path;
+        this.host = host;
        this.headers = headers;
    }

@@ -366,6 +367,7 @@ class WsStreamSettings extends XrayCommonClass {
        return new WsStreamSettings(
            json.acceptProxyProtocol,
            json.path,
+            json.host,
            XrayCommonClass.toHeaders(json.headers),
        );
    }
@@ -374,6 +376,7 @@ class WsStreamSettings extends XrayCommonClass {
        return {
            acceptProxyProtocol: this.acceptProxyProtocol,
            path: this.path,
+            host: this.host,
            headers: XrayCommonClass.toV2Headers(this.headers, false),
        };
    }
@@ -472,19 +475,38 @@ class GrpcStreamSettings extends XrayCommonClass {
    }
 }

-class HttpUpgradeStreamSettings extends XrayCommonClass {
-    constructor(acceptProxyProtocol=false, path='/', host='') {
+class HTTPUpgradeStreamSettings extends XrayCommonClass {
+    constructor(acceptProxyProtocol=false, path='/', host='', headers=[]) {
        super();
        this.acceptProxyProtocol = acceptProxyProtocol;
        this.path = path;
        this.host = host;
+        this.headers = headers;
+    }
+
+    addHeader(name, value) {
+        this.headers.push({ name: name, value: value });
+    }
+
+    getHeader(name) {
+        for (const header of this.headers) {
+            if (header.name.toLowerCase() === name.toLowerCase()) {
+                return header.value;
+            }
+        }
+        return null;
+    }
+
+    removeHeader(index) {
+        this.headers.splice(index, 1);
    }

    static fromJson(json={}) {
-        return new HttpUpgradeStreamSettings(
+        return new HTTPUpgradeStreamSettings(
            json.acceptProxyProtocol,
            json.path,
            json.host,
+            XrayCommonClass.toHeaders(json.headers),
        );
    }

@@ -493,6 +515,7 @@ class HttpUpgradeStreamSettings extends XrayCommonClass {
            acceptProxyProtocol: this.acceptProxyProtocol,
            path: this.path,
            host: this.host,
+            headers: XrayCommonClass.toV2Headers(this.headers, false),
        };
    }
 }
@@ -861,7 +884,7 @@ class StreamSettings extends XrayCommonClass {
        httpSettings=new HttpStreamSettings(),
        quicSettings=new QuicStreamSettings(),
        grpcSettings=new GrpcStreamSettings(),
-        httpupgradeSettings=new HttpUpgradeStreamSettings(),
+        httpupgradeSettings=new HTTPUpgradeStreamSettings(),
        sockopt = undefined,
        ) {
        super();
@@ -940,7 +963,7 @@ class StreamSettings extends XrayCommonClass {
            HttpStreamSettings.fromJson(json.httpSettings),
            QuicStreamSettings.fromJson(json.quicSettings),
            GrpcStreamSettings.fromJson(json.grpcSettings),
-            HttpUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
+            HTTPUpgradeStreamSettings.fromJson(json.httpupgradeSettings),
            SockoptStreamSettings.fromJson(json.sockopt),
        );
    }
@@ -1108,11 +1131,21 @@ class Inbound extends XrayCommonClass {
        if (this.isTcp) {
            return this.stream.tcp.request.getHeader("Host");
        } else if (this.isWs) {
-            return this.stream.ws.getHeader("Host");
+            const hostHeader = this.stream.ws.getHeader("Host");
+            if (hostHeader !== null) {
+                return hostHeader;
+            } else {
+                return this.stream.ws.host;
+            }        
        } else if (this.isH2) {
            return this.stream.http.host[0];
        } else if (this.isHttpupgrade) {
-            return this.stream.httpupgrade.host;
+            const hostHeader = this.stream.httpupgrade.getHeader("Host");
+            if (hostHeader !== null) {
+                return hostHeader;
+            } else {
+                return this.stream.httpupgrade.host;
+            }        
        }
        return null;
    }
@@ -1230,6 +1263,7 @@ class Inbound extends XrayCommonClass {
        } else if (network === 'ws') {
            let ws = this.stream.ws;
            obj.path = ws.path;
+            obj.host = ws.host;
            let index = ws.headers.findIndex(header => header.name.toLowerCase() === 'host');
            if (index >= 0) {
                obj.host = ws.headers[index].value;
@@ -1252,6 +1286,10 @@ class Inbound extends XrayCommonClass {
            let httpupgrade = this.stream.httpupgrade;
            obj.path = httpupgrade.path;
            obj.host = httpupgrade.host;
+            let index = httpupgrade.headers.findIndex(header => header.name.toLowerCase() === 'host');
+            if (index >= 0) {
+                obj.host = httpupgrade.headers[index].value;
+            }
        }

        if (security === 'tls') {
@@ -1284,9 +1322,9 @@ class Inbound extends XrayCommonClass {
                if (tcp.type === 'http') {
                    const request = tcp.request;
                    params.set("path", request.path.join(','));
-                    const index = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
-                    if (index >= 0) {
-                        const host = request.headers[index].value;
+                    const tcpIndex = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                    if (tcpIndex >= 0) {
+                        const host = request.headers[tcpIndex].value;
                        params.set("host", host);
                    }
                    params.set("headerType", 'http');
@@ -1300,9 +1338,10 @@ class Inbound extends XrayCommonClass {
            case "ws":
                const ws = this.stream.ws;
                params.set("path", ws.path);
-                const index = ws.headers.findIndex(header => header.name.toLowerCase() === 'host');
-                if (index >= 0) {
-                    const host = ws.headers[index].value;
+                params.set("host", ws.host);
+                const wsIndex = ws.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                if (wsIndex >= 0) {
+                    const host = ws.headers[wsIndex].value;
                    params.set("host", host);
                }
                break;
@@ -1326,9 +1365,14 @@ class Inbound extends XrayCommonClass {
                }
                break;
            case "httpupgrade":
-                    const httpupgrade = this.stream.httpupgrade;
-                    params.set("path", httpupgrade.path);
-                    params.set("host", httpupgrade.host);
+                const httpupgrade = this.stream.httpupgrade;
+                params.set("path", httpupgrade.path);
+                params.set("host", httpupgrade.host);
+                const httpupgradeIndex = httpupgrade.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                if (httpupgradeIndex >= 0) {
+                    const host = httpupgrade.headers[httpupgradeIndex].value;
+                    params.set("host", host);
+                }
                break;
        }

@@ -1392,7 +1436,7 @@ class Inbound extends XrayCommonClass {
        return url.toString();
    }

-    genSSLink(address='', port=this.port, forceTls, remark='', clientPassword) {
+    genSSLink(address = '', port = this.port, forceTls, remark = '', clientPassword) {
        let settings = this.settings;
        const type = this.stream.network;
        const security = forceTls == 'same' ? this.stream.security : forceTls;
@@ -1404,9 +1448,9 @@ class Inbound extends XrayCommonClass {
                if (tcp.type === 'http') {
                    const request = tcp.request;
                    params.set("path", request.path.join(','));
-                    const index = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
-                    if (index >= 0) {
-                        const host = request.headers[index].value;
+                    const tcpIndex = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                    if (tcpIndex >= 0) {
+                        const host = request.headers[tcpIndex].value;
                        params.set("host", host);
                    }
                    params.set("headerType", 'http');
@@ -1420,9 +1464,10 @@ class Inbound extends XrayCommonClass {
            case "ws":
                const ws = this.stream.ws;
                params.set("path", ws.path);
-                const index = ws.headers.findIndex(header => header.name.toLowerCase() === 'host');
-                if (index >= 0) {
-                    const host = ws.headers[index].value;
+                params.set("host", ws.host);
+                const wsIndex = ws.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                if (wsIndex >= 0) {
+                    const host = ws.headers[wsIndex].value;
                    params.set("host", host);
                }
                break;
@@ -1441,26 +1486,31 @@ class Inbound extends XrayCommonClass {
                const grpc = this.stream.grpc;
                params.set("serviceName", grpc.serviceName);
                params.set("authority", grpc.authority);
-                if(grpc.multiMode){
+                if (grpc.multiMode) {
                    params.set("mode", "multi");
                }
                break;
            case "httpupgrade":
-                    const httpupgrade = this.stream.httpupgrade;
-                    params.set("path", httpupgrade.path);
-                    params.set("host", httpupgrade.host);
+                const httpupgrade = this.stream.httpupgrade;
+                params.set("path", httpupgrade.path);
+                params.set("host", httpupgrade.host);
+                const httpupgradeIndex = httpupgrade.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                if (httpupgradeIndex >= 0) {
+                    const host = httpupgrade.headers[httpupgradeIndex].value;
+                    params.set("host", host);
+                }
                break;
        }

        if (security === 'tls') {
            params.set("security", "tls");
-            if (this.stream.isTls){
-                params.set("fp" , this.stream.tls.settings.fingerprint);
+            if (this.stream.isTls) {
+                params.set("fp", this.stream.tls.settings.fingerprint);
                params.set("alpn", this.stream.tls.alpn);
-                if(this.stream.tls.settings.allowInsecure){
+                if (this.stream.tls.settings.allowInsecure) {
                    params.set("allowInsecure", "1");
                }
-                if (!ObjectUtil.isEmpty(this.stream.tls.sni)){
+                if (!ObjectUtil.isEmpty(this.stream.tls.sni)) {
                    params.set("sni", this.stream.tls.sni);
                }
            }
@@ -1491,9 +1541,9 @@ class Inbound extends XrayCommonClass {
                if (tcp.type === 'http') {
                    const request = tcp.request;
                    params.set("path", request.path.join(','));
-                    const index = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
-                    if (index >= 0) {
-                        const host = request.headers[index].value;
+                    const tcpIndex = request.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                    if (tcpIndex >= 0) {
+                        const host = request.headers[tcpIndex].value;
                        params.set("host", host);
                    }
                    params.set("headerType", 'http');
@@ -1507,9 +1557,10 @@ class Inbound extends XrayCommonClass {
            case "ws":
                const ws = this.stream.ws;
                params.set("path", ws.path);
-                const index = ws.headers.findIndex(header => header.name.toLowerCase() === 'host');
-                if (index >= 0) {
-                    const host = ws.headers[index].value;
+                params.set("host", ws.host);
+                const wsIndex = ws.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                if (wsIndex >= 0) {
+                    const host = ws.headers[wsIndex].value;
                    params.set("host", host);
                }
                break;
@@ -1533,9 +1584,14 @@ class Inbound extends XrayCommonClass {
                }
                break;
            case "httpupgrade":
-                    const httpupgrade = this.stream.httpupgrade;
-                    params.set("path", httpupgrade.path);
-                    params.set("host", httpupgrade.host);
+                const httpupgrade = this.stream.httpupgrade;
+                params.set("path", httpupgrade.path);
+                params.set("host", httpupgrade.host);
+                const httpUpgradeIndex = httpupgrade.headers.findIndex(header => header.name.toLowerCase() === 'host');
+                if (httpUpgradeIndex >= 0) {
+                    const host = httpupgrade.headers[httpUpgradeIndex].value;
+                    params.set("host", host);
+                }
                break;
        }

--- a/web/assets/qrcode/qrious.min.js
+++ b/web/assets/qrcode/qrious.min.js
--- a/web/assets/qrcode/qrious2.min.js
+++ b/web/assets/qrcode/qrious2.min.js
--- a/web/html/common/qrcode_modal.html
+++ b/web/html/common/qrcode_modal.html
@@ -1,32 +1,23 @@
 {{define "qrcodeModal"}}
 <a-modal id="qrcode-modal" v-model="qrModal.visible" :title="qrModal.title"
-        :dialog-style="{ top: '20px' }"
-        :closable="true"
-        :class="themeSwitcher.currentTheme"
-        :footer="null"
-        width="300px">
-    <a-tag color="green" style="margin-bottom: 10px;display: block;text-align: center;">
-        {{ i18n "pages.inbounds.clickOnQRcode" }}
-    </a-tag>
-    <template v-if="app.subSettings.enable && qrModal.subId">
-        <a-divider>{{ i18n "pages.settings.subSettings"}}</a-divider>
-        <canvas @click="copyToClipboard('qrCode-sub',genSubLink(qrModal.client.subId))"
-            id="qrCode-sub"
-            class="qr-bg">
-        </canvas>
-        <a-divider>{{ i18n "pages.settings.subSettings"}} Json</a-divider>
-        <canvas @click="copyToClipboard('qrCode-subJson',genSubJsonLink(qrModal.client.subId))"
-            id="qrCode-subJson"
-            style="width: 100%; height: 100%; display: flex; border-radius: 1rem;">
-        </canvas>
-    </template>
-    <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider>
-    <template v-for="(row, index) in qrModal.qrcodes">
-        <a-tag color="green" style="margin: 10px 0; display: block; text-align: center;">[[ row.remark ]]</a-tag>
-        <canvas @click="copyToClipboard('qrCode-'+index, row.link)"
-            :id="'qrCode-'+index"
-            class="qr-bg"></canvas>
-    </template>
+    :dialog-style="{ top: '20px' }"
+    :closable="true"
+    :class="themeSwitcher.currentTheme"
+    :footer="null" width="300px">
+  <a-tag color="green" style="margin-bottom: 10px;display: block;text-align: center;">
+    {{ i18n "pages.inbounds.clickOnQRcode" }}
+  </a-tag>
+  <template v-if="app.subSettings.enable && qrModal.subId">
+    <a-divider>{{ i18n "pages.settings.subSettings"}}</a-divider>
+    <div class="qr-bg"><canvas @click="copyToClipboard('qrCode-sub',genSubLink(qrModal.client.subId))" id="qrCode-sub" class="qr-cv"></canvas></div>
+    <a-divider>{{ i18n "pages.settings.subSettings"}} Json</a-divider>
+    <div class="qr-bg"><canvas @click="copyToClipboard('qrCode-subJson',genSubJsonLink(qrModal.client.subId))" id="qrCode-subJson" class="qr-cv"></canvas></div>
+  </template>
+  <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider>
+  <template v-for="(row, index) in qrModal.qrcodes">
+    <a-tag color="green" style="margin: 10px 0; display: block; text-align: center;">[[ row.remark ]]</a-tag>
+    <div class="qr-bg"><canvas @click="copyToClipboard('qrCode-'+index, row.link)" :id="'qrCode-'+index" class="qr-cv"></canvas></div>
+  </template>
 </a-modal>

 <script>
@@ -87,8 +78,13 @@
            setQrCode(elmentId, content) {
                new QRious({
                    element: document.querySelector('#' + elmentId),
-                    size: 260,
+                    size: 400,
                    value: content,
+                    background: 'white',
+                    backgroundAlpha: 0,
+                    foreground: 'black',
+                    padding: 2,
+                    level: 'L'
                });
            },
            genSubLink(subID) {
--- a/web/html/xui/client_bulk_modal.html
+++ b/web/html/xui/client_bulk_modal.html
@@ -143,7 +143,7 @@
        emailPrefix: "",
        emailPostfix: "",
        subId: "",
-        tgId: "",
+        tgId: 0,
        flow: "",
        delayedStart: false,
        reset: 0,
@@ -200,7 +200,7 @@
            this.emailPrefix = "";
            this.emailPostfix = "";
            this.subId = "";
-            this.tgId = "";
+            this.tgId  = 0;
            this.flow = "";
            this.dbInbound = new DBInbound(dbInbound);
            this.inbound = dbInbound.toInbound();
--- a/web/html/xui/component/themeSwitch.html
+++ b/web/html/xui/component/themeSwitch.html
@@ -1,6 +1,6 @@
 {{define "component/themeSwitchTemplate"}}
 <template>
-  <a-menu :theme="themeSwitcher.currentTheme" mode="inline" selected-keys="">
+  <a-menu class="change-theme" :theme="themeSwitcher.currentTheme" mode="inline" selected-keys="">
    <a-menu-item mode="inline" class="ant-menu-theme-switch">
      <a-icon type="bulb" :theme="themeSwitcher.isDarkTheme ? 'filled' : 'outlined'"></a-icon>
      <a-switch size="small" :default-checked="themeSwitcher.isDarkTheme" @change="themeSwitcher.toggleTheme()"></a-switch>
@@ -57,6 +57,13 @@
        getContainer: () => document.getElementById('message')
      });
      document.getElementById('message').className = themeSwitcher.currentTheme;
+      const themeAnimations = document.querySelector('.change-theme');
+      themeAnimations.addEventListener('mousedown', () => {
+        document.documentElement.setAttribute('data-theme-animations', 'off');
+      });
+      themeAnimations.addEventListener('mouseleave', () => {
+        document.documentElement.removeAttribute('data-theme-animations');
+      });
    }
  });
 </script>
--- a/web/html/xui/form/client.html
+++ b/web/html/xui/form/client.html
@@ -61,7 +61,7 @@
                <a-icon type="question-circle"></a-icon>
            </a-tooltip>
        </template>
-        <a-input v-model.trim="client.tgId"></a-input>
+        <a-input-number style="width: 50%" v-model="client.tgId" min="0"></a-input-number>
    </a-form-item>
    <a-form-item v-if="app.ipLimitEnable">
        <template slot="label">
@@ -75,7 +75,7 @@
        </template>
        <a-input-number v-model="client.limitIp" min="0"></a-input-number>
    </a-form-item>
-    <a-form-item v-if="app.ipLimitEnable && client.email && isEdit">
+    <a-form-item v-if="client.limitIp > 0 && client.email && isEdit">
        <template slot="label">
            <a-tooltip>
                <template slot="title">
--- a/web/html/xui/form/outbound.html
+++ b/web/html/xui/form/outbound.html
@@ -290,8 +290,8 @@
            <a-input v-model="outbound.stream.ws.host"></a-input>
        </a-form-item>
        <a-form-item label='{{ i18n "path" }}'>
-            <a-form-item><a-input v-model.trim="outbound.stream.ws.path"></a-input>
-            </a-form-item>
+            <a-input v-model.trim="outbound.stream.ws.path"></a-input>
+        </a-form-item>
    </template>

    <!-- http -->
@@ -347,8 +347,8 @@
            <a-input v-model="outbound.stream.httpupgrade.host"></a-input>
        </a-form-item>
        <a-form-item label='{{ i18n "path" }}'>
-            <a-form-item><a-input v-model.trim="outbound.stream.httpupgrade.path"></a-input>
-            </a-form-item>
+            <a-input v-model.trim="outbound.stream.httpupgrade.path"></a-input>
+        </a-form-item>
    </template>
 </template>

--- a/web/html/xui/form/stream/stream_httpupgrade.html
+++ b/web/html/xui/form/stream/stream_httpupgrade.html
@@ -3,11 +3,24 @@
    <a-form-item label="PROXY Protocol">
        <a-switch v-model="inbound.stream.httpupgrade.acceptProxyProtocol"></a-switch>
    </a-form-item>
-    <a-form-item label='{{ i18n "path" }}'>
-        <a-input v-model.trim="inbound.stream.httpupgrade.path"></a-input>
-    </a-form-item>
    <a-form-item label='{{ i18n "host" }}'>
        <a-input v-model.trim="inbound.stream.httpupgrade.host"></a-input>
    </a-form-item>
+    <a-form-item label='{{ i18n "path" }}'>
+        <a-input v-model.trim="inbound.stream.httpupgrade.path"></a-input>
+    </a-form-item>
+    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'>
+        <a-button size="small" @click="inbound.stream.httpupgrade.addHeader('host', '')">+</a-button>
+    </a-form-item>
+    <a-form-item :wrapper-col="{span:24}">
+        <a-input-group compact v-for="(header, index) in inbound.stream.httpupgrade.headers">
+            <a-input style="width: 50%" v-model.trim="header.name" placeholder='{{ i18n "pages.inbounds.stream.general.name"}}'>
+                <template slot="addonBefore" style="margin: 0;">[[ index+1 ]]</template>
+            </a-input>
+            <a-input style="width: 50%" v-model.trim="header.value" placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
+                <a-button slot="addonAfter" size="small" @click="inbound.stream.httpupgrade.removeHeader(index)">-</a-button>
+            </a-input>
+        </a-input-group>
+    </a-form-item>
 </a-form>
 {{end}}
--- a/web/html/xui/form/stream/stream_ws.html
+++ b/web/html/xui/form/stream/stream_ws.html
@@ -3,11 +3,14 @@
    <a-form-item label="PROXY Protocol">
        <a-switch v-model="inbound.stream.ws.acceptProxyProtocol"></a-switch>
    </a-form-item>
+    <a-form-item label='{{ i18n "host" }}'>
+        <a-input v-model.trim="inbound.stream.ws.host"></a-input>
+    </a-form-item>
    <a-form-item label='{{ i18n "path" }}'>
        <a-input v-model.trim="inbound.stream.ws.path"></a-input>
    </a-form-item>
    <a-form-item label='{{ i18n "pages.inbounds.stream.tcp.requestHeader" }}'>
-        <a-button size="small" @click="inbound.stream.ws.addHeader('Host', '')">+</a-button>
+        <a-button size="small" @click="inbound.stream.ws.addHeader('host', '')">+</a-button>
    </a-form-item>
    <a-form-item :wrapper-col="{span:24}">
        <a-input-group compact v-for="(header, index) in inbound.stream.ws.headers">
--- a/web/html/xui/inbound_client_table.html
+++ b/web/html/xui/inbound_client_table.html
@@ -54,7 +54,7 @@
            <template v-else-if="!client.enable">{{ i18n "disabled" }}</template>
            <template v-else-if="client.enable && isClientOnline(client.email)">{{ i18n "online" }}</template>
        </template>
-    <a-badge :color="client.enable ? statsExpColor(record, client.email) : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'">
+    <a-badge :class="isClientOnline(client.email)? 'online-animation' : ''" :color="client.enable ? statsExpColor(record, client.email) : themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'">
    </a-badge>
    </a-tooltip>
    [[ client.email ]]
@@ -258,7 +258,7 @@
            </table>
        </template>
        <a-badge>
-            <a-icon v-if="!client.enable" slot="count" type="pause-circle" :style="'color: ' + themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-icon>
+            <a-icon v-if="!client.enable" slot="count" type="pause-circle" theme="filled" :style="'color: ' + themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-icon>
            <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;"><a-icon type="solution"></a-icon></a-button>
        </a-badge>
    </a-popover>
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -143,7 +143,7 @@
            <tr>
                <td>
                    <a-tag v-if="infoModal.clientStats && infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)">
-                        [[ sizeFormat(infoModal.clientSettings.totalGB - infoModal.clientStats.up - infoModal.clientStats.down) ]]
+                        [[ getRemStats() ]]
                    </a-tag>
                </td>
                <td>
@@ -423,7 +423,11 @@
            },
            statsColor(stats) {
                return usageColor(stats.up + stats.down, app.trafficDiff, stats.total);
-            }
+            },
+            getRemStats() {
+                remained = this.infoModal.clientStats.total - this.infoModal.clientStats.up - this.infoModal.clientStats.down;
+                return remained>0 ? sizeFormat(remained) : '-';
+            },
        },
        
    });
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -2,450 +2,463 @@
 <html lang="en">
 {{template "head" .}}
 <style>
-    @media (min-width: 769px) {
-        .ant-layout-content {
-            margin: 24px 16px;
-        }
+  @media (min-width: 769px) {
+    .ant-layout-content {
+      margin: 24px 16px;
    }
-
-    @media (max-width: 768px) {
-        .ant-card-body {
-            padding: .5rem;
-        }
+  }
+  @media (max-width: 768px) {
+    .ant-card-body {
+      padding: .5rem;
    }
-
-    .ant-col-sm-24 {
-        margin: 0.5rem -2rem 0.5rem 2rem;
+  }
+  .ant-col-sm-24 {
+    margin: 0.5rem -2rem 0.5rem 2rem;
+  }
+  tr.hideExpandIcon .ant-table-row-expand-icon {
+    display: none;
+  }
+  .infinite-tag {
+    padding: 0 5px;
+    border-radius: 2rem;
+    min-width: 50px;
+  }
+  .infinite-bar .ant-progress-inner .ant-progress-bg {
+    background-color: #F2EAF1;
+    border: #D5BED2 solid 1px;
+  }
+  .dark .infinite-bar .ant-progress-inner .ant-progress-bg {
+    background-color: #7a316f;
+    border: #7a316f solid 1px;
+  }
+  .ant-collapse {
+    margin: 5px 0;
+  }
+  .info-large-tag {
+    max-width: 200px;
+    overflow: hidden;
+  }
+  .online-animation .ant-badge-status-dot {
+    animation: onlineAnimation 1.2s linear infinite;
+  }
+  @keyframes onlineAnimation {
+    0%,
+    50%,
+    100% {
+      transform: scale(1);
+      opacity: 1;
    }
-    tr.hideExpandIcon .ant-table-row-expand-icon {
-        display: none;
-    }
-    .infinite-tag {
-        padding: 0 5px;
-        border-radius: 2rem;
-        min-width: 50px;
-    }
-    .infinite-bar .ant-progress-inner .ant-progress-bg {
-        background-color: #F2EAF1;
-        border: #D5BED2 solid 1px;
-    }
-    .dark .infinite-bar .ant-progress-inner .ant-progress-bg {
-        background-color: #3c1536;
-        border: #7a316f solid 1px;
-    }
-    .ant-collapse {
-        margin: 5px 0;
-    }
-    .info-large-tag {
-        max-width: 200px;
-        overflow: hidden;
+    10% {
+      transform: scale(1.5);
+      opacity: .2;
    }
+  }
 </style>

 <body>
 <a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
-    {{ template "commonSider" . }}
-    <a-layout id="content-layout">
-        <a-layout-content>
-            <a-spin :spinning="spinning" :delay="500" tip='{{ i18n "loading"}}'>
-                <transition name="list" appear>
-                    <a-alert type="error" v-if="showAlert" style="margin-bottom: 10px"
-                    message='{{ i18n "secAlertTitle" }}'
-                    color="red"
-                    description='{{ i18n "secAlertSsl" }}'
-                    show-icon closable
-                    >
-                    </a-alert>
-                </transition>
-                <transition name="list" appear>
-                    <a-card hoverable>
-                        <a-row>
-                            <a-col :xs="24" :sm="24" :lg="12">
-                                {{ i18n "pages.inbounds.totalDownUp" }}:
-                                <a-tag color="green">[[ sizeFormat(total.up) ]] / [[ sizeFormat(total.down) ]]</a-tag>
-                            </a-col>
-                            <a-col :xs="24" :sm="24" :lg="12">
-                                {{ i18n "pages.inbounds.totalUsage" }}:
-                                <a-tag color="green">[[ sizeFormat(total.up + total.down) ]]</a-tag>
-                            </a-col>
-                            <a-col :xs="24" :sm="24" :lg="12">
-                                {{ i18n "pages.inbounds.inboundCount" }}:
-                                <a-tag color="green">[[ dbInbounds.length ]]</a-tag>
-                            </a-col>
-                            <a-col :xs="24" :sm="24" :lg="12">
-                                <template>
-                                    <div>
-                                        <a-back-top :target="() => document.getElementById('content-layout')" visibility-height="200">
-                                        </a-back-top>
-                                {{ i18n "clients" }}:
-                                <a-tag color="green">[[ total.clients ]]</a-tag>
-                                <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                    <template slot="content">
-                                        <p v-for="clientEmail in total.deactive">[[ clientEmail ]]</p>
-                                    </template>
-                                    <a-tag v-if="total.deactive.length">[[ total.deactive.length ]]</a-tag>
-                                </a-popover>
-                                <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                    <template slot="content">
-                                        <p v-for="clientEmail in total.depleted">[[ clientEmail ]]</p>
-                                    </template>
-                                    <a-tag color="red" v-if="total.depleted.length">[[ total.depleted.length ]]</a-tag>
-                                </a-popover>
-                                <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                    <template slot="content">
-                                        <p v-for="clientEmail in total.expiring">[[ clientEmail ]]</p>
-                                    </template>
-                                    <a-tag color="orange" v-if="total.expiring.length">[[ total.expiring.length ]]</a-tag>
-                                </a-popover>
-                                <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                    <template slot="content">
-                                        <p v-for="clientEmail in onlineClients">[[ clientEmail ]]</p>
-                                    </template>
-                                    <a-tag color="blue" v-if="onlineClients.length">[[ onlineClients.length ]]</a-tag>
-                                </a-popover>
-                            </div>
-                        </template>
-                            </a-col>
-                        </a-row>
-                    </a-card>
-                </transition>
-                <transition name="list" appear>
-                    <a-card hoverable>
-                        <div slot="title">
-                            <a-row>
-                                <a-col :xs="12" :sm="12" :lg="12">
-                                    <a-button type="primary" icon="plus" @click="openAddInbound">
-                                        <template v-if="!isMobile">{{ i18n "pages.inbounds.addInbound" }}</template>
-                                    </a-button>
-                                    <a-dropdown :trigger="['click']">
-                                        <a-button type="primary" icon="menu">
-                                            <template v-if="!isMobile">{{ i18n "pages.inbounds.generalActions" }}</template>
-                                        </a-button>
-                                        <a-menu slot="overlay" @click="a => generalActions(a)" :theme="themeSwitcher.currentTheme">
-                                            <a-menu-item key="import">
-                                                <a-icon type="import"></a-icon>
-                                                {{ i18n "pages.inbounds.importInbound" }}
-                                            </a-menu-item>
-                                            <a-menu-item key="export">
-                                                <a-icon type="export"></a-icon>
-                                                {{ i18n "pages.inbounds.export" }}
-                                            </a-menu-item>
-                                            <a-menu-item key="subs" v-if="subSettings.enable">
-                                                <a-icon type="export"></a-icon>
-                                                {{ i18n "pages.inbounds.export" }} - {{ i18n "pages.settings.subSettings" }}
-                                            </a-menu-item>
-                                            <a-menu-item key="resetInbounds">
-                                                <a-icon type="reload"></a-icon>
-                                                {{ i18n "pages.inbounds.resetAllTraffic" }}
-                                            </a-menu-item>
-                                            <a-menu-item key="resetClients">
-                                                <a-icon type="file-done"></a-icon>
-                                                {{ i18n "pages.inbounds.resetAllClientTraffics" }}
-                                            </a-menu-item>
-                                            <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
-                                                <a-icon type="rest"></a-icon>
-                                                {{ i18n "pages.inbounds.delDepletedClients" }}
-                                            </a-menu-item>
-                                        </a-menu>
-                                    </a-dropdown>
-                                </a-col>
-                                <a-col :xs="12" :sm="12" :lg="12" style="text-align: right;">
-                                    <a-select v-model="refreshInterval"
-                                              style="width: 65px;"
-                                              v-if="isRefreshEnabled"
-                                              @change="changeRefreshInterval"
-                                              :dropdown-class-name="themeSwitcher.currentTheme">
-                                        <a-select-option v-for="key in [5,10,30,60]" :value="key*1000">[[ key ]]s</a-select-option>
-                                    </a-select>
-                                    <a-icon type="sync" :spin="refreshing" @click="manualRefresh" style="margin: 0 5px;"></a-icon>
-                                    <a-switch v-model="isRefreshEnabled" @change="toggleRefresh"></a-switch>
-                                </a-col>
-                            </a-row>
-                        </div>
-                        <div :style="isMobile ? '' : 'display: flex; align-items: center; justify-content: flex-start;'">
-                            <a-switch v-model="enableFilter"
-                                :style="isMobile ? 'margin-bottom: .5rem; display: flex;' : 'margin-right: .5rem;'"
-                                @change="toggleFilter">
-                                <a-icon slot="checkedChildren" type="search"></a-icon>
-                                <a-icon slot="unCheckedChildren" type="filter"></a-icon>
-                            </a-switch>
-                            <a-input v-if="!enableFilter" v-model.lazy="searchKey" placeholder='{{ i18n "search" }}' autofocus style="max-width: 300px" :size="isMobile ? 'small' : ''"></a-input>
-                            <a-radio-group v-if="enableFilter" v-model="filterBy" @change="filterInbounds" button-style="solid" :size="isMobile ? 'small' : ''">
-                                <a-radio-button value="">{{ i18n "none" }}</a-radio-button>
-                                <a-radio-button value="deactive">{{ i18n "disabled" }}</a-radio-button>
-                                <a-radio-button value="depleted">{{ i18n "depleted" }}</a-radio-button>
-                                <a-radio-button value="expiring">{{ i18n "depletingSoon" }}</a-radio-button>
-                                <a-radio-button value="online">{{ i18n "online" }}</a-radio-button>
-                            </a-radio-group>
-                        </div>
-                        <a-back-top></a-back-top>
-                        <a-table :columns="isMobile ? mobileColumns : columns" :row-key="dbInbound => dbInbound.id"
-                                 :data-source="searchedInbounds"
-                                 :scroll="isMobile ? {} : { x: 1000 }"
-                                 :pagination=pagination(searchedInbounds)
-                                 :expand-icon-as-cell="false"
-                                 :expand-row-by-click="false"
-                                 :expand-icon-column-index="0"
-                                 :indent-size="0"
-                                 :row-class-name="dbInbound => (dbInbound.isMultiUser() ? '' : 'hideExpandIcon')"
-                                 style="margin-top: 10px">
-                            <template slot="action" slot-scope="text, dbInbound">
-                                <a-dropdown :trigger="['click']">
-                                    <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 20px; text-decoration: solid;"></a-icon>
-                                    <a-menu slot="overlay" @click="a => clickAction(a, dbInbound)" :theme="themeSwitcher.currentTheme">
-                                        <a-menu-item key="edit">
-                                            <a-icon type="edit"></a-icon>
-                                            {{ i18n "edit" }}
-                                        </a-menu-item>
-                                        <a-menu-item key="qrcode" v-if="(dbInbound.isSS && !dbInbound.toInbound().isSSMultiUser) || dbInbound.isWireguard">
-                                            <a-icon type="qrcode"></a-icon>
-                                            {{ i18n "qrCode" }}
-                                        </a-menu-item>
-                                        <template v-if="dbInbound.isMultiUser()">
-                                            <a-menu-item key="addClient">
-                                                <a-icon type="user-add"></a-icon>
-                                                {{ i18n "pages.client.add"}}
-                                            </a-menu-item>
-                                            <a-menu-item key="addBulkClient">
-                                                <a-icon type="usergroup-add"></a-icon>
-                                                {{ i18n "pages.client.bulk"}}
-                                            </a-menu-item>
-                                            <a-menu-item key="resetClients">
-                                                <a-icon type="file-done"></a-icon>
-                                                {{ i18n "pages.inbounds.resetInboundClientTraffics"}}
-                                            </a-menu-item>
-                                            <a-menu-item key="export">
-                                                <a-icon type="export"></a-icon>
-                                                {{ i18n "pages.inbounds.export"}}
-                                            </a-menu-item>
-                                            <a-menu-item key="subs" v-if="subSettings.enable">
-                                                <a-icon type="export"></a-icon>
-                                                {{ i18n "pages.inbounds.export"}} - {{ i18n "pages.settings.subSettings" }}
-                                            </a-menu-item>
-                                            <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
-                                                <a-icon type="rest"></a-icon>
-                                                {{ i18n "pages.inbounds.delDepletedClients" }}
-                                            </a-menu-item>
-                                        </template>
-                                        <template v-else>
-                                            <a-menu-item key="showInfo">
-                                                <a-icon type="info-circle"></a-icon>
-                                                {{ i18n "info"}}
-                                            </a-menu-item>
-                                        </template>
-                                        <a-menu-item key="clipboard">
-                                            <a-icon type="copy"></a-icon>
-                                            {{ i18n "pages.inbounds.exportInbound" }}
-                                        </a-menu-item>
-                                        <a-menu-item key="resetTraffic">
-                                            <a-icon type="retweet"></a-icon> {{ i18n "pages.inbounds.resetTraffic" }}
-                                        </a-menu-item>
-                                        <a-menu-item key="clone">
-                                            <a-icon type="block"></a-icon> {{ i18n "pages.inbounds.clone"}}
-                                        </a-menu-item>
-                                        <a-menu-item key="delete">
-                                            <span style="color: #FF4D4F">
-                                                <a-icon type="delete"></a-icon> {{ i18n "delete"}}
-                                            </span>
-                                        </a-menu-item>
-                                        <a-menu-item v-if="isMobile">
-                                            <a-switch size="small" v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
-                                            {{ i18n "pages.inbounds.enable" }}
-                                        </a-menu-item>
-                                    </a-menu>
-                                </a-dropdown>
+  {{ template "commonSider" . }}
+  <a-layout id="content-layout">
+    <a-layout-content>
+      <a-spin :spinning="spinning" :delay="500" tip='{{ i18n "loading"}}'>
+        <transition name="list" appear>
+          <a-alert type="error" v-if="showAlert" style="margin-bottom: 10px"
+            message='{{ i18n "secAlertTitle" }}'
+            color="red"
+            description='{{ i18n "secAlertSsl" }}'
+            show-icon closable>
+          </a-alert>
+        </transition>
+        <transition name="list" appear>
+          <a-card hoverable>
+            <a-row>
+              <a-col :xs="24" :sm="24" :lg="12">
+                {{ i18n "pages.inbounds.totalDownUp" }}:
+                <a-tag color="green">[[ sizeFormat(total.up) ]] / [[ sizeFormat(total.down) ]]</a-tag>
+              </a-col>
+              <a-col :xs="24" :sm="24" :lg="12">
+                {{ i18n "pages.inbounds.totalUsage" }}:
+                <a-tag color="green">[[ sizeFormat(total.up + total.down) ]]</a-tag>
+              </a-col>
+              <a-col :xs="24" :sm="24" :lg="12">
+                {{ i18n "pages.inbounds.inboundCount" }}:
+                <a-tag color="green">[[ dbInbounds.length ]]</a-tag>
+              </a-col>
+              <a-col :xs="24" :sm="24" :lg="12">
+                <template>
+                  <div>
+                    <a-back-top :target="() => document.getElementById('content-layout')" visibility-height="200"></a-back-top>
+                    {{ i18n "clients" }}:
+                    <a-tag color="green">[[ total.clients ]]</a-tag>
+                    <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <p v-for="clientEmail in total.deactive">[[ clientEmail ]]</p>
+                      </template>
+                      <a-tag v-if="total.deactive.length">[[ total.deactive.length ]]</a-tag>
+                    </a-popover>
+                    <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <p v-for="clientEmail in total.depleted">[[ clientEmail ]]</p>
+                      </template>
+                      <a-tag color="red" v-if="total.depleted.length">[[ total.depleted.length ]]</a-tag>
+                    </a-popover>
+                    <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <p v-for="clientEmail in total.expiring">[[ clientEmail ]]</p>
+                      </template>
+                      <a-tag color="orange" v-if="total.expiring.length">[[ total.expiring.length ]]</a-tag>
+                    </a-popover>
+                    <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                      <template slot="content">
+                        <p v-for="clientEmail in onlineClients">[[ clientEmail ]]</p>
+                      </template>
+                      <a-tag color="blue" v-if="onlineClients.length">[[ onlineClients.length ]]</a-tag>
+                    </a-popover>
+                  </div>
+                </template>
+              </a-col>
+            </a-row>
+          </a-card>
+        </transition>
+        <transition name="list" appear>
+          <a-card hoverable>
+            <div slot="title">
+              <a-row>
+                <a-col :xs="12" :sm="12" :lg="12">
+                  <a-button type="primary" icon="plus" @click="openAddInbound">
+                    <template v-if="!isMobile">{{ i18n "pages.inbounds.addInbound" }}</template>
+                  </a-button>
+                  <a-dropdown :trigger="['click']">
+                    <a-button type="primary" icon="menu">
+                      <template v-if="!isMobile">{{ i18n "pages.inbounds.generalActions" }}</template>
+                    </a-button>
+                    <a-menu slot="overlay" @click="a => generalActions(a)" :theme="themeSwitcher.currentTheme">
+                      <a-menu-item key="import">
+                        <a-icon type="import"></a-icon>
+                        {{ i18n "pages.inbounds.importInbound" }}
+                      </a-menu-item>
+                      <a-menu-item key="export">
+                        <a-icon type="export"></a-icon>
+                        {{ i18n "pages.inbounds.export" }}
+                      </a-menu-item>
+                      <a-menu-item key="subs" v-if="subSettings.enable">
+                        <a-icon type="export"></a-icon>
+                        {{ i18n "pages.inbounds.export" }} - {{ i18n "pages.settings.subSettings" }}
+                      </a-menu-item>
+                      <a-menu-item key="resetInbounds">
+                        <a-icon type="reload"></a-icon>
+                        {{ i18n "pages.inbounds.resetAllTraffic" }}
+                      </a-menu-item>
+                      <a-menu-item key="resetClients">
+                        <a-icon type="file-done"></a-icon>
+                        {{ i18n "pages.inbounds.resetAllClientTraffics" }}
+                      </a-menu-item>
+                      <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
+                        <a-icon type="rest"></a-icon>
+                        {{ i18n "pages.inbounds.delDepletedClients" }}
+                      </a-menu-item>
+                    </a-menu>
+                  </a-dropdown>
+                </a-col>
+                <a-col :xs="12" :sm="12" :lg="12" style="text-align: right;">
+                  <a-select v-model="refreshInterval"
+                      style="width: 65px;"
+                      v-if="isRefreshEnabled"
+                      @change="changeRefreshInterval"
+                      :dropdown-class-name="themeSwitcher.currentTheme">
+                    <a-select-option v-for="key in [5,10,30,60]" :value="key*1000">[[ key ]]s</a-select-option>
+                  </a-select>
+                  <a-icon type="sync" :spin="refreshing" @click="manualRefresh" style="margin: 0 5px;"></a-icon>
+                  <a-switch v-model="isRefreshEnabled" @change="toggleRefresh"></a-switch>
+                </a-col>
+              </a-row>
+            </div>
+            <div :style="isMobile ? '' : 'display: flex; align-items: center; justify-content: flex-start;'">
+              <a-switch v-model="enableFilter"
+                  :style="isMobile ? 'margin-bottom: .5rem; display: flex;' : 'margin-right: .5rem;'"
+                  @change="toggleFilter">
+                <a-icon slot="checkedChildren" type="search"></a-icon>
+                <a-icon slot="unCheckedChildren" type="filter"></a-icon>
+              </a-switch>
+              <a-input v-if="!enableFilter" v-model.lazy="searchKey" placeholder='{{ i18n "search" }}' autofocus style="max-width: 300px" :size="isMobile ? 'small' : ''"></a-input>
+              <a-radio-group v-if="enableFilter" v-model="filterBy" @change="filterInbounds" button-style="solid" :size="isMobile ? 'small' : ''">
+                <a-radio-button value="">{{ i18n "none" }}</a-radio-button>
+                <a-radio-button value="deactive">{{ i18n "disabled" }}</a-radio-button>
+                <a-radio-button value="depleted">{{ i18n "depleted" }}</a-radio-button>
+                <a-radio-button value="expiring">{{ i18n "depletingSoon" }}</a-radio-button>
+                <a-radio-button value="online">{{ i18n "online" }}</a-radio-button>
+              </a-radio-group>
+            </div>
+            <a-back-top></a-back-top>
+            <a-table :columns="isMobile ? mobileColumns : columns" :row-key="dbInbound => dbInbound.id"
+                :data-source="searchedInbounds"
+                :scroll="isMobile ? {} : { x: 1000 }"
+                :pagination=pagination(searchedInbounds)
+                :expand-icon-as-cell="false"
+                :expand-row-by-click="false"
+                :expand-icon-column-index="0"
+                :indent-size="0"
+                :row-class-name="dbInbound => (dbInbound.isMultiUser() ? '' : 'hideExpandIcon')"
+                style="margin-top: 10px">
+              <template slot="action" slot-scope="text, dbInbound">
+                <a-dropdown :trigger="['click']">
+                  <a-icon @click="e => e.preventDefault()" type="more" style="font-size: 20px; text-decoration: solid;"></a-icon>
+                  <a-menu slot="overlay" @click="a => clickAction(a, dbInbound)" :theme="themeSwitcher.currentTheme">
+                    <a-menu-item key="edit">
+                      <a-icon type="edit"></a-icon>
+                      {{ i18n "edit" }}
+                    </a-menu-item>
+                    <a-menu-item key="qrcode" v-if="(dbInbound.isSS && !dbInbound.toInbound().isSSMultiUser) || dbInbound.isWireguard">
+                      <a-icon type="qrcode"></a-icon>
+                      {{ i18n "qrCode" }}
+                    </a-menu-item>
+                    <template v-if="dbInbound.isMultiUser()">
+                      <a-menu-item key="addClient">
+                        <a-icon type="user-add"></a-icon>
+                        {{ i18n "pages.client.add"}}
+                      </a-menu-item>
+                      <a-menu-item key="addBulkClient">
+                        <a-icon type="usergroup-add"></a-icon>
+                        {{ i18n "pages.client.bulk"}}
+                      </a-menu-item>
+                      <a-menu-item key="resetClients">
+                        <a-icon type="file-done"></a-icon>
+                        {{ i18n "pages.inbounds.resetInboundClientTraffics"}}
+                      </a-menu-item>
+                      <a-menu-item key="export">
+                        <a-icon type="export"></a-icon>
+                        {{ i18n "pages.inbounds.export"}}
+                      </a-menu-item>
+                      <a-menu-item key="subs" v-if="subSettings.enable">
+                        <a-icon type="export"></a-icon>
+                        {{ i18n "pages.inbounds.export"}} - {{ i18n "pages.settings.subSettings" }}
+                      </a-menu-item>
+                      <a-menu-item key="delDepletedClients" style="color: #FF4D4F;">
+                        <a-icon type="rest"></a-icon>
+                        {{ i18n "pages.inbounds.delDepletedClients" }}
+                      </a-menu-item>
+                    </template>
+                    <template v-else>
+                      <a-menu-item key="showInfo">
+                        <a-icon type="info-circle"></a-icon>
+                        {{ i18n "info"}}
+                      </a-menu-item>
+                    </template>
+                    <a-menu-item key="clipboard">
+                      <a-icon type="copy"></a-icon>
+                      {{ i18n "pages.inbounds.exportInbound" }}
+                    </a-menu-item>
+                    <a-menu-item key="resetTraffic">
+                      <a-icon type="retweet"></a-icon> {{ i18n "pages.inbounds.resetTraffic" }}
+                    </a-menu-item>
+                    <a-menu-item key="clone">
+                      <a-icon type="block"></a-icon> {{ i18n "pages.inbounds.clone"}}
+                    </a-menu-item>
+                    <a-menu-item key="delete">
+                      <span style="color: #FF4D4F">
+                        <a-icon type="delete"></a-icon> {{ i18n "delete"}}
+                      </span>
+                    </a-menu-item>
+                    <a-menu-item v-if="isMobile">
+                      <a-switch size="small" v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
+                      {{ i18n "pages.inbounds.enable" }}
+                    </a-menu-item>
+                  </a-menu>
+                </a-dropdown>
+              </template>
+              <template slot="protocol" slot-scope="text, dbInbound">
+                <a-tag style="margin:0;" color="purple">[[ dbInbound.protocol ]]</a-tag>
+                <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
+                  <a-tag style="margin:0;" color="green">[[ dbInbound.toInbound().stream.network ]]</a-tag>
+                  <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="blue">TLS</a-tag>
+                  <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isXtls" color="blue">XTLS</a-tag>
+                  <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="blue">Reality</a-tag>
+                </template>
+              </template>
+              <template slot="clients" slot-scope="text, dbInbound">
+                <template v-if="clientCount[dbInbound.id]">
+                  <a-tag style="margin:0;" color="green">[[ clientCount[dbInbound.id].clients ]]</a-tag>
+                  <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                    <template slot="content">
+                      <p v-for="clientEmail in clientCount[dbInbound.id].deactive">[[ clientEmail ]]</p>
+                    </template>
+                    <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
+                  </a-popover>
+                  <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                    <template slot="content">
+                      <p v-for="clientEmail in clientCount[dbInbound.id].depleted">[[ clientEmail ]]</p>
+                    </template>
+                    <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
+                  </a-popover>
+                  <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                    <template slot="content">
+                      <p v-for="clientEmail in clientCount[dbInbound.id].expiring">[[ clientEmail ]]</p>
+                    </template>
+                    <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
+                  </a-popover>
+                  <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                    <template slot="content">
+                      <p v-for="clientEmail in clientCount[dbInbound.id].online">[[ clientEmail ]]</p>
+                    </template>
+                    <a-tag style="margin:0; padding: 0 2px;" color="blue" v-if="clientCount[dbInbound.id].online.length">[[ clientCount[dbInbound.id].online.length ]]</a-tag>
+                  </a-popover>
+                </template>
+              </template>
+              <template slot="traffic" slot-scope="text, dbInbound">
+                <a-popover :overlay-class-name="themeSwitcher.currentTheme">
+                  <template slot="content">
+                    <table cellpadding="2" width="100%">
+                      <tr>
+                        <td>↑[[ sizeFormat(dbInbound.up) ]]</td>
+                        <td>↓[[ sizeFormat(dbInbound.down) ]]</td>
+                      </tr>
+                      <tr v-if="dbInbound.total > 0 &&  dbInbound.up + dbInbound.down < dbInbound.total">
+                        <td>{{ i18n "remained" }}</td>
+                        <td>[[ sizeFormat(dbInbound.total - dbInbound.up - dbInbound.down) ]]</td>
+                      </tr>
+                    </table>
+                  </template>
+                  <a-tag :color="usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
+                    [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
+                    <template v-if="dbInbound.total > 0">
+                        [[ sizeFormat(dbInbound.total) ]]
+                    </template>
+                    <template v-else>
+                      <svg style="fill: currentColor; height: 10px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512">
+                        <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" />
+                      </svg>
+                    </template>
+                  </a-tag>
+                </a-popover>
+              </template>
+              <template slot="enable" slot-scope="text, dbInbound">
+                <a-switch v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
+              </template>
+              <template slot="expiryTime" slot-scope="text, dbInbound">
+                <a-popover v-if="dbInbound.expiryTime > 0" :overlay-class-name="themeSwitcher.currentTheme">
+                  <template slot="content">
+                    [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
+                  </template>
+                  <a-tag style="min-width: 50px;" :color="usageColor(new Date().getTime(), app.expireDiff, dbInbound._expiryTime)">
+                    [[ remainedDays(dbInbound._expiryTime) ]]
+                  </a-tag>
+                </a-popover>
+                <a-tag v-else color="purple" class="infinite-tag">&infin;</a-tag>
+              </template>
+              <template slot="info" slot-scope="text, dbInbound">
+                <a-popover placement="bottomRight" :overlay-class-name="themeSwitcher.currentTheme" trigger="click">
+                  <template slot="content">
+                    <table cellpadding="2">
+                      <tr>
+                        <td>{{ i18n "pages.inbounds.protocol" }}</td>
+                        <td>
+                          <a-tag style="margin:0;" color="purple">[[ dbInbound.protocol ]]</a-tag>
+                          <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
+                            <a-tag style="margin:0;" color="blue">[[ dbInbound.toInbound().stream.network ]]</a-tag>
+                            <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="green">tls</a-tag>
+                            <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="green">reality</a-tag>
+                          </template>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td>{{ i18n "pages.inbounds.port" }}</td>
+                        <td><a-tag>[[ dbInbound.port ]]</a-tag></td>
+                      </tr>
+                      <tr v-if="clientCount[dbInbound.id]">
+                        <td>{{ i18n "clients" }}</td>
+                        <td>
+                          <a-tag style="margin:0;" color="blue">[[ clientCount[dbInbound.id].clients ]]</a-tag>
+                          <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                            <template slot="content">
+                              <p v-for="clientEmail in clientCount[dbInbound.id].deactive">[[ clientEmail ]]</p>
                            </template>
-                            <template slot="protocol" slot-scope="text, dbInbound">
-                                <a-tag style="margin:0;" color="purple">[[ dbInbound.protocol ]]</a-tag>
-                                <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
-                                    <a-tag style="margin:0;" color="green">[[ dbInbound.toInbound().stream.network ]]</a-tag>
-                                    <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="blue">TLS</a-tag>
-                                    <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isXtls" color="blue">XTLS</a-tag>
-                                    <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="blue">Reality</a-tag>
+                            <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
+                          </a-popover>
+                          <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                            <template slot="content">
+                              <p v-for="clientEmail in clientCount[dbInbound.id].depleted">[[ clientEmail ]]</p>
+                            </template>
+                            <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
+                          </a-popover>
+                          <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                            <template slot="content">
+                              <p v-for="clientEmail in clientCount[dbInbound.id].expiring">[[ clientEmail ]]</p>
+                            </template>
+                            <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
+                          </a-popover>
+                          <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
+                            <template slot="content">
+                              <p v-for="clientEmail in clientCount[dbInbound.id].online">[[ clientEmail ]]</p>
+                            </template>
+                            <a-tag style="margin:0; padding: 0 2px;" color="green" v-if="clientCount[dbInbound.id].online.length">[[ clientCount[dbInbound.id].online.length ]]</a-tag>
+                          </a-popover>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td>{{ i18n "pages.inbounds.traffic" }}</td>
+                        <td>
+                          <a-popover :overlay-class-name="themeSwitcher.currentTheme">
+                            <template slot="content">
+                              <table cellpadding="2" width="100%">
+                                <tr>
+                                  <td>↑[[ sizeFormat(dbInbound.up) ]]</td>
+                                  <td>↓[[ sizeFormat(dbInbound.down) ]]</td>
+                                </tr>
+                                <tr v-if="dbInbound.total > 0 &&  dbInbound.up + dbInbound.down < dbInbound.total">
+                                  <td>{{ i18n "remained" }}</td>
+                                  <td>[[ sizeFormat(dbInbound.total - dbInbound.up - dbInbound.down) ]]</td>
+                                </tr>
+                              </table>
+                            </template>
+                            <a-tag :color="usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
+                                [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
+                                <template v-if="dbInbound.total > 0">
+                                    [[ sizeFormat(dbInbound.total) ]]
                                </template>
-                            </template>
-                            <template slot="clients" slot-scope="text, dbInbound">
-                                <template v-if="clientCount[dbInbound.id]">
-                                    <a-tag style="margin:0;" color="green">[[ clientCount[dbInbound.id].clients ]]</a-tag>
-                                    <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                        <template slot="content">
-                                            <p v-for="clientEmail in clientCount[dbInbound.id].deactive">[[ clientEmail ]]</p>
-                                        </template>
-                                        <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
-                                    </a-popover>
-                                    <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                        <template slot="content">
-                                            <p v-for="clientEmail in clientCount[dbInbound.id].depleted">[[ clientEmail ]]</p>
-                                        </template>
-                                        <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
-                                    </a-popover>
-                                    <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                        <template slot="content">
-                                            <p v-for="clientEmail in clientCount[dbInbound.id].expiring">[[ clientEmail ]]</p>
-                                        </template>
-                                        <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
-                                    </a-popover>
-                                    <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                        <template slot="content">
-                                            <p v-for="clientEmail in clientCount[dbInbound.id].online">[[ clientEmail ]]</p>
-                                        </template>
-                                        <a-tag style="margin:0; padding: 0 2px;" color="blue" v-if="clientCount[dbInbound.id].online.length">[[ clientCount[dbInbound.id].online.length ]]</a-tag>
-                                    </a-popover>  
-                                </template>
-                            </template>
-                            <template slot="traffic" slot-scope="text, dbInbound">
-                                <a-popover :overlay-class-name="themeSwitcher.currentTheme">
-                                    <template slot="content">
-                                        <table cellpadding="2" width="100%">
-                                            <tr>
-                                                <td>↑[[ sizeFormat(dbInbound.up) ]]</td>
-                                                <td>↓[[ sizeFormat(dbInbound.down) ]]</td>
-                                            </tr>
-                                            <tr v-if="dbInbound.total > 0 &&  dbInbound.up + dbInbound.down < dbInbound.total">
-                                                <td>{{ i18n "remained" }}</td>
-                                                <td>[[ sizeFormat(dbInbound.total - dbInbound.up - dbInbound.down) ]]</td>
-                                            </tr>
-                                        </table>
-                                    </template>
-                                    <a-tag :color="usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
-                                        [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
-                                        <template v-if="dbInbound.total > 0">
-                                            [[ sizeFormat(dbInbound.total) ]]
-                                        </template>
-                                        <template v-else>
-                                            <svg style="fill: currentColor; height: 10px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z"/></svg>
-                                        </template>
-                                    </a-tag>
-                                </a-popover>
-                            </template>
-                            <template slot="enable" slot-scope="text, dbInbound">
-                                <a-switch v-model="dbInbound.enable" @change="switchEnable(dbInbound.id,dbInbound.enable)"></a-switch>
-                            </template>
-                            <template slot="expiryTime" slot-scope="text, dbInbound">
-                                <a-popover v-if="dbInbound.expiryTime > 0" :overlay-class-name="themeSwitcher.currentTheme">
-                                    <template slot="content">
-                                        [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
-                                    </template>
-                                    <a-tag style="min-width: 50px;" :color="usageColor(new Date().getTime(), app.expireDiff, dbInbound._expiryTime)">
-                                        [[ remainedDays(dbInbound._expiryTime) ]]
-                                    </a-tag>
-                                </a-popover>
-                                <a-tag v-else color="purple" class="infinite-tag">&infin;</a-tag>
-                            </template>
-                            <template slot="info" slot-scope="text, dbInbound">
-                                <a-popover placement="bottomRight" :overlay-class-name="themeSwitcher.currentTheme" trigger="click">
-                                    <template slot="content">
-                                        <table cellpadding="2">
-                                            <tr>
-                                                <td>{{ i18n "pages.inbounds.protocol" }}</td>
-                                                <td>
-                                                    <a-tag style="margin:0;" color="purple">[[ dbInbound.protocol ]]</a-tag>
-                                                    <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
-                                                        <a-tag style="margin:0;" color="blue">[[ dbInbound.toInbound().stream.network ]]</a-tag>
-                                                        <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="green">tls</a-tag>
-                                                        <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="green">reality</a-tag>
-                                                    </template>                    
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>{{ i18n "pages.inbounds.port" }}</td>
-                                                <td><a-tag>[[ dbInbound.port ]]</a-tag></td>
-                                            </tr>
-                                            <tr v-if="clientCount[dbInbound.id]">
-                                                <td>{{ i18n "clients" }}</td>
-                                                <td>
-                                                    <a-tag style="margin:0;" color="blue">[[ clientCount[dbInbound.id].clients ]]</a-tag>
-                                                    <a-popover title='{{ i18n "disabled" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                                        <template slot="content">
-                                                            <p v-for="clientEmail in clientCount[dbInbound.id].deactive">[[ clientEmail ]]</p>
-                                                        </template>
-                                                        <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
-                                                    </a-popover>
-                                                    <a-popover title='{{ i18n "depleted" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                                        <template slot="content">
-                                                            <p v-for="clientEmail in clientCount[dbInbound.id].depleted">[[ clientEmail ]]</p>
-                                                        </template>
-                                                        <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
-                                                    </a-popover>
-                                                    <a-popover title='{{ i18n "depletingSoon" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                                        <template slot="content">
-                                                            <p v-for="clientEmail in clientCount[dbInbound.id].expiring">[[ clientEmail ]]</p>
-                                                        </template>
-                                                        <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
-                                                    </a-popover>
-                                                    <a-popover title='{{ i18n "online" }}' :overlay-class-name="themeSwitcher.currentTheme">
-                                                        <template slot="content">
-                                                            <p v-for="clientEmail in clientCount[dbInbound.id].online">[[ clientEmail ]]</p>
-                                                        </template>
-                                                        <a-tag style="margin:0; padding: 0 2px;" color="green" v-if="clientCount[dbInbound.id].online.length">[[ clientCount[dbInbound.id].online.length ]]</a-tag>
-                                                    </a-popover>                
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>{{ i18n "pages.inbounds.traffic" }}</td>
-                                                <td>
-                                                    <a-popover :overlay-class-name="themeSwitcher.currentTheme">
-                                                        <template slot="content">
-                                                            <table cellpadding="2" width="100%">
-                                                                <tr>
-                                                                    <td>↑[[ sizeFormat(dbInbound.up) ]]</td>
-                                                                    <td>↓[[ sizeFormat(dbInbound.down) ]]</td>
-                                                                </tr>
-                                                                <tr v-if="dbInbound.total > 0 &&  dbInbound.up + dbInbound.down < dbInbound.total">
-                                                                    <td>{{ i18n "remained" }}</td>
-                                                                    <td>[[ sizeFormat(dbInbound.total - dbInbound.up - dbInbound.down) ]]</td>
-                                                                </tr>
-                                                            </table>
-                                                        </template>
-                                                        <a-tag :color="usageColor(dbInbound.up + dbInbound.down, app.trafficDiff, dbInbound.total)">
-                                                            [[ sizeFormat(dbInbound.up + dbInbound.down) ]] /
-                                                            <template v-if="dbInbound.total > 0">
-                                                                [[ sizeFormat(dbInbound.total) ]]
-                                                            </template>
-                                                            <template v-else>&infin;</template>
-                                                        </a-tag>
-                                                    </a-popover>                    
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>{{ i18n "pages.inbounds.expireDate" }}</td>
-                                                <td>
-                                                    <a-tag style="min-width: 50px; text-align: center;" v-if="dbInbound.expiryTime > 0" :color="dbInbound.isExpiry? 'red': 'blue'">
-                                                        [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
-                                                    </a-tag>
-                                                    <a-tag v-else style="text-align: center;" color="purple" class="infinite-tag">&infin;</a-tag>                    
-                                                </td>
-                                            </tr>
-                                        </table>
-                                    </template>
-                                    <a-badge>
-                                        <a-icon v-if="!dbInbound.enable" slot="count" type="pause-circle" :style="'color: ' + themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-icon>
-                                        <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;">
-                                            <a-icon type="info"></a-icon>
-                                        </a-button>
-                                    </a-badge>
-                                </a-popover>
-                            </template>
-                            <template slot="expandedRowRender" slot-scope="record">
-                                <a-table
-                                    :row-key="client => client.id"
-                                    :columns="isMobile ? innerMobileColumns : innerColumns"
-                                    :data-source="getInboundClients(record)"
-                                    :pagination=pagination(getInboundClients(record))
-                                    :style="isMobile ? 'margin: -12px 2px -13px;' : 'margin: -12px 22px -13px;'">
-                                    {{template "client_table"}}
-                                </a-table>
-                            </template>
-                        </a-table>
-                    </a-card>
-                </transition>
-            </a-spin>
-        </a-layout-content>
-    </a-layout>
+                              <template v-else>&infin;</template>
+                            </a-tag>
+                          </a-popover>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td>{{ i18n "pages.inbounds.expireDate" }}</td>
+                        <td>
+                          <a-tag style="min-width: 50px; text-align: center;" v-if="dbInbound.expiryTime > 0" :color="dbInbound.isExpiry? 'red': 'blue'">
+                            [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
+                          </a-tag>
+                          <a-tag v-else style="text-align: center;" color="purple" class="infinite-tag">&infin;</a-tag>
+                        </td>
+                      </tr>
+                    </table>
+                  </template>
+                  <a-badge>
+                    <a-icon v-if="!dbInbound.enable" slot="count" type="pause-circle" :style="'color: ' + themeSwitcher.isDarkTheme ? '#2c3950' : '#bcbcbc'"></a-icon>
+                    <a-button shape="round" size="small" style="font-size: 14px; padding: 0 10px;">
+                      <a-icon type="info"></a-icon>
+                    </a-button>
+                  </a-badge>
+                </a-popover>
+              </template>
+              <template slot="expandedRowRender" slot-scope="record">
+                <a-table
+                  :row-key="client => client.id"
+                  :columns="isMobile ? innerMobileColumns : innerColumns"
+                  :data-source="getInboundClients(record)"
+                  :pagination=pagination(getInboundClients(record))
+                  :style="isMobile ? 'margin: -12px 2px -13px;' : 'margin: -12px 22px -13px;'">
+                  {{template "client_table"}}
+                </a-table>
+              </template>
+            </a-table>
+          </a-card>
+        </transition>
+      </a-spin>
+    </a-layout-content>
+  </a-layout>
 </a-layout>
 {{template "js" .}}
 <script src="{{ .base_path }}assets/base64/base64.min.js"></script>
-<script src="{{ .base_path }}assets/qrcode/qrious.min.js"></script>
+<script src="{{ .base_path }}assets/qrcode/qrious2.min.js"></script>
 <script src="{{ .base_path }}assets/clipboard/clipboard.min.js"></script>
 <script src="{{ .base_path }}assets/uri/URI.min.js"></script>
 <script src="{{ .base_path }}assets/js/model/xray.js?{{ .cur_ver }}"></script>
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -19,327 +19,314 @@
 </style>

 <body>
-<a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
+  <a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
    {{ template "commonSider" . }}
    <a-layout id="content-layout">
-        <a-layout-content>
-            <a-spin :spinning="spinning" :delay="200" :tip="loadingTip"/>
-            <transition name="list" appear>
-                <a-alert type="error" v-if="showAlert" style="margin-bottom: 10px"
-                message='{{ i18n "secAlertTitle" }}'
-                color="red"
-                description='{{ i18n "secAlertSsl" }}'
-                show-icon closable
-                >
-                </a-alert>
-            </transition>
-            <transition name="list" appear>
+      <a-layout-content>
+        <a-spin :spinning="spinning" :delay="200" :tip="loadingTip">
+          <transition name="list" appear>
+            <a-alert type="error" v-if="showAlert" style="margin-bottom: 10px"
+              message='{{ i18n "secAlertTitle" }}'
+              color="red"
+              description='{{ i18n "secAlertSsl" }}'
+              show-icon closable>
+            </a-alert>
+          </transition>
+          <transition name="list" appear>
+            <a-row>
+              <a-card hoverable>
                <a-row>
-                    <a-card hoverable>
-                        <a-row>
-                            <a-col :sm="24" :md="12">
-                                <a-row>
-                                    <a-col :span="12" style="text-align: center">
-                                        <a-progress type="dashboard" status="normal"
-                                                    :stroke-color="status.cpu.color"
-                                                    :percent="status.cpu.percent"></a-progress>
-                                        <div><b>CPU:</b> [[ cpuCoreFormat(status.cpuCores) ]]</div>
-                                        <div><b>Speed:</b> [[ cpuSpeedFormat(status.cpuSpeedMhz) ]]</div>
-                                    </a-col>
-                                    <a-col :span="12" style="text-align: center">
-                                        <a-progress type="dashboard" status="normal"
-                                                    :stroke-color="status.mem.color"
-                                                    :percent="status.mem.percent"></a-progress>
-                                        <div>
-                                            <b>{{ i18n "pages.index.memory"}}:</b> [[ sizeFormat(status.mem.current) ]] / [[ sizeFormat(status.mem.total) ]]
-                                        </div>
-                                    </a-col>
-                                </a-row>
-                            </a-col>
-                            <a-col :sm="24" :md="12">
-                                <a-row>
-                                    <a-col :span="12" style="text-align: center">
-                                        <a-progress type="dashboard" status="normal"
-                                                    :stroke-color="status.swap.color"
-                                                    :percent="status.swap.percent"></a-progress>
-                                        <div>
-                                            <b>Swap:</b> [[ sizeFormat(status.swap.current) ]] / [[ sizeFormat(status.swap.total) ]]
-                                        </div>
-                                    </a-col>
-                                    <a-col :span="12" style="text-align: center">
-                                        <a-progress type="dashboard" status="normal"
-                                                    :stroke-color="status.disk.color"
-                                                    :percent="status.disk.percent"></a-progress>
-                                        <div>
-                                            <b>{{ i18n "pages.index.hard"}}:</b> [[ sizeFormat(status.disk.current) ]] / [[ sizeFormat(status.disk.total) ]]
-                                        </div>
-                                    </a-col>
-                                </a-row>
-                            </a-col>
-                        </a-row>
-                    </a-card>
+                  <a-col :sm="24" :md="12">
+                    <a-row>
+                      <a-col :span="12" style="text-align: center">
+                        <a-progress type="dashboard" status="normal"
+                          :stroke-color="status.cpu.color"
+                          :percent="status.cpu.percent"></a-progress>
+                        <div><b>CPU:</b> [[ cpuCoreFormat(status.cpuCores) ]]</div>
+                        <div><b>Speed:</b> [[ cpuSpeedFormat(status.cpuSpeedMhz) ]]</div>
+                      </a-col>
+                      <a-col :span="12" style="text-align: center">
+                        <a-progress type="dashboard" status="normal"
+                          :stroke-color="status.mem.color"
+                          :percent="status.mem.percent"></a-progress>
+                        <div>
+                          <b>{{ i18n "pages.index.memory"}}:</b> [[ sizeFormat(status.mem.current) ]] / [[ sizeFormat(status.mem.total) ]]
+                        </div>
+                      </a-col>
+                    </a-row>
+                  </a-col>
+                  <a-col :sm="24" :md="12">
+                    <a-row>
+                      <a-col :span="12" style="text-align: center">
+                        <a-progress type="dashboard" status="normal"
+                          :stroke-color="status.swap.color"
+                          :percent="status.swap.percent"></a-progress>
+                        <div>
+                          <b>Swap:</b> [[ sizeFormat(status.swap.current) ]] / [[ sizeFormat(status.swap.total) ]]
+                        </div>
+                      </a-col>
+                      <a-col :span="12" style="text-align: center">
+                        <a-progress type="dashboard" status="normal"
+                          :stroke-color="status.disk.color"
+                          :percent="status.disk.percent"></a-progress>
+                        <div>
+                          <b>{{ i18n "pages.index.hard"}}:</b> [[ sizeFormat(status.disk.current) ]] / [[ sizeFormat(status.disk.total) ]]
+                        </div>
+                      </a-col>
+                    </a-row>
+                  </a-col>
                </a-row>
-            </transition>
-            <transition name="list" appear>
-                <a-row>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <b>3X-UI:</b>
-                            <a rel="noopener" href="https://github.com/MHSanaei/3x-ui/releases" target="_blank"><a-tag color="green">v{{ .cur_ver }}</a-tag></a>
-                            <a rel="noopener" href="https://t.me/panel3xui" target="_blank"><a-tag color="green">@Panel3xui</a-tag></a>
-                        </a-card>
+              </a-card>
+            </a-row>
+          </transition>
+          <transition name="list" appear>
+            <a-row>
+              <a-col :sm="24" :lg="12">
+                <a-card hoverable>
+                  <b>3X-UI:</b>
+                  <a rel="noopener" href="https://github.com/MHSanaei/3x-ui/releases" target="_blank"><a-tag color="green">v{{ .cur_ver }}</a-tag></a>
+                  <a rel="noopener" href="https://t.me/XrayUI" target="_blank"><a-tag color="green">@XrayUI</a-tag></a>
+                </a-card>
+              </a-col>
+              <a-col :sm="24" :lg="12">
+                <a-card hoverable>
+                  <b>{{ i18n "pages.index.operationHours" }}:</b>
+                  <a-tag :color="status.xray.color">Xray: [[ formatSecond(status.appStats.uptime) ]]</a-tag>
+                  <a-tag color="green">OS: [[ formatSecond(status.uptime) ]]</a-tag>
+                </a-card>
+              </a-col>
+              <a-col :sm="24" :lg="12">
+                <a-card hoverable>
+                  <b>{{ i18n "pages.index.xrayStatus" }}:</b>
+                  <a-tag style="text-transform: capitalize;" :color="status.xray.color">[[ status.xray.state ]] </a-tag>
+                  <a-popover v-if="status.xray.state === State.Error" :overlay-class-name="themeSwitcher.currentTheme">
+                    <span slot="title" style="font-size: 12pt">An error occurred while running Xray
+                      <a-tag color="purple" style="cursor: pointer; float: right;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
+                    </span>
+                    <template slot="content">
+                      <p style="max-width: 400px" v-for="line in status.xray.errorMsg.split('\n')">[[ line ]]</p>
+                    </template>
+                    <a-icon type="question-circle"></a-icon>
+                  </a-popover>
+                  <a-tag color="purple" style="cursor: pointer;" @click="stopXrayService">{{ i18n "pages.index.stopXray" }}</a-tag>
+                  <a-tag color="purple" style="cursor: pointer;" @click="restartXrayService">{{ i18n "pages.index.restartXray" }}</a-tag>
+                  <a-tag color="purple" style="cursor: pointer;" @click="openSelectV2rayVersion">v[[ status.xray.version ]]</a-tag>
+                </a-card>
+              </a-col>
+              <a-col :sm="24" :lg="12">
+                <a-card hoverable>
+                  <b>{{ i18n "menu.link" }}:</b>
+                  <a-tag color="purple" style="cursor: pointer;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
+                  <a-tag color="purple" style="cursor: pointer;" @click="openConfig">{{ i18n "pages.index.config" }}</a-tag>
+                  <a-tag color="purple" style="cursor: pointer;" @click="openBackup">{{ i18n "pages.index.backup" }}</a-tag>
+                </a-card>
+              </a-col>
+              <a-col :sm="24" :lg="12">
+                <a-card hoverable>
+                  <b>{{ i18n "pages.index.systemLoad" }}:</b>
+                  <a-tag color="green">
+                    <a-tooltip>
+                          [[ status.loads[0] ]] | [[ status.loads[1] ]] | [[ status.loads[2] ]]
+                      <template slot="title">
+                        {{ i18n "pages.index.systemLoadDesc" }}
+                      </template>
+                    </a-tooltip>
+                  </a-tag>
+                </a-card>
+              </a-col>
+              <a-col :sm="24" :lg="12">
+                <a-card hoverable>
+                  <b>{{ i18n "usage"}}:</b>
+                  <a-tag color="green"> RAM: [[ sizeFormat(status.appStats.mem) ]] </a-tag>
+                  <a-tag color="green"> Threads: [[ status.appStats.threads ]] </a-tag>
+                </a-card>
+              </a-col>
+              <a-col :sm="24" :lg="12">
+                <a-card hoverable>
+                  <a-row>
+                    <a-col :span="12">
+                      <a-tag>
+                        <a-tooltip>
+                          <a-icon type="global"></a-icon> IPv4
+                          <template slot="title">
+                            [[ status.publicIP.ipv4 ]]
+                          </template>
+                        </a-tooltip>
+                      </a-tag>
                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <b>{{ i18n "pages.index.operationHours" }}:</b>
-                            <a-tag :color="status.xray.color">Xray: [[ formatSecond(status.appStats.uptime) ]]</a-tag>
-                            <a-tag color="green">OS: [[ formatSecond(status.uptime) ]]</a-tag>
-                        </a-card>
+                    <a-col :span="12">
+                      <a-tag>
+                        <a-tooltip>
+                          <a-icon type="global"></a-icon> IPv6
+                          <template slot="title">
+                            [[ status.publicIP.ipv6 ]]
+                          </template>
+                        </a-tooltip>
+                      </a-tag>
                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <b>{{ i18n "pages.index.xrayStatus" }}:</b>
-                            <a-tag style="text-transform: capitalize;" :color="status.xray.color">[[ status.xray.state ]]
-                            </a-tag>
-                            <a-popover v-if="status.xray.state === State.Error"
-                                :overlay-class-name="themeSwitcher.currentTheme">
-                                <span slot="title" style="font-size: 12pt">An error occurred while running Xray
-                                    <a-tag color="purple" style="cursor: pointer; float: right;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
-                                </span>
-                                <template slot="content">
-                                    <p style="max-width: 400px" v-for="line in status.xray.errorMsg.split('\n')">[[ line ]]</p>
-                                </template>
-                                <a-icon type="question-circle"></a-icon>
-                            </a-popover>
-                            <a-tag color="purple" style="cursor: pointer;" @click="stopXrayService">{{ i18n "pages.index.stopXray" }}</a-tag>
-                            <a-tag color="purple" style="cursor: pointer;" @click="restartXrayService">{{ i18n "pages.index.restartXray" }}</a-tag>                    
-                            <a-tag color="purple" style="cursor: pointer;" @click="openSelectV2rayVersion">v[[ status.xray.version ]]</a-tag>
-                        </a-card>
+                  </a-row>
+                </a-card>
+              </a-col>
+              <a-col :sm="24" :lg="12">
+                <a-card hoverable>
+                  <a-row>
+                    <a-col :span="12">
+                      <a-tag>
+                        <a-tooltip>
+                          <a-icon type="swap"></a-icon> TCP: [[ status.tcpCount ]]
+                          <template slot="title">
+                            {{ i18n "pages.index.connectionTcpCountDesc" }}
+                          </template>
+                        </a-tooltip>
+                      </a-tag>
                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <b>{{ i18n "menu.link" }}:</b>
-                            <a-tag color="purple" style="cursor: pointer;" @click="openLogs()">{{ i18n "pages.index.logs" }}</a-tag>
-                            <a-tag color="purple" style="cursor: pointer;" @click="openConfig">{{ i18n "pages.index.config" }}</a-tag>
-                            <a-tag color="purple" style="cursor: pointer;" @click="openBackup">{{ i18n "pages.index.backup" }}</a-tag>
-                        </a-card>
+                    <a-col :span="12">
+                      <a-tag>
+                        <a-tooltip>
+                          <a-icon type="swap"></a-icon> UDP: [[ status.udpCount ]]
+                          <template slot="title">
+                            {{ i18n "pages.index.connectionUdpCountDesc" }}
+                          </template>
+                        </a-tooltip>
+                      </a-tag>
                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <b>{{ i18n "pages.index.systemLoad" }}:</b>
-                            <a-tag color="green">
-                            <a-tooltip>
-                                [[ status.loads[0] ]] | [[ status.loads[1] ]] | [[ status.loads[2] ]]
-                                <template slot="title">
-                                    {{ i18n "pages.index.systemLoadDesc" }}
-                                </template>
-                            </a-tooltip>
-                            </a-tag>
-                        </a-card>
+                  </a-row>
+                </a-card>
+              </a-col>
+              <a-col :sm="24" :lg="12">
+                <a-card hoverable>
+                  <a-row>
+                    <a-col :span="12">
+                      <a-tag>
+                        <a-tooltip>
+                          <a-icon type="arrow-up"></a-icon> Up: [[ sizeFormat(status.netIO.up) ]]/s
+                          <template slot="title">
+                            {{ i18n "pages.index.upSpeed" }}
+                          </template>
+                        </a-tooltip>
+                      </a-tag>
                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <b>{{ i18n "usage"}}:</b>
-                            <a-tag color="green">
-                                RAM: [[ sizeFormat(status.appStats.mem) ]]
-                            </a-tag>
-                            <a-tag color="green">
-                                Threads: [[ status.appStats.threads ]]
-                            </a-tag>
-                        </a-card>
+                    <a-col :span="12">
+                      <a-tag>
+                        <a-tooltip>
+                          <a-icon type="arrow-down"></a-icon> Down: [[ sizeFormat(status.netIO.down) ]]/s
+                          <template slot="title">
+                            {{ i18n "pages.index.downSpeed" }}
+                          </template>
+                        </a-tooltip>
+                      </a-tag>
                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <a-row>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                    <a-icon type="global"></a-icon> IPv4
-                                        <template slot="title">
-                                            [[ status.publicIP.ipv4 ]]
-                                        </template>
-                                    </a-tooltip>
-                                </a-tag>
-                            </a-col>
-                            <a-col :span="12">
-                                <a-tag>
-                                    <a-tooltip>
-                                    <a-icon type="global"></a-icon> IPv6
-                                        <template slot="title">
-                                            [[ status.publicIP.ipv6 ]]
-                                        </template>
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                            </a-row>
-                        </a-card>
-                    </a-col>                    
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <a-row>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                    <a-icon type="swap"></a-icon> TCP:  [[ status.tcpCount ]]
-                                        <template slot="title">
-                                            {{ i18n "pages.index.connectionTcpCountDesc" }}
-                                        </template>
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                    <a-icon type="swap"></a-icon> UDP:  [[ status.udpCount ]]
-                                        <template slot="title">
-                                            {{ i18n "pages.index.connectionUdpCountDesc" }}
-                                        </template>
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                            </a-row>
-                        </a-card>
+                  </a-row>
+                </a-card>
+              </a-col>
+              <a-col :sm="24" :lg="12">
+                <a-card hoverable>
+                  <a-row>
+                    <a-col :span="12">
+                      <a-tag>
+                        <a-tooltip>
+                          <a-icon type="cloud-upload"></a-icon>
+                          <template slot="title">
+                            {{ i18n "pages.index.totalSent" }}
+                          </template> Out: [[ sizeFormat(status.netTraffic.sent) ]]
+                        </a-tooltip>
+                      </a-tag>
                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <a-row>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                    <a-icon type="arrow-up"></a-icon>
-                                    Up: [[ sizeFormat(status.netIO.up) ]]/s
-                                        <template slot="title">
-                                            {{ i18n "pages.index.upSpeed" }}
-                                        </template>
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                    <a-icon type="arrow-down"></a-icon>
-                                    Down: [[ sizeFormat(status.netIO.down) ]]/s
-                                        <template slot="title">
-                                            {{ i18n "pages.index.downSpeed" }}
-                                        </template>
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                            </a-row>
-                        </a-card>
+                    <a-col :span="12">
+                      <a-tag>
+                        <a-tooltip>
+                          <a-icon type="cloud-download"></a-icon>
+                          <template slot="title">
+                            {{ i18n "pages.index.totalReceive" }}
+                          </template> In: [[ sizeFormat(status.netTraffic.recv) ]]
+                        </a-tooltip>
+                      </a-tag>
                    </a-col>
-                    <a-col :sm="24" :lg="12">
-                        <a-card hoverable>
-                            <a-row>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                        <a-icon type="cloud-upload"></a-icon>
-                                        <template slot="title">
-                                            {{ i18n "pages.index.totalSent" }}
-                                        </template> Out: [[ sizeFormat(status.netTraffic.sent) ]]
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                                <a-col :span="12">
-                                    <a-tag>
-                                    <a-tooltip>
-                                        <a-icon type="cloud-download"></a-icon>
-                                        <template slot="title">
-                                            {{ i18n "pages.index.totalReceive" }}
-                                        </template> In: [[ sizeFormat(status.netTraffic.recv) ]]
-                                    </a-tooltip>
-                                    </a-tag>
-                                </a-col>
-                            </a-row>
-                        </a-card>
-                    </a-col>
-                </a-row>
-            </transition>
-        </a-layout-content>
+                  </a-row>
+                </a-card>
+              </a-col>
+            </a-row>
+          </transition>
+        </a-spin>
+      </a-layout-content>
    </a-layout>
-
    <a-modal id="version-modal" v-model="versionModal.visible" title='{{ i18n "pages.index.xraySwitch" }}' :closable="true"
        @ok="() => versionModal.visible = false" :class="themeSwitcher.currentTheme" footer="">
-        <a-alert type="warning" style="margin-bottom: 12px; width: fit-content"
-            message='{{ i18n "pages.index.xraySwitchClickDesk" }}' show-icon></a-alert>
-        <template v-for="version, index in versionModal.versions">
-            <a-tag :color="index % 2 == 0 ? 'purple' : 'green'" style="margin-right: 12px; margin-bottom: 12px"
-                @click="switchV2rayVersion(version)">
-                [[ version ]]
-            </a-tag>
-        </template>
+      <a-alert type="warning" style="margin-bottom: 12px; width: fit-content"
+        message='{{ i18n "pages.index.xraySwitchClickDesk" }}' show-icon></a-alert>
+      <template v-for="version, index in versionModal.versions">
+        <a-tag :color="index % 2 == 0 ? 'purple' : 'green'" style="margin-right: 12px; margin-bottom: 12px"
+          @click="switchV2rayVersion(version)">
+          [[ version ]]
+        </a-tag>
+      </template>
    </a-modal>
-
    <a-modal id="log-modal" v-model="logModal.visible"
-             :closable="true" @cancel="() => logModal.visible = false"
-             :class="themeSwitcher.currentTheme"
-             width="800px" footer="">
-        <template slot="title">
-            {{ i18n "pages.index.logs" }}
-            <a-icon :spin="logModal.loading"
-                    type="sync"
-                    style="vertical-align: middle; margin-left: 10px;"
-                    :disabled="logModal.loading"
-                    @click="openLogs()">
-            </a-icon>
-        </template>
-        <a-form layout="inline">
-            <a-form-item>
-                <a-input-group compact>
-                    <a-select v-model="logModal.rows" style="width:70px;"
-                    @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">
-                        <a-select-option value="10">10</a-select-option>
-                        <a-select-option value="20">20</a-select-option>
-                        <a-select-option value="50">50</a-select-option>
-                        <a-select-option value="100">100</a-select-option>
-                    </a-select>
-                    <a-select v-model="logModal.level" style="width:100px;"
-                    @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">
-                        <a-select-option value="debug">Debug</a-select-option>
-                        <a-select-option value="info">Info</a-select-option>
-                        <a-select-option value="notice">Notice</a-select-option>
-                        <a-select-option value="warning">Warning</a-select-option>
-                        <a-select-option value="err">Error</a-select-option>
-                    </a-select>
-                </a-input-group>
-            </a-form-item>
-            <a-form-item>
-                <a-checkbox v-model="logModal.syslog" @change="openLogs()">SysLog</a-checkbox>
-            </a-form-item>
-            <a-form-item style="float: right;">
-                <a-button type="primary" icon="download"
-                :href="'data:application/text;charset=utf-8,' + encodeURIComponent(logModal.logs.join('\n'))" download="x-ui.log">
-                </a-button>
-            </a-form-item>
-        </a-form>
-        <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto;" v-html="logModal.formattedLogs"></div>
+        :closable="true" @cancel="() => logModal.visible = false"
+        :class="themeSwitcher.currentTheme"
+        width="800px" footer="">
+      <template slot="title">
+        {{ i18n "pages.index.logs" }}
+        <a-icon :spin="logModal.loading"
+          type="sync"
+          style="vertical-align: middle; margin-left: 10px;"
+          :disabled="logModal.loading"
+          @click="openLogs()">
+        </a-icon>
+      </template>
+      <a-form layout="inline">
+        <a-form-item style="margin-right: 0.5rem;">
+          <a-input-group compact>
+            <a-select size="small" v-model="logModal.rows" style="width:70px;"
+                @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">
+              <a-select-option value="10">10</a-select-option>
+              <a-select-option value="20">20</a-select-option>
+              <a-select-option value="50">50</a-select-option>
+              <a-select-option value="100">100</a-select-option>
+            </a-select>
+            <a-select size="small" v-model="logModal.level" style="width:95px;"
+                @change="openLogs()" :dropdown-class-name="themeSwitcher.currentTheme">
+              <a-select-option value="debug">Debug</a-select-option>
+              <a-select-option value="info">Info</a-select-option>
+              <a-select-option value="notice">Notice</a-select-option>
+              <a-select-option value="warning">Warning</a-select-option>
+              <a-select-option value="err">Error</a-select-option>
+            </a-select>
+          </a-input-group>
+        </a-form-item>
+        <a-form-item>
+          <a-checkbox v-model="logModal.syslog" @change="openLogs()">SysLog</a-checkbox>
+        </a-form-item>
+        <a-form-item style="float: right;">
+          <a-button type="primary" icon="download"
+            :href="'data:application/text;charset=utf-8,' + encodeURIComponent(logModal.logs?.join('\n'))" download="x-ui.log">
+          </a-button>
+        </a-form-item>
+      </a-form>
+      <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto; margin-top: 0.5rem;" v-html="logModal.formattedLogs"></div>
    </a-modal>
-
    <a-modal id="backup-modal" v-model="backupModal.visible" :title="backupModal.title"
-            :closable="true" footer=""
-            :class="themeSwitcher.currentTheme">
-            <a-alert type="warning" style="margin-bottom: 10px; width: fit-content"
-            :message="backupModal.description"
-            show-icon
-            ></a-alert>
-        <a-space direction="horizontal" style="text-align: center" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="exportDatabase()">
-                [[ backupModal.exportText ]]
-            </a-button>
-            <a-button type="primary" @click="importDatabase()">
-                [[ backupModal.importText ]]
-            </a-button>
-        </a-space>
+        :closable="true" footer=""
+        :class="themeSwitcher.currentTheme">
+      <a-alert type="warning" style="margin-bottom: 10px; width: fit-content"
+        :message="backupModal.description"
+        show-icon>
+      </a-alert>
+      <a-space direction="horizontal" style="text-align: center; margin-bottom: 10px;">
+        <a-button type="primary" @click="exportDatabase()">
+            [[ backupModal.exportText ]]
+        </a-button>
+        <a-button type="primary" @click="importDatabase()">
+            [[ backupModal.importText ]]
+        </a-button>
+      </a-space>
    </a-modal>
-
-</a-layout>
+  </a-layout>
 {{template "js" .}}
 <script src="{{ .base_path }}assets/clipboard/clipboard.min.js"></script>
 {{template "component/themeSwitcher" .}}
 {{template "textModal"}}
 <script>
-
    const State = {
        Running: "running",
        Stop: "stop",
@@ -664,7 +651,6 @@
            }
        },
    });
-
 </script>
 </body>
 </html>
--- a/web/html/xui/settings.html
+++ b/web/html/xui/settings.html
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
--- a/web/html/xui/xray_balancer_modal.html
+++ b/web/html/xui/xray_balancer_modal.html
@@ -21,8 +21,8 @@
            <a-select v-model="balancerModal.balancer.strategy" :dropdown-class-name="themeSwitcher.currentTheme">
                <a-select-option value="random">Random</a-select-option>
                <a-select-option value="roundRobin">Round Robin</a-select-option>
-                <a-select-option value="leastload">Least Load</a-select-option>
-                <a-select-option value="leastping">Least Ping</a-select-option>
+                <a-select-option value="leastLoad">Least Load</a-select-option>
+                <a-select-option value="leastPing">Least Ping</a-select-option>
            </a-select>
        </a-form-item>
        <a-form-item label='{{ i18n "pages.xray.balancer.balancerSelectors" }}' has-feedback 
--- a/web/job/check_client_ip_job.go
+++ b/web/job/check_client_ip_job.go
@@ -44,7 +44,7 @@ func (j *CheckClientIpJob) Run() {
 			shouldClearAccessLog = j.processLogFile()
 		} else {
 			if !f2bInstalled {
-				logger.Warning("fail2ban is not installed. IP limiting may not work properly.")
+				logger.Warning("[iplimit] fail2ban is not installed. IP limiting may not work properly.")
 			}
 		}
 	}
@@ -58,8 +58,11 @@ func (j *CheckClientIpJob) clearAccessLog() {
 	logAccessP, err := os.OpenFile(xray.GetAccessPersistentLogPath(), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0o644)
 	j.checkError(err)

+	// get access log path to open it
+	accessLogPath, err := xray.GetAccessLogPath()
+	j.checkError(err)
+
 	// reopen the access log file for reading
-	accessLogPath := xray.GetAccessLogPath()
 	file, err := os.Open(accessLogPath)
 	j.checkError(err)

@@ -106,15 +109,9 @@ func (j *CheckClientIpJob) hasLimitIp() bool {
 	return false
 }

-func (j *CheckClientIpJob) checkFail2BanInstalled() bool {
-	cmd := "fail2ban-client"
-	args := []string{"-h"}
-	err := exec.Command(cmd, args...).Run()
-	return err == nil
-}
-
 func (j *CheckClientIpJob) processLogFile() bool {
-	accessLogPath := xray.GetAccessLogPath()
+	accessLogPath, err := xray.GetAccessLogPath()
+	j.checkError(err)

 	file, err := os.Open(accessLogPath)
 	j.checkError(err)
@@ -170,10 +167,21 @@ func (j *CheckClientIpJob) processLogFile() bool {
 	return shouldCleanLog
 }

-func (j *CheckClientIpJob) checkAccessLogAvailable(doWarning bool) bool {
-	accessLogPath := xray.GetAccessLogPath()
+func (j *CheckClientIpJob) checkFail2BanInstalled() bool {
+	cmd := "fail2ban-client"
+	args := []string{"-h"}
+	err := exec.Command(cmd, args...).Run()
+	return err == nil
+}
+
+func (j *CheckClientIpJob) checkAccessLogAvailable(handleWarning bool) bool {
 	isAvailable := true
 	warningMsg := ""
+	accessLogPath, err := xray.GetAccessLogPath()
+	if err != nil {
+		return false
+	}
+
 	// access log is not available if it is set to 'none' or an empty string
 	switch accessLogPath {
 	case "none":
@@ -183,7 +191,8 @@ func (j *CheckClientIpJob) checkAccessLogAvailable(doWarning bool) bool {
 		warningMsg = "Access log doesn't exist in your Xray Configs"
 		isAvailable = false
 	}
-	if doWarning && warningMsg != "" {
+
+	if handleWarning && warningMsg != "" {
 		logger.Warning(warningMsg)
 	}
 	return isAvailable
--- a/web/job/clear_logs_job.go
+++ b/web/job/clear_logs_job.go
@@ -19,29 +19,22 @@ func (j *ClearLogsJob) Run() {
 	logFiles := []string{xray.GetIPLimitLogPath(), xray.GetIPLimitBannedLogPath(), xray.GetAccessPersistentLogPath()}
 	logFilesPrev := []string{xray.GetIPLimitBannedPrevLogPath(), xray.GetAccessPersistentPrevLogPath()}

-	// clear old previous logs
-	for i := 0; i < len(logFilesPrev); i++ {
-		if err := os.Truncate(logFilesPrev[i], 0); err != nil {
-			logger.Warning("clear logs job err:", err)
-		}
-	}
-
 	// clear log files and copy to previous logs
 	for i := 0; i < len(logFiles); i++ {
 		if i > 0 {
 			// copy to previous logs
-			logFilePrev, err := os.OpenFile(logFilesPrev[i-1], os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644)
+			logFilePrev, err := os.OpenFile(logFilesPrev[i-1], os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
 			if err != nil {
 				logger.Warning("clear logs job err:", err)
 			}

-			logFile, err := os.Open(logFiles[i])
-			if err != nil {
-				logger.Warning("clear logs job err:", err)
-			}
-
-			_, err = io.Copy(logFilePrev, logFile)
-			if err != nil {
+			logFile, err :=  os.OpenFile(logFiles[i], os.O_CREATE|os.O_RDONLY, 0644)
+			if err == nil {
+				_, err = io.Copy(logFilePrev, logFile)
+				if err != nil {
+					logger.Warning("clear logs job err:", err)
+				}
+			} else {
 				logger.Warning("clear logs job err:", err)
 			}

--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -172,6 +172,23 @@ func (s *InboundService) AddInbound(inbound *model.Inbound) (*model.Inbound, boo
 		return inbound, false, err
 	}

+	// Secure client ID
+	for _, client := range clients {
+		if inbound.Protocol == "trojan" {
+			if client.Password == "" {
+				return inbound, false, common.NewError("empty client ID")
+			}
+		} else if inbound.Protocol == "shadowsocks" {
+			if client.Email == "" {
+				return inbound, false, common.NewError("empty client ID")
+			}
+		} else {
+			if client.ID == "" {
+				return inbound, false, common.NewError("empty client ID")
+			}
+		}
+	}
+
 	db := database.GetDB()
 	tx := db.Begin()
 	defer func() {
@@ -413,6 +430,23 @@ func (s *InboundService) AddInboundClient(data *model.Inbound) (bool, error) {
 		return false, err
 	}

+	// Secure client ID
+	for _, client := range clients {
+		if oldInbound.Protocol == "trojan" {
+			if client.Password == "" {
+				return false, common.NewError("empty client ID")
+			}
+		} else if oldInbound.Protocol == "shadowsocks" {
+			if client.Email == "" {
+				return false, common.NewError("empty client ID")
+			}
+		} else {
+			if client.ID == "" {
+				return false, common.NewError("empty client ID")
+			}
+		}
+	}
+
 	var oldSettings map[string]interface{}
 	err = json.Unmarshal([]byte(oldInbound.Settings), &oldSettings)
 	if err != nil {
@@ -496,9 +530,9 @@ func (s *InboundService) DelInboundClient(inboundId int, clientId string) (bool,
 		client_key = "email"
 	}

-	inerfaceClients := settings["clients"].([]interface{})
+	interfaceClients := settings["clients"].([]interface{})
 	var newClients []interface{}
-	for _, client := range inerfaceClients {
+	for _, client := range interfaceClients {
 		c := client.(map[string]interface{})
 		c_id := c[client_key].(string)
 		if c_id == clientId {
@@ -1152,20 +1186,20 @@ func (s *InboundService) GetClientByEmail(clientEmail string) (*xray.ClientTraff
 	return nil, nil, common.NewError("Client Not Found In Inbound For Email:", clientEmail)
 }

-func (s *InboundService) SetClientTelegramUserID(trafficId int, tgId string) error {
+func (s *InboundService) SetClientTelegramUserID(trafficId int, tgId int64) (bool, error) {
 	traffic, inbound, err := s.GetClientInboundByTrafficID(trafficId)
 	if err != nil {
-		return err
+		return false, err
 	}
 	if inbound == nil {
-		return common.NewError("Inbound Not Found For Traffic ID:", trafficId)
+		return false, common.NewError("Inbound Not Found For Traffic ID:", trafficId)
 	}

 	clientEmail := traffic.Email

 	oldClients, err := s.GetClients(inbound)
 	if err != nil {
-		return err
+		return false, err
 	}

 	clientId := ""
@@ -1184,13 +1218,13 @@ func (s *InboundService) SetClientTelegramUserID(trafficId int, tgId string) err
 	}

 	if len(clientId) == 0 {
-		return common.NewError("Client Not Found For Email:", clientEmail)
+		return false, common.NewError("Client Not Found For Email:", clientEmail)
 	}

 	var settings map[string]interface{}
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
-		return err
+		return false, err
 	}
 	clients := settings["clients"].([]interface{})
 	var newClients []interface{}
@@ -1204,11 +1238,11 @@ func (s *InboundService) SetClientTelegramUserID(trafficId int, tgId string) err
 	settings["clients"] = newClients
 	modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
 	if err != nil {
-		return err
+		return false, err
 	}
 	inbound.Settings = string(modifiedSettings)
-	_, err = s.UpdateInboundClient(inbound, clientId)
-	return err
+	needRestart, err := s.UpdateInboundClient(inbound, clientId)
+	return needRestart, err
 }

 func (s *InboundService) checkIsEnabledByEmail(clientEmail string) (bool, error) {
@@ -1237,18 +1271,18 @@ func (s *InboundService) checkIsEnabledByEmail(clientEmail string) (bool, error)
 	return isEnable, err
 }

-func (s *InboundService) ToggleClientEnableByEmail(clientEmail string) (bool, error) {
+func (s *InboundService) ToggleClientEnableByEmail(clientEmail string) (bool, bool, error) {
 	_, inbound, err := s.GetClientInboundByEmail(clientEmail)
 	if err != nil {
-		return false, err
+		return false, false, err
 	}
 	if inbound == nil {
-		return false, common.NewError("Inbound Not Found For Email:", clientEmail)
+		return false, false, common.NewError("Inbound Not Found For Email:", clientEmail)
 	}

 	oldClients, err := s.GetClients(inbound)
 	if err != nil {
-		return false, err
+		return false, false, err
 	}

 	clientId := ""
@@ -1269,13 +1303,13 @@ func (s *InboundService) ToggleClientEnableByEmail(clientEmail string) (bool, er
 	}

 	if len(clientId) == 0 {
-		return false, common.NewError("Client Not Found For Email:", clientEmail)
+		return false, false, common.NewError("Client Not Found For Email:", clientEmail)
 	}

 	var settings map[string]interface{}
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
-		return false, err
+		return false, false, err
 	}
 	clients := settings["clients"].([]interface{})
 	var newClients []interface{}
@@ -1289,30 +1323,30 @@ func (s *InboundService) ToggleClientEnableByEmail(clientEmail string) (bool, er
 	settings["clients"] = newClients
 	modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
 	if err != nil {
-		return false, err
+		return false, false, err
 	}
 	inbound.Settings = string(modifiedSettings)

-	_, err = s.UpdateInboundClient(inbound, clientId)
+	needRestart, err := s.UpdateInboundClient(inbound, clientId)
+	if err != nil {
+		return false, needRestart, err
+	}
+
+	return !clientOldEnabled, needRestart, nil
+}
+
+func (s *InboundService) ResetClientIpLimitByEmail(clientEmail string, count int) (bool, error) {
+	_, inbound, err := s.GetClientInboundByEmail(clientEmail)
 	if err != nil {
 		return false, err
 	}
-
-	return !clientOldEnabled, nil
-}
-
-func (s *InboundService) ResetClientIpLimitByEmail(clientEmail string, count int) error {
-	_, inbound, err := s.GetClientInboundByEmail(clientEmail)
-	if err != nil {
-		return err
-	}
 	if inbound == nil {
-		return common.NewError("Inbound Not Found For Email:", clientEmail)
+		return false, common.NewError("Inbound Not Found For Email:", clientEmail)
 	}

 	oldClients, err := s.GetClients(inbound)
 	if err != nil {
-		return err
+		return false, err
 	}

 	clientId := ""
@@ -1331,13 +1365,13 @@ func (s *InboundService) ResetClientIpLimitByEmail(clientEmail string, count int
 	}

 	if len(clientId) == 0 {
-		return common.NewError("Client Not Found For Email:", clientEmail)
+		return false, common.NewError("Client Not Found For Email:", clientEmail)
 	}

 	var settings map[string]interface{}
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
-		return err
+		return false, err
 	}
 	clients := settings["clients"].([]interface{})
 	var newClients []interface{}
@@ -1351,25 +1385,25 @@ func (s *InboundService) ResetClientIpLimitByEmail(clientEmail string, count int
 	settings["clients"] = newClients
 	modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
 	if err != nil {
-		return err
+		return false, err
 	}
 	inbound.Settings = string(modifiedSettings)
-	_, err = s.UpdateInboundClient(inbound, clientId)
-	return err
+	needRestart, err := s.UpdateInboundClient(inbound, clientId)
+	return needRestart, err
 }

-func (s *InboundService) ResetClientExpiryTimeByEmail(clientEmail string, expiry_time int64) error {
+func (s *InboundService) ResetClientExpiryTimeByEmail(clientEmail string, expiry_time int64) (bool, error) {
 	_, inbound, err := s.GetClientInboundByEmail(clientEmail)
 	if err != nil {
-		return err
+		return false, err
 	}
 	if inbound == nil {
-		return common.NewError("Inbound Not Found For Email:", clientEmail)
+		return false, common.NewError("Inbound Not Found For Email:", clientEmail)
 	}

 	oldClients, err := s.GetClients(inbound)
 	if err != nil {
-		return err
+		return false, err
 	}

 	clientId := ""
@@ -1388,13 +1422,13 @@ func (s *InboundService) ResetClientExpiryTimeByEmail(clientEmail string, expiry
 	}

 	if len(clientId) == 0 {
-		return common.NewError("Client Not Found For Email:", clientEmail)
+		return false, common.NewError("Client Not Found For Email:", clientEmail)
 	}

 	var settings map[string]interface{}
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
-		return err
+		return false, err
 	}
 	clients := settings["clients"].([]interface{})
 	var newClients []interface{}
@@ -1408,28 +1442,28 @@ func (s *InboundService) ResetClientExpiryTimeByEmail(clientEmail string, expiry
 	settings["clients"] = newClients
 	modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
 	if err != nil {
-		return err
+		return false, err
 	}
 	inbound.Settings = string(modifiedSettings)
-	_, err = s.UpdateInboundClient(inbound, clientId)
-	return err
+	needRestart, err := s.UpdateInboundClient(inbound, clientId)
+	return needRestart, err
 }

-func (s *InboundService) ResetClientTrafficLimitByEmail(clientEmail string, totalGB int) error {
+func (s *InboundService) ResetClientTrafficLimitByEmail(clientEmail string, totalGB int) (bool, error) {
 	if totalGB < 0 {
-		return common.NewError("totalGB must be >= 0")
+		return false, common.NewError("totalGB must be >= 0")
 	}
 	_, inbound, err := s.GetClientInboundByEmail(clientEmail)
 	if err != nil {
-		return err
+		return false, err
 	}
 	if inbound == nil {
-		return common.NewError("Inbound Not Found For Email:", clientEmail)
+		return false, common.NewError("Inbound Not Found For Email:", clientEmail)
 	}

 	oldClients, err := s.GetClients(inbound)
 	if err != nil {
-		return err
+		return false, err
 	}

 	clientId := ""
@@ -1448,13 +1482,13 @@ func (s *InboundService) ResetClientTrafficLimitByEmail(clientEmail string, tota
 	}

 	if len(clientId) == 0 {
-		return common.NewError("Client Not Found For Email:", clientEmail)
+		return false, common.NewError("Client Not Found For Email:", clientEmail)
 	}

 	var settings map[string]interface{}
 	err = json.Unmarshal([]byte(inbound.Settings), &settings)
 	if err != nil {
-		return err
+		return false, err
 	}
 	clients := settings["clients"].([]interface{})
 	var newClients []interface{}
@@ -1468,11 +1502,11 @@ func (s *InboundService) ResetClientTrafficLimitByEmail(clientEmail string, tota
 	settings["clients"] = newClients
 	modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
 	if err != nil {
-		return err
+		return false, err
 	}
 	inbound.Settings = string(modifiedSettings)
-	_, err = s.UpdateInboundClient(inbound, clientId)
-	return err
+	needRestart, err := s.UpdateInboundClient(inbound, clientId)
+	return needRestart, err
 }

 func (s *InboundService) ResetClientTrafficByEmail(clientEmail string) error {
@@ -1653,10 +1687,10 @@ func (s *InboundService) DelDepletedClients(id int) (err error) {
 	return err
 }

-func (s *InboundService) GetClientTrafficTgBot(tgId string) ([]*xray.ClientTraffic, error) {
+func (s *InboundService) GetClientTrafficTgBot(tgId int64) ([]*xray.ClientTraffic, error) {
 	db := database.GetDB()
 	var inbounds []*model.Inbound
-	err := db.Model(model.Inbound{}).Where("settings like ?", fmt.Sprintf(`%%"tgId": "%s"%%`, tgId)).Find(&inbounds).Error
+	err := db.Model(model.Inbound{}).Where("settings like ?", fmt.Sprintf(`%%"tgId": %d%%`, tgId)).Find(&inbounds).Error
 	if err != nil && err != gorm.ErrRecordNotFound {
 		return nil, err
 	}
--- a/web/service/setting.go
+++ b/web/service/setting.go
@@ -17,6 +17,7 @@ import (
 	"x-ui/util/random"
 	"x-ui/util/reflect_util"
 	"x-ui/web/entity"
+	"x-ui/xray"
 )

 //go:embed config.json
@@ -460,22 +461,11 @@ func (s *SettingService) SetWarp(data string) error {
 }

 func (s *SettingService) GetIpLimitEnable() (bool, error) {
-	templateConfig, err := s.GetXrayConfigTemplate()
+	accessLogPath, err := xray.GetAccessLogPath()
 	if err != nil {
 		return false, err
 	}
-
-	var xrayConfig map[string]interface{}
-	err = json.Unmarshal([]byte(templateConfig), &xrayConfig)
-	if err != nil {
-		return false, err
-	}
-	if logConfig, ok := xrayConfig["log"].(map[string]interface{}); ok {
-		if accessLogPath, ok := logConfig["access"].(string); ok {
-			return accessLogPath == "./access.log", nil
-		}
-	}
-	return false, nil
+	return (accessLogPath != "none" && accessLogPath != ""), nil
 }

 func (s *SettingService) UpdateAllSetting(allSetting *entity.AllSetting) error {
--- a/web/service/tgbot.go
+++ b/web/service/tgbot.go
@@ -6,7 +6,6 @@ import (
 	"net"
 	"net/url"
 	"os"
-	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -39,8 +38,9 @@ var (
 type LoginStatus byte

 const (
-	LoginSuccess LoginStatus = 1
-	LoginFail    LoginStatus = 0
+	LoginSuccess        LoginStatus = 1
+	LoginFail           LoginStatus = 0
+	EmptyTelegramUserID             = int64(0)
 )

 type Tgbot struct {
@@ -207,18 +207,20 @@ func (t *Tgbot) OnReceive() {
 	botHandler.HandleMessage(func(_ *telego.Bot, message telego.Message) {
 		if message.UsersShared != nil {
 			if checkAdmin(message.From.ID) {
-				userIDsStr := ""
-				for _, userID := range message.UsersShared.UserIDs {
-					userIDsStr += strconv.FormatInt(userID, 10) + " "
+				for _, sharedUser := range message.UsersShared.Users {
+					userID := sharedUser.UserID
+					needRestart, err := t.inboundService.SetClientTelegramUserID(message.UsersShared.RequestID, userID)
+					if needRestart {
+						t.xrayService.SetToNeedRestart()
+					}
+					output := ""
+					if err != nil {
+						output += t.I18nBot("tgbot.messages.selectUserFailed")
+					} else {
+						output += t.I18nBot("tgbot.messages.userSaved")
+					}
+					t.SendMsgToTgbot(message.Chat.ID, output, tu.ReplyKeyboardRemove())
 				}
-				err := t.inboundService.SetClientTelegramUserID(message.UsersShared.RequestID, userIDsStr)
-				output := ""
-				if err != nil {
-					output += t.I18nBot("tgbot.messages.selectUserFailed")
-				} else {
-					output += t.I18nBot("tgbot.messages.userSaved")
-				}
-				t.SendMsgToTgbot(message.Chat.ID, output, tu.ReplyKeyboardRemove())
 			} else {
 				t.SendMsgToTgbot(message.Chat.ID, t.I18nBot("tgbot.noResult"), tu.ReplyKeyboardRemove())
 			}
@@ -256,7 +258,9 @@ func (t *Tgbot) answerCommand(message *telego.Message, chatId int64, isAdmin boo
 			if isAdmin {
 				t.searchClient(chatId, commandArgs[0])
 			} else {
-				t.getClientUsage(chatId, strconv.FormatInt(message.From.ID, 10), commandArgs[0])
+				// Convert message.From.ID to int64
+				fromID := int64(message.From.ID)
+				t.getClientUsage(chatId, fromID, commandArgs[0])
 			}
 		} else {
 			msg += t.I18nBot("tgbot.commands.usage")
@@ -331,7 +335,6 @@ func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 			case "reset_traffic_c":
 				err := t.inboundService.ResetClientTrafficByEmail(email)
 				if err == nil {
-					t.xrayService.SetToNeedRestart()
 					t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.resetTrafficSuccess", "Email=="+email))
 					t.searchClient(chatId, email, callbackQuery.Message.GetMessageID())
 				} else {
@@ -372,9 +375,11 @@ func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 				if len(dataArray) == 3 {
 					limitTraffic, err := strconv.Atoi(dataArray[2])
 					if err == nil {
-						err := t.inboundService.ResetClientTrafficLimitByEmail(email, limitTraffic)
-						if err == nil {
+						needRestart, err := t.inboundService.ResetClientTrafficLimitByEmail(email, limitTraffic)
+						if needRestart {
 							t.xrayService.SetToNeedRestart()
+						}
+						if err == nil {
 							t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.setTrafficLimitSuccess", "Email=="+email))
 							t.searchClient(chatId, email, callbackQuery.Message.GetMessageID())
 							return
@@ -501,9 +506,11 @@ func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 							}

 						}
-						err := t.inboundService.ResetClientExpiryTimeByEmail(email, date)
-						if err == nil {
+						needRestart, err := t.inboundService.ResetClientExpiryTimeByEmail(email, date)
+						if needRestart {
 							t.xrayService.SetToNeedRestart()
+						}
+						if err == nil {
 							t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.expireResetSuccess", "Email=="+email))
 							t.searchClient(chatId, email, callbackQuery.Message.GetMessageID())
 							return
@@ -606,9 +613,11 @@ func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 				if len(dataArray) == 3 {
 					count, err := strconv.Atoi(dataArray[2])
 					if err == nil {
-						err := t.inboundService.ResetClientIpLimitByEmail(email, count)
-						if err == nil {
+						needRestart, err := t.inboundService.ResetClientIpLimitByEmail(email, count)
+						if needRestart {
 							t.xrayService.SetToNeedRestart()
+						}
+						if err == nil {
 							t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.resetIpSuccess", "Email=="+email, "Count=="+strconv.Itoa(count)))
 							t.searchClient(chatId, email, callbackQuery.Message.GetMessageID())
 							return
@@ -718,7 +727,10 @@ func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 					t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.errorOperation"))
 					return
 				}
-				err = t.inboundService.SetClientTelegramUserID(traffic.Id, "")
+				needRestart, err := t.inboundService.SetClientTelegramUserID(traffic.Id, EmptyTelegramUserID)
+				if needRestart {
+					t.xrayService.SetToNeedRestart()
+				}
 				if err == nil {
 					t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.removedTGUserSuccess", "Email=="+email))
 					t.clientTelegramUserInfo(chatId, email, callbackQuery.Message.GetMessageID())
@@ -736,9 +748,11 @@ func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 				)
 				t.editMessageCallbackTgBot(chatId, callbackQuery.Message.GetMessageID(), inlineKeyboard)
 			case "toggle_enable_c":
-				enabled, err := t.inboundService.ToggleClientEnableByEmail(email)
-				if err == nil {
+				enabled, needRestart, err := t.inboundService.ToggleClientEnableByEmail(email)
+				if needRestart {
 					t.xrayService.SetToNeedRestart()
+				}
+				if err == nil {
 					if enabled {
 						t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.enableSuccess", "Email=="+email))
 					} else {
@@ -770,8 +784,9 @@ func (t *Tgbot) asnwerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 		t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.getBanLogs"))
 		t.sendBanLogs(chatId, true)
 	case "client_traffic":
+		tgUserID := callbackQuery.From.ID
 		t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.clientUsage"))
-		t.getClientUsage(chatId, strconv.FormatInt(callbackQuery.From.ID, 10))
+		t.getClientUsage(chatId, tgUserID)
 	case "client_commands":
 		t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.commands"))
 		t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.commands.helpClientCommands"))
@@ -1122,7 +1137,7 @@ func (t *Tgbot) clientInfoMsg(
 	return output
 }

-func (t *Tgbot) getClientUsage(chatId int64, tgUserID string, email ...string) {
+func (t *Tgbot) getClientUsage(chatId int64, tgUserID int64, email ...string) {
 	traffics, err := t.inboundService.GetClientTrafficTgBot(tgUserID)
 	if err != nil {
 		logger.Warning(err)
@@ -1132,7 +1147,7 @@ func (t *Tgbot) getClientUsage(chatId int64, tgUserID string, email ...string) {
 	}

 	if len(traffics) == 0 {
-		t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.askToAddUserId", "TgUserID=="+tgUserID))
+		t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.askToAddUserId", "TgUserID=="+strconv.FormatInt(tgUserID, 10)))
 		return
 	}

@@ -1205,8 +1220,8 @@ func (t *Tgbot) clientTelegramUserInfo(chatId int64, email string, messageID ...
 		return
 	}
 	tgId := "None"
-	if len(client.TgID) > 0 {
-		tgId = client.TgID
+	if client.TgID != 0 {
+		tgId = strconv.FormatInt(client.TgID, 10)
 	}

 	output := ""
@@ -1439,24 +1454,20 @@ func (t *Tgbot) notifyExhausted() {
 		logger.Warning("Unable to load Inbounds", err)
 	}

-	var chatIDsDone []string
+	var chatIDsDone []int64
 	for _, inbound := range inbounds {
 		if inbound.Enable {
 			if len(inbound.ClientStats) > 0 {
 				clients, err := t.inboundService.GetClients(inbound)
 				if err == nil {
 					for _, client := range clients {
-						if client.TgID != "" {
-							chatID, err := strconv.ParseInt(client.TgID, 10, 64)
-							if err != nil {
-								logger.Warning("TgID is not a number: ", client.TgID)
-								continue
-							}
-							if !slices.Contains(chatIDsDone, client.TgID) && !checkAdmin(chatID) {
+						if client.TgID != 0 {
+							chatID := client.TgID
+							if !int64Contains(chatIDsDone, chatID) && !checkAdmin(chatID) {
 								var disabledClients []xray.ClientTraffic
 								var exhaustedClients []xray.ClientTraffic
 								traffics, err := t.inboundService.GetClientTrafficTgBot(client.TgID)
-								if err == nil {
+								if err == nil && len(traffics) > 0 {
 									output := t.I18nBot("tgbot.messages.exhaustedCount", "Type=="+t.I18nBot("tgbot.clients"))
 									for _, traffic := range traffics {
 										if traffic.Enable {
@@ -1485,7 +1496,7 @@ func (t *Tgbot) notifyExhausted() {
 										}
 										t.SendMsgToTgbot(chatID, output)
 									}
-									chatIDsDone = append(chatIDsDone, client.TgID)
+									chatIDsDone = append(chatIDsDone, chatID)
 								}
 							}
 						}
@@ -1496,6 +1507,15 @@ func (t *Tgbot) notifyExhausted() {
 	}
 }

+func int64Contains(slice []int64, item int64) bool {
+	for _, s := range slice {
+		if s == item {
+			return true
+		}
+	}
+	return false
+}
+
 func (t *Tgbot) onlineClients(chatId int64, messageID ...int) {
 	if !p.IsRunning() {
 		return
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -310,7 +310,14 @@
 "subURI" = "Reverse Proxy URI"
 "subURIDesc" = "The URI path of the subscription URL for use behind proxies."
 "fragment" = "Fragmentation"
-"fragmentDesc" = "Enable fragmentation for TLS hello packet"
+"fragmentDesc" = "Enable fragmentation for TLS hello packet."
+"fragmentSett" = "Fragmentation Settings"
+"mux" = "Mux"
+"muxDesc" = "Transmit multiple independent data streams within an established data stream."
+"muxSett" = "Mux Settings"
+"direct" = "Direct Connection"
+"directDesc" = "Directly establishes connections with domains or IP ranges of a specific country."
+"directSett" = "Direct Connection Options"

 [pages.xray]
 "title" = "Xray Configs"
--- a/web/translation/translate.es_ES.toml
+++ b/web/translation/translate.es_ES.toml
@@ -147,8 +147,8 @@
 "totalFlow" = "Flujo Total"
 "leaveBlankToNeverExpire" = "Dejar en Blanco para Nunca Expirar"
 "noRecommendKeepDefault" = "No hay requisitos especiales para mantener la configuración predeterminada"
-"certificatePath" = "Camino"
-"certificateContent" = "Contenido"
+"certificatePath" = "Ruta Cert"
+"certificateContent" = "Datos Cert"
 "publicKey" = "Clave Pública"
 "privatekey" = "Clave Privada"
 "clickOnQRcode" = "Haz clic en el Código QR para Copiar"
@@ -201,7 +201,7 @@
 "last" = "Último"
 "prefix" = "Prefijo"
 "postfix" = "Sufijo"
-"delayedStart" = "Iniciar el primer uso"
+"delayedStart" = "Iniciar después del primer uso"
 "expireDays" = "Duración"
 "days" = "Día(s)"
 "renew" = "Renovación automática"
@@ -311,6 +311,13 @@
 "subURIDesc" = "Cambiar el URI base de la URL de suscripción para usar detrás de los servidores proxy"
 "fragment" = "Fragmentación"
 "fragmentDesc" = "Habilitar la fragmentación para el paquete de saludo de TLS"
+"fragmentSett" = "Configuración de Fragmentación"
+"mux" = "Mux"
+"muxDesc" = "Transmite múltiples flujos de datos independientes dentro de un flujo de datos establecido."
+"muxSett" = "Configuración Mux"
+"direct" = "Conexión Directa"
+"directDesc" = "Establece conexiones directas con dominios o rangos de IP de un país específico."
+"directSett" = "Opciones de Conexión Directa"

 [pages.xray]
 "title" = "Xray Configuración"
@@ -447,8 +454,8 @@
 "portal" = "portal"
 "intercon" = "Interconexión"
 "settings" = "Configuración"
-"accountInfo" = "Información de la cuenta"
-"outboundStatus" = "Estado de salida"
+"accountInfo" = "Información de la Cuenta"
+"outboundStatus" = "Estado de Salida"
 "sendThrough" = "Enviar a través de"

 [pages.xray.balancer]
@@ -626,4 +633,4 @@
 "removedTGUserSuccess" = "✅ {{ .Email }} : Usuario de Telegram eliminado exitosamente."
 "enableSuccess" = "✅ {{ .Email }} : Habilitado exitosamente."
 "disableSuccess" = "✅ {{ .Email }} : Deshabilitado exitosamente."
-"askToAddUserId" = "¡No se encuentra su configuración!\r\nPor favor, pídale a su administrador que use su ID de usuario de Telegram en su(s) configuración(es).\r\n\r\nSu ID de usuario: <code>{{ .TgUserID }}</code>"
+"askToAddUserId" = "¡No se encuentra su configuración!\r\nPor favor, pídale a su administrador que use su ID de usuario de Telegram en su(s) configuración(es).\r\n\r\nSu ID de usuario: <code>{{ .TgUserID }}</code>"
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -309,8 +309,15 @@
 "subShowInfoDesc" = "ترافیک و زمان باقی‌مانده را در برنامه‌های کاربری نمایش می‌دهد"
 "subURI" = "پروکسی معکوس URI مسیر"
 "subURIDesc" = "سابسکریپشن را برای استفاده در پشت پراکسی‌ها تغییر می‌دهد URI مسیر"
-"fragment" = "تکه‌تکه شدن"
-"fragmentDesc" = "فعال کردن تکه تکه شدن برای بسته نخست تی‌ال‌اس"
+"fragment" = "فرگمنت"
+"fragmentDesc" = "فعال کردن فرگمنت برای بسته‌ی نخست تی‌ال‌اس"
+"fragmentSett" = "تنظیمات فرگمنت"
+"mux" = "ماکس"
+"muxDesc" = "چندین جریان داده مستقل را در یک جریان داده ثابت منتقل می کند"
+"muxSett" = "تنظیمات ماکس"
+"direct" = "اتصال مستقیم"
+"directDesc" = "به طور مستقیم با دامنه ها یا محدوده آی‌پی یک کشور خاص ارتباط برقرار می کند"
+"directSett" = "گزینه های اتصال مستقیم"

 [pages.xray]
 "title" = "پیکربندی ایکس‌ری"
--- a/web/translation/translate.id_ID.toml
+++ b/web/translation/translate.id_ID.toml
@@ -311,6 +311,13 @@
 "subURIDesc" = "URI path URL langganan untuk penggunaan di belakang proxy."
 "fragment" = "Fragmentasi"
 "fragmentDesc" = "Aktifkan fragmentasi untuk paket hello TLS"
+"fragmentSett" = "Pengaturan Fragmentasi"
+"mux" = "Mux"
+"muxDesc" = "Mengirimkan beberapa aliran data independen dalam aliran data yang sudah ada."
+"muxSett" = "Pengaturan Mux"
+"direct" = "Koneksi langsung"
+"directDesc" = "Secara langsung membuat koneksi dengan domain atau rentang IP negara tertentu."
+"directSett" = "Opsi Koneksi Langsung"

 [pages.xray]
 "title" = "Konfigurasi Xray"
--- a/web/translation/translate.ru_RU.toml
+++ b/web/translation/translate.ru_RU.toml
@@ -311,6 +311,13 @@
 "subURIDesc" = "Изменить базовый URI URL-адреса подписки для использования за прокси-серверами"
 "fragment" = "Фрагментация"
 "fragmentDesc" = "Включить фрагментацию для пакета приветствия TLS"
+"fragmentSett" = "Настройки фрагментации"
+"mux" = "Mux"
+"muxDesc" = "Передача нескольких независимых потоков данных в рамках установленного потока данных."
+"muxSett" = "Mux Настройки"
+"direct" = "Прямая связь"
+"directDesc" = "Напрямую устанавливает соединения с доменами или диапазонами IP конкретной страны."
+"directSett" = "Варианты прямого подключения"

 [pages.xray]
 "title" = "Настройки Xray"
--- a/web/translation/translate.uk_UA.toml
+++ b/web/translation/translate.uk_UA.toml
@@ -311,6 +311,13 @@
 "subURIDesc" = "URI до URL-адреси підписки для використання за проксі."
 "fragment" = "Фрагментація"
 "fragmentDesc" = "Увімкнути фрагментацію для пакету привітання TLS"
+"fragmentSett" = "Параметри фрагментації"
+"mux" = "Mux"
+"muxDesc" = "Передавати кілька незалежних потоків даних у межах встановленого потоку даних."
+"muxSett" = "Налаштування Mux"
+"direct" = "Пряме підключення"
+"directDesc" = "Безпосередньо встановлює з’єднання з доменами або діапазонами IP певної країни."
+"directSett" = "Параметри прямого підключення"

 [pages.xray]
 "title" = "Xray конфігурації"
--- a/web/translation/translate.vi_VN.toml
+++ b/web/translation/translate.vi_VN.toml
@@ -311,6 +311,13 @@
 "subURIDesc" = "Thay đổi URI cơ sở của URL gói đăng ký để sử dụng cho proxy trung gian"
 "fragment" = "Sự phân mảnh"
 "fragmentDesc" = "Kích hoạt phân mảnh cho gói TLS hello"
+"fragmentSett" = "Cài đặt phân mảnh"
+"mux" = "Mux"
+"muxDesc" = "Truyền nhiều luồng dữ liệu độc lập trong luồng dữ liệu đã thiết lập."
+"muxSett" = "Mux Cài đặt"
+"direct" = "Kết nối trực tiếp"
+"directDesc" = "Trực tiếp thiết lập kết nối với tên miền hoặc dải IP của một quốc gia cụ thể."
+"directSett" = "Tùy chọn kết nối trực tiếp"

 [pages.xray]
 "title" = "Cài đặt Xray"
--- a/web/translation/translate.zh_Hans.toml
+++ b/web/translation/translate.zh_Hans.toml
@@ -30,8 +30,8 @@
 "sure" = "确定"
 "encryption" = "加密"
 "transmission" = "传输"
-"host" = "Host"
-"path" = "Path"
+"host" = "主机"
+"path" = "路径"
 "camouflage" = "伪装"
 "status" = "状态"
 "enabled" = "开启"
@@ -311,6 +311,13 @@
 "subURIDesc" = "用于代理后面的订阅 URL 的 URI 路径"
 "fragment" = "分片"
 "fragmentDesc" = "启用 TLS hello 数据包分片"
+"fragmentSett" = "设置"
+"mux" = "多路复用器"
+"muxDesc" = "在已建立的数据流内传输多个独立的数据流"
+"muxSett" = "复用器设置"
+"direct" = "直接连接"
+"directDesc" = "直接与特定国家的域或IP范围建立连接"
+"directSett" = "直接连接选项"

 [pages.xray]
 "title" = "Xray 配置"
@@ -321,7 +328,7 @@
 "generalConfigs" = "常规配置"
 "generalConfigsDesc" = "这些选项将决定常规配置"
 "logConfigs" = "日志"
-"logConfigsDesc" = "日志可能会影响服务器的效率，建议仅在需要时启用"
+"logConfigsDesc" = "日志可能会影响服务器的性能，建议仅在需要时启用"
 "blockConfigs" = "防护屏蔽"
 "blockConfigsDesc" = "这些选项将阻止用户连接到特定协议和网站"
 "blockCountryConfigs" = "屏蔽国家/地区"
@@ -423,7 +430,7 @@
 "up" = "向上"
 "down" = "向下"
 "source" = "来源"
-"dest" = "目的地"
+"dest" = "目的地址"
 "inbound" = "入站"
 "outbound" = "出站"
 "balancer" = "负载均衡"
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -38,17 +38,23 @@ echo "The OS release is: $release"
 os_version=""
 os_version=$(grep -i version_id /etc/os-release | cut -d \" -f2 | cut -d . -f1)

-if [[ "${release}" == "centos" ]]; then
+if [[ "${release}" == "arch" ]]; then
+    echo "Your OS is Arch Linux"
+elif [[ "${release}" == "manjaro" ]]; then
+    echo "Your OS is Manjaro"
+elif [[ "${release}" == "armbian" ]]; then
+    echo "Your OS is Armbian"
+elif [[ "${release}" == "centos" ]]; then
    if [[ ${os_version} -lt 8 ]]; then
        echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
    fi
 elif [[ "${release}" == "ubuntu" ]]; then
    if [[ ${os_version} -lt 20 ]]; then
-        echo -e "${red}please use Ubuntu 20 or higher version! ${plain}\n" && exit 1
+        echo -e "${red} Please use Ubuntu 20 or higher version!${plain}\n" && exit 1
    fi
 elif [[ "${release}" == "fedora" ]]; then
    if [[ ${os_version} -lt 36 ]]; then
-        echo -e "${red}please use Fedora 36 or higher version! ${plain}\n" && exit 1
+        echo -e "${red} Please use Fedora 36 or higher version!${plain}\n" && exit 1
    fi
 elif [[ "${release}" == "debian" ]]; then
    if [[ ${os_version} -lt 11 ]]; then
@@ -56,18 +62,31 @@ elif [[ "${release}" == "debian" ]]; then
    fi
 elif [[ "${release}" == "almalinux" ]]; then
    if [[ ${os_version} -lt 9 ]]; then
-        echo -e "${red} Please use Almalinux 9 or higher ${plain}\n" && exit 1
+        echo -e "${red} Please use AlmaLinux 9 or higher ${plain}\n" && exit 1
    fi
 elif [[ "${release}" == "rocky" ]]; then
    if [[ ${os_version} -lt 9 ]]; then
-        echo -e "${red} Please use Rockylinux 9 or higher ${plain}\n" && exit 1
+        echo -e "${red} Please use Rocky Linux 9 or higher ${plain}\n" && exit 1
    fi
-elif [[ "${release}" == "arch" ]]; then
-    echo "Your OS is ArchLinux"
-elif [[ "${release}" == "manjaro" ]]; then
-    echo "Your OS is Manjaro"
-elif [[ "${release}" == "armbian" ]]; then
-    echo "Your OS is Armbian"
+elif [[ "${release}" == "oracle" ]]; then
+    if [[ ${os_version} -lt 8 ]]; then
+        echo -e "${red} Please use Oracle Linux 8 or higher ${plain}\n" && exit 1
+    fi
+else
+    echo -e "${red}Your operating system is not supported by this script.${plain}\n"
+    echo "Please ensure you are using one of the following supported operating systems:"
+    echo "- Ubuntu 20.04+"
+    echo "- Debian 11+"
+    echo "- CentOS 8+"
+    echo "- Fedora 36+"
+    echo "- Arch Linux"
+    echo "- Manjaro"
+    echo "- Armbian"
+    echo "- AlmaLinux 9+"
+    echo "- Rocky Linux 9+"
+    echo "- Oracle Linux 8+"
+    exit 1
+
 fi

 # Declare Variables
@@ -394,15 +413,18 @@ enable_bbr() {

    # Check the OS and install necessary packages
    case "${release}" in
-    ubuntu | debian)
+    ubuntu | debian | armbian)
        apt-get update && apt-get install -yqq --no-install-recommends ca-certificates
        ;;
-    centos | almalinux | rocky)
+    centos | almalinux | rocky | oracle)
        yum -y update && yum -y install ca-certificates
        ;;
    fedora)
        dnf -y update && dnf -y install ca-certificates
        ;;
+    arch | manjaro)
+        pacman -Sy --noconfirm ca-certificates
+        ;;
    *)
        echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
        exit 1
@@ -721,12 +743,15 @@ ssl_cert_issue() {
    ubuntu | debian | armbian)
        apt update && apt install socat -y
        ;;
-    centos | almalinux | rocky)
+    centos | almalinux | rocky | oracle)
        yum -y update && yum -y install socat
        ;;
    fedora)
        dnf -y update && dnf -y install socat
        ;;
+    arch | manjaro)
+        pacman -Sy --noconfirm socat
+        ;;
    *)
        echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
        exit 1
@@ -1082,16 +1107,19 @@ install_iplimit() {

        # Check the OS and install necessary packages
        case "${release}" in
-        ubuntu | debian)
+        ubuntu | debian | armbian)
            apt update && apt install fail2ban -y
            ;;
-        centos | almalinux | rocky)
+        centos | almalinux | rocky | oracle)
            yum update -y && yum install epel-release -y
            yum -y install fail2ban
            ;;
        fedora)
            dnf -y update && dnf -y install fail2ban
            ;;
+        arch | manjaro)
+        pacman -Syu --noconfirm fail2ban
+        ;;
        *)
            echo -e "${red}Unsupported operating system. Please check the script and install the necessary packages manually.${plain}\n"
            exit 1
@@ -1158,12 +1186,12 @@ remove_iplimit() {
        rm -rf /etc/fail2ban
        systemctl stop fail2ban
        case "${release}" in
-        ubuntu | debian)
+        ubuntu | debian | armbian)
            apt-get remove -y fail2ban
            apt-get purge -y fail2ban -y
            apt-get autoremove -y
            ;;
-        centos | almalinux | rocky)
+        centos | almalinux | rocky | oracle)
            yum remove fail2ban -y
            yum autoremove -y
            ;;
@@ -1171,6 +1199,9 @@ remove_iplimit() {
            dnf remove fail2ban -y
            dnf autoremove -y
            ;;
+        arch | manjaro)
+            pacman -Rns --noconfirm fail2ban
+            ;;
        *)
            echo -e "${red}Unsupported operating system. Please uninstall Fail2ban manually.${plain}\n"
            exit 1
--- a/xray/process.go
+++ b/xray/process.go
@@ -57,28 +57,28 @@ func GetAccessPersistentPrevLogPath() string {
 	return config.GetLogFolder() + "/3xipl-ap.prev.log"
 }

-func GetAccessLogPath() string {
+func GetAccessLogPath() (string, error) {
 	config, err := os.ReadFile(GetConfigPath())
 	if err != nil {
 		logger.Warningf("Something went wrong: %s", err)
+		return "", err
 	}

 	jsonConfig := map[string]interface{}{}
 	err = json.Unmarshal([]byte(config), &jsonConfig)
 	if err != nil {
 		logger.Warningf("Something went wrong: %s", err)
+		return "", err
 	}

 	if jsonConfig["log"] != nil {
 		jsonLog := jsonConfig["log"].(map[string]interface{})
 		if jsonLog["access"] != nil {
-
 			accessLogPath := jsonLog["access"].(string)
-
-			return accessLogPath
+			return accessLogPath, nil
 		}
 	}
-	return ""
+	return "", err
 }

 func stopProcess(p *Process) {
@@ -194,16 +194,17 @@ func (p *process) Start() (err error) {

 	defer func() {
 		if err != nil {
+			logger.Error("Failure in running xray-core process: ", err)
 			p.exitErr = err
 		}
 	}()

 	data, err := json.MarshalIndent(p.config, "", "  ")
 	if err != nil {
-		return common.NewErrorf("Failed to generate xray configuration file: %v", err)
+		return common.NewErrorf("Failed to generate XRAY configuration files: %v", err)
 	}

-	err = os.MkdirAll(config.GetLogFolder(), 0770)
+	err = os.MkdirAll(config.GetLogFolder(), 0o770)
 	if err != nil {
 		logger.Warningf("Something went wrong: %s", err)
 	}
@@ -223,6 +224,7 @@ func (p *process) Start() (err error) {
 	go func() {
 		err := cmd.Run()
 		if err != nil {
+			logger.Error("Failure in running xray-core: ", err)
 			p.exitErr = err
 		}
 	}()
Author	SHA1	Message	Date
mhsanaei	59708d6410	bug fix - tgid #2214	2024-04-03 17:02:31 +03:30
mhsanaei	be8e78797a	v2.2.8	2024-04-02 23:50:15 +03:30
mhsanaei	6d364638ca	fix direct on json sub for ru vn has been removed	2024-04-02 23:43:16 +03:30
mhsanaei	c147636133	add header for httpupgrade	2024-04-02 23:41:06 +03:30
Ho3ein	fa7a6a3f99	Merge pull request #2198 from TaraRostami/main Minor UI fixes	2024-04-02 20:06:40 +03:30
TaraRostami	620da1784b	Minor UI fixes	2024-04-02 19:54:55 +03:30
Ho3ein	b13e1d666d	Merge pull request #2197 from MHSanaei/dev tgbot	2024-04-02 19:53:25 +03:30
mhsanaei	2935eeb36a	telego v0.29.2	2024-04-02 15:43:01 +03:30
mhsanaei	eb382cd5b4	tgbot - fix chatid	2024-04-02 15:04:44 +03:30
Tara Rostami	f02c82677d	Minor Fixes (#2190 ) Update index.html Update xray.html	2024-04-02 13:03:40 +03:30
mhsanaei	5a5f7afb68	bug fix	2024-04-02 12:13:32 +03:30
mhsanaei	3a6bca794f	v2.2.7	2024-04-01 17:45:58 +04:30
mhsanaei	4e20bb5f02	Add host for WS	2024-04-01 17:02:02 +04:30
MisakaNo の小破站	44b7eb881c	Add s390x arch support (#2172 )	2024-04-01 12:41:58 +03:30
mhsanaei	9b1146780c	OS - Oracle Linux	2024-04-01 13:12:28 +04:30
mhsanaei	866f7bd042	[subjson] avoid array for one config Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-04-01 12:22:10 +04:30
mhsanaei	9454af46b7	[log] add exit code Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-04-01 12:20:34 +04:30
mhsanaei	9d18e925cc	[xray] fix: convert link to json Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-04-01 12:14:20 +04:30
mhsanaei	21d988133e	[sub] fix grpc authority failure Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-04-01 12:09:45 +04:30
mhsanaei	0633a25d29	avoid empty client id Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-04-01 12:08:25 +04:30
mhsanaei	47243f0374	telegram channel XrayUI https://t.me/XrayUI	2024-04-01 11:46:28 +04:30
mhsanaei	ede67f2d6c	Xray core v1.8.10	2024-04-01 11:42:01 +04:30
Tara Rostami	d759e09569	QRious2 (#2156 )	2024-04-01 10:38:22 +03:30
emirjorge	684e777628	Improve Spanish Translation and updates (#2169 ) * Add files via upload * Add Translation Spanish to README.es_ES.md * fixed and short * Update README.md * Update README.md	2024-03-31 17:05:36 +03:30
dependabot[bot]	1e902c2511	Bump github.com/xtls/xray-core from 1.8.9 to 1.8.10 (#2165 ) Bumps [github.com/xtls/xray-core](https://github.com/xtls/xray-core) from 1.8.9 to 1.8.10. - [Release notes](https://github.com/xtls/xray-core/releases) - [Commits](https://github.com/xtls/xray-core/compare/v1.8.9...v1.8.10) --- updated-dependencies: - dependency-name: github.com/xtls/xray-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-03-30 18:57:11 +03:30
dependabot[bot]	1a0cdfbfbc	Bump gorm.io/gorm from 1.25.8 to 1.25.9 (#2151 ) Bumps [gorm.io/gorm](https://github.com/go-gorm/gorm) from 1.25.8 to 1.25.9. - [Release notes](https://github.com/go-gorm/gorm/releases) - [Commits](https://github.com/go-gorm/gorm/compare/v1.25.8...v1.25.9) --- updated-dependencies: - dependency-name: gorm.io/gorm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-03-30 18:53:12 +03:30
dependabot[bot]	53e7608ddf	Bump github.com/gin-contrib/gzip from 0.0.6 to 1.0.0 (#2132 ) Bumps [github.com/gin-contrib/gzip](https://github.com/gin-contrib/gzip) from 0.0.6 to 1.0.0. - [Release notes](https://github.com/gin-contrib/gzip/releases) - [Changelog](https://github.com/gin-contrib/gzip/blob/master/.goreleaser.yaml) - [Commits](https://github.com/gin-contrib/gzip/compare/v0.0.6...v1.0.0) --- updated-dependencies: - dependency-name: github.com/gin-contrib/gzip dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-03-30 18:52:58 +03:30
somebodywashere	43ec88bb24	Small fixes (#2106 )	2024-03-21 10:21:12 +03:30
somebodywashere	c5b30d6c6c	Fix clear logs job (#2090 )	2024-03-20 14:17:35 +03:30
dependabot[bot]	7fad81edab	Bump github.com/pelletier/go-toml/v2 from 2.1.1 to 2.2.0 (#2102 ) Bumps [github.com/pelletier/go-toml/v2](https://github.com/pelletier/go-toml) from 2.1.1 to 2.2.0. - [Release notes](https://github.com/pelletier/go-toml/releases) - [Changelog](https://github.com/pelletier/go-toml/blob/v2/.goreleaser.yaml) - [Commits](https://github.com/pelletier/go-toml/compare/v2.1.1...v2.2.0) --- updated-dependencies: - dependency-name: github.com/pelletier/go-toml/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-03-20 14:13:57 +03:30
dependabot[bot]	b9a5fd2c09	Bump gorm.io/gorm from 1.25.7 to 1.25.8 (#2095 ) Bumps [gorm.io/gorm](https://github.com/go-gorm/gorm) from 1.25.7 to 1.25.8. - [Release notes](https://github.com/go-gorm/gorm/releases) - [Commits](https://github.com/go-gorm/gorm/compare/v1.25.7...v1.25.8) --- updated-dependencies: - dependency-name: gorm.io/gorm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-03-20 14:13:47 +03:30
Tara Rostami	0bec29f2ba	UI Improvements (#2067 )	2024-03-20 14:13:37 +03:30
somebodywashere	a7418d9708	Fixed unnecessary Xray restarts in Tgbot #2076 Fixed unnecessary Xray restarts in Tgbot	2024-03-15 21:17:51 +03:00
somebodywashere	abd69a253a	Fixed unnecessary Xray restarts in Tgbot	2024-03-15 21:13:20 +03:00
Steven	2b420bd517	Fixed tanslation mistakes (#2050 )	2024-03-13 14:18:25 +03:30
MHSanaei	14d04e8ec9	fix remained traffic in info Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-03-13 14:17:19 +03:30
MHSanaei	1e2be10429	BurstObservatory & Observatory Co-Authored-By: Alireza Ahmadi <alireza7@gmail.com>	2024-03-13 12:15:59 +03:30
Hamidreza	569c9428fb	[iplimit] fix access log path in settings service (#2044 ) * [iplimit] fix access log path in settings service better to avoid hardcoding the access log path to enhance flexibility. not all users prefer the default './access.log' * [iplimit] fix iplimit	2024-03-13 11:24:41 +03:30
@@ -1 +1 @@
 .2.6
 .2.8