Add trojan multiuser

2026-03-15 13:46:10 +00:00 · 2023-02-07 01:14:53 +01:00
38 changed files with 16847 additions and 921 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,12 +1,18 @@
 name: Docker Image CI
 on:
  push:
-    tags:
-      - "*"
+    branches: [ master ]
  workflow_dispatch:
+      inputs:
+        project:
+          description: 'Project'
+          required: true
+          default: 

 jobs:
+
  build:
+
    runs-on: ubuntu-latest

    steps:
@@ -14,42 +20,30 @@ jobs:
      with:
        submodules: true
   
-    - name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v4
-      with:
-        images: |
-          alireza7/x-ui
-          ghcr.io/alireza0/x-ui
-        tags: |
-          type=ref,event=branch
-          type=ref,event=tag
-          type=pep440,pattern={{version}}
-
    - name: Set up QEMU
      uses: docker/setup-qemu-action@v1

+
+    - name: Docker Hub login
+      env:
+        DOCKERHUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+        DOCKERHUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
+      run: |
+        echo "${DOCKERHUB_TOKEN}" | docker login --username ${DOCKERHUB_USERNAME} --password-stdin
+
    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
+      id: buildx
+      uses: crazy-max/ghaction-docker-buildx@v1
      with:
-        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-        password: ${{ secrets.DOCKER_HUB_TOKEN }}
+        buildx-version: latest

-    - name: Login to GHCR
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Build and push
-      uses: docker/build-push-action@v4
-      with:
-        context: .
-        push: true
-        platforms: linux/amd64,linux/arm64/v8
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
+    - name: Build Dockerfile
+      env:
+        DOCKERHUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+        DOCKERHUB_REPO: ${{ secrets.DOCKER_HUB_REPOSITORY }}
+      run: |
+        docker buildx build \
+        --platform=linux/amd64,linux/arm64 \
+        --output "type=image,push=true" \
+        --file ./Dockerfile ./ \
+        --tag $(echo "${DOCKERHUB_USERNAME}" | tr '[:upper:]' '[:lower:]')/${{ github.event.inputs.project }}:latest
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,10 +4,9 @@ on:
    tags:
      - "*"
  workflow_dispatch:
-
 jobs:
  release:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
    outputs:
      upload_url: ${{ steps.create_release.outputs.upload_url }}
    steps:
@@ -15,7 +14,7 @@ jobs:
        id: create_release
        uses: actions/create-release@v1
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }}
        with:
          tag_name: ${{ github.ref }}
          release_name: ${{ github.ref }}
@@ -24,7 +23,7 @@ jobs:
  linuxamd64build:
    name: build x-ui amd64 version
    needs: release
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v2
      - name: Set up Go
@@ -55,7 +54,7 @@ jobs:
      - name: upload
        uses: actions/upload-release-asset@v1
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }}
        with:
          upload_url: ${{ needs.release.outputs.upload_url }}
          asset_path: x-ui-linux-amd64.tar.gz
@@ -64,7 +63,7 @@ jobs:
  linuxarm64build:
    name: build x-ui arm64 version
    needs: release
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v2
      - name: Set up Go
@@ -97,7 +96,7 @@ jobs:
      - name: upload
        uses: actions/upload-release-asset@v1
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }}
        with:
          upload_url: ${{ needs.release.outputs.upload_url }}
          asset_path: x-ui-linux-arm64.tar.gz
@@ -106,7 +105,7 @@ jobs:
  linuxs390xbuild:
    name: build x-ui s390x version
    needs: release
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v2
      - name: Set up Go
@@ -139,7 +138,7 @@ jobs:
      - name: upload
        uses: actions/upload-release-asset@v1
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }}
        with:
          upload_url: ${{ needs.release.outputs.upload_url }}
          asset_path: x-ui-linux-s390x.tar.gz
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 .idea
 .vscode
 tmp
-bin/
+bin/xray-darwin-arm64
+bin/config.json
 dist/
 x-ui-*.tar.gz
 /x-ui
--- a/23
+++ b/23
@@ -1,16 +1,17 @@
-FROM golang:1.20-alpine AS builder
-WORKDIR /app
-ENV CGO_ENABLED 1
-RUN apk add gcc && apk --no-cache --update add build-base
+FROM golang:latest AS builder
+WORKDIR /root
 COPY . .
 RUN go build main.go

-FROM alpine
-LABEL org.opencontainers.image.authors="alireza7@gmail.com"
-ENV TZ=Asia/Tehran
-WORKDIR /app

-RUN apk add ca-certificates tzdata && mkdir bin
-COPY --from=builder  /app/main /app/x-ui
+FROM debian:11-slim
+LABEL org.opencontainers.image.authors="alireza7@gmail.com"
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends -y ca-certificates \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+ENV TZ=Asia/Tehran
+WORKDIR /root
+COPY --from=builder  /root/main /root/x-ui
+COPY ./bin/. /root/bin/.
 VOLUME [ "/etc/x-ui" ]
-CMD [ "./x-ui" ]
+CMD [ "./x-ui" ]
--- a/README.md
+++ b/README.md
@@ -1,29 +1,22 @@
 # x-ui
-![](https://img.shields.io/github/v/release/alireza0/x-ui.svg) 
-![](https://img.shields.io/docker/pulls/alireza7/x-ui.svg)
-[![Go Report Card](https://goreportcard.com/badge/github.com/alireza0/x-ui)](https://goreportcard.com/report/github.com/alireza0/x-ui)
-[![Downloads](https://img.shields.io/github/downloads/alireza0/x-ui/total.svg)](https://img.shields.io/github/downloads/alireza0/x-ui/total.svg)
-[![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0.en.html)
 > **Disclaimer: This project is only for personal learning and communication, please do not use it for illegal purposes, please do not use it in a production environment**


-xray panel supporting multi-protocol, **Multi-lang (English,Farsi,Chinese)**
+xray panel supporting multi-protocol, **Multi-lang (English,Chinese)**, **IP Restrication Per Inbound**

 | Features        | Enable?           |
 | ------------- |:-------------:|
 | Multi-lang | :heavy_check_mark: |
-| Search in deep | :heavy_check_mark: |
-| Inbound Multi User | :heavy_check_mark: |
-| Multi User Traffic & Expiration time | :heavy_check_mark: |
-| REST API | :heavy_check_mark: |
-| Telegram BOT | :heavy_check_mark: |
+| [Inbound Multi User](https://github.com/alireza0/x-ui/#enable-multi-user-traffic--exprire-day) | :heavy_check_mark: |
+| [Multi User Traffic & expire day](https://github.com/alireza0/x-ui/#enable-multi-user-traffic--exprire-day) | :heavy_check_mark: |
+| [REST API](https://github.com/alireza0/x-ui/pull/51) | :heavy_check_mark: |
+| [Telegram BOT](https://github.com/alireza0/x-ui/pull/110) | :heavy_check_mark: |

 **If you think this project is helpful to you, you may wish to give a** :star2: 

 # Features

 - System Status Monitoring
- Search within all inbounds and clients
 - Support multi-user multi-protocol, web page visualization operation
 - Supported protocols: vmess, vless, trojan, shadowsocks, dokodemo-door, socks, http
 - Support for configuring more transport configurations
@@ -33,10 +26,61 @@ xray panel supporting multi-protocol, **Multi-lang (English,Farsi,Chinese)**
 - Support one-click SSL certificate application and automatic renewal
 - For more advanced configuration items, please refer to the panel

-# Screenshoot from Inbouds page
+# Enable IP Restrictions Per Inbound
+`!!! NO NEED TO DO THIS IF YOU HAVE FRESH INSTALL`

-![inbounds](./media/inbounds.png)
+1 - open panel settings and tab xray related settings find `"api": ` and put bellow code just before it :
+ ```json
+ "log": {
+    "loglevel": "warning", 
+    "access": "./access.log"
+  }, 
+```
+- change access log path as you want

+2 - add **Unique Email** for inbound(vmess & vless & trojan)
+
+# Enable Multi User Traffic & Exprire Day
+![Screenshot from 2022-11-15 07-43-58](https://user-images.githubusercontent.com/16622377/201922652-111ff5b8-272b-49f5-a656-d6f57d79eaed.png)
+
+`!!! NO NEED TO DO THIS IF YOU HAVE FRESH INSTALL`
+
+**for enable traffic for users you should do :**
+
+find this in config : 
+``` json
+ "policy": {
+    "system": {
+```
+**and add this just after  ` "policy": {` :**
+```json
+    "levels": {
+      "0": {
+        "statsUserUplink": true,
+        "statsUserDownlink": true
+      }
+    },
+```
+
+
+**the final output is like :**
+```json
+  "policy": {
+    "levels": {
+      "0": {
+        "statsUserUplink": true,
+        "statsUserDownlink": true
+      }
+    },
+
+    "system": {
+      "statsInboundDownlink": true,
+      "statsInboundUplink": true
+    }
+  },
+  "routing": {
+```
+ restart panel
 # Install & Upgrade

 ```
@@ -92,19 +136,27 @@ docker build -t x-ui .

 ## SSL certificate application

-### Cloudflare
-
 > This feature and tutorial are provided by [FranzKafkaYu](https://github.com/FranzKafkaYu)

-### Certbot
+The script has a built-in SSL certificate application function. To use this script to apply for a certificate, the following conditions must be met:

-```bash
-snap install core; snap refresh core
-snap install --classic certbot
-ln -s /snap/bin/certbot /usr/bin/certbot
+- Know the Cloudflare registered email
+- Know the Cloudflare Global API Key
+- The domain name has been resolved to the current server through cloudflare

-certbot certonly --standalone --register-unsafely-without-email --non-interactive --agree-tos -d <Your Domain Name>
-```
+How to get the Cloudflare Global API Key:
+    ![](media/bda84fbc2ede834deaba1c173a932223.png)
+    ![](media/d13ffd6a73f938d1037d0708e31433bf.png)
+
+When using, just enter `email`, `domain`, `API KEY` and the schematic diagram is as follows：
+        ![](media/2022-04-04_141259.png)
+
+Precautions:
+
+- The script uses DNS API for certificate request
+- By default, Let'sEncrypt is used as the CA party
+- The certificate installation directory is the /root/cert directory
+- The certificates applied for by this script are all generic domain name certificates

 ## Tg robot use (under development, temporarily unavailable)

@@ -152,46 +204,6 @@ First install the latest version of x-ui on the server where v2-ui is installed,
 x-ui v2-ui
 ```

-# T-Shoots:
-
-**If you ygrade from an old version or other forks, for enable traffic for users you should do :**
-
-find this in config : 
-``` json
- "policy": {
-    "system": {
-```
-**and add this just after  ` "policy": {` :**
-```json
-    "levels": {
-      "0": {
-        "statsUserUplink": true,
-        "statsUserDownlink": true
-      }
-    },
-```
-
-
-**the final output is like :**
-```json
-  "policy": {
-    "levels": {
-      "0": {
-        "statsUserUplink": true,
-        "statsUserDownlink": true
-      }
-    },
-
-    "system": {
-      "statsInboundDownlink": true,
-      "statsInboundUplink": true
-    }
-  },
-  "routing": {
-```
- restart panel
- 
-
 ## Stargazers over time

 [![Stargazers over time](https://starchart.cc/alireza0/x-ui.svg)](https://starchart.cc/alireza0/x-ui)
--- a/bin/geoip.dat
+++ b/bin/geoip.dat
--- a/bin/geosite.dat
+++ b/bin/geosite.dat
--- a/bin/xray-linux-amd64
+++ b/bin/xray-linux-amd64
--- a/config/version
+++ b/config/version
@@ -1 +1 @@
-0.2.3
+0.1.0
--- a/db/x-ui.db
+++ b/db/x-ui.db
--- a/go.mod
+++ b/go.mod
@@ -1,52 +1,27 @@
 module x-ui

-go 1.20
+go 1.16

 require (
-	github.com/BurntSushi/toml v1.0.0
+	github.com/BurntSushi/toml v0.3.1
+	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
 	github.com/Workiva/go-datastructures v1.0.53
 	github.com/gin-contrib/sessions v0.0.3
 	github.com/gin-gonic/gin v1.7.1
+	github.com/go-cmd/cmd v1.4.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
-	github.com/nicksnyder/go-i18n/v2 v2.2.1
+	github.com/nicksnyder/go-i18n/v2 v2.1.2
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/shirou/gopsutil v3.21.3+incompatible
-	github.com/xtls/xray-core v1.7.5
-	go.uber.org/atomic v1.10.0
-	golang.org/x/text v0.6.0
-	google.golang.org/grpc v1.53.0
+	github.com/tklauser/go-sysconf v0.3.5 // indirect
+	github.com/xtls/xray-core v1.4.2
+	go.uber.org/atomic v1.7.0
+	golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744 // indirect
+	golang.org/x/text v0.3.6
+	google.golang.org/grpc v1.38.0
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gorm.io/driver/sqlite v1.1.4
 	gorm.io/gorm v1.21.9
 )
-
-require (
-	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-ole/go-ole v1.2.5 // indirect
-	github.com/go-playground/locales v0.13.0 // indirect
-	github.com/go-playground/universal-translator v0.17.0 // indirect
-	github.com/go-playground/validator/v10 v10.4.1 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/gorilla/context v1.1.1 // indirect
-	github.com/gorilla/securecookie v1.1.1 // indirect
-	github.com/gorilla/sessions v1.1.3 // indirect
-	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.2 // indirect
-	github.com/json-iterator/go v1.1.9 // indirect
-	github.com/leodido/go-urn v1.2.0 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
-	github.com/mattn/go-sqlite3 v1.14.5 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/pires/go-proxyproto v0.6.2 // indirect
-	github.com/tklauser/go-sysconf v0.3.5 // indirect
-	github.com/tklauser/numcpus v0.2.2 // indirect
-	github.com/ugorji/go/codec v1.1.7 // indirect
-	golang.org/x/crypto v0.5.0 // indirect
-	golang.org/x/net v0.5.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-)
--- a/go.sum
+++ b/go.sum
@@ -7,9 +7,8 @@ dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBr
 dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
 dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU=
-github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 h1:5sXbqlSomvdjlRbWyNqkPsJ3Fg+tQZCbgeX1VGljbQY=
 github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/Workiva/go-datastructures v1.0.53 h1:J6Y/52yX10Xc5JjXmGtWoSSxs3mZnGSaq37xZZh7Yig=
@@ -44,6 +43,7 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew=
@@ -57,6 +57,8 @@ github.com/gin-gonic/gin v1.7.1 h1:qC89GU3p8TvKWMAVhEpmpB2CIb1hnqt2UdKZaP93mS8=
 github.com/gin-gonic/gin v1.7.1/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
+github.com/go-cmd/cmd v1.4.1 h1:JUcEIE84v8DSy02XTZpUDeGKExk2oW3DA10hTjbQwmc=
+github.com/go-cmd/cmd v1.4.1/go.mod h1:tbBenttXtZU4c5djS1o7PWL5pd2xAr5sIqH1kGdNiRc=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
@@ -72,6 +74,7 @@ github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7a
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 h1:wG8n/XJQ07TmjbITcGiUaOtXxdrINDz1b0J1w0SzqDc=
 github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1/go.mod h1:A2S0CWkNylc2phvKXWBBdD3K0iGnDBGbzRpISP2zBl8=
+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
@@ -165,6 +168,7 @@ github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGw
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/memcachier/mc v2.0.1+incompatible/go.mod h1:7bkvFE61leUBvXz+yxsOnGBQSZpBSPIMUQSmmSHvuXc=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
+github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
@@ -174,13 +178,16 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 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.2.1 h1:aOzRCdwsJuoExfZhoiXHy4bjruwCMdt5otbYojM/PaA=
-github.com/nicksnyder/go-i18n/v2 v2.2.1/go.mod h1:fF2++lPHlo+/kPaj3nB0uxtPwzlPm+BlgwGX7MkeGj0=
+github.com/nicksnyder/go-i18n/v2 v2.1.2 h1:QHYxcUJnGHBaq7XbvgunmZ2Pn0focXFqTD61CkH146c=
+github.com/nicksnyder/go-i18n/v2 v2.1.2/go.mod h1:d++QJC9ZVf7pa48qrsRWhMJ5pSHIPmS3OLqK1niyLxs=
+github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
@@ -191,8 +198,6 @@ github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rK
 github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/pires/go-proxyproto v0.5.0 h1:A4Jv4ZCaV3AFJeGh5mGwkz4iuWUYMlQ7IoO/GTuSuLo=
 github.com/pires/go-proxyproto v0.5.0/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9Gw5rnCjcwzAY=
-github.com/pires/go-proxyproto v0.6.2 h1:KAZ7UteSOt6urjme6ZldyFm4wDe/z0ZUP0Yv0Dos0d8=
-github.com/pires/go-proxyproto v0.6.2/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9Gw5rnCjcwzAY=
 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=
@@ -251,6 +256,7 @@ github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITn
 github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA=
 github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
 github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q=
+github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
@@ -260,17 +266,12 @@ github.com/xtls/go v0.0.0-20201118062508-3632bf3b7499 h1:QHESTXtfgc1ABV+ArlbPVqU
 github.com/xtls/go v0.0.0-20201118062508-3632bf3b7499/go.mod h1:5TB2+k58gx4A4g2Nf5miSHNDF6CuAzHKpWBooLAshTs=
 github.com/xtls/xray-core v1.4.2 h1:D0Le+Qy9L/eY5LbUQfrk7WJ8wbODpQSW/ZRCg+BRe7c=
 github.com/xtls/xray-core v1.4.2/go.mod h1:DmL/9rOCliev/a6HciWEvSJVEhUF6C0EpD3clW8v0pc=
-github.com/xtls/xray-core v1.7.5 h1:Ukr3hXnOG2ciViQL7kfYRl9S3GVej2dkV7DzabmoLL4=
-github.com/xtls/xray-core v1.7.5/go.mod h1:Mx1QzIDvSk4eZ8hKa3AYsSPfyZJNQXWVXTJxJRJ98wI=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
 go.starlark.net v0.0.0-20210312235212-74c10e2c17dc h1:pVkptfeOTFfx+zXZo7HEHN3d5LmhatBFvHdm/f2QnpY=
 go.starlark.net v0.0.0-20210312235212-74c10e2c17dc/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
 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=
@@ -279,18 +280,14 @@ golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
-golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -306,11 +303,8 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210330230544-e57232859fb2 h1:nGCZOty+lVDsc4H2qPFksI5Se296+V+GhMiL/TzmYNk=
 golang.org/x/net v0.0.0-20210330230544-e57232859fb2/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -323,9 +317,8 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -347,23 +340,15 @@ golang.org/x/sys v0.0.0-20201231184435-2d18734c6014/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/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-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744 h1:yhBbb4IRs2HS9PPlAg6DMC6mUOKexJBNsLf4Z+6En1Q=
+golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 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.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -376,7 +361,6 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -397,8 +381,6 @@ google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRn
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 h1:vArvWooPH749rNHpBGgVl+U9B9dATjiEhJzcWGlovNs=
-google.golang.org/genproto v0.0.0-20230202175211-008b39050e57/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
@@ -409,8 +391,6 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
 google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
-google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -423,8 +403,6 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -432,6 +410,7 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 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=
--- a/install.sh
+++ b/install.sh
@@ -26,7 +26,7 @@ elif cat /proc/version | grep -Eqi "ubuntu"; then
 elif cat /proc/version | grep -Eqi "centos|red hat|redhat"; then
    release="centos"
 else
-    echo -e "${red} Check system OS failed, please contact the author! ${plain}\n" && exit 1
+    echo -e "${red} check system OS failed,please contact with author! ${plain}\n" && exit 1
 fi

 arch=$(arch)
@@ -39,13 +39,13 @@ elif [[ $arch == "s390x" ]]; then
    arch="s390x"
 else
    arch="amd64"
-    echo -e "${red} Fail to check system arch, will use default arch: ${arch}${plain}"
+    echo -e "${red} Fail to check system arch,will use default arch here: ${arch}${plain}"
 fi

 echo "arch: ${arch}"

 if [ $(getconf WORD_BIT) != '32' ] && [ $(getconf LONG_BIT) != '64' ]; then
-    echo "x-ui dosen't support 32-bit(x86) system, please use 64 bit operating system(x86_64) instead,if there is something wrong, plz let me know"
+    echo "x-ui dosen't support 32bit(x86) system,please use 64 bit operating system(x86_64) instead,if there is something wrong,plz let me know"
    exit -1
 fi

@@ -61,15 +61,15 @@ fi

 if [[ x"${release}" == x"centos" ]]; then
    if [[ ${os_version} -le 6 ]]; then
-        echo -e "${red} Please use CentOS 7 or higher version ${plain}\n" && exit 1
+        echo -e "${red} please use CentOS 7 or higher version ${plain}\n" && exit 1
    fi
 elif [[ x"${release}" == x"ubuntu" ]]; then
    if [[ ${os_version} -lt 16 ]]; then
-        echo -e "${red} Please use Ubuntu 16 or higher version ${plain}\n" && exit 1
+        echo -e "${red} please use Ubuntu 16 or higher version ${plain}\n" && exit 1
    fi
 elif [[ x"${release}" == x"debian" ]]; then
    if [[ ${os_version} -lt 8 ]]; then
-        echo -e "${red} Please use Debian 8 or higher version ${plain}\n" && exit 1
+        echo -e "${red} please use Debian 8 or higher version ${plain}\n" && exit 1
    fi
 fi

@@ -83,22 +83,22 @@ install_base() {

 #This function will be called when user installed x-ui out of sercurity
 config_after_install() {
-    echo -e "${yellow}Install/update finished! For security it's recommended to modify panel settings ${plain}"
-    read -p "Do you want to continue with the modification [y/n]? ": config_confirm
+    echo -e "${yellow} Install/update finished need to modify panel settings out of security ${plain}"
+    read -p "are you continue,if you type n will skip this at this time[y/n]": config_confirm
    if [[ x"${config_confirm}" == x"y" || x"${config_confirm}" == x"Y" ]]; then
-        read -p "Please set up your username:" config_account
-        echo -e "${yellow}Your username will be:${config_account}${plain}"
-        read -p "Please set up your password:" config_password
-        echo -e "${yellow}Your password will be:${config_password}${plain}"
-        read -p "Please set up the panel port:" config_port
-        echo -e "${yellow}Your panel port is:${config_port}${plain}"
-        echo -e "${yellow}Initializing, please wait...${plain}"
+        read -p "please set up your username:" config_account
+        echo -e "${yellow}your username will be:${config_account}${plain}"
+        read -p "please set up your password:" config_password
+        echo -e "${yellow}your password will be:${config_password}${plain}"
+        read -p "please set up the panel port:" config_port
+        echo -e "${yellow}your panel port is:${config_port}${plain}"
+        echo -e "${yellow}initializing,wait some time here...${plain}"
        /usr/local/x-ui/x-ui setting -username ${config_account} -password ${config_password}
-        echo -e "${yellow}Account name and password set successfully!${plain}"
+        echo -e "${yellow}account name and password set down!${plain}"
        /usr/local/x-ui/x-ui setting -port ${config_port}
-        echo -e "${yellow}Panel port set successfully!${plain}"
+        echo -e "${yellow}panel port set down!${plain}"
    else
-        echo -e "${red}Canceled, will use the default settings.${plain}"
+        echo -e "${red}Canceled, all setting items are default settings${plain}"
    fi
 }

@@ -109,19 +109,19 @@ install_x-ui() {
    if [ $# == 0 ]; then
        last_version=$(curl -Ls "https://api.github.com/repos/alireza0/x-ui/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
        if [[ ! -n "$last_version" ]]; then
-            echo -e "${red}Failed to fetch x-ui version, it maybe due to Github API restrictions, please try it later${plain}"
+            echo -e "${red}refresh x-ui version failed,it may due to Github API restriction,please try it later${plain}"
            exit 1
        fi
-        echo -e "Got x-ui latest version: ${last_version}, beginning the installation..."
+        echo -e "get x-ui latest version succeed: ${last_version}, begin to install..."
        wget -N --no-check-certificate -O /usr/local/x-ui-linux-${arch}.tar.gz https://github.com/alireza0/x-ui/releases/download/${last_version}/x-ui-linux-${arch}.tar.gz
        if [[ $? -ne 0 ]]; then
-            echo -e "${red}Dowanloading x-ui failed, please be sure that your server can access Github ${plain}"
+            echo -e "${red}dowanload x-ui failed,please be sure that your server can access Github ${plain}"
            exit 1
        fi
    else
        last_version=$1
        url="https://github.com/alireza0/x-ui/releases/download/${last_version}/x-ui-linux-${arch}.tar.gz"
-        echo -e "Begining to install x-ui v$1"
+        echo -e "begin to install x-ui v$1"
        wget -N --no-check-certificate -O /usr/local/x-ui-linux-${arch}.tar.gz ${url}
        if [[ $? -ne 0 ]]; then
            echo -e "${red}dowanload x-ui v$1 failed,please check the verison exists${plain}"
@@ -151,7 +151,7 @@ install_x-ui() {
    systemctl daemon-reload
    systemctl enable x-ui
    systemctl start x-ui
-    echo -e "${green}x-ui v${last_version}${plain} installation finished, it is up and running now..."
+    echo -e "${green}x-ui v${last_version}${plain} install finished,it is working now..."
    echo -e ""
    echo -e "x-ui control menu usages: "
    echo -e "----------------------------------------------"
@@ -170,6 +170,6 @@ install_x-ui() {
    echo -e "----------------------------------------------"
 }

-echo -e "${green}Excuting...${plain}"
+echo -e "${green}excuting...${plain}"
 install_base
 install_x-ui $1
--- a/media/2022-04-04_141259.png
+++ b/media/2022-04-04_141259.png
--- a/media/bda84fbc2ede834deaba1c173a932223.png
+++ b/media/bda84fbc2ede834deaba1c173a932223.png
--- a/media/d13ffd6a73f938d1037d0708e31433bf.png
+++ b/media/d13ffd6a73f938d1037d0708e31433bf.png
--- a/media/inbounds.png
+++ b/media/inbounds.png
--- a/web/assets/ant-design-vue@1.7.2/antd.min.css
+++ b/web/assets/ant-design-vue@1.7.2/antd.min.css
--- a/web/assets/css/custom.css
+++ b/web/assets/css/custom.css
@@ -144,9 +144,4 @@

 .ant-progress-inner {
    background-color: #EBEEF5;
-}
-
-.deactive-client .ant-collapse-header{
-    color:rgb(255, 255, 255) !important;
-    background-color: rgb(255, 127, 127);
 }
--- a/web/assets/js/model/models.js
+++ b/web/assets/js/model/models.js
@@ -151,9 +151,9 @@ class DBInbound {
        }
    }

-    genLink(clientIndex) {
+    genLink() {
        const inbound = this.toInbound();
-        return inbound.genLink(this.address, this.remark, clientIndex);
+        return inbound.genLink(this.address, this.remark);
    }
 }

@@ -171,7 +171,7 @@ class AllSetting {
        this.tgRunTime = "";
        this.xrayTemplateConfig = "";

-        this.timeLocation = "Asia/Tehran";
+        this.timeLocation = "Asia/Shanghai";

        if (data == null) {
            return
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -952,7 +952,7 @@ class Inbound extends XrayCommonClass {
                address = this.stream.tls.server;
            }
        }
-        
+
        let obj = {
            v: '2',
            ps: remark,
@@ -1059,27 +1059,15 @@ class Inbound extends XrayCommonClass {

    genTrojanLink(address='', remark='', clientIndex=0) {
        let settings = this.settings;
-        return `trojan://${settings.trojans[clientIndex].password}@${address}:${this.port}#${encodeURIComponent(remark)}`;
+        return `trojan://${settings.trojans[clientIndex].password}@${address}:${this.port}#${encodeURIComponent(remark+"-"+settings.trojans[clientIndex].email)}`;
    }

    genLink(address='', remark='', clientIndex=0) {
        switch (this.protocol) {
-            case Protocols.VMESS:
-                if (this.settings.vmesses[clientIndex].email != ""){
-                    remark += '-' + this.settings.vmesses[clientIndex].email
-                }
-                return this.genVmessLink(address, remark, clientIndex);
-            case Protocols.VLESS:
-                if (this.settings.vlesses[clientIndex].email != ""){
-                    remark += '-' + this.settings.vlesses[clientIndex].email
-                }
-                return this.genVLESSLink(address, remark, clientIndex);
+            case Protocols.VMESS: return this.genVmessLink(address, remark, clientIndex);
+            case Protocols.VLESS: return this.genVLESSLink(address, remark, clientIndex);
            case Protocols.SHADOWSOCKS: return this.genSSLink(address, remark);
-            case Protocols.TROJAN:
-                if (this.settings.trojans[clientIndex].email != ""){
-                    remark += '-' + this.settings.trojans[clientIndex].email
-                }
-                return this.genTrojanLink(address, remark, clientIndex);
+            case Protocols.TROJAN: return this.genTrojanLink(address, remark, clientIndex);
            default: return '';
        }
    }
@@ -1197,7 +1185,7 @@ Inbound.VmessSettings = class extends Inbound.Settings {
    }
 };
 Inbound.VmessSettings.Vmess = class extends XrayCommonClass {
-    constructor(id=RandomUtil.randomUUID(), alterId=0, email=RandomUtil.randomText(), totalGB=0, expiryTime='') {
+    constructor(id=RandomUtil.randomUUID(), alterId=0, email='', totalGB=0, expiryTime='') {
        super();
        this.id = id;
        this.alterId = alterId;
@@ -1279,7 +1267,7 @@ Inbound.VLESSSettings = class extends Inbound.Settings {
 };
 Inbound.VLESSSettings.VLESS = class extends XrayCommonClass {

-    constructor(id=RandomUtil.randomUUID(), flow=FLOW_CONTROL.DIRECT, email=RandomUtil.randomText(), totalGB=0, expiryTime='') {
+    constructor(id=RandomUtil.randomUUID(), flow=FLOW_CONTROL.DIRECT, email='', totalGB=0, expiryTime='') {
        super();
        this.id = id;
        this.flow = flow;
@@ -1393,7 +1381,7 @@ Inbound.TrojanSettings = class extends Inbound.Settings {
    }
 };
 Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
-    constructor(password=RandomUtil.randomSeq(10), flow=FLOW_CONTROL.DIRECT, email=RandomUtil.randomText(), totalGB=0, expiryTime='') {
+    constructor(password=RandomUtil.randomSeq(10), flow=FLOW_CONTROL.DIRECT, email='', totalGB=0, expiryTime='') {
        super();
        this.password = password;
        this.flow = flow;
--- a/web/assets/js/util/common.js
+++ b/web/assets/js/util/common.js
@@ -54,16 +54,4 @@ function addZero(num) {
 function toFixed(num, n) {
    n = Math.pow(10, n);
    return Math.round(num * n) / n;
-}
-
-function debounce (fn, delay) {
-    var timeoutID = null
-    return function () {
-      clearTimeout(timeoutID)
-      var args = arguments
-      var that = this
-      timeoutID = setTimeout(function () {
-        fn.apply(that, args)
-      }, delay)
-    }
-  }
+}
--- a/web/assets/js/util/utils.js
+++ b/web/assets/js/util/utils.js
@@ -136,16 +136,6 @@ class RandomUtil {
            return (c === 'x' ? r : (r & 0x7 | 0x8)).toString(16);
        });
    }
-
-    static randomText() {
-        var chars = 'abcdefghijklmnopqrstuvwxyz1234567890';
-        var string = '';
-        var len = 6 + Math.floor(Math.random() * 5)
-        for(var ii=0; ii<len; ii++){
-            string += chars[Math.floor(Math.random() * chars.length)];
-        }
-        return string;
-    }
 }

 class ObjectUtil {
--- a/web/html/common/qrcode_modal.html
+++ b/web/html/common/qrcode_modal.html
@@ -2,7 +2,26 @@
 <a-modal id="qrcode-modal" v-model="qrModal.visible" :title="qrModal.title"
         :closable="true" width="300px" :ok-text="qrModal.okText"
         cancel-text='{{ i18n "close" }}' :ok-button-props="{attrs:{id:'qr-modal-ok-btn'}}">
-    <canvas id="qrCode" style="width: 100%; height: 100%;"></canvas>
+    <a-tag color="green" style="margin-bottom: 10px;display: block;text-align: center;" >{{ i18n "pages.inbounds.clickOnQRcode" }}</a-tag>
+    <canvas v-if="qrModal.inbound.protocol != Protocols.VMESS && qrModal.inbound.protocol != Protocols.VLESS && qrModal.inbound.protocol != Protocols.TROJAN" id="qrCode" style="width: 100%; height: 100%;"></canvas>
+
+    <template v-if="qrModal.inbound.protocol === Protocols.VMESS" v-for="(vmess, index) in qrModal.inbound.settings.vmesses">
+        <a-tag color="red" style="margin-bottom: 10px;display: block;text-align: center;" v-text="vmess.email"></a-tag>
+        <canvas @click="copyTextToClipboard(`qrCode-vmess-${vmess.id}`,index)" :id="`qrCode-vmess-${vmess.id}`" style="width: 100%; height: 100%;"></canvas>
+        <a-divider style="height: 2px; background-color: #7e7e7e" />
+    </template>
+
+    <template v-if="qrModal.inbound.protocol === Protocols.VLESS" v-for="(vless, index) in qrModal.inbound.settings.vlesses">
+        <a-tag color="red" style="margin-bottom: 10px;display: block;text-align: center;" v-text="vless.email"></a-tag>
+        <canvas @click="copyTextToClipboard(`qrCode-vless-${vless.id}`,index)" :id="`qrCode-vless-${vless.id}`" style="width: 100%; height: 100%;"></canvas>
+        <a-divider style="height: 2px; background-color: #7e7e7e" />
+    </template>
+
+    <template v-if="qrModal.inbound.protocol === Protocols.TROJAN" v-for="(trojan, index) in qrModal.inbound.settings.trojans">
+        <a-tag color="red" style="margin-bottom: 10px;display: block;text-align: center;" v-text="trojan.email"></a-tag>
+        <canvas @click="copyTextToClipboard(`qrCode-trojan-${trojan.password}`,index)" :id="`qrCode-trojan-${trojan.password}`" style="width: 100%; height: 100%;"></canvas>
+        <a-divider style="height: 2px; background-color: #7e7e7e" />
+    </template>
 </a-modal>

 <script>
@@ -57,6 +76,57 @@
        data: {
            qrModal: qrModal,
        },
+        methods: {
+            setQrCode(elmentId,index) {
+                content = qrModal.inbound.genLink(qrModal.dbInbound.address,qrModal.dbInbound.remark,index)
+
+                new QRious({
+                        element: document.querySelector('#'+elmentId),
+                        size: 260,
+                        value: content,
+                    });
+            },
+            copyTextToClipboard(elmentId,index) {
+                link = qrModal.inbound.genLink(qrModal.dbInbound.address,qrModal.dbInbound.remark,index)
+                this.qrModal.copyText = link
+
+                this.qrModal.clipboard = new ClipboardJS('#' + elmentId, {
+                        text: () => link,
+                    });
+                this.qrModal.clipboard.on('success', () => { 
+                    app.$message.success('{{ i18n "copied" }}')
+                    this.qrModal.clipboard.destroy();
+                });
+
+
+            }
+        },
+        updated()  {
+            switch (qrModal.inbound.protocol) {
+                    case Protocols.VMESS: 
+                        vmesses = qrModal.inbound.settings.vmesses
+                        for (const index in vmesses) {
+                            this.setQrCode("qrCode-vmess-" + vmesses[index].id ,index)
+                        }
+                    break;
+                    case Protocols.VLESS: 
+                        vlesses = qrModal.inbound.settings.vlesses
+
+                        for (const index in vlesses) {
+                            this.setQrCode("qrCode-vless-" + vlesses[index].id ,index)
+                        }
+                    break;
+                    case Protocols.TROJAN: 
+                        trojans = qrModal.inbound.settings.trojans
+
+                        for (const index in trojans) {
+                            this.setQrCode("qrCode-trojan-" + trojans[index].password ,index)
+                        }
+                    break;
+                    default: return null;
+            }
+
+        }
    });

 </script>
--- a/web/html/xui/component/inbound_info.html
+++ b/web/html/xui/component/inbound_info.html
@@ -0,0 +1,119 @@
+{{define "inboundInfoStream"}}
+<table>
+    <tr>
+        <td>{{ i18n "transmission" }}</td><td><a-tag color="green">[[ inbound.network ]]</a-tag></td>
+    </tr>
+<template v-if="inbound.isTcp || inbound.isWs || inbound.isH2">
+    <tr v-if="inbound.host"><td>{{ i18n "host" }}</td><td><a-tag color="green">[[ inbound.host ]]</a-tag></td></tr>
+    <tr v-else><td>{{ i18n "host" }}</td><td><a-tag color="orange">{{ i18n "none" }}</a-tag></td></tr>
+
+    <tr v-if="inbound.path"><td>{{ i18n "path" }}</td><td><a-tag color="green">[[ inbound.path ]]</a-tag></td></tr>
+    <tr v-else><td>{{ i18n "path" }}</td><td><a-tag color="orange">{{ i18n "none" }}</a-tag></td></tr>
+</template>
+
+<template v-if="inbound.isQuic">
+    <tr><td>quic {{ i18n "encryption" }}</td><td><a-tag color="green">[[ inbound.quicSecurity ]]</a-tag></td></tr>
+    <tr><td>quic {{ i18n "password" }}</td><td><a-tag color="green">[[ inbound.quicKey ]]</a-tag></td></tr>
+    <tr><td>quic {{ i18n "camouflage" }}</td><td><a-tag color="green">[[ inbound.quicType ]]</a-tag></td></tr>
+</template>
+
+<template v-if="inbound.isKcp">
+    <tr><td>kcp {{ i18n "encryption" }}</td><td><a-tag color="green">[[ inbound.kcpType ]]</a-tag></td></tr>
+    <tr><td>kcp {{ i18n "password" }}</td><td><a-tag color="green">[[ inbound.kcpSeed ]]</a-tag></td></tr>
+</template>
+
+<template v-if="inbound.isGrpc">
+    <tr><td>grpc serviceName</td><td><a-tag color="green">[[ inbound.serviceName ]]</a-tag></td></tr>
+</template>
+</table>
+</td></tr>
+<tr colspan="2">
+    <td v-if="inbound.tls">
+        tls: <a-tag color="green">{{ i18n "enabled" }}</a-tag><br />
+        tls {{ i18n "domainName" }}: <a-tag :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
+    </td>
+    <td v-else-if="inbound.xtls">
+        xtls: <a-tag color="green">{{ i18n "enabled" }}</a-tag><br />
+        xtls {{ i18n "domainName" }}: <a-tag :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
+    </td>
+    <td v-else>tls: <a-tag color="red">{{ i18n "disabled" }}</a-tag>
+{{end}}
+
+{{define "component/inboundInfoComponent"}}
+<div>
+    <table style="margin-bottom: 10px">
+        <tr><td>
+            <table>
+                <tr><td>{{ i18n "protocol" }}</td><td><a-tag color="green">[[ dbInbound.protocol ]]</a-tag></td></tr>
+                <tr><td>{{ i18n "pages.inbounds.address" }}</td><td><a-tag color="blue">[[ dbInbound.address ]]</a-tag></td></tr>
+                <tr><td>{{ i18n "pages.inbounds.port" }}</td><td><a-tag color="green">[[ dbInbound.port ]]</a-tag></td></tr>
+            </table>
+        </td>
+        <td>
+            <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
+                {{template "inboundInfoStream"}}
+            </template>
+        </td></tr>
+    </table>
+    <a-divider>{{ i18n "clients" }}</a-divider>
+    <table v-if="dbInbound.isVMess">
+        <tr>
+            <th>email</th>
+            <th>uuid</th>
+        </tr>
+        <tr v-for="(vmess, index) in inbound.settings.vmesses">
+            <td><a-tag color="green">[[ vmess.email ]]</a-tag></td>
+            <td><a-tag color="green">[[ vmess.id ]]</a-tag></td>
+        </tr>
+    </table>
+
+    <table v-if="dbInbound.isVLess">
+        <tr>
+            <th>email</th>
+            <th>uuid</th>
+        </tr>
+        <tr v-for="(vless, index) in inbound.settings.vlesses">
+            <td><a-tag color="green">[[ vless.email ]]</a-tag></td>
+            <td><a-tag color="green">[[ vless.id ]]</a-tag></td>
+        </tr>
+    </table>
+
+    <table v-if="dbInbound.isTrojan">
+        <tr>
+            <th>email</th>
+            <th>password</th>
+        </tr>
+        <tr v-for="(trojan, index) in inbound.settings.trojans">
+            <td><a-tag color="green">[[ trojan.email ]]</a-tag></td>
+            <td><a-tag color="green">[[ trojan.password ]]</a-tag></td>
+        </tr>
+    </table>
+
+    <template v-if="dbInbound.isSS">
+        <p>{{ i18n "encryption"}}: <a-tag color="green">[[ inbound.method ]]</a-tag></p>
+        <p>{{ i18n "password"}}: <a-tag color="green">[[ inbound.password ]]</a-tag></p>
+    </template>
+
+    <template v-if="dbInbound.isSocks">
+        <p>{{ i18n "username"}}: <a-tag color="green">[[ inbound.username ]]</a-tag></p>
+        <p>{{ i18n "password"}}: <a-tag color="green">[[ inbound.password ]]</a-tag></p>
+    </template>
+
+    <template v-if="dbInbound.isHTTP">
+        <p>{{ i18n "username"}}: <a-tag color="green">[[ inbound.username ]]</a-tag></p>
+        <p>{{ i18n "password"}}: <a-tag color="green">[[ inbound.password ]]</a-tag></p>
+    </template>
+
+</div>
+{{end}}
+
+{{define "component/inboundInfo"}}
+<script>
+    Vue.component('inbound-info', {
+        delimiters: ['[[', ']]'],
+        props: ["dbInbound", "inbound"],
+        template: `{{template "component/inboundInfoComponent"}}`,
+    });
+
+</script>
+{{end}}
--- a/web/html/xui/form/protocol/trojan.html
+++ b/web/html/xui/form/protocol/trojan.html
@@ -4,7 +4,7 @@
 <a-collapse activeKey="0"  v-for="(trojan, index) in inbound.settings.trojans"
 :key="`trojan-${index}`">

-    <a-collapse-panel :class="getHeaderStyle(trojan.email)" :header="getHeaderText(trojan.email)">
+    <a-collapse-panel :header="getHeaderText(trojan.email)">
        <a-tag v-if="isExpiry(index) || ((getUpStats(trojan.email) + getDownStats(trojan.email)) > trojan.totalGB && trojan.totalGB != 0)" color="red" style="margin-bottom: 10px;display: block;text-align: center;">Account is (Expired|Traffic Ended) And Disabled</a-tag>
        <a-form layout="inline">
            <a-form-item>
@@ -60,7 +60,7 @@
        <a-form layout="inline">
            <a-tooltip v-if="trojan._totalGB > 0">
                <template slot="title">
-                    {{ i18n "pages.inbounds.resetTraffic" }}
+                    reset traffic
                </template>
                <span style="color: #FF4D4F">
                    <a-icon type="delete" @click="resetClientTraffic(trojan,$event)"></a-icon>
--- a/web/html/xui/form/protocol/vless.html
+++ b/web/html/xui/form/protocol/vless.html
@@ -4,7 +4,7 @@
 <a-collapse activeKey="0"  v-for="(vless, index) in inbound.settings.vlesses"
 :key="`vless-${index}`">

-    <a-collapse-panel :class="getHeaderStyle(vless.email)" :header="getHeaderText(vless.email)">
+    <a-collapse-panel :header="getHeaderText(vless.email)">
        <a-tag v-if="isExpiry(index) || ((getUpStats(vless.email) + getDownStats(vless.email)) > vless.totalGB && vless.totalGB != 0)" color="red" style="margin-bottom: 10px;display: block;text-align: center;">Account is (Expired|Traffic Ended) And Disabled</a-tag>

        <a-form layout="inline">
@@ -61,7 +61,7 @@
        <a-form layout="inline">
            <a-tooltip v-if="vless._totalGB > 0">
                <template slot="title">
-                    {{ i18n "pages.inbounds.resetTraffic" }}
+                    reset traffic
                </template>
                <span style="color: #FF4D4F">
                    <a-icon type="delete" @click="resetClientTraffic(vless,$event)"></a-icon>
--- a/web/html/xui/form/protocol/vmess.html
+++ b/web/html/xui/form/protocol/vmess.html
@@ -3,7 +3,7 @@
 <label>{{ i18n "clients"}}</label>
 <a-collapse activeKey="0"  v-for="(vmess, index) in inbound.settings.vmesses"
 :key="`vmess-${index}`">
-    <a-collapse-panel :class="getHeaderStyle(vmess.email)" :header="getHeaderText(vmess.email)">
+    <a-collapse-panel :header="getHeaderText(vmess.email)">
        <a-tag v-if="isExpiry(index) || ((getUpStats(vmess.email) + getDownStats(vmess.email)) > vmess.totalGB && vmess.totalGB != 0)" color="red" style="margin-bottom: 10px;display: block;text-align: center;">Account is (Expired|Traffic Ended) And Disabled</a-tag>

        <a-form layout="inline">
@@ -57,7 +57,7 @@
        <a-form layout="inline">
            <a-tooltip v-if="vmess._totalGB > 0">
                <template slot="title">
-                    {{ i18n "pages.inbounds.resetTraffic" }}
+                    reset traffic
                </template>
                <span style="color: #FF4D4F">
                    <a-icon type="delete" @click="resetClientTraffic(vmess,$event)"></a-icon>
--- a/web/html/xui/inbound_client_table.html
+++ b/web/html/xui/inbound_client_table.html
@@ -1,34 +0,0 @@
-{{define "client_table"}}
-<template slot="actions" slot-scope="text, client, index">
-    <a-dropdown>
-        <a-icon @click="e => e.preventDefault()" type="menu"></a-icon>
-        <template #overlay>
-          <a-menu>
-            <a-menu-item v-if="record.hasLink()" @click="showQrcode(record,index);"><a-icon type="qrcode"></a-icon>{{ i18n "qrCode" }}</a-menu-item>
-            <a-menu-item @click="showInfo(record,index);"><a-icon type="info-circle"></a-icon>{{ i18n "info" }}</a-menu-item>
-            <a-menu-item @click="resetClientTraffic(client,record,$event)" v-if="client.email != ''"><a-icon type="retweet"></a-icon>{{ i18n "pages.inbounds.resetTraffic" }}</a-menu-item>
-          </a-menu>
-        </template>
-    </a-dropdown>
-</template>
-<template slot="client" slot-scope="text, client">
-    [[ client.email ]]
-    <a-tag v-if="!isClientEnabled(record, client.email)" color="red">{{ i18n "disabled" }}</a-tag>
-</template>                                    
-<template slot="traffic" slot-scope="text, client">
-    <a-tag color="blue">[[ sizeFormat(getUpStats(record, client.email)) ]] / [[ sizeFormat(getDownStats(record, client.email)) ]]</a-tag>
-    <template v-if="client._totalGB > 0">
-        <a-tag v-if="isTrafficExhausted(record, client.email)" color="red">[[client._totalGB]]GB</a-tag>
-        <a-tag v-else color="cyan">[[client._totalGB]]GB</a-tag>
-    </template>
-    <a-tag v-else color="green">{{ i18n "indefinite" }}</a-tag>
-</template>                                    
-<template slot="expiryTime" slot-scope="text, client, index">
-    <template v-if="client._expiryTime > 0">
-        <a-tag :color="isExpiry(record, index)? 'red' : 'blue'">
-            [[ DateUtil.formatMillis(client._expiryTime) ]]
-        </a-tag>
-    </template>
-    <a-tag v-else color="green">{{ i18n "indefinite" }}</a-tag>
-</template>
-{{end}}
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -1,103 +1,9 @@
 {{define "inboundInfoModal"}}
-<a-modal id="inbound-info-modal"
-    v-model="infoModal.visible" title='{{ i18n "pages.inbounds.details"}}'
-    :closable="true"
-    :mask-closable="true"
-    :footer="null"
-    width="600px"
-    >
-    <table style="margin-bottom: 10px; width: 100%;">
-        <tr><td>
-            <table>
-                <tr><td>{{ i18n "protocol" }}</td><td><a-tag color="green">[[ dbInbound.protocol ]]</a-tag></td></tr>
-                <tr><td>{{ i18n "pages.inbounds.address" }}</td><td><a-tag color="blue">[[ dbInbound.address ]]</a-tag></td></tr>
-                <tr><td>{{ i18n "pages.inbounds.port" }}</td><td><a-tag color="green">[[ dbInbound.port ]]</a-tag></td></tr>
-            </table>
-        </td>
-        <td v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
-            <table>
-                <tr>
-                    <td>{{ i18n "transmission" }}</td><td><a-tag color="green">[[ inbound.network ]]</a-tag></td>
-                </tr>
-            <template v-if="inbound.isTcp || inbound.isWs || inbound.isH2">
-                <tr v-if="inbound.host"><td>{{ i18n "host" }}</td><td><a-tag color="green">[[ inbound.host ]]</a-tag></td></tr>
-                <tr v-else><td>{{ i18n "host" }}</td><td><a-tag color="orange">{{ i18n "none" }}</a-tag></td></tr>
-            
-                <tr v-if="inbound.path"><td>{{ i18n "path" }}</td><td><a-tag color="green">[[ inbound.path ]]</a-tag></td></tr>
-                <tr v-else><td>{{ i18n "path" }}</td><td><a-tag color="orange">{{ i18n "none" }}</a-tag></td></tr>
-            </template>
-            
-            <template v-if="inbound.isQuic">
-                <tr><td>quic {{ i18n "encryption" }}</td><td><a-tag color="green">[[ inbound.quicSecurity ]]</a-tag></td></tr>
-                <tr><td>quic {{ i18n "password" }}</td><td><a-tag color="green">[[ inbound.quicKey ]]</a-tag></td></tr>
-                <tr><td>quic {{ i18n "camouflage" }}</td><td><a-tag color="green">[[ inbound.quicType ]]</a-tag></td></tr>
-            </template>
-            
-            <template v-if="inbound.isKcp">
-                <tr><td>kcp {{ i18n "encryption" }}</td><td><a-tag color="green">[[ inbound.kcpType ]]</a-tag></td></tr>
-                <tr><td>kcp {{ i18n "password" }}</td><td><a-tag color="green">[[ inbound.kcpSeed ]]</a-tag></td></tr>
-            </template>
-            
-            <template v-if="inbound.isGrpc">
-                <tr><td>grpc serviceName</td><td><a-tag color="green">[[ inbound.serviceName ]]</a-tag></td></tr>
-            </template>
-            </table>
-        </td></tr>
-            <tr colspan="2">
-                <td v-if="inbound.tls">
-                    tls: <a-tag color="green">{{ i18n "enabled" }}</a-tag><br />
-                    tls {{ i18n "domainName" }}: <a-tag :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
-                </td>
-                <td v-else-if="inbound.xtls">
-                    xtls: <a-tag color="green">{{ i18n "enabled" }}</a-tag><br />
-                    xtls {{ i18n "domainName" }}: <a-tag :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
-                </td>
-                <td v-else>tls: <a-tag color="red">{{ i18n "disabled" }}</a-tag>
-            </td>
-        </tr>
-    </table>
-    <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider>
-    <table style="margin-bottom: 10px; width: 100%;">
-        <tr><th>[[ Object.keys(infoModal.clientSettings)[0] ]]</th><th>[[ Object.keys(infoModal.clientSettings)[1] ]]</th><th>[[ Object.keys(infoModal.clientSettings)[2] ]]</th></tr>
-        <tr>
-            <td><a-tag color="green">[[ Object.values(infoModal.clientSettings)[0] ]]</a-tag></td>
-            <td><a-tag color="green">[[ Object.values(infoModal.clientSettings)[1] ]]</a-tag></td>
-            <td><a-tag color="green">[[ Object.values(infoModal.clientSettings)[2] ]]</a-tag></td>
-        </tr>
-    </table>
-    <table style="margin-bottom: 10px; width: 100%;">
-            <tr><th>{{ i18n "usage" }}</th><th>{{ i18n "pages.inbounds.totalFlow" }}</th><th>{{ i18n "pages.inbounds.expireDate" }}</th><th>{{ i18n "enable" }}</th></tr>    
-        <tr>
-            <td>
-                <a-tag :color="statsColor(infoModal.clientStats)">
-                    [[ sizeFormat(infoModal.clientStats['up']) ]] / 
-                    [[ sizeFormat(infoModal.clientStats['down']) ]]
-                    ([[ sizeFormat(infoModal.clientStats['up'] + infoModal.clientStats['down']) ]])
-                </a-tag>
-            </td>
-            <td>
-                <a-tag v-if="infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)">[[ sizeFormat(infoModal.clientSettings.totalGB) ]]</a-tag>
-                <a-tag v-else color="green">{{ i18n "indefinite" }}</a-tag>
-            </td>
-            <td>
-                <template v-if="infoModal.clientSettings.expiryTime > 0">
-                    <a-tag :color="infoModal.isExpired ? 'red' : 'blue'">
-                        [[ DateUtil.formatMillis(infoModal.clientSettings.expiryTime) ]]
-                    </a-tag>
-                </template>
-                <a-tag v-else color="green">{{ i18n "indefinite" }}</a-tag>
-            </td>
-            <td>
-                <a-tag v-if="infoModal.clientStats.enable" color="blue">{{ i18n "enabled" }}</a-tag>
-                <a-tag v-else color="red">{{ i18n "disabled" }}</a-tag>
-            </td>
-        </tr>
-    </table>
-    <div v-if="dbInbound.hasLink()">
-        <a-divider>URL</a-divider>
-        <p>[[ infoModal.link ]]</p>
-        <button class="ant-btn ant-btn-primary" id="copy-url-link"><a-icon type="snippets"></a-icon>{{ i18n "copy" }}</button>
-    </div>
+{{template "component/inboundInfo"}}
+<a-modal id="inbound-info-modal" v-model="infoModal.visible" title='{{ i18n "pages.inbounds.details"}}' @ok="infoModal.ok"
+         :closable="true" :mask-closable="true"
+         ok-text='{{ i18n "pages.inbounds.copyLink"}}' cancel-text='{{ i18n "close" }}' :ok-button-props="infoModal.okBtnPros">
+    <inbound-info :db-inbound="dbInbound" :inbound="inbound"></inbound-info>
 </a-modal>
 <script>

@@ -105,41 +11,32 @@
        visible: false,
        inbound: new Inbound(),
        dbInbound: new DBInbound(),
-        clientSettings: new Inbound.Settings(),
-        clientStats: [],
-        upStats: 0,
-        downStats: 0,
        clipboard: null,
-        link: null,
-        index: 0,
-        isExpired: false,
-        show(dbInbound, index=0) {
-            this.index = index;
+        okBtnPros: {
+            attrs: {
+                id: "inbound-info-modal-ok-btn",
+                style: "",
+            },
+        },
+        show(dbInbound) {
            this.inbound = dbInbound.toInbound();
            this.dbInbound = new DBInbound(dbInbound);
-            this.link = dbInbound.genLink(index);
-            this.clientSettings = Object.values(JSON.parse(this.inbound.settings).clients)[index];
-            this.clientStats = dbInbound.clientStats;
-            this.isExpired = this.inbound.isExpiry(index);
-            if(dbInbound.clientStats.length > 0)
-            {
-                for (const key in dbInbound.clientStats) {
-                    if (Object.hasOwnProperty.call(dbInbound.clientStats, key)) {
-                        if(dbInbound.clientStats[key]['email'] == this.clientSettings.email)
-                            this.clientStats = dbInbound.clientStats[key];
-
-                    }
-                }
-            }
            this.visible = true;
-            infoModalApp.$nextTick(() => {
-                if (this.clipboard === null) {
-                    this.clipboard = new ClipboardJS('#copy-url-link', {
-                        text: () => this.link,
+
+            if (dbInbound.hasLink()) {
+                this.okBtnPros.attrs.style = "";
+            } else {
+                this.okBtnPros.attrs.style = "display: none";
+            }
+
+            if (this.clipboard == null) {
+                infoModalApp.$nextTick(() => {
+                    this.clipboard = new ClipboardJS(`#${this.okBtnPros.attrs.id}`, {
+                        text: () => this.dbInbound.genLink(),
                    });
-                    this.clipboard.on('success', () => app.$message.success('{{ i18n "copied" }}'));
-                }
-            });
+                    this.clipboard.on('success', () => app.$message.success('{{ i18n "copySuccess" }}'));
+                });
+            }
        },
        close() {
            infoModal.visible = false;
@@ -157,33 +54,7 @@
            get inbound() {
                return this.infoModal.inbound;
            }
-        },
-        methods: {
-            setQrCode(elmentId,index) {
-                content = infoModal.inbound.genLink(infoModal.dbInbound.address,infoModal.dbInbound.remark,index)
-
-                new QRious({
-                        element: document.querySelector('#'+elmentId),
-                        size: 260,
-                        value: content,
-                    });
-            },
-            copyTextToClipboard(elmentId,content) {
-                this.infoModal.clipboard = new ClipboardJS('#' + elmentId, {
-                        text: () => content,
-                    });
-                this.infoModal.clipboard.on('success', () => { 
-                    app.$message.success('{{ i18n "copied" }}')
-                    this.infoModal.clipboard.destroy();
-                });
-            },
-            statsColor(stats) {
-                if(stats['total'] === 0) return 'blue'
-                else if(stats['total'] > 0 && (stats['down']+stats['up']) < stats['total']) return 'cyan'
-                else return 'red'
-            }
-        },
-        
+        }
    });

 </script>
--- a/web/html/xui/inbound_modal.html
+++ b/web/html/xui/inbound_modal.html
@@ -157,10 +157,6 @@
                return email + (this.isClientEnable(email) == true ? ' Active' : ' Deactive')
            },

-            getHeaderStyle(email) {
-                return (this.isClientEnable(email) == true ? '' : 'deactive-client')
-            },
-            
            getNewEmail(client) {
                var chars = 'abcdefghijklmnopqrstuvwxyz1234567890';
                var string = '';
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -27,15 +27,15 @@
                    <a-card hoverable style="margin-bottom: 20px;">
                        <a-row>
                            <a-col :xs="24" :sm="24" :lg="12">
-                                {{ i18n "pages.inbounds.totalDownUp" }}:
+                                {{ 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" }}:
+                                {{ 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" }}:
+                                {{ i18n "pages.inbounds.inboundCount" }}：
                                <a-tag color="green">[[ dbInbounds.length ]]</a-tag>
                            </a-col>
                        </a-row>
@@ -46,10 +46,10 @@
                        <div slot="title">
                            <a-button type="primary" icon="plus" @click="openAddInbound"></a-button>
                        </div>
-                        <a-input v-model.lazy="searchKey" placeholder="{{ i18n "search" }}" autofocus style="max-width: 300px"></a-input>
-                        <a-table :columns="columns" :row-key="dbInbound => dbInbound.id"
-                                 :data-source="searchedInbounds"
-                                 :loading="spinning" :scroll="{ x: 1300 }"
+<!--                        <a-input v-model="searchKey" placeholder="search" autofocus style="max-width: 300px"></a-input>-->
+                            <a-table :columns="columns" :row-key="dbInbound => dbInbound.id"
+                                 :data-source="dbInbounds"
+                                 :loading="spinning" :scroll="{ x: 1500 }"
                                 :pagination="false"
                                 style="margin-top: 20px"
                                 @change="() => getDBInbounds()">
@@ -57,7 +57,7 @@
                                <a-dropdown :trigger="['click']">
                                    <a-icon @click="e => e.preventDefault()" type="menu"></a-icon>
                                    <a-menu slot="overlay" @click="a => clickAction(a, dbInbound)">
-                                        <a-menu-item v-if="dbInbound.isSS" key="qrcode">
+                                        <a-menu-item v-if="dbInbound.hasLink()" key="qrcode">
                                            <a-icon type="qrcode"></a-icon>
                                            {{ i18n "qrCode" }}
                                        </a-menu-item>
@@ -87,6 +87,9 @@
                                </template>
                                <a-tag v-else color="green">{{ i18n "unlimited" }}</a-tag>
                            </template>
+                            <template slot="settings" slot-scope="text, dbInbound">
+                                <a-button type="link" @click="showInfo(dbInbound)">{{ i18n "check" }}</a-button>
+                            </template>
                            <template slot="stream" slot-scope="text, dbInbound, index">
                                <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
                                    <a-tag color="green">[[ inbounds[index].stream.network ]]</a-tag>
@@ -107,37 +110,13 @@
                                        [[ DateUtil.formatMillis(dbInbound.expiryTime) ]]
                                    </a-tag>
                                </template>
-                                <a-tag v-else color="green">{{ i18n "indefinite" }}</a-tag>
-                            </template>
-                            <template slot="expandedRowRender" slot-scope="record">
-                                <a-table
-                                v-if="(record.protocol === Protocols.VLESS) || (record.protocol === Protocols.VMESS)"
-                                :row-key="client => client.id"
-                                :columns="innerColumns"
-                                :data-source="getInboundClients(record)"
-                                :pagination="false"
-                                >
-                                    {{template "client_table"}}
-                                </a-table>
-                                <a-table
-                                v-else-if="record.protocol === Protocols.TROJAN"
-                                :row-key="client => client.id"
-                                :columns="innerTrojanColumns"
-                                :data-source="getInboundClients(record)"
-                                :pagination="false"
-                                >
-                                    {{template "client_table"}}
-                                </a-table>
-                                <a-table
-                                v-else
-                                :row-key="client => client.id"
-                                :columns="innerOneColumns"
-                                :data-source="record"
-                                :pagination="false"
-                                >
-                                    {{template "client_table"}}
-                                </a-table>
+                                <a-tag v-else color="green">{{ i18n "indefinitely" }}</a-tag>
                            </template>
+                            <template #expandedRowRender="{ record }">
+                                <p style="margin: 0">
+                                  {{ i18n "none" }}
+                                </p>
+                              </template>                          
                        </a-table>
                    </a-card>
                </transition>
@@ -166,23 +145,28 @@
    }, {
        title: '{{ i18n "pages.inbounds.remark" }}',
        align: 'center',
-        width: 60,
+        width: 100,
        dataIndex: "remark",
    }, {
        title: '{{ i18n "pages.inbounds.protocol" }}',
        align: 'center',
-        width: 40,
+        width: 60,
        scopedSlots: { customRender: 'protocol' },
    }, {
        title: '{{ i18n "pages.inbounds.port" }}',
        align: 'center',
        dataIndex: "port",
-        width: 30,
+        width: 60,
    }, {
        title: '{{ i18n "pages.inbounds.traffic" }}↑|↓',
        align: 'center',
        width: 150,
        scopedSlots: { customRender: 'traffic' },
+    }, {
+        title: '{{ i18n "pages.inbounds.details" }}',
+        align: 'center',
+        width: 40,
+        scopedSlots: { customRender: 'settings' },
    }, {
        title: '{{ i18n "pages.inbounds.transportConfig" }}',
        align: 'center',
@@ -195,26 +179,6 @@
        scopedSlots: { customRender: 'expiryTime' },
    }];

-    const innerColumns = [
-        { title: '', width: 20, scopedSlots: { customRender: 'actions' } },
-        { title: '{{ i18n "pages.inbounds.client" }}', width: 80, scopedSlots: { customRender: 'client' } },
-        { title: '{{ i18n "pages.inbounds.traffic" }}↑|↓', width: 80, scopedSlots: { customRender: 'traffic' } },
-        { title: '{{ i18n "pages.inbounds.expireDate" }}', width: 70, scopedSlots: { customRender: 'expiryTime' } },
-        { title: 'UID', width: 150, dataIndex: "id" },
-    ];
-
-    const innerTrojanColumns = [
-        { title: '', width: 20, scopedSlots: { customRender: 'actions' } },
-        { title: '{{ i18n "pages.inbounds.client" }}', width: 80, scopedSlots: { customRender: 'client' } },
-        { title: '{{ i18n "pages.inbounds.traffic" }}↑|↓', width: 80, scopedSlots: { customRender: 'traffic' } },
-        { title: '{{ i18n "pages.inbounds.expireDate" }}', width: 70, scopedSlots: { customRender: 'expiryTime' } },
-        { title: 'Password', width: 150, dataIndex: "password" },
-    ];
-
-    const innerOneColumns = [
-        { title: '', width: 50, scopedSlots: { customRender: 'actions' } },
-    ];
-
    const app = new Vue({
        delimiters: ['[[', ']]'],
        el: '#app',
@@ -224,7 +188,6 @@
            inbounds: [],
            dbInbounds: [],
            searchKey: '',
-            searchedInbounds: [],
        },
        methods: {
            loading(spinning=true) {
@@ -242,12 +205,10 @@
            setInbounds(dbInbounds) {
                this.inbounds.splice(0);
                this.dbInbounds.splice(0);
-                this.searchedInbounds.splice(0);
                for (const inbound of dbInbounds) {
                    const dbInbound = new DBInbound(inbound);
                    this.inbounds.push(dbInbound.toInbound());
                    this.dbInbounds.push(dbInbound);
-                    this.searchedInbounds.push(dbInbound);
                }
            },
            searchInbounds(key) {
@@ -257,18 +218,7 @@
                    this.searchedInbounds.splice(0, this.searchedInbounds.length);
                    this.dbInbounds.forEach(inbound => {
                        if (ObjectUtil.deepSearch(inbound, key)) {
-                            const newInbound = new DBInbound(inbound);
-                            const inboundSettings = JSON.parse(inbound.settings);
-                            if (inboundSettings.hasOwnProperty('clients')){
-                                const searchedSettings = { "clients": [] };
-                                inboundSettings.clients.forEach(client => {
-                                    if (ObjectUtil.deepSearch(client, key)){
-                                        searchedSettings.clients.push(client);
-                                    }
-                                });
-                                newInbound.settings = Inbound.Settings.fromJson(inbound.protocol, searchedSettings);
-                            }
-                            this.searchedInbounds.push(newInbound);
+                            this.searchedInbounds.push(inbound);
                        }
                    });
                }
@@ -377,12 +327,12 @@
                    onOk: () => this.submit('/xui/inbound/del/' + dbInbound.id),
                });
            },
-            showQrcode(dbInbound, clientIndex) {
-                const link = dbInbound.genLink(clientIndex);
+            showQrcode(dbInbound) {
+                const link = dbInbound.genLink();
                qrModal.show('{{ i18n "qrCode"}}', link, dbInbound);
            },
-            showInfo(dbInbound, index) {
-                infoModal.show(dbInbound, index);
+            showInfo(dbInbound) {
+                infoModal.show(dbInbound);
            },
            switchEnable(dbInbound) {
                this.submit(`/xui/inbound/update/${dbInbound.id}`, dbInbound);
@@ -393,108 +343,11 @@
                    await this.getDBInbounds();
                }
            },
-            getInboundClients(dbInbound) {
-                if(dbInbound.protocol == Protocols.VLESS) {
-                    return dbInbound.toInbound().settings.vlesses
-                } else if(dbInbound.protocol == Protocols.VMESS) {
-                    return dbInbound.toInbound().settings.vmesses
-                } else if(dbInbound.protocol == Protocols.TROJAN) {
-                    return dbInbound.toInbound().settings.trojans
-                }
-            },
-            resetClientTraffic(client,inbound,event) {
-                this.$confirm({
-                    title: '{{ i18n "pages.inbounds.resetTraffic"}}',
-                    content: '{{ i18n "pages.inbounds.resetTrafficContent"}}',
-                    okText: '{{ i18n "reset"}}',
-                    cancelText: '{{ i18n "cancel"}}',
-                    onOk: () => {
-                        this.resetClTraffic(client,inbound,event);
-                    },
-                });
-            },
-            async resetClTraffic(client,inbound,event) {
-                const msg = await HttpUtil.post('/xui/inbound/resetClientTraffic/'+ client.email);
-                if (!msg.success) {
-                    return;
-                }
-                clientStats = inbound.clientStats
-                if(clientStats.length > 0)
-                {
-                    for (const key in clientStats) {
-                        if (Object.hasOwnProperty.call(clientStats, key)) {
-                            if(clientStats[key]['email'] == client.email){ 
-                                clientStats[key]['up'] = 0
-                                clientStats[key]['down'] = 0
-                            }
-                        }
-                    }
-                }
-            },
-            isExpiry(dbInbound, index) {
-                return dbInbound.toInbound().isExpiry(index)
-            },
-            getUpStats(dbInbound, email) {
-                clientStats = dbInbound.clientStats
-                if(clientStats.length > 0)
-                {
-                    for (const key in clientStats) {
-                        if (Object.hasOwnProperty.call(clientStats, key)) {
-                            if(clientStats[key]['email'] == email)
-                                return clientStats[key]['up']
-
-                        }
-                    }
-                }
-
-            },
-            getDownStats(dbInbound, email) {
-                clientStats = dbInbound.clientStats
-                if(clientStats.length > 0)
-                {
-                    for (const key in clientStats) {
-                        if (Object.hasOwnProperty.call(clientStats, key)) {
-                            if(clientStats[key]['email'] == email)
-                                return clientStats[key]['down']
-
-                        }
-                    }
-                }
-            },
-            isTrafficExhausted(dbInbound, email) {
-                clientStats = dbInbound.clientStats
-                if(clientStats.length > 0)
-                {
-                    for (const key in clientStats) {
-                        if (Object.hasOwnProperty.call(clientStats, key)) {
-                            if(clientStats[key]['email'] == email)
-                                return clientStats[key]['down']+clientStats[key]['up'] > clientStats[key]['total']
-
-                        }
-                    }
-                }
-            },
-            isClientEnabled(dbInbound, email) {
-                clientStats = dbInbound.clientStats
-                if(clientStats.length > 0)
-                {
-                    for (const key in clientStats) {
-                        if (Object.hasOwnProperty.call(clientStats, key)) {
-                            if(clientStats[key]['email'] == email)
-                                return clientStats[key]['enable']
-
-                        }
-                    }
-                }
-                else{
-                    return true
-                }
-            },
        },
        watch: {
-            searchKey: debounce(function (newVal) {
-                this.searchInbounds(newVal);
-            }, 500)
+            searchKey(value) {
+                this.searchInbounds(value);
+            }
        },
        mounted() {
            this.getDBInbounds();
@@ -515,7 +368,6 @@
    });

 </script>
-
 {{template "inboundModal"}}
 {{template "promptModal"}}
 {{template "qrcodeModal"}}
--- a/web/html/xui/setting.html
+++ b/web/html/xui/setting.html
@@ -87,28 +87,13 @@
                                             style="max-width: 300px"></a-input>
                                </a-form-item>
                                <a-form-item>
-<!--                                    <a-button type="primary" @click="updateUser">Revise</a-button>-->
+<!--                                    <a-button type="primary" @click="updateUser">修改</a-button>-->
                                    <a-button type="primary" @click="updateUser">{{ i18n "confirm" }}</a-button>
                                </a-form-item>
                            </a-form>
                        </a-tab-pane>
                        <a-tab-pane key="3" tab='{{ i18n "pages.setting.xrayConfiguration"}}'>
                            <a-list item-layout="horizontal" style="background: white">
-                                <setting-list-item type="switch" title='{{ i18n "pages.setting.xrayConfigTorrent"}}' desc='{{ i18n "pages.setting.xrayConfigTorrentDesc"}}'  v-model="torrentSettings"></setting-list-item>
-                                <setting-list-item type="switch" title='{{ i18n "pages.setting.xrayConfigPrivateIp"}}' desc='{{ i18n "pages.setting.xrayConfigPrivateIpDesc"}}'  v-model="privateIpSettings"></setting-list-item>
-                                <a-divider>{{ i18n "pages.setting.advancedTemplate"}}</a-divider>
-                                <a-collapse>
-                                    <a-collapse-panel header="{{ i18n "pages.setting.xrayConfigInbounds"}}">
-                                        <setting-list-item type="textarea" title='{{ i18n "pages.setting.xrayConfigInbounds"}}' desc='{{ i18n "pages.setting.xrayConfigInboundsDesc"}}' v-model ="inboundSettings"></setting-list-item>
-                                    </a-collapse-panel>
-                                    <a-collapse-panel header="{{ i18n "pages.setting.xrayConfigOutbounds"}}">
-                                        <setting-list-item type="textarea" title='{{ i18n "pages.setting.xrayConfigOutbounds"}}' desc='{{ i18n "pages.setting.xrayConfigOutboundsDesc"}}' v-model ="outboundSettings"></setting-list-item>
-                                    </a-collapse-panel>
-                                    <a-collapse-panel header="{{ i18n "pages.setting.xrayConfigRoutings"}}">
-                                        <setting-list-item type="textarea" title='{{ i18n "pages.setting.xrayConfigRoutings"}}' desc='{{ i18n "pages.setting.xrayConfigRoutingsDesc"}}' v-model ="routingRuleSettings"></setting-list-item>
-                                    </a-collapse-panel>
-                                </a-collapse>
-                                <a-divider>{{ i18n "pages.setting.completeTemplate"}}</a-divider>
                                <setting-list-item type="textarea" title='{{ i18n "pages.setting.xrayConfigTemplate"}}' desc='{{ i18n "pages.setting.xrayConfigTemplateDesc"}}' v-model="allSetting.xrayTemplateConfig"></setting-list-item>
                            </a-list>
                        </a-tab-pane>
@@ -204,102 +189,6 @@
                this.saveBtnDisable = this.oldAllSetting.equals(this.allSetting);
            }
        },
-        computed: {
-            templateSettings: {
-                get: function () { return this.allSetting.xrayTemplateConfig ? JSON.parse(this.allSetting.xrayTemplateConfig) : null ; },
-                set: function (newValue) { this.allSetting.xrayTemplateConfig = JSON.stringify(newValue, null, 2) },
-            },
-            inboundSettings: {
-                get: function () { return this.templateSettings ? JSON.stringify(this.templateSettings.inbounds, null, 2) : null; },
-                set: function (newValue) {
-                    newTemplateSettings = this.templateSettings;
-                    newTemplateSettings.inbounds = JSON.parse(newValue)
-                    this.templateSettings = newTemplateSettings
-                },
-            },
-            outboundSettings: {
-                get: function () { return this.templateSettings ? JSON.stringify(this.templateSettings.outbounds, null, 2) : null; },
-                set: function (newValue) {
-                    newTemplateSettings = this.templateSettings;
-                    newTemplateSettings.outbounds = JSON.parse(newValue)
-                    this.templateSettings = newTemplateSettings
-                },
-            },
-            routingRuleSettings: {
-                get: function () { return this.templateSettings ? JSON.stringify(this.templateSettings.routing.rules, null, 2) : null; },
-                set: function (newValue) {
-                    newTemplateSettings = this.templateSettings;
-                    newTemplateSettings.routing.rules = JSON.parse(newValue)
-                    this.templateSettings = newTemplateSettings
-                },
-            },
-            torrentSettings: {
-                get: function () {
-                    torrentFilter = false
-                    if(this.templateSettings != null){
-                        this.templateSettings.routing.rules.forEach(routingRule => {
-                            if(routingRule.hasOwnProperty("protocol")){
-                                if (routingRule.protocol[0] === "bittorrent" && routingRule.outboundTag == "blocked"){
-                                    torrentFilter = true
-                                }
-                            }
-                        });
-                    }
-                    return torrentFilter
-                },
-                set: function (newValue) {
-                    newTemplateSettings = JSON.parse(this.allSetting.xrayTemplateConfig);
-                    if (newValue){
-                        newTemplateSettings.routing.rules.push(JSON.parse("{\"outboundTag\": \"blocked\",\"protocol\": [\"bittorrent\"],\"type\": \"field\"}"))
-                    }
-                    else {
-                        newTemplateSettings.routing.rules = [];
-                        this.templateSettings.routing.rules.forEach(routingRule => {
-                            if (routingRule.hasOwnProperty('protocol')){
-                                if (routingRule.protocol[0] === "bittorrent" && routingRule.outboundTag == "blocked"){
-                                    return;
-                                }
-                            }
-                            newTemplateSettings.routing.rules.push(routingRule);
-                        });
-                    }
-                    this.templateSettings = newTemplateSettings
-                },
-            },
-            privateIpSettings: {
-                get: function () {
-                    localIpFilter = false
-                    if(this.templateSettings != null){
-                        this.templateSettings.routing.rules.forEach(routingRule => {
-                            if(routingRule.hasOwnProperty("ip")){
-                                if (routingRule.ip[0] === "geoip:private" && routingRule.outboundTag == "blocked"){
-                                    localIpFilter = true
-                                }
-                            }
-                        });
-                    }
-                    return localIpFilter
-                },
-                set: function (newValue) {
-                    newTemplateSettings = JSON.parse(this.allSetting.xrayTemplateConfig);
-                    if (newValue){
-                        newTemplateSettings.routing.rules.push(JSON.parse("{\"outboundTag\": \"blocked\",\"ip\": [\"geoip:private\"],\"type\": \"field\"}"))
-                    }
-                    else {
-                        newTemplateSettings.routing.rules = [];
-                        this.templateSettings.routing.rules.forEach(routingRule => {
-                            if (routingRule.hasOwnProperty('ip')){
-                                if (routingRule.ip[0] === "geoip:private" && routingRule.outboundTag == "blocked"){
-                                    return;
-                                }
-                            }
-                            newTemplateSettings.routing.rules.push(routingRule);
-                        });
-                    }
-                    this.templateSettings = newTemplateSettings
-                },
-            },
-        }
    });

 </script>
--- a/web/service/setting.go
+++ b/web/service/setting.go
@@ -28,7 +28,7 @@ var defaultValueMap = map[string]string{
 	"webKeyFile":         "",
 	"secret":             random.Seq(32),
 	"webBasePath":        "/",
-	"timeLocation":       "Asia/Tehran",
+	"timeLocation":       "Asia/Shanghai",
 	"tgBotEnable":        "false",
 	"tgBotToken":         "",
 	"tgBotChatId":        "0",
@@ -69,7 +69,7 @@ func (s *SettingService) GetAllSetting() (*entity.AllSetting, error) {
 		}

 		if !found {
-			// Some settings are automatically generated, no need to return to the front end to modify the user
+			// 有些设置自动生成，不需要返回到前端给用户修改
 			return nil
 		}

--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -1,50 +1,47 @@
-"username" = "Username"
-"password" = "Password"
-"login" = "Login"
-"confirm" = "Confirm"
-"cancel" = "Cancel"
-"close" = "Close"
-"copy" = "Copy"
-"copied" = "Copied"
-"download" = "Download"
-"remark" = "Remark"
-"enable" = "Enable"
-"protocol" = "Protocol"
-"search" = "Search"
+"username" = "username"
+"password" = "password"
+"login" = "login"
+"confirm" = "confirm"
+"cancel" = "cancel"
+"close" = "close"
+"copy" = "copy"
+"copied" = "copied"
+"download" = "download"
+"remark" = "remark"
+"enable" = "enable"
+"protocol" = "protocol"

 "loading" = "Loading"
-"second" = "Second"
-"minute" = "Minute"
-"hour" = "Hour"
-"day" = "Day"
-"check" = "Check"
-"indefinite" = "Indefinite"
-"unlimited" = "Unlimited"
-"none" = "None"
+"second" = "second"
+"minute" = "minute"
+"hour" = "hour"
+"day" = "day"
+"check" = "check"
+"indefinitely" = "indefinitely"
+"unlimited" = "unlimited"
+"none" = "none"
 "qrCode" = "QR Code"
-"info" = "More information"
-"edit" = "Edit"
-"delete" = "Delete"
-"reset" = "Reset"
+"edit" = "edit"
+"delete" = "delete"
+"reset" = "reset"
 "copySuccess" = "Copy successfully"
 "sure" = "Sure"
-"encryption" = "Encryption"
-"transmission" = "Transmission"
-"host" = "Host"
-"path" = "Path"
-"camouflage" = "Camouflage"
-"enabled" = "Enabled"
-"disabled" = "Disabled"
-"domainName" = "Domain name"
-"additional" = "Alter"
+"encryption" = "encryption"
+"transmission" = "transmission"
+"host" = "host"
+"path" = "path"
+"camouflage" = "camouflage"
+"enabled" = "enabled"
+"disabled" = "disabled"
+"domainName" = "domain name"
+"additional" = "alter"
 "monitor" = "Listen IP"
-"certificate" = "Certificat"
-"fail" = "Fail"
-"success" = " Success"
-"getVersion" = "Get version"
-"install" = "Install"
+"certificate" = "certificat"
+"fail" = "fail"
+"success" = " success"
+"getVersion" = "get version"
+"install" = "install"
 "clients" = "Clients"
-"usage" = "Usage"

 [menu]
 "dashboard" = "System Status"
@@ -64,10 +61,11 @@
 "wrongUsernameOrPassword" = "Invalid username or password"
 "successLogin" = "Login"

+
 [pages.index]
-"title" = "System status"
-"memory" = "Memory"
-"hard" = "Hard disk"
+"title" = "system status"
+"memory" = "memory"
+"hard" = "hard disk"
 "xrayStatus" = "xray Status"
 "xraySwitch" = "Switch Version"
 "xraySwitchClick" = "Click on the version you want to switch"
@@ -81,26 +79,27 @@
 "downSpeed" = "Total download speed for all network cards"
 "totalSent" = "Total upload traffic of all network cards since system startup"
 "totalReceive" = "Total download traffic of all network cards since system startup"
-"xraySwitchVersionDialog" = "Switch xray version"
-"xraySwitchVersionDialogDesc" = "Whether to switch the xray version to"
+"xraySwitchVersionDialog" = "switch xray version"
+"xraySwitchVersionDialogDesc" = "whether to switch the xray version to"
 "dontRefreshh" = "Installation is in progress, please do not refresh this page"

+
 [pages.inbounds]
 "title" = "Inbounds"
 "totalDownUp" = "Total uploads/downloads"
 "totalUsage" = "Total usage"
 "inboundCount" = "Number of inbound"
-"operate" = "Operate"
-"enable" = "Enable"
-"remark" = "Remark"
-"protocol" = "Protocol"
-"port" = "Port"
-"traffic" = "Traffic"
-"details" = "Details"
-"transportConfig" = "Transport config"
-"expireDate" = "Expire date"
-"resetTraffic" = "Reset traffic"
-"addInbound" = "Add Inbound"
+"operate" = "operate"
+"enable" = "enable"
+"remark" = "remark"
+"protocol" = "protocol"
+"port" = "port"
+"traffic" = "traffic"
+"details" = "details"
+"transportConfig" = "transport config"
+"expireDate" = "expire date"
+"resetTraffic" = "reset traffic"
+"addInbound" = "addInbound"
 "addTo" = "Add To"
 "revise" = "Revise"
 "modifyInbound" = "Modify InBound"
@@ -108,44 +107,44 @@
 "deleteInboundContent" = "Are you sure you want to delete inbound?"
 "resetTrafficContent" = "Are you sure you want to reset traffic?"
 "copyLink" = "Copy Link"
-"address" = "Address"
-"network" = "Network"
-"destinationPort" = "Destination port"
-"targetAddress" = "Target address"
+"address" = "address"
+"network" = "network"
+"destinationPort" = "destination port"
+"targetAddress" = "target address"
 "disableInsecureEncryption" = "Disable insecure encryption"
 "monitorDesc" = "Leave blank by default"
-"meansNoLimit" = "Means no limit"
-"totalFlow" = "Total flow"
+"meansNoLimit" = "means no limit"
+"totalFlow" = "total flow"
 "leaveBlankToNeverExpire" = "Leave blank to never expire"
 "noRecommendKeepDefault" = "There are no special requirements to keep the default"
-"certificatePath" = "Certificate file path"
-"certificateContent" = "Certificate file content"
-"publicKeyPath" = "Public key file path"
-"publicKeyContent" = "Public key content"
-"keyPath" = "Key file path"
-"keyContent" = "Key content"
-"clickOnQRcode" = "Click on QR Code to Copy"
-"client" = "Client"
+"certificatePath" = "certificate file path"
+"certificateContent" = "certificate file content"
+"publicKeyPath" = "public key file path"
+"publicKeyContent" = "public key content"
+"keyPath" = "key file path"
+"keyContent" = "key content"
+"clickOnQRcode" = "click on QR Code to Copy"

 [pages.inbounds.toasts]
 "obtain" = "Obtain"

 [pages.inbounds.stream.general]
-"requestHeader" = "Request header"
-"name" = "Name"
-"value" = "Value"
+"requestHeader" = "request header"
+"name" = "name"
+"value" = "value"

 [pages.inbounds.stream.tcp]
-"requestVersion" = "Request version"
-"requestMethod" = "Request method"
-"requestPath" = "Request path"
-"responseVersion" = "Response version"
-"responseStatus" = "Response status"
-"responseStatusDescription" = "Response status description"
-"responseHeader" = "Response header"
+"requestVersion" = "request version"
+"requestMethod" = "request method"
+"requestPath" = "request path"
+"responseVersion" = "response version"
+"responseStatus" = "response status"
+"responseStatusDescription" = "response status description"
+"responseHeader" = "response header"

 [pages.inbounds.stream.quic]
-"encryption" = "Encryption"
+"encryption" = "encryption"
+

 [pages.setting]
 "title" = "Setting"
@@ -171,20 +170,8 @@
 "currentPassword" = "Current Password"
 "newUsername" = "New Username"
 "newPassword" = "New Password"
-"advancedTemplate" = "Advanced template parts"
-"completeTemplate" = "Complete template of Xray configuration"
-"xrayConfigTemplate" = "Xray Configuration Template"
-"xrayConfigTemplateDesc" = "Generate the final xray configuration file based on this template, restart the panel to take effect."
-"xrayConfigTorrent" = "Ban bittorrent usage"
-"xrayConfigTorrentDesc" = "Change the configuration temlate to avoid using bittorrent by users, restart the panel to take effect"
-"xrayConfigPrivateIp" = "Ban private ip range to connect"
-"xrayConfigPrivateIpDesc" = "Change the configuration temlate to avoid connecting with private IP ranges, restart the panel to take effect"
-"xrayConfigInbounds" = "Configuration of Inbounds"
-"xrayConfigInboundsDesc" = "Change the configuration temlate to accept special clients, restart the panel to take effect"
-"xrayConfigOutbounds" = "Configuration of Outbounds"
-"xrayConfigOutboundsDesc" = "Change the configuration temlate to define outgoing ways for this server, restart the panel to take effect"
-"xrayConfigRoutings" = "Configuration of Routing rules"
-"xrayConfigRoutingsDesc" = "Change the configuration temlate to define Routing rules for this server, restart the panel to take effect"
+"xrayConfigTemplate" = "xray Configuration Template"
+"xrayConfigTemplateDesc" = "Generate the final xray configuration file based on this template, restart the panel to take effect"
 "telegramBotEnable" = "Enable telegram bot"
 "telegramBotEnableDesc" = "Restart the panel to take effect"
 "telegramToken" = "Telegram Token"
@@ -197,8 +184,8 @@
 "timeZoneDesc" = "The scheduled task runs according to the time in the time zone, and restarts the panel to take effect"

 [pages.setting.toasts]
-"modifySetting" = "Modify setting"
-"getSetting" = "Get setting"
-"modifyUser" = "Modify user"
+"modifySetting" = "modify setting"
+"getSetting" = "get setting"
+"modifyUser" = "modify user"
 "originalUserPassIncorrect" = "The original user name or original password is incorrect"
 "userPassMustBeNotEmpty" = "New username and new password cannot be empty"
--- a/web/translation/translate.fa_IR.toml
+++ b/web/translation/translate.fa_IR.toml
@@ -10,7 +10,6 @@
 "remark" = "نام"
 "enable" = "فعال"
 "protocol" = "پروتکل"
-"search" = "جستجو"

 "loading" = "در حال بروزرسانی..."
 "second" = "ثانیه"
@@ -18,11 +17,10 @@
 "hour" = "ساعت"
 "day" = "روز"
 "check" = "چک کردن"
-"indefinite" = "نامحدود"
+"indefinitely" = "نامحدود"
 "unlimited" = "نامحدود"
 "none" = "هیچ"
 "qrCode" = "QR کد"
-"info" = "اطلاعات بیشتر"
 "edit" = "ویرایش"
 "delete" = "حذف"
 "reset" = "ریست"
@@ -34,7 +32,7 @@
 "path" = "مسیر"
 "camouflage" = "استتار"
 "enabled" = "فعال"
-"disabled" = "غیرفعال"
+"disabled" = "disabled"
 "domainName" = "آدرس دامنه"
 "additional" = "آی دی جایگزین"
 "monitor" = "آی پی اتصال"
@@ -44,11 +42,10 @@
 "getVersion" = "دریافت ورژن"
 "install" = "نصب"
 "clients" = "کاربران"
-"usage" = "استفاده"

 [menu]
 "dashboard" = "وضعیت سیستم"
-"inbounds" = "سرویس ها" 
+"inbounds" = "سروریس ها" 
 "setting" = "تنظیمات پنل"
 "logout" = "خروج"
 "link" = "دیگر"
@@ -64,6 +61,7 @@
 "wrongUsernameOrPassword" = "نام کاربری و رمز عبور اشتباه میباشد"
 "successLogin" = "خوش آمدید"

+
 [pages.index]
 "title" = "وضعیت سیستم"
 "memory" = "حافظه رم"
@@ -85,6 +83,7 @@
 "xraySwitchVersionDialogDesc" = "آیا از تغییر ورژن مطمئن هستین"
 "dontRefreshh" = "در حال نصب ، لطفا رفرش نکنید "

+
 [pages.inbounds]
 "title" = "کاربران"
 "totalDownUp" = "جمع آپلود/دانلود"
@@ -125,7 +124,6 @@
 "keyPath" = "مسیر فایل Private.key"
 "keyContent" = "محتوای Private.key"
 "clickOnQRcode" = "برای کپی بر روی کد تصویری کلیک کنید"
-"client" = "کاربر"

 [pages.inbounds.toasts]
 "obtain" = "Obtain"
@@ -147,6 +145,7 @@
 [pages.inbounds.stream.quic]
 "encryption" = "رمزنگاری"

+
 [pages.setting]
 "title" = "تنظیمات"
 "save" = "ذخیره"
@@ -171,20 +170,8 @@
 "currentPassword" = "رمز عبور فعلی"
 "newUsername" = "نام کاربری جدید"
 "newPassword" = "رمز عبور جدید"
-"advancedTemplate" = "بخش های پیشرفته الگو"
-"completeTemplate" = "الگوی کامل تنظیمات ایکس ری"
-"xrayConfigTemplate" = "تنظیمات الگو ایکس ری"
-"xrayConfigTemplateDesc" = "فایل پیکربندی ایکس ری نهایی بر اساس این الگو ایجاد میشود. لطفاً این را تغییر ندهید مگر اینکه دقیقاً بدانید که چه کاری انجام می دهید! پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"xrayConfigTorrent" = "فیلتر کردن بیت تورنت"
-"xrayConfigTorrentDesc" = "الگوی تنظیمات را برای فیلتر کردن پروتکل بیت تورنت برای کاربران تغییر میدهد.  پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"xrayConfigPrivateIp" = "جلوگیری از اتصال آی پی های نامعتبر"
-"xrayConfigPrivateIpDesc" = "الگوی تنظیمات را برای فیلتر کردن اتصال آی پی های نامعتبر و بسته های سرگردان تغییر میدهد.  پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"xrayConfigInbounds" = "تنظیمات ورودی"
-"xrayConfigInboundsDesc" = "میتوانید الگوی تنظیمات را برای ورودی های خاص تنظیم نمایید.  پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"xrayConfigOutbounds" = "تنظیمات خروجی"
-"xrayConfigOutboundsDesc" = "میتوانید الگوی تنظیمات را برای خروجی اینترنت تنظیم نمایید.  پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"xrayConfigRoutings" = "تنظیمات قوانین مسیریابی"
-"xrayConfigRoutingsDesc" = "میتوانید الگوی تنظیمات را برای مسیریابی تنظیم نمایید.  پنل را مجدداً راه اندازی کنید تا اعمال شود"
+"xrayConfigTemplate" = "تنظیمات قالب Xray"
+"xrayConfigTemplateDesc" = "فایل پیکربندی xray نهایی را بر اساس این الگو ایجاد کنید. لطفاً این را تغییر ندهید مگر اینکه دقیقاً بدانید که چه کاری انجام می دهید! پنل را مجدداً راه اندازی کنید تا اعمال شود"
 "telegramBotEnable" = "فعالسازی ربات تلگرام"
 "telegramBotEnableDesc" = "پنل را مجدداً راه اندازی کنید تا اعمال شود"
 "telegramToken" = "توکن تلگرام"
--- a/web/translation/translate.zh_Hans.toml
+++ b/web/translation/translate.zh_Hans.toml
@@ -10,7 +10,6 @@
 "remark" = "备注"
 "enable" = "启用"
 "protocol" = "协议"
-"search" = "搜尋"

 "loading" = "加载中"
 "second" = "秒"
@@ -18,11 +17,10 @@
 "hour" = "小时"
 "day" = "天"
 "check" = "查看"
-"indefinite" = "无限期"
+"indefinitely" = "无限期"
 "unlimited" = "无限制"
 "none" = "无"
 "qrCode" = "二维码"
-"info" = "更多信息"
 "edit" = "编辑"
 "delete" = "删除"
 "reset" = "重置"
@@ -44,7 +42,6 @@
 "getVersion" = "获取版本"
 "install" = "安装"
 "clients" = "客户端"
-"usage" = "用法"

 [menu]
 "dashboard" = "系统状态"
@@ -85,6 +82,7 @@
 "xraySwitchVersionDialogDesc" = "是否切换 xray 版本至"
 "dontRefreshh" = "安装中，请不要刷新此页面"

+
 [pages.inbounds]
 "title" = "入站列表"
 "totalDownUp" = "总上传 / 下载"
@@ -124,8 +122,7 @@
 "publicKeyContent" = "公钥内容"
 "keyPath" = "密钥文件路径"
 "keyContent" = "密钥内容"
-"clickOnQRcode" = "点击二维码复制"
-"client" = "客户"
+"clickOnQRcode" = "click on QR Code to Copy"

 [pages.inbounds.toasts]
 "obtain" = "获取"
@@ -147,6 +144,7 @@
 [pages.inbounds.stream.quic]
 "encryption" = "加密"

+
 [pages.setting]
 "title" = "设置"
 "save" = "保存配置"
@@ -171,20 +169,8 @@
 "currentPassword" = "原密码"
 "newUsername" = "新用户名"
 "newPassword" = "新密码"
-"advancedTemplate" = "高级模板部件"
-"completeTemplate" = "Xray 配置的完整模板"
-"xrayConfigTemplate" = "xray 配置模板"
-"xrayConfigTemplateDesc" = "以该模型为基础生成最终的xray配置文件，重新启动面板生成效率"
-"xrayConfigTorrent" = "禁止使用 bittorrent"
-"xrayConfigTorrentDesc" = "更改配置模板避免用户使用bittorrent，重启面板生效"
-"xrayConfigPrivateIp" = "禁止私人 ip 范围连接"
-"xrayConfigPrivateIpDesc" = "更改配置模板以避免连接私有 IP 范围，重启面板生效"
-"xrayConfigInbounds" = "入站配置"
-"xrayConfigInboundsDesc" = "更改配置模板接受特殊客户端，重启面板生效"
-"xrayConfigOutbounds" = "出站配置"
-"xrayConfigOutboundsDesc" = "更改配置模板定义此服务器的传出方式，重启面板生效"
-"xrayConfigRoutings" = "路由规则配置"
-"xrayConfigRoutingsDesc" = "更改配置模板为该服务器定义路由规则，重启面板生效"
+"xrayConfigTemplate" = "xray 配置模版"
+"xrayConfigTemplateDesc" = "以该模版为基础生成最终的 xray 配置文件，重启面板生效"
 "telegramBotEnable" = "启用电报机器人"
 "telegramBotEnableDesc" = "重启面板生效"
 "telegramToken" = "电报机器人TOKEN"
@@ -201,4 +187,5 @@
 "getSetting" = "获取设置"
 "modifyUser" = "修改用户"
 "originalUserPassIncorrect" = "原用户名或原密码错误"
-"userPassMustBeNotEmpty" = "新用户名和新密码不能为空"
+"userPassMustBeNotEmpty" = "新用户名和新密码不能为空"
+
@@ -1 +1 @@
 .2.3
 .1.0