old design

2023-03-23 23:22:50 +03:30
76 changed files with 1419 additions and 9204 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the 3x-ui bug**
+A clear and concise description of what the bug is.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Server (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,56 +0,0 @@
-name: Issue Report
-description: "Create a report to help us improve."
-body:
-  - type:  checkboxes
-    id: terms
-    attributes:
-      label: Welcome
-      options:
-        - label: Yes, I'm using the latest major release. Only such installations are supported.
-          required: true
-        - label: Yes, I'm using the supported system. Only such systems are supported.
-          required: true
-        - label: Yes, I have read all WIKI document,nothing can help me in my problem.
-          required: true
-        - label: Yes, I've searched similar issues on GitHub and didn't find any.
-          required: true
-        - label: Yes, I've included all information below (version, config, log, etc).
-          required: true
-
-  - type: textarea
-    id: problem
-    attributes:
-      label: Description of the problem,screencshot would be good 
-      placeholder: Your problem description
-    validations:
-      required: true
-
-  - type: textarea
-    id: version
-    attributes:
-      label: Version of 3x-ui
-      value: |-
-        <details>
-
-        ```console
-        # Paste here
-        ```
-
-        </details>
-    validations:
-      required: true
-
-  - type: textarea
-    id: log
-    attributes:
-      label: x-ui log reports or xray log
-      value: |-
-        <details>
-
-        ```console
-        # paste log here
-        ```
-
-        </details>
-    validations:
-      required: true
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ jobs:
    name: build x-ui amd64 version
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@v3.5.0
+      - uses: actions/checkout@v3.4.0
      - name: Set up Go
        uses: actions/setup-go@v4.0.0
        with:
@@ -27,7 +27,6 @@ jobs:
          rm -f Xray-linux-64.zip geoip.dat geosite.dat
          wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
          wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
-          wget https://github.com/bootmortis/iran-hosted-domains/releases/latest/download/iran.dat
          mv xray xray-linux-amd64
          cd ..
          cd ..
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # 3x-ui
-[![](https://img.shields.io/github/v/release/mhsanaei/3x-ui.svg)](https://github.com/MHSanaei/3x-ui/releases)
-[![](https://img.shields.io/github/actions/workflow/status/mhsanaei/3x-ui/release.yml.svg)](#)
-[![GO Version](https://img.shields.io/github/go-mod/go-version/mhsanaei/3x-ui.svg)](#)
-[![Downloads](https://img.shields.io/github/downloads/mhsanaei/3x-ui/total.svg)](#)
+![](https://img.shields.io/github/v/release/mhsanaei/3x-ui.svg)
+![](https://img.shields.io/github/actions/workflow/status/mhsanaei/3x-ui/release.yml.svg)
+![GO Version](https://img.shields.io/github/go-mod/go-version/mhsanaei/3x-ui.svg)
+![Downloads](https://img.shields.io/github/downloads/mhsanaei/3x-ui/total.svg)
 [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0.en.html)


@@ -34,7 +34,6 @@ certbot renew --dry-run
 - Port: 2053
 - username and password will be generated randomly if you skip to modify your own security(x-ui "7")
 - database path: /etc/x-ui/x-ui.db
- xray config path: /usr/local/x-ui/bin/config.json

 before you set ssl on settings
 - http:// ip or domain:2053/xui
@@ -45,9 +44,8 @@ After you set ssl on settings
 # Enable Traffic For Users:

 **copy and paste to xray Configuration :** (you don't need to do this if you have a fresh install)
- [enable traffic](./media/enable-traffic.txt)
- [enable traffic+block all IR IP address](./media/enable-traffic+block-IR-IP.txt)
- [enable traffic+block all IR domain](./media/enable-traffic+block-IR-domain.txt)
+- [for enable traffic](https://raw.githubusercontent.com/mhsanaei/3x-ui/main/media/for%20enable%20traffic.txt)
+- [for enable traffic+block all iran ip address](https://raw.githubusercontent.com/mhsanaei/3x-ui/main/media/for%20enable%20traffic%2Bblock%20all%20iran%20ip.txt)

 # Features

@@ -62,7 +60,6 @@ After you set ssl on settings
 - Support https access panel (self-provided domain name + ssl certificate)
 - Support one-click SSL certificate application and automatic renewal
 - For more advanced configuration items, please refer to the panel
- fix api routes (user setting will create with api)

 # Tg robot use

@@ -79,8 +76,6 @@ Set the robot-related parameters in the panel background, including:

 Reference syntax:

- 30 * * * * * //Notify at the 30s of each point
- 0 */10 * * * * //Notify at the first second of each 10 minutes
 - @hourly // hourly notification
 - @daily // Daily notification (00:00 in the morning)
 - @every 8h // notify every 8 hours
@@ -91,40 +86,18 @@ Reference syntax:
 - Login notification
 - CPU threshold notification
 - Threshold for Expiration time and Traffic to report in advance
- Support client report menu if client's telegram username added to the user's configurations
+- Support client report if client's telegram username is added to the end of `email` like 'test123@telegram_username'
 - Support telegram traffic report searched with UID (VMESS/VLESS) or Password (TROJAN) - anonymously
 - Menu based bot
 - Search client by email ( only admin )
 - Check all inbounds
 - Check server status
- Check depleted users
+- Check Exhausted users
 - Receive backup by request and in periodic reports

-
-## API routes
-
- `/login` with `PUSH` user data: `{username: '', password: ''}` for login
- `/xui/API/inbounds` base for following actions:
-
-| Method | Path | Action |
-| ------------- | ------------- | ------------- |
-| GET | "/list" | Get all inbounds |
-| GET | "/get/:id" | Get inbound with inbound.id |
-| POST | "/add" | Add inbound |
-| POST | "/del/:id" | Delete Inbound |
-| POST | "/update/:id" | Update Inbound |
-| POST | "/clientIps/:email" | Client Ip address |
-| POST | "/clearClientIps/:email" | Clear Client Ip address |
-| POST | "/addClient/" | Add Client to inbound |
-| POST | "/delClient/:email" | Delete Client |
-| POST | "/updateClient/:index" | Update Client |
-| POST | "/:id/resetClientTraffic/:email" | Reset Client's Traffic |
-| POST | "/resetAllTraffics" | Reset traffics of all inbounds |
-| POST | "/resetAllClientTraffics/:id" | Reset traffics of all clients in an inbound |
-
 # A Special Thanks To
 - [alireza0](https://github.com/alireza0/)
- [FranzKafkaYu](https://github.com/FranzKafkaYu)
+- [HexaSoftwareTech](https://github.com/HexaSoftwareTech/)

 # Suggestion System
 - Ubuntu 20.04+
--- a/config/version
+++ b/config/version
@@ -1 +1 @@
-1.2.2
+1.0.9
--- a/database/db.go
+++ b/database/db.go
@@ -92,7 +92,7 @@ func InitDB(dbPath string) error {
 	if err != nil {
 		return err
 	}
-
+	
 	return nil
 }

--- a/database/model/model.go
+++ b/database/model/model.go
@@ -44,9 +44,9 @@ type Inbound struct {
 	Sniffing       string   `json:"sniffing" form:"sniffing"`
 }
 type InboundClientIps struct {
-	Id          int    `json:"id" gorm:"primaryKey;autoIncrement"`
+	Id       int    `json:"id" gorm:"primaryKey;autoIncrement"`
 	ClientEmail string `json:"clientEmail" form:"clientEmail" gorm:"unique"`
-	Ips         string `json:"ips" form:"ips"`
+	Ips string `json:"ips" form:"ips"`
 }

 func (i *Inbound) GenXrayInboundConfig() *xray.InboundConfig {
@@ -73,14 +73,10 @@ type Setting struct {

 type Client struct {
 	ID         string `json:"id"`
-	Password   string `json:"password"`
-	Flow       string `json:"flow"`
 	AlterIds   uint16 `json:"alterId"`
 	Email      string `json:"email"`
 	LimitIP    int    `json:"limitIp"`
+	Security   string `json:"security"`
 	TotalGB    int64  `json:"totalGB" form:"totalGB"`
 	ExpiryTime int64  `json:"expiryTime" form:"expiryTime"`
-	Enable     bool   `json:"enable" form:"enable"`
-	TgID       string `json:"tgId" form:"tgId"`
-	SubID      string `json:"subId" form:"subId"`
 }
--- a/go.mod
+++ b/go.mod
@@ -8,29 +8,29 @@ require (
 	github.com/gin-gonic/gin v1.9.0
 	github.com/go-cmd/cmd v1.4.1
 	github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
-	github.com/goccy/go-json v0.10.2
 	github.com/nicksnyder/go-i18n/v2 v2.2.1
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pelletier/go-toml/v2 v2.0.7
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/shirou/gopsutil/v3 v3.23.3
+	github.com/shirou/gopsutil/v3 v3.23.2
 	github.com/xtls/xray-core v1.8.0
 	go.uber.org/atomic v1.10.0
-	golang.org/x/text v0.9.0
+	golang.org/x/text v0.8.0
 	google.golang.org/grpc v1.54.0
-	gorm.io/driver/sqlite v1.5.0
-	gorm.io/gorm v1.25.0
+	gorm.io/driver/sqlite v1.4.4
+	gorm.io/gorm v1.24.6
 )

 require (
 	github.com/BurntSushi/toml v1.2.1 // indirect
-	github.com/bytedance/sonic v1.8.7 // indirect
+	github.com/bytedance/sonic v1.8.2 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.12.0 // indirect
+	github.com/go-playground/validator/v10 v10.11.2 // indirect
+	github.com/goccy/go-json v0.10.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/securecookie v1.1.1 // indirect
@@ -39,25 +39,24 @@ require (
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	github.com/leodido/go-urn v1.2.3 // indirect
-	github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/lufia/plan9stats v0.0.0-20230110061619-bbe2e5e100de // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-sqlite3 v1.14.16 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pires/go-proxyproto v0.7.0 // indirect
+	github.com/pires/go-proxyproto v0.6.2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
-	github.com/shoenig/go-m1cpu v0.1.5 // indirect
 	github.com/tklauser/go-sysconf v0.3.11 // indirect
 	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/ugorji/go/codec v1.2.10 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.8.0 // indirect
-	golang.org/x/net v0.9.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	golang.org/x/arch v0.2.0 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
+	google.golang.org/protobuf v1.29.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -9,8 +9,8 @@ github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
 github.com/bradleypeabody/gorilla-sessions-memcache v0.0.0-20181103040241-659414f458e1/go.mod h1:dkChI7Tbtx7H1Tj7TqGSZMOeGpMP5gLHtjroHd4agiI=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.8.7 h1:d3sry5vGgVq/OpgozRUNP6xBsSo0mtNdwliApw+SAMQ=
-github.com/bytedance/sonic v1.8.7/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
+github.com/bytedance/sonic v1.8.2 h1:Eq1oE3xWIBE3tj2ZtJFK1rDAx7+uA4bRytozVhXMHKY=
+github.com/bytedance/sonic v1.8.2/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
@@ -41,14 +41,14 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-playground/validator/v10 v10.12.0 h1:E4gtWgxWxp8YSxExrQFv5BpCahla0PVF2oTTEYaWQGI=
-github.com/go-playground/validator/v10 v10.12.0/go.mod h1:hCAPuzYvKdP33pxWa+2+6AIKXEKqjIUyqsNCtbsSJrA=
+github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
+github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 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 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
+github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
@@ -73,6 +73,7 @@ github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/z
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -83,16 +84,18 @@ github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
 github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/leodido/go-urn v1.2.3 h1:6BE2vPT0lqoz3fmOesHZiaiFh7889ssCo2GMvLCfiuA=
-github.com/leodido/go-urn v1.2.3/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
+github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
+github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
-github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a h1:N9zuLhTvBSRt0gWSiJswwQ2HqDmtX/ZCDJURnKUt1Ik=
-github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE=
+github.com/lufia/plan9stats v0.0.0-20230110061619-bbe2e5e100de h1:V53FWzU6KAZVi1tPp5UIsMoUWJ2/PNwYIDXnu7QuBCE=
+github.com/lufia/plan9stats v0.0.0-20230110061619-bbe2e5e100de/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
-github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
@@ -113,8 +116,8 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v
 github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us=
 github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
 github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
-github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
-github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4=
+github.com/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.9.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=
@@ -129,22 +132,19 @@ github.com/refraction-networking/utls v1.2.3-0.20230308205431-4f1df6c200db h1:UL
 github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
+github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 github.com/sagernet/sing v0.1.7 h1:g4vjr3q8SUlBZSx97Emz5OBfSMBxxW5Q8C2PfdoSo08=
 github.com/sagernet/sing-shadowsocks v0.1.1 h1:uFK2rlVeD/b1xhDwSMbUI2goWc6fOKxp+ZeKHZq6C9Q=
 github.com/sagernet/wireguard-go v0.0.0-20221116151939-c99467f53f2c h1:vK2wyt9aWYHHvNLWniwijBu/n4pySypiKRhN32u/JGo=
 github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIOUX+osiMraVgIrMR27uMXnRJWGm1+GL8/63U=
-github.com/shirou/gopsutil/v3 v3.23.3 h1:Syt5vVZXUDXPEXpIBt5ziWsJ4LdSAAxF4l/xZeQgSEE=
-github.com/shirou/gopsutil/v3 v3.23.3/go.mod h1:lSBNN6t3+D6W5e5nXTxc8KIMMVxAcS+6IJlffjRRlMU=
-github.com/shoenig/go-m1cpu v0.1.4/go.mod h1:Wwvst4LR89UxjeFtLRMrpgRiyY4xPsejnVZym39dbAQ=
-github.com/shoenig/go-m1cpu v0.1.5 h1:LF57Z/Fpb/WdGLjt2HZilNnmZOxg/q2bSKTQhgbrLrQ=
-github.com/shoenig/go-m1cpu v0.1.5/go.mod h1:Wwvst4LR89UxjeFtLRMrpgRiyY4xPsejnVZym39dbAQ=
-github.com/shoenig/test v0.6.3 h1:GVXWJFk9PiOjN0KoJ7VrJGH6uLPnqxR7/fe3HUPfE0c=
-github.com/shoenig/test v0.6.3/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
+github.com/shirou/gopsutil/v3 v3.23.2 h1:PAWSuiAszn7IhPMBtXsbSCafej7PqUOvY6YywlQUExU=
+github.com/shirou/gopsutil/v3 v3.23.2/go.mod h1:gv0aQw33GLo3pG8SiWKiQrbDzbRY1K80RyZJ7V4Th1M=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
@@ -161,8 +161,8 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
-github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/ugorji/go/codec v1.2.10 h1:eimT6Lsr+2lzmSZxPhLFoOWFmQqwk0fllJJ5hEbTXtQ=
+github.com/ugorji/go/codec v1.2.10/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e h1:5QefA066A1tF8gHIiADmOVOV5LS43gt3ONnlEl3xkwI=
 github.com/xtls/reality v0.0.0-20230309125256-0d0713b108c8 h1:LLtLxEe3S0Ko+ckqt4t29RLskpNdOZfgjZCC2/Byr50=
 github.com/xtls/xray-core v1.8.0 h1:/OD0sDv6YIBqvE+cVfnqlKrtbMs0Fm9IP5BR5d8Eu4k=
@@ -175,14 +175,14 @@ go.starlark.net v0.0.0-20230302034142-4b1e35fe2254 h1:Ss6D3hLXTM0KobyBYEAygXzFfG
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
-golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.2.0 h1:W1sUEHXiJTfjaFJ5SLo0N6lZn+0eO5gWD1MFeTGqQEY=
+golang.org/x/arch v0.2.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
-golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
+golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/exp v0.0.0-20230307190834-24139beb5833 h1:SChBja7BCQewoTAU7IgvucQKMIXrEpFxNMs0spT3/5s=
 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=
@@ -192,8 +192,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 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-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
-golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/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-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -209,10 +209,11 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
-golang.org/x/sys v0.7.0/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=
@@ -220,8 +221,8 @@ 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/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -232,16 +233,16 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 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=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
+google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA=
+google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
 google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag=
 google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM=
+google.golang.org/protobuf v1.29.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-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -249,11 +250,11 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/sqlite v1.5.0 h1:zKYbzRCpBrT1bNijRnxLDJWPjVfImGEn0lSnUY5gZ+c=
-gorm.io/driver/sqlite v1.5.0/go.mod h1:kDMDfntV9u/vuMmz8APHtHF0b4nyBB7sfCieC6G8k8I=
-gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.0 h1:+KtYtb2roDz14EQe4bla8CbQlmb9dN3VejSai3lprfU=
-gorm.io/gorm v1.25.0/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+gorm.io/driver/sqlite v1.4.4 h1:gIufGoR0dQzjkyqDyYSCvsYR6fba1Gw5YKDqKeChxFc=
+gorm.io/driver/sqlite v1.4.4/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI=
+gorm.io/gorm v1.24.0/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
+gorm.io/gorm v1.24.6 h1:wy98aq9oFEetsc4CAbKD2SoBCdMzsbSIvSUUFJuHi5s=
+gorm.io/gorm v1.24.6/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
 gvisor.dev/gvisor v0.0.0-20220901235040-6ca97ef2ce1c h1:m5lcgWnL3OElQNVyp3qcncItJ2c0sQlSGjYK2+nJTA4=
 lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
--- a/install.sh
+++ b/install.sh
@@ -66,17 +66,14 @@ else
    echo -e "${red}Failed to check the OS version, please contact the author!${plain}" && exit 1
 fi

-install_base() {
-    case "${release}" in
-        centos|fedora)
-            yum install -y -q wget curl tar
-            ;;
-        *)
-            apt install -y -q wget curl tar
-            ;;
-    esac
-}

+install_base() {
+    if [[ "${release}" == "centos" ]]; then
+        yum install wget curl tar -y
+    else
+        apt install wget curl tar -y
+    fi
+}
 #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}"
--- a/main.go
+++ b/main.go
@@ -136,7 +136,7 @@ func updateTgbotEnableSts(status bool) {
 	return
 }

-func updateTgbotSetting(tgBotToken string, tgBotChatid string, tgBotRuntime string) {
+func updateTgbotSetting(tgBotToken string, tgBotChatid int, tgBotRuntime string) {
 	err := database.InitDB(config.GetDBPath())
 	if err != nil {
 		fmt.Println(err)
@@ -165,7 +165,7 @@ func updateTgbotSetting(tgBotToken string, tgBotChatid string, tgBotRuntime stri
 		}
 	}

-	if tgBotChatid != "" {
+	if tgBotChatid != 0 {
 		err := settingService.SetTgBotChatId(tgBotChatid)
 		if err != nil {
 			fmt.Println(err)
@@ -224,7 +224,7 @@ func main() {
 	var username string
 	var password string
 	var tgbottoken string
-	var tgbotchatid string
+	var tgbotchatid int
 	var enabletgbot bool
 	var tgbotRuntime string
 	var reset bool
@@ -236,7 +236,7 @@ func main() {
 	settingCmd.StringVar(&password, "password", "", "set login password")
 	settingCmd.StringVar(&tgbottoken, "tgbottoken", "", "set telegrame bot token")
 	settingCmd.StringVar(&tgbotRuntime, "tgbotRuntime", "", "set telegrame bot cron time")
-	settingCmd.StringVar(&tgbotchatid, "tgbotchatid", "", "set telegrame bot chat id")
+	settingCmd.IntVar(&tgbotchatid, "tgbotchatid", 0, "set telegrame bot chat id")
 	settingCmd.BoolVar(&enabletgbot, "enabletgbot", false, "enable telegram bot notify")

 	oldUsage := flag.Usage
@@ -287,7 +287,7 @@ func main() {
 		if show {
 			showSetting(show)
 		}
-		if (tgbottoken != "") || (tgbotchatid != "") || (tgbotRuntime != "") {
+		if (tgbottoken != "") || (tgbotchatid != 0) || (tgbotRuntime != "") {
 			updateTgbotSetting(tgbottoken, tgbotchatid, tgbotRuntime)
 		}
 	default:
--- a/media/1.png
+++ b/media/1.png
--- a/media/2.png
+++ b/media/2.png
--- a/media/3.png
+++ b/media/3.png
--- a/media/4.png
+++ b/media/4.png
--- a/media/enable-traffic+block-IR-domain.txt
+++ b/media/enable-traffic+block-IR-domain.txt
@@ -1,84 +0,0 @@
-{
-  "log": {
-    "loglevel": "warning",
-    "access": "./access.log"
-  },
-  "api": {
-    "services": [
-      "HandlerService",
-      "LoggerService",
-      "StatsService"
-    ],
-    "tag": "api"
-  },
-  "inbounds": [
-    {
-      "listen": "127.0.0.1",
-      "port": 62789,
-      "protocol": "dokodemo-door",
-      "settings": {
-        "address": "127.0.0.1"
-      },
-      "tag": "api"
-    }
-  ],
-  "outbounds": [
-    {
-      "protocol": "freedom",
-      "settings": {}
-    },
-    {
-      "protocol": "blackhole",
-      "settings": {},
-      "tag": "blocked"
-    }
-  ],
-  "policy": {
-    "levels": {
-      "0": {
-        "statsUserUplink": true,
-        "statsUserDownlink": true
-      }
-    },
-    "system": {
-      "statsInboundDownlink": true,
-      "statsInboundUplink": true
-    }
-  },
-  "routing": {
-    "domainStrategy": "IPIfNonMatch",
-    "rules": [
-      {
-        "inboundTag": [
-          "api"
-        ],
-        "outboundTag": "api",
-        "type": "field"
-      },
-      {
-        "ip": [
-          "geoip:private"
-        ],
-        "outboundTag": "blocked",
-        "type": "field"
-      },
-      {
-        "outboundTag": "blocked",
-        "protocol": [
-          "bittorrent"
-        ],
-        "type": "field"
-      },
-      {
-        "outboundTag": "blocked",
-        "domain": [
-          "regexp:.+.ir$",
-          "ext:iran.dat:ir",
-          "ext:iran.dat:other"
-        ],
-        "type": "field"
-      }
-    ]
-  },
-  "stats": {}
-}
--- a/media/enable-traffic+block-IR-IP.txt
+++ b/media/enable-traffic+block-IR-IP.txt
@@ -1,8 +1,9 @@
 {
  "log": {
-    "loglevel": "warning",
+    "loglevel": "warning", 
    "access": "./access.log"
  },
+ 
  "api": {
    "services": [
      "HandlerService",
@@ -55,26 +56,20 @@
        "outboundTag": "api",
        "type": "field"
      },
+      {
+        "ip": [
+          "geoip:private",
+          "geoip:ir"
+        ],
+        "outboundTag": "blocked",
+        "type": "field"
+      },
      {
        "outboundTag": "blocked",
        "protocol": [
          "bittorrent"
        ],
        "type": "field"
-      },
-      {
-        "outboundTag": "blocked",
-        "ip": [
-          "geoip:private"
-        ],
-        "type": "field"
-      },
-      {
-        "outboundTag": "blocked",
-        "ip": [
-          "geoip:ir"
-        ],
-        "type": "field"
      }
    ]
  },
--- a/media/enable-traffic.txt
+++ b/media/enable-traffic.txt
@@ -1,8 +1,9 @@
 {
  "log": {
-    "loglevel": "warning",
+    "loglevel": "warning", 
    "access": "./access.log"
  },
+ 
  "api": {
    "services": [
      "HandlerService",
@@ -46,7 +47,6 @@
    }
  },
  "routing": {
-    "domainStrategy": "IPIfNonMatch",
    "rules": [
      {
        "inboundTag": [
@@ -56,10 +56,10 @@
        "type": "field"
      },
      {
-        "outboundTag": "blocked",
        "ip": [
          "geoip:private"
        ],
+        "outboundTag": "blocked",
        "type": "field"
      },
      {
--- a/util/sys/sys_darwin.go
+++ b/util/sys/sys_darwin.go
@@ -1,4 +1,3 @@
-//go:build darwin
 // +build darwin

 package sys
--- a/util/sys/sys_linux.go
+++ b/util/sys/sys_linux.go
@@ -1,4 +1,3 @@
-//go:build linux
 // +build linux

 package sys
--- 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
@@ -156,12 +156,6 @@
    padding:16px;
 }

-.ant-table-expand-icon-th,
-.ant-table-row-expand-icon-cell {
-    width: 30px;
-    min-width: 30px;
-}
-
 .ant-menu-dark,
 .ant-menu-dark .ant-menu-sub,
 .ant-layout-header,
@@ -180,7 +174,6 @@

 .ant-card-dark:hover {
    border-color: #e8e8e8;
-    box-shadow: 0 2px 8px rgba(255,255,255,.15);
 }

 .ant-card-dark .ant-table-thead th {
@@ -223,25 +216,20 @@

 .ant-card-dark .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td,
 .ant-card-dark .ant-select-dropdown-menu-item:hover:not(.ant-select-dropdown-menu-item-disabled),
-.ant-card-dark .ant-calendar-date:hover,
-.ant-card-dark .ant-select-dropdown-menu-item-active,
-.ant-card-dark li.ant-calendar-time-picker-select-option-selected {
+.ant-card-dark .ant-calendar-date:hover {
    background-color: #004488;
 }

-.ant-card-dark tbody .ant-table-expanded-row,
-.ant-card-dark .ant-calendar-time-picker-inner {
+.ant-card-dark tbody .ant-table-expanded-row {
    color: hsla(0,0%,100%,.65);
    background-color: #1a212a; 
 }

 .ant-card-dark .ant-input,
 .ant-card-dark .ant-input-number,
-.ant-card-dark .ant-input-number-handler-wrap,
 .ant-card-dark .ant-calendar-input,
 .ant-card-dark .ant-select-dropdown-menu-item-selected,
-.ant-card-dark .ant-select-selection,
-.ant-card-dark .ant-calendar-picker-clear {
+.ant-card-dark .ant-select-selection {
    color: hsla(0,0%,100%,.65);
    background-color: #2e3b52;
 }
@@ -251,12 +239,6 @@
    background-color: #161b22;
 }

-.ant-dropdown-menu-dark,
-.ant-card-dark .ant-modal-content {
-    border: 1px solid rgba(255, 255, 255, 0.65);
-    box-shadow: 0 2px 8px rgba(255,255,255,.15);
-}
-
 .ant-card-dark .ant-modal-content,
 .ant-card-dark .ant-modal-body,
 .ant-card-dark .ant-modal-header,
@@ -298,12 +280,6 @@
    border: 1px solid hsla(0,0%,100%,.30);
 }

-.ant-card-dark .ant-tag {
-    color: hsla(0,0%,100%,.65);
-    background: rgba(255,255,255,.04);
-    border-color: #434343;
-}
-
 .ant-card-dark .ant-tag-blue {
    color: #3c9ae8;
    background: #111d2c;
@@ -358,29 +334,6 @@
    color:  hsla(0,0%,100%,.65);
    background-color: #073763;
    border-color: #1890ff;
-    text-shadow: 0 -1px 0 rgba(255,255,255,.12);
-    box-shadow: 0 2px 0 rgba(255,255,255,.045);
-}
-.ant-card-dark .ant-btn-primary:hover {
-    background-color: #40a9ff;
-    border-color: #40a9ff;
-}
-
-.ant-dark .ant-popover-content {
-    border: 1px solid #e8e8e8;
-    border-radius: 4px;
-    box-shadow: 0 2px 8px rgba(255,255,255,.15);
-}
-
-.ant-dark .ant-popover-inner {
-    background: #222a37;
-}
-
-.ant-dark .ant-popover-title,
-.ant-dark .ant-popover-inner-content {
-    color: hsla(0,0%,100%,.65);
-}
-
-.ant-dark .ant-popover-placement-top>.ant-popover-content>.ant-popover-arrow {
-    border-color: transparent #2e3b52 #2e3b52 transparent;
+    text-shadow: 0 -1px 0 rgba(0,0,0,.12);
+    box-shadow: 0 2px 0 rgba(0,0,0,.045);
 }
--- a/web/assets/favicon.ico
+++ b/web/assets/favicon.ico
--- a/web/assets/js/langs.js
+++ b/web/assets/js/langs.js
@@ -4,7 +4,7 @@ supportLangs = [
       value : "en-US",
       icon : "🇺🇸"
    },
-    {
+	{
        name : "Farsi",
        value : "fa_IR",
        icon : "🇮🇷"
--- a/web/assets/js/model/models.js
+++ b/web/assets/js/model/models.js
@@ -36,8 +36,7 @@ class DBInbound {
        this.remark = "";
        this.enable = true;
        this.expiryTime = 0;
-        this.limitIp = 0;
-
+        this.iplimit = 0;
        this.listen = "";
        this.port = 0;
        this.protocol = "";
@@ -110,6 +109,10 @@ class DBInbound {
    get isExpiry() {
        return this.expiryTime < new Date().getTime();
    }
+	get isDBInboundEmpty() {
+        const inbound = this.toInbound();
+        return inbound.isInboundEmpty();
+    }

    toInbound() {
        let settings = {};
@@ -156,7 +159,6 @@ class DBInbound {
        const inbound = this.toInbound();
        return inbound.genLink(this.address, this.remark, clientIndex);
    }
-    
 	get genInboundLinks() {
        const inbound = this.toInbound();
        return inbound.genInboundLinks(this.address, this.remark);
@@ -171,14 +173,10 @@ class AllSetting {
        this.webCertFile = "";
        this.webKeyFile = "";
        this.webBasePath = "/";
-        this.expireDiff = "";
-        this.trafficDiff = "";
        this.tgBotEnable = false;
        this.tgBotToken = "";
-        this.tgBotChatId = "";
-        this.tgRunTime = "@daily";
-        this.tgBotBackup = false;
-        this.tgCpu = "";
+        this.tgBotChatId = 0;
+        this.tgRunTime = "";
        this.xrayTemplateConfig = "";

        this.timeLocation = "Asia/Tehran";
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -17,15 +17,16 @@ const VmessMethods = {
 };

 const SSMethods = {
-	AES_128_GCM: 'aes-128-gcm',
-	AES_256_GCM: 'aes-256-gcm',
-	CHACHA20_POLY1305: 'chacha20-poly1305',
-	CHACHA20_IETF_POLY1305: 'chacha20-ietf-poly1305',
-	XCHACHA20_POLY1305: 'xchacha20-poly1305',
-	XCHACHA20_IETF_POLY1305: 'xchacha20-ietf-poly1305',
+    // AES_256_CFB: 'aes-256-cfb',
+    // AES_128_CFB: 'aes-128-cfb',
+    // CHACHA20: 'chacha20',
+    // CHACHA20_IETF: 'chacha20-ietf',
+    CHACHA20_POLY1305: 'chacha20-poly1305',
+    AES_256_GCM: 'aes-256-gcm',
+    AES_128_GCM: 'aes-128-gcm',
 	BLAKE3_AES_128_GCM: '2022-blake3-aes-128-gcm',
-	BLAKE3_AES_256_GCM: '2022-blake3-aes-256-gcm',
-	BLAKE3_CHACHA20_POLY1305: '2022-blake3-chacha20-poly1305',
+    BLAKE3_AES_256_GCM: '2022-blake3-aes-256-gcm',
+    BLAKE3_CHACHA20_POLY1305: '2022-blake3-chacha20-poly1305',
 };

 const RULE_IP = {
@@ -91,11 +92,7 @@ const UTLS_FINGERPRINT = {
    UTLS_RANDOMIZED: "randomized",
 };

-const bytesToHex = e => Array.from(e).map(e => e.toString(16).padStart(2, 0)).join('');
-const hexToBytes = e => new Uint8Array(e.match(/[0-9a-f]{2}/gi).map(e => parseInt(e, 16)));
-
 const ALPN_OPTION = {
-    H3: "h3",
    H2: "h2",
    HTTP1: "http/1.1",
 };
@@ -109,6 +106,7 @@ Object.freeze(XTLS_FLOW_CONTROL);
 Object.freeze(TLS_FLOW_CONTROL);
 Object.freeze(TLS_VERSION_OPTION);
 Object.freeze(TLS_CIPHER_OPTION);
+Object.freeze(UTLS_FINGERPRINT);
 Object.freeze(ALPN_OPTION);

 class XrayCommonClass {
@@ -169,25 +167,27 @@ class XrayCommonClass {
 }

 class TcpStreamSettings extends XrayCommonClass {
-    constructor(acceptProxyProtocol=false,
-                type='none',
-                request=new TcpStreamSettings.TcpRequest(),
-                response=new TcpStreamSettings.TcpResponse(),
-                ) {
+    constructor(
+        type = 'none',
+        acceptProxyProtocol = false,
+        request = new TcpStreamSettings.TcpRequest(),
+        response = new TcpStreamSettings.TcpResponse(),
+    ) {
        super();
-        this.acceptProxyProtocol = acceptProxyProtocol;
        this.type = type;
        this.request = request;
        this.response = response;
+        this.acceptProxyProtocol = acceptProxyProtocol;
    }

-    static fromJson(json={}) {
+    static fromJson(json = {}) {
        let header = json.header;
        if (!header) {
            header = {};
        }
-        return new TcpStreamSettings(json.acceptProxyProtocol,
+        return new TcpStreamSettings(
            header.type,
+            json.acceptProxyProtocol,
            TcpStreamSettings.TcpRequest.fromJson(header.request),
            TcpStreamSettings.TcpResponse.fromJson(header.response),
        );
@@ -195,21 +195,21 @@ class TcpStreamSettings extends XrayCommonClass {

    toJson() {
        return {
-            acceptProxyProtocol: this.acceptProxyProtocol,
            header: {
                type: this.type,
                request: this.type === 'http' ? this.request.toJson() : undefined,
                response: this.type === 'http' ? this.response.toJson() : undefined,
            },
+            acceptProxyProtocol: this.acceptProxyProtocol,
        };
    }
 }

 TcpStreamSettings.TcpRequest = class extends XrayCommonClass {
-    constructor(version='1.1',
-                method='GET',
-                path=['/'],
-                headers=[],
+    constructor(version = '1.1',
+        method = 'GET',
+        path = ['/'],
+        headers = [],
    ) {
        super();
        this.version = version;
@@ -243,7 +243,7 @@ TcpStreamSettings.TcpRequest = class extends XrayCommonClass {
        this.headers.splice(index, 1);
    }

-    static fromJson(json={}) {
+    static fromJson(json = {}) {
        return new TcpStreamSettings.TcpRequest(
            json.version,
            json.method,
@@ -262,10 +262,10 @@ TcpStreamSettings.TcpRequest = class extends XrayCommonClass {
 };

 TcpStreamSettings.TcpResponse = class extends XrayCommonClass {
-    constructor(version='1.1',
-                status='200',
-                reason='OK',
-                headers=[],
+    constructor(version = '1.1',
+        status = '200',
+        reason = 'OK',
+        headers = [],
    ) {
        super();
        this.version = version;
@@ -282,7 +282,7 @@ TcpStreamSettings.TcpResponse = class extends XrayCommonClass {
        this.headers.splice(index, 1);
    }

-    static fromJson(json={}) {
+    static fromJson(json = {}) {
        return new TcpStreamSettings.TcpResponse(
            json.version,
            json.status,
@@ -475,13 +475,9 @@ class GrpcStreamSettings extends XrayCommonClass {
 }

 class TlsStreamSettings extends XrayCommonClass {
-    constructor(serverName='',
-                minVersion = TLS_VERSION_OPTION.TLS12,
-                maxVersion = TLS_VERSION_OPTION.TLS13,
-                cipherSuites = '',
-                certificates=[new TlsStreamSettings.Cert()],
-                alpn=[],
-                settings=[new TlsStreamSettings.Settings()]) {
+    constructor(serverName = '', minVersion = TLS_VERSION_OPTION.TLS10, maxVersion = TLS_VERSION_OPTION.TLS13,
+        cipherSuites = '',
+        certificates = [new TlsStreamSettings.Cert()], alpn=[''] ,settings=[new TlsStreamSettings.Settings()]) {
        super();
        this.server = serverName;
        this.minVersion = minVersion;
@@ -489,7 +485,7 @@ class TlsStreamSettings extends XrayCommonClass {
        this.cipherSuites = cipherSuites;
        this.certs = certificates;
        this.alpn = alpn;
-        this.settings = settings;
+		this.settings = settings;
    }

    addCert(cert) {
@@ -502,15 +498,15 @@ class TlsStreamSettings extends XrayCommonClass {

    static fromJson(json={}) {
        let certs;
-        let settings;
+		let settings;
        if (!ObjectUtil.isEmpty(json.certificates)) {
            certs = json.certificates.map(cert => TlsStreamSettings.Cert.fromJson(cert));
        }
-
 		if (!ObjectUtil.isEmpty(json.settings)) {
            let values = json.settings[0];
            settings = [new TlsStreamSettings.Settings(values.allowInsecure , values.fingerprint, values.serverName)];
        }
+
        return new TlsStreamSettings(
            json.serverName,
            json.minVersion,
@@ -518,7 +514,7 @@ class TlsStreamSettings extends XrayCommonClass {
            json.cipherSuites,
            certs,
            json.alpn,
-            settings,
+			settings,
        );
    }

@@ -531,6 +527,7 @@ class TlsStreamSettings extends XrayCommonClass {
            certificates: TlsStreamSettings.toJsonArray(this.certs),
            alpn: this.alpn,
            settings: TlsStreamSettings.toJsonArray(this.settings),
+			
        };
    }
 }
@@ -577,105 +574,44 @@ TlsStreamSettings.Cert = class extends XrayCommonClass {
 };

 TlsStreamSettings.Settings = class extends XrayCommonClass {
-    constructor(allowInsecure = false, fingerprint = '', serverName = '') {
-        super();
-        this.allowInsecure = allowInsecure;
-        this.fingerprint = fingerprint;
-        this.serverName = serverName;
-    }
-    static fromJson(json = {}) {
-        return new TlsStreamSettings.Settings(
-            json.allowInsecure,
-            json.fingerprint,
-            json.servername,
-        );
-    }
-    toJson() {
-        return {
-            allowInsecure: this.allowInsecure,
-            fingerprint: this.fingerprint,
-            serverName: this.serverName,
-        };
-    }
+  constructor(allowInsecure = false, fingerprint = '', serverName = '') {
+    super();
+    this.allowInsecure = allowInsecure;
+    this.fingerprint = fingerprint;
+    this.serverName = serverName;
+  }
+  static fromJson(json = {}) {
+    return new TlsStreamSettings.Settings(
+      json.allowInsecure,
+      json.fingerprint,
+      json.servername,
+    );
+  }
+  toJson() {
+    return {
+      allowInsecure: this.allowInsecure,
+      fingerprint: this.fingerprint,
+      serverName: this.serverName,
+    };
+  }
 };

-class RealityStreamSettings extends XrayCommonClass {
-    
-    constructor(
-        show = false,xver = 0,
-        fingerprint = UTLS_FINGERPRINT.UTLS_FIREFOX,
-        dest = 'yahoo.com:443',
-        serverNames = 'yahoo.com,www.yahoo.com',
-        privateKey = RandomUtil.randomX25519PrivateKey(),
-        publicKey = '',
-        minClient = '',
-        maxClient = '',
-        maxTimediff = 0,
-        shortIds = RandomUtil.randowShortId() 
-        )   
-        {
-        super();
-        this.show = show;
-        this.xver = xver;
-        this.fingerprint = fingerprint;
-        this.dest = dest;
-        this.serverNames = serverNames instanceof Array ? serverNames.join(",") : serverNames;
-        this.privateKey = privateKey;
-        this.publicKey = RandomUtil.randomX25519PublicKey(this.privateKey);
-        this.minClient = minClient;
-        this.maxClient = maxClient;
-        this.maxTimediff = maxTimediff;
-        this.shortIds = shortIds instanceof Array ? shortIds.join(",") : shortIds; 
-        }
-        static fromJson(json = {}) {
-        return new RealityStreamSettings(
-            json.show,
-            json.xver,
-            json.fingerprint,
-            json.dest,
-            json.serverNames,
-            json.privateKey,
-            json.publicKey,
-            json.minClient,
-            json.maxClient,
-            json.maxTimediff,
-            json.shortIds  
-        );
-        }
-        toJson() {
-        return {
-            show: this.show,
-            xver: this.xver,
-            fingerprint: this.fingerprint,
-            dest: this.dest,
-            serverNames: this.serverNames.split(/,|，|\s+/),
-            privateKey: this.privateKey,
-            publicKey: this.publicKey,
-            minClient: this.minClient,
-            maxClient: this.maxClient,
-            maxTimediff: this.maxTimediff,
-            shortIds: this.shortIds.split(/,|，|\s+/)
-            };
-        }
-    }

 class StreamSettings extends XrayCommonClass {
    constructor(network='tcp',
-        security='none',
-        tlsSettings=new TlsStreamSettings(),
-        realitySettings = new RealityStreamSettings(),
-        tcpSettings=new TcpStreamSettings(),
-        kcpSettings=new KcpStreamSettings(),
-        wsSettings=new WsStreamSettings(),
-        httpSettings=new HttpStreamSettings(),
-        quicSettings=new QuicStreamSettings(),
-        grpcSettings=new GrpcStreamSettings(),
-        ) {
+		security='none',
+		tlsSettings=new TlsStreamSettings(),
+		tcpSettings=new TcpStreamSettings(),
+		kcpSettings=new KcpStreamSettings(),
+		wsSettings=new WsStreamSettings(),
+		httpSettings=new HttpStreamSettings(),
+		quicSettings=new QuicStreamSettings(),
+		grpcSettings=new GrpcStreamSettings(),
+		) {
        super();
        this.network = network;
        this.security = security;
        this.tls = tlsSettings;
-        this.reality = realitySettings;
        this.tcp = tcpSettings;
        this.kcp = kcpSettings;
        this.ws = wsSettings;
@@ -708,34 +644,17 @@ class StreamSettings extends XrayCommonClass {
        }
    }

-    //for Reality
-    get isReality() {
-        return this.security === "reality";
-    }
-
-    set isReality(isReality) {
-        if (isReality) {
-            this.security = "reality";
-        } else {
-            this.security = "none";
-        }
-    }
-    
-    static fromJson(json = {}) {
-        let tls, reality;
+    static fromJson(json={}) {
+        let tls;
        if (json.security === "xtls") {
            tls = TlsStreamSettings.fromJson(json.XTLSSettings);
-        } else if (json.security === "tls") {
+        } else {
            tls = TlsStreamSettings.fromJson(json.tlsSettings);
        }
-        if (json.security === "reality") {
-            reality = RealityStreamSettings.fromJson(json.realitySettings)
-        }
        return new StreamSettings(
            json.network,
            json.security,
            tls,
-            reality,
            TcpStreamSettings.fromJson(json.tcpSettings),
            KcpStreamSettings.fromJson(json.kcpSettings),
            WsStreamSettings.fromJson(json.wsSettings),
@@ -753,7 +672,6 @@ class StreamSettings extends XrayCommonClass {
            tlsSettings: this.isTls ? this.tls.toJson() : undefined,
            XTLSSettings: this.isXTLS ? this.tls.toJson() : undefined,
            tcpSettings: network === 'tcp' ? this.tcp.toJson() : undefined,
-            realitySettings: this.isReality ? this.reality.toJson() : undefined,
            kcpSettings: network === 'kcp' ? this.kcp.toJson() : undefined,
            wsSettings: network === 'ws' ? this.ws.toJson() : undefined,
            httpSettings: network === 'http' ? this.http.toJson() : undefined,
@@ -811,23 +729,20 @@ class Inbound extends XrayCommonClass {
    get protocol() {
        return this._protocol;
    }
-
+    
    set protocol(protocol) {
        this._protocol = protocol;
        this.settings = Inbound.Settings.getSettings(protocol);
        if (protocol === Protocols.TROJAN) {
-            this.tls = true;
+            this.tls = false;
        }
    }
-
    get tls() {
        return this.stream.security === 'tls';
    }

    set tls(isTls) {
        if (isTls) {
-            this.xtls = false;
-            this.reality = false;
            this.stream.security = 'tls';
        } else {
            this.stream.security = 'none';
@@ -840,32 +755,12 @@ class Inbound extends XrayCommonClass {

    set XTLS(isXTLS) {
        if (isXTLS) {
-            this.xtls = false;
-            this.reality = false;
            this.stream.security = 'xtls';
        } else {
            this.stream.security = 'none';
        }
    }

-    //for Reality
-    get reality() {
-        if (this.stream.security === "reality") {
-            return this.network === "tcp" || this.network === "grpc" || this.network === "http";
-        }
-        return false;
-    }
-
-    set reality(isReality) {
-        if (isReality) {
-            this.tls = false;
-            this.xtls = false;
-            this.stream.security = "reality";
-        } else {
-            this.stream.security = "none";
-        }
-    }
-
    get network() {
        return this.stream.network;
    }
@@ -1024,16 +919,16 @@ class Inbound extends XrayCommonClass {
    isExpiry(index) {
        switch (this.protocol) {
            case Protocols.VMESS:
-                if(this.settings.vmesses[index].expiryTime > 0)
-                    return this.settings.vmesses[index].expiryTime < new Date().getTime();
+                if(this.settings.vmesses[index]._expiryTime != null)
+                    return this.settings.vmesses[index]._expiryTime < new Date().getTime();
                return false
            case Protocols.VLESS:
-                if(this.settings.vlesses[index].expiryTime > 0)
-                    return this.settings.vlesses[index].expiryTime < new Date().getTime();
+                if(this.settings.vlesses[index]._expiryTime != null)
+                    return this.settings.vlesses[index]._expiryTime < new Date().getTime();
                return false
                case Protocols.TROJAN:
-                    if(this.settings.trojans[index].expiryTime > 0)
-                        return this.settings.trojans[index].expiryTime < new Date().getTime();
+                    if(this.settings.trojans[index]._expiryTime != null)
+                        return this.settings.trojans[index]._expiryTime < new Date().getTime();
                    return false
            default:
                return false;
@@ -1045,6 +940,7 @@ class Inbound extends XrayCommonClass {
            case Protocols.VMESS:
            case Protocols.VLESS:
            case Protocols.TROJAN:
+            case Protocols.SHADOWSOCKS:
                break;
            default:
                return false;
@@ -1061,21 +957,10 @@ class Inbound extends XrayCommonClass {
                return false;
        }
    }
-
-    canEnableReality() {
-        switch (this.protocol) {
-            case Protocols.VLESS:
-            case Protocols.TROJAN:
-                break;
-            default:
-                return false;
-        }
-        return this.network === "tcp" || this.network === "grpc" || this.network === "http";
-    }
-
+	
    //this is used for xtls-rprx-vision
    canEnableTlsFlow() {
-        if (((this.stream.security === 'tls') || (this.stream.security === 'reality')) && (this.network === "tcp")) {
+        if ((this.stream.security === 'tls') && (this.network === "tcp")) {
            switch (this.protocol) {
                case Protocols.VLESS:
                    return true;
@@ -1085,10 +970,11 @@ class Inbound extends XrayCommonClass {
        }
        return false;
    }
-
+	
    canSetTls() {
        return this.canEnableTls();
    }
+     

    canEnableXTLS() {
        switch (this.protocol) {
@@ -1105,7 +991,7 @@ class Inbound extends XrayCommonClass {
        switch (this.protocol) {
            case Protocols.VMESS:
            case Protocols.VLESS:
-            case Protocols.TROJAN:
+			case Protocols.TROJAN:
            case Protocols.SHADOWSOCKS:
                return true;
            default:
@@ -1182,7 +1068,7 @@ class Inbound extends XrayCommonClass {
                address = this.stream.tls.server;
            }
        }
-        
+		
        let obj = {
            v: '2',
            ps: remark,
@@ -1195,7 +1081,7 @@ class Inbound extends XrayCommonClass {
            host: host,
            path: path,
            tls: this.stream.security,
-            sni: this.stream.tls.settings[0]['serverName'],
+			sni: this.stream.tls.settings[0]['serverName'],
            fp: this.stream.tls.settings[0]['fingerprint'],
            alpn: this.stream.tls.alpn.join(','),
            allowInsecure: this.stream.tls.settings[0].allowInsecure,
@@ -1265,46 +1151,26 @@ class Inbound extends XrayCommonClass {
            if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
                address = this.stream.tls.server;
 			}
-            if (this.stream.tls.settings[0]['serverName'] !== ''){
+			if (this.stream.tls.settings[0]['serverName'] !== ''){
                params.set("sni", this.stream.tls.settings[0]['serverName']);
            }
            if (type === "tcp" && this.settings.vlesses[clientIndex].flow.length > 0) {
                params.set("flow", this.settings.vlesses[clientIndex].flow);
            }
        }
-
-        if (this.XTLS) {
-            params.set("security", "xtls");
+		
+		if (this.XTLS) {
+            params.set("security", "tls");
            params.set("alpn", this.stream.tls.alpn);
            if(this.stream.tls.settings[0].allowInsecure){
                params.set("allowInsecure", "1");
            }
-            if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
-                address = this.stream.tls.server;
-            }
-            params.set("flow", this.settings.vlesses[clientIndex].flow);
-        }
+			if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
+				address = this.stream.tls.server;
+			}
+			params.set("flow", this.settings.vlesses[clientIndex].flow);
+		}

-        if (this.reality) {
-            params.set("security", "reality");
-            if (!ObjectUtil.isArrEmpty(this.stream.reality.serverNames)) {
-                params.set("sni", this.stream.reality.serverNames.split(/,|，|\s+/)[0]);
-            }
-            if (this.stream.reality.publicKey != "") {
-                //params.set("pbk", Ed25519.getPublicKey(this.stream.reality.privateKey));
-                params.set("pbk", this.stream.reality.publicKey);
-            }
-            if (this.stream.network === 'tcp') {
-                params.set("flow", this.settings.vlesses[clientIndex].flow);
-            }
-            if (this.stream.reality.shortIds != "") {
-                params.set("sid", this.stream.reality.shortIds);
-            }
-            if (this.stream.reality.fingerprint != "") {
-                params.set("fp", this.stream.reality.fingerprint);
-            }
-        }
-        
        const link = `vless://${uuid}@${address}:${port}`;
        const url = new URL(link);
        for (const [key, value] of params) {
@@ -1314,13 +1180,18 @@ class Inbound extends XrayCommonClass {
        return url.toString();
    }

-    genSSLink(address='', remark='') {
+    genSSLink(address = '', remark = '') {
        let settings = this.settings;
        const server = this.stream.tls.server;
        if (!ObjectUtil.isEmpty(server)) {
            address = server;
        }
-        return 'ss://' + safeBase64(settings.method + ':' + settings.password) + `@${address}:${this.port}#${encodeURIComponent(remark)}`;
+        if (settings.method == SSMethods.BLAKE3_AES_128_GCM || settings.method == SSMethods.BLAKE3_AES_256_GCM || settings.method == SSMethods.BLAKE3_CHACHA20_POLY1305) {
+            return `ss://${settings.method}:${settings.password}@${address}:${this.port}#${encodeURIComponent(remark)}`;
+        } else {
+            return 'ss://' + safeBase64(settings.method + ':' + settings.password + '@' + address + ':' + this.port)
+                + '#' + encodeURIComponent(remark);
+        }
    }

    genTrojanLink(address = '', remark = '', clientIndex = 0) {
@@ -1328,7 +1199,7 @@ class Inbound extends XrayCommonClass {
        const port = this.port;
        const type = this.stream.network;
        const params = new Map();
-        params.set("type", this.stream.network);
+		params.set("type", this.stream.network);
        switch (type) {
            case "tcp":
                const tcp = this.stream.tcp;
@@ -1383,44 +1254,24 @@ class Inbound extends XrayCommonClass {
            }
            if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
                address = this.stream.tls.server;
-            }
-            if (this.stream.tls.settings[0]['serverName'] !== ''){
-                params.set("sni", this.stream.tls.settings[0]['serverName']);
 			}
-        }
-
-        if (this.reality) {
-            params.set("security", "reality");
-            if (!ObjectUtil.isArrEmpty(this.stream.reality.serverNames)) {
-                params.set("sni", this.stream.reality.serverNames.split(/,|，|\s+/)[0]);
-            }
-            if (this.stream.reality.publicKey != "") {
-                //params.set("pbk", Ed25519.getPublicKey(this.stream.reality.privateKey));
-                params.set("pbk", this.stream.reality.publicKey);
-            }
-            if (this.stream.network === 'tcp') {
-                params.set("flow", this.settings.trojans[clientIndex].flow);
-            }
-            if (this.stream.reality.shortIds != "") {
-                params.set("sid", this.stream.reality.shortIds);
-            }
-            if (this.stream.reality.fingerprint != "") {
-                params.set("fp", this.stream.reality.fingerprint);
+			if (this.stream.tls.settings[0]['serverName'] !== ''){
+                params.set("sni", this.stream.tls.settings[0]['serverName']);
            }
        }
-
+		
 		if (this.XTLS) {
-            params.set("security", "xtls");
+            params.set("security", "tls");
            params.set("alpn", this.stream.tls.alpn);
            if(this.stream.tls.settings[0].allowInsecure){
                params.set("allowInsecure", "1");
            }
            if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
-                address = this.stream.tls.server;
-			}
-            params.set("flow", this.settings.trojans[clientIndex].flow);
-        }
-
+            address = this.stream.tls.server;
+            }
+			params.set("flow", this.settings.trojans[clientIndex].flow);
+		}
+        
        const link = `trojan://${settings.trojans[clientIndex].password}@${address}:${this.port}#${encodeURIComponent(remark)}`;
        const url = new URL(link);
        for (const [key, value] of params) {
@@ -1451,9 +1302,8 @@ class Inbound extends XrayCommonClass {
            default: return '';
        }
    }
-
    genInboundLinks(address = '', remark = '') {
-        let link = '';
+    let link = '';
        switch (this.protocol) {
            case Protocols.VMESS:
            case Protocols.VLESS:
@@ -1466,7 +1316,7 @@ class Inbound extends XrayCommonClass {
                return (this.genSSLink(address, remark) + '\r\n');
            default: return '';
        }
-    }
+}

    static fromJson(json={}) {
        return new Inbound(
@@ -1581,7 +1431,7 @@ Inbound.VmessSettings = class extends Inbound.Settings {
    }
 };
 Inbound.VmessSettings.Vmess = class extends XrayCommonClass {
-    constructor(id=RandomUtil.randomUUID(), alterId=0, email=RandomUtil.randomText(),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId='') {
+    constructor(id=RandomUtil.randomUUID(), alterId=0, email=RandomUtil.randomText(),limitIp=0, totalGB=0, expiryTime='') {
        super();
        this.id = id;
        this.alterId = alterId;
@@ -1589,9 +1439,6 @@ Inbound.VmessSettings.Vmess = class extends XrayCommonClass {
        this.limitIp = limitIp;
        this.totalGB = totalGB;
        this.expiryTime = expiryTime;
-        this.enable = enable;
-        this.tgId = tgId;
-        this.subId = subId;
    }

    static fromJson(json={}) {
@@ -1602,18 +1449,13 @@ Inbound.VmessSettings.Vmess = class extends XrayCommonClass {
            json.limitIp,
            json.totalGB,
            json.expiryTime,
-            json.enable,
-            json.tgId,
-            json.subId,
+
        );
    }
    get _expiryTime() {
        if (this.expiryTime === 0 || this.expiryTime === "") {
            return null;
        }
-        if (this.expiryTime < 0){
-            return this.expiryTime / -86400000;
-        }
        return moment(this.expiryTime);
    }

@@ -1641,7 +1483,7 @@ Inbound.VLESSSettings = class extends Inbound.Settings {
                fallbacks=[],) {
        super(protocol);
        this.vlesses = vlesses;
-        this.decryption = 'none'; // Using decryption is not implemented here
+        this.decryption = 'none';
        this.fallbacks = fallbacks;
    }

@@ -1653,7 +1495,6 @@ Inbound.VLESSSettings = class extends Inbound.Settings {
        this.fallbacks.splice(index, 1);
    }

-    // decryption should be set to static value
    static fromJson(json={}) {
        return new Inbound.VLESSSettings(
            Protocols.VLESS,
@@ -1666,14 +1507,15 @@ Inbound.VLESSSettings = class extends Inbound.Settings {
    toJson() {
        return {
            clients: Inbound.VLESSSettings.toJsonArray(this.vlesses),
-            decryption: 'none',
+            decryption: this.decryption,
            fallbacks: Inbound.VLESSSettings.toJsonArray(this.fallbacks),
        };
    }

 };
 Inbound.VLESSSettings.VLESS = class extends XrayCommonClass {
-    constructor(id=RandomUtil.randomUUID(), flow='', email=RandomUtil.randomText(),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId='') {
+
+    constructor(id=RandomUtil.randomUUID(), flow='', email=RandomUtil.randomText(),limitIp=0, totalGB=0, expiryTime='') {
        super();
        this.id = id;
        this.flow = flow;
@@ -1681,9 +1523,7 @@ Inbound.VLESSSettings.VLESS = class extends XrayCommonClass {
        this.limitIp = limitIp;
        this.totalGB = totalGB;
        this.expiryTime = expiryTime;
-        this.enable = enable;
-        this.tgId = tgId;
-        this.subId = subId;
+
    }

    static fromJson(json={}) {
@@ -1694,19 +1534,14 @@ Inbound.VLESSSettings.VLESS = class extends XrayCommonClass {
            json.limitIp,
            json.totalGB,
            json.expiryTime,
-            json.enable,
-            json.tgId,
-            json.subId,
+
        );
-      }
+    }

    get _expiryTime() {
        if (this.expiryTime === 0 || this.expiryTime === "") {
            return null;
        }
-        if (this.expiryTime < 0){
-            return this.expiryTime / -86400000;
-        }
        return moment(this.expiryTime);
    }

@@ -1766,8 +1601,8 @@ Inbound.VLESSSettings.Fallback = class extends XrayCommonClass {

 Inbound.TrojanSettings = class extends Inbound.Settings {
    constructor(protocol,
-                trojans=[new Inbound.TrojanSettings.Trojan()],
-                fallbacks=[],) {
+		trojans=[new Inbound.TrojanSettings.Trojan()],
+		fallbacks=[],) {
        super(protocol);
        this.trojans = trojans;
        this.fallbacks = fallbacks;
@@ -1796,7 +1631,7 @@ Inbound.TrojanSettings = class extends Inbound.Settings {
    }
 };
 Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
-    constructor(password=RandomUtil.randomSeq(10), flow='', email=RandomUtil.randomText(),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId='') {
+    constructor(password=RandomUtil.randomSeq(10), flow='', email=RandomUtil.randomText(),limitIp=0, totalGB=0, expiryTime='') {
        super();
        this.password = password;
        this.flow = flow;
@@ -1804,9 +1639,6 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
        this.limitIp = limitIp;
        this.totalGB = totalGB;
        this.expiryTime = expiryTime;
-        this.enable = enable;
-        this.tgId = tgId;
-        this.subId = subId;
    }

    toJson() {
@@ -1817,13 +1649,10 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
            limitIp: this.limitIp,
            totalGB: this.totalGB,
            expiryTime: this.expiryTime,
-            enable: this.enable,
-            tgId: this.tgId,
-            subId: this.subId,
        };
    }

-    static fromJson(json = {}) {
+    static fromJson(json={}) {
        return new Inbound.TrojanSettings.Trojan(
            json.password,
            json.flow,
@@ -1831,9 +1660,7 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
            json.limitIp,
            json.totalGB,
            json.expiryTime,
-            json.enable,
-            json.tgId,
-            json.subId,
+
        );
    }

@@ -1841,9 +1668,6 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
        if (this.expiryTime === 0 || this.expiryTime === "") {
            return null;
        }
-        if (this.expiryTime < 0){
-            return this.expiryTime / -86400000;
-        }
        return moment(this.expiryTime);
    }

@@ -1905,9 +1729,9 @@ Inbound.TrojanSettings.Fallback = class extends XrayCommonClass {

 Inbound.ShadowsocksSettings = class extends Inbound.Settings {
    constructor(protocol,
-                method=SSMethods.BLAKE3_AES_256_GCM,
-                password=RandomUtil.randomSeq(44),
-                network='tcp,udp'
+        method = SSMethods.BLAKE3_AES_256_GCM,
+        password = RandomUtil.randomSeq(44),
+        network = 'tcp,udp'
    ) {
        super(protocol);
        this.method = method;
@@ -1915,7 +1739,7 @@ Inbound.ShadowsocksSettings = class extends Inbound.Settings {
        this.network = network;
    }

-    static fromJson(json={}) {
+    static fromJson(json = {}) {
        return new Inbound.ShadowsocksSettings(
            Protocols.SHADOWSOCKS,
            json.method,
@@ -1939,7 +1763,7 @@ Inbound.DokodemoSettings = class extends Inbound.Settings {
        this.address = address;
        this.port = port;
        this.network = network;
-        this.followRedirect = followRedirect;
+		this.followRedirect = followRedirect;
    }

    static fromJson(json={}) {
@@ -1948,7 +1772,7 @@ Inbound.DokodemoSettings = class extends Inbound.Settings {
            json.address,
            json.port,
            json.network,
-            json.followRedirect,
+			json.followRedirect,
        );
    }

@@ -1957,7 +1781,7 @@ Inbound.DokodemoSettings = class extends Inbound.Settings {
            address: this.address,
            port: this.port,
            network: this.network,
-            followRedirect: this.followRedirect,
+			followRedirect: this.followRedirect,
        };
    }
 };
@@ -2084,4 +1908,4 @@ Inbound.HttpSettings.HttpAccount = class extends XrayCommonClass {
    static fromJson(json={}) {
        return new Inbound.HttpSettings.HttpAccount(json.user, json.pass);
    }
-};
+};
--- a/web/assets/js/util/utils.js
+++ b/web/assets/js/util/utils.js
@@ -89,31 +89,6 @@ const seq = [
    'U', 'V', 'W', 'X', 'Y', 'Z'
 ];

-const shortIdSeq = [
-    'a', 'b', 'c', 'd', 'e', 'f',
-    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-];
-
-const x25519Map = new Map(
-    [
-        ['EH2FWe-Ij_FFAa2u9__-aiErLvVIneP601GOCdlyPWw', "goY3OtfaA4UYbiz7Hn0NysI5QJrK0VT_Chg6RLgUPQU"],
-        ['cKI_6DoMSP1IepeWWXrG3G9nkehl94KYBhagU50g2U0', "VigpKFbSLnHLzBWobZaS1IBmw--giJ51w92y723ajnU"],
-        ['qM2SNyK3NyHB6deWpEP3ITyCGKQFRTna_mlKP0w1QH0', "HYyIGuyNFslmcnNT7mrDdmuXwn4cm7smE_FZbYguKHQ"],
-        ['qCWg5GMEDFd3n1nxDswlIpOHoPUXMLuMOIiLUVzubkI', "rJFC3dUjJxMnVZiUGzmf_LFsJUwFWY-CU5RQgFOHCWM"],
-        ['4NOBxDrEsOhNI3Y3EnVIy_TN-uyBoAjQw6QM0YsOi0s', "CbcY9qc4YuMDJDyyL0OITlU824TBg1O84ClPy27e2RM"],
-        ['eBvFb0M4HpSOwWjtXV8zliiEs_hg56zX4a2LpuuqpEI', "CjulQ2qVIky7ImIfysgQhNX7s_drGLheCGSkVHcLZhc"],
-        ['yEpOzQV04NNcycWVeWtRNTzv5TS-ynTuKRacZCH-6U8', "O9RSr5gSdok2K_tobQnf_scyKVqnCx6C4Jrl7_rCZEQ"],
-        ['CNt6TAUVCwqM6xIBHyni0K3Zqbn2htKQLvLb6XDgh0s', "d9cGLVBrDFS02L2OvkqyqwFZ1Ux3AHs28ehl4Rwiyl0"],
-        ['EInKw-6Wr0rAHXlxxDuZU5mByIzcD3Z-_iWPzXlUL1k', "LlYD2nNVAvyjNvjZGZh4R8PkMIwkc6EycPTvR2LE0nQ"],
-        ['GKIKo7rcXVyle-EUHtGIDtYnDsI6osQmOUl3DTJRAGc', "VcqHivYGGoBkcxOI6cSSjQmneltstkb2OhvO53dyhEM"],
-        ['-FVDzv68IC17fJVlNDlhrrgX44WeBfbhwjWpCQVXGHE', "PGG2EYOvsFt2lAQTD7lqHeRxz2KxvllEDKcUrtizPBU"],
-        ['0H3OJEYEu6XW7woqy7cKh2vzg6YHkbF_xSDTHKyrsn4', "mzevpYbS8kXengBY5p7tt56QE4tS3lwlwRemmkcQeyc"],
-        ['8F8XywN6ci44ES6em2Z0fYYxyptB9uaXY9Hc1WSSPE4', "qCZUdWQZ2H33vWXnOkG8NpxBeq3qn5QWXlfCOWBNkkc"],
-        ['IN0dqfkC10dj-ifRHrg2PmmOrzYs697ajGMwcLbu-1g', "2UW_EO3r7uczPGUUlpJBnMDpDmWUHE2yDzCmXS4sckE"],
-        ['uIcmks5rAhvBe4dRaJOdeSqgxLGGMZhsGk4J4PEKL2s', "F9WJV_74IZp0Ide4hWjiJXk9FRtBUBkUr3mzU-q1lzk"],
-    ]
-);
-
 class RandomUtil {

    static randomIntRange(min, max) {
@@ -132,14 +107,6 @@ class RandomUtil {
        return str;
    }

-    static randomShortIdSeq(count) {
-        let str = '';
-        for (let i = 0; i < count; ++i) {
-            str += shortIdSeq[this.randomInt(16)];
-        }
-        return str;
-    }
-
    static randomLowerAndNum(count) {
        let str = '';
        for (let i = 0; i < count; ++i) {
@@ -169,27 +136,7 @@ class RandomUtil {
            return (c === 'x' ? r : (r & 0x7 | 0x8)).toString(16);
        });
    }
-
-    static randowShortId() {
-        let str = '';
-        str += this.randomShortIdSeq(8)
-        return str;
-    }
-
-    static randomX25519PrivateKey() {
-        let num = x25519Map.size;
-        let index = this.randomInt(num);
-        let cntr = 0;
-        for (let key of x25519Map.keys()) {
-            if (cntr++ === index) {
-                return key;
-            }
-        }
-    }
-
-    static randomX25519PublicKey(key) {
-        return x25519Map.get(key)
-    }
+    
    static randomText() {
        var chars = 'abcdefghijklmnopqrstuvwxyz1234567890';
        var string = '';
--- a/web/controller/api.go
+++ b/web/controller/api.go
@@ -1,10 +1,13 @@
 package controller

-import "github.com/gin-gonic/gin"
-
+import (
+	"github.com/gin-gonic/gin"
+)
 type APIController struct {
 	BaseController
+
 	inboundController *InboundController
+	settingController *SettingController
 }

 func NewAPIController(g *gin.RouterGroup) *APIController {
@@ -17,26 +20,21 @@ func (a *APIController) initRouter(g *gin.RouterGroup) {
 	g = g.Group("/xui/API/inbounds")
 	g.Use(a.checkLogin)

-	g.GET("/list", a.getAllInbounds)
-	g.GET("/get/:id", a.getSingleInbound)
+	g.GET("/", a.inbounds)
+	g.GET("/get/:id", a.inbound)
 	g.POST("/add", a.addInbound)
 	g.POST("/del/:id", a.delInbound)
 	g.POST("/update/:id", a.updateInbound)
-	g.POST("/clientIps/:email", a.getClientIps)
-	g.POST("/clearClientIps/:email", a.clearClientIps)
-	g.POST("/addClient/", a.addInboundClient)
-	g.POST("/delClient/:email", a.delInboundClient)
-	g.POST("/updateClient/:index", a.updateInboundClient)
-	g.POST("/:id/resetClientTraffic/:email", a.resetClientTraffic)
-	g.POST("/resetAllTraffics", a.resetAllTraffics)
-	g.POST("/resetAllClientTraffics/:id", a.resetAllClientTraffics)

+	
 	a.inboundController = NewInboundController(g)
 }
-func (a *APIController) getAllInbounds(c *gin.Context) {
+
+
+func (a *APIController) inbounds(c *gin.Context) {
 	a.inboundController.getInbounds(c)
 }
-func (a *APIController) getSingleInbound(c *gin.Context) {
+func (a *APIController) inbound(c *gin.Context) {
 	a.inboundController.getInbound(c)
 }
 func (a *APIController) addInbound(c *gin.Context) {
@@ -48,29 +46,3 @@ func (a *APIController) delInbound(c *gin.Context) {
 func (a *APIController) updateInbound(c *gin.Context) {
 	a.inboundController.updateInbound(c)
 }
-
-func (a *APIController) getClientIps(c *gin.Context) {
-	a.inboundController.getClientIps(c)
-}
-
-func (a *APIController) clearClientIps(c *gin.Context) {
-	a.inboundController.clearClientIps(c)
-}
-func (a *APIController) addInboundClient(c *gin.Context) {
-	a.inboundController.addInboundClient(c)
-}
-func (a *APIController) delInboundClient(c *gin.Context) {
-	a.inboundController.delInboundClient(c)
-}
-func (a *APIController) updateInboundClient(c *gin.Context) {
-	a.inboundController.updateInboundClient(c)
-}
-func (a *APIController) resetClientTraffic(c *gin.Context) {
-	a.inboundController.resetClientTraffic(c)
-}
-func (a *APIController) resetAllTraffics(c *gin.Context) {
-	a.inboundController.resetAllTraffics(c)
-}
-func (a *APIController) resetAllClientTraffics(c *gin.Context) {
-	a.inboundController.resetAllClientTraffics(c)
-}
--- a/web/controller/inbound.go
+++ b/web/controller/inbound.go
@@ -33,12 +33,7 @@ func (a *InboundController) initRouter(g *gin.RouterGroup) {
 	g.POST("/update/:id", a.updateInbound)
 	g.POST("/clientIps/:email", a.getClientIps)
 	g.POST("/clearClientIps/:email", a.clearClientIps)
-	g.POST("/addClient/", a.addInboundClient)
-	g.POST("/delClient/:email", a.delInboundClient)
-	g.POST("/updateClient/:index", a.updateInboundClient)
-	g.POST("/:id/resetClientTraffic/:email", a.resetClientTraffic)
-	g.POST("/resetAllTraffics", a.resetAllTraffics)
-	g.POST("/resetAllClientTraffics/:id", a.resetAllClientTraffics)
+	g.POST("/resetClientTraffic/:email", a.resetClientTraffic)

 }

@@ -129,11 +124,10 @@ func (a *InboundController) updateInbound(c *gin.Context) {
 		a.xrayService.SetToNeedRestart()
 	}
 }
-
 func (a *InboundController) getClientIps(c *gin.Context) {
 	email := c.Param("email")

-	ips, err := a.inboundService.GetInboundClientIps(email)
+	ips , err := a.inboundService.GetInboundClientIps(email)
 	if err != nil {
 		jsonObj(c, "No IP Record", nil)
 		return
@@ -150,109 +144,13 @@ func (a *InboundController) clearClientIps(c *gin.Context) {
 	}
 	jsonMsg(c, "Log Cleared", nil)
 }
-func (a *InboundController) addInboundClient(c *gin.Context) {
-	inbound := &model.Inbound{}
-	err := c.ShouldBind(inbound)
-	if err != nil {
-		jsonMsg(c, I18n(c, "pages.inbounds.revise"), err)
-		return
-	}
-
-	err = a.inboundService.AddInboundClient(inbound)
-	if err != nil {
-		jsonMsg(c, "something worng!", err)
-		return
-	}
-	jsonMsg(c, "Client added", nil)
-	if err == nil {
-		a.xrayService.SetToNeedRestart()
-	}
-}
-
-func (a *InboundController) delInboundClient(c *gin.Context) {
-	email := c.Param("email")
-	inbound := &model.Inbound{}
-	err := c.ShouldBind(inbound)
-	if err != nil {
-		jsonMsg(c, I18n(c, "pages.inbounds.revise"), err)
-		return
-	}
-
-	err = a.inboundService.DelInboundClient(inbound, email)
-	if err != nil {
-		jsonMsg(c, "something worng!", err)
-		return
-	}
-	jsonMsg(c, "Client deleted", nil)
-	if err == nil {
-		a.xrayService.SetToNeedRestart()
-	}
-}
-
-func (a *InboundController) updateInboundClient(c *gin.Context) {
-	index, err := strconv.Atoi(c.Param("index"))
-	if err != nil {
-		jsonMsg(c, I18n(c, "pages.inbounds.revise"), err)
-		return
-	}
-
-	inbound := &model.Inbound{}
-	err = c.ShouldBind(inbound)
-	if err != nil {
-		jsonMsg(c, I18n(c, "pages.inbounds.revise"), err)
-		return
-	}
-
-	err = a.inboundService.UpdateInboundClient(inbound, index)
-	if err != nil {
-		jsonMsg(c, "something worng!", err)
-		return
-	}
-	jsonMsg(c, "Client updated", nil)
-	if err == nil {
-		a.xrayService.SetToNeedRestart()
-	}
-}
-
 func (a *InboundController) resetClientTraffic(c *gin.Context) {
-	id, err := strconv.Atoi(c.Param("id"))
-	if err != nil {
-		jsonMsg(c, I18n(c, "pages.inbounds.revise"), err)
-		return
-	}
 	email := c.Param("email")

-	err = a.inboundService.ResetClientTraffic(id, email)
+	err := a.inboundService.ResetClientTraffic(email)
 	if err != nil {
 		jsonMsg(c, "something worng!", err)
 		return
 	}
 	jsonMsg(c, "traffic reseted", nil)
-	if err == nil {
-		a.xrayService.SetToNeedRestart()
-	}
-}
-
-func (a *InboundController) resetAllTraffics(c *gin.Context) {
-	err := a.inboundService.ResetAllTraffics()
-	if err != nil {
-		jsonMsg(c, "something worng!", err)
-		return
-	}
-	jsonMsg(c, "All traffics reseted", nil)
-}
-
-func (a *InboundController) resetAllClientTraffics(c *gin.Context) {
-	id, err := strconv.Atoi(c.Param("id"))
-	if err != nil {
-		jsonMsg(c, I18n(c, "pages.inbounds.revise"), err)
-		return
-	}
-
-	err = a.inboundService.ResetAllClientTraffics(id)
-	if err != nil {
-		jsonMsg(c, "something worng!", err)
-		return
-	}
-	jsonMsg(c, "All traffics of client reseted", nil)
 }
--- a/web/controller/index.go
+++ b/web/controller/index.go
@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"time"
 	"x-ui/logger"
+	"x-ui/web/job"
 	"x-ui/web/service"
 	"x-ui/web/session"

@@ -19,7 +20,6 @@ type IndexController struct {
 	BaseController

 	userService service.UserService
-	tgbot       service.Tgbot
 }

 func NewIndexController(g *gin.RouterGroup) *IndexController {
@@ -60,13 +60,13 @@ func (a *IndexController) login(c *gin.Context) {
 	user := a.userService.CheckUser(form.Username, form.Password)
 	timeStr := time.Now().Format("2006-01-02 15:04:05")
 	if user == nil {
-		a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 0)
+		job.NewStatsNotifyJob().UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 0)
 		logger.Infof("wrong username or password: \"%s\" \"%s\"", form.Username, form.Password)
 		pureJsonMsg(c, false, I18n(c, "pages.login.toasts.wrongUsernameOrPassword"))
 		return
 	} else {
 		logger.Infof("%s login success,Ip Address:%s\n", form.Username, getRemoteIp(c))
-		a.tgbot.UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 1)
+		job.NewStatsNotifyJob().UserLoginNotify(form.Username, getRemoteIp(c), timeStr, 1)
 	}

 	err = session.SetLoginUser(c, user)
--- a/web/controller/server.go
+++ b/web/controller/server.go
@@ -1,11 +1,10 @@
 package controller

 import (
+	"github.com/gin-gonic/gin"
 	"time"
 	"x-ui/web/global"
 	"x-ui/web/service"
-
-	"github.com/gin-gonic/gin"
 )

 type ServerController struct {
@@ -38,9 +37,6 @@ func (a *ServerController) initRouter(g *gin.RouterGroup) {
 	g.POST("/stopXrayService", a.stopXrayService)
 	g.POST("/restartXrayService", a.restartXrayService)
 	g.POST("/installXray/:version", a.installXray)
-	g.POST("/logs/:count", a.getLogs)
-	g.POST("/getConfigJson", a.getConfigJson)
-	g.GET("/getDb", a.getDb)
 }

 func (a *ServerController) refreshStatus() {
@@ -91,13 +87,13 @@ func (a *ServerController) installXray(c *gin.Context) {
 }

 func (a *ServerController) stopXrayService(c *gin.Context) {
-	a.lastGetStatusTime = time.Now()
+        a.lastGetStatusTime = time.Now()
 	err := a.serverService.StopXrayService()
 	if err != nil {
 		jsonMsg(c, "", err)
 		return
 	}
-	jsonMsg(c, "Xray stoped", err)
+	jsonMsg(c, "Xray stoped",err)

 }
 func (a *ServerController) restartXrayService(c *gin.Context) {
@@ -106,39 +102,6 @@ func (a *ServerController) restartXrayService(c *gin.Context) {
 		jsonMsg(c, "", err)
 		return
 	}
-	jsonMsg(c, "Xray restarted", err)
+	jsonMsg(c, "Xray restarted",err)

-}
-
-func (a *ServerController) getLogs(c *gin.Context) {
-	count := c.Param("count")
-	logs, err := a.serverService.GetLogs(count)
-	if err != nil {
-		jsonMsg(c, I18n(c, "getLogs"), err)
-		return
-	}
-	jsonObj(c, logs, nil)
-}
-
-func (a *ServerController) getConfigJson(c *gin.Context) {
-	configJson, err := a.serverService.GetConfigJson()
-	if err != nil {
-		jsonMsg(c, I18n(c, "getLogs"), err)
-		return
-	}
-	jsonObj(c, configJson, nil)
-}
-
-func (a *ServerController) getDb(c *gin.Context) {
-	db, err := a.serverService.GetDb()
-	if err != nil {
-		jsonMsg(c, I18n(c, "getLogs"), err)
-		return
-	}
-	// Set the headers for the response
-	c.Header("Content-Type", "application/octet-stream")
-	c.Header("Content-Disposition", "attachment; filename=xui.db")
-
-	// Write the file contents to the response
-	c.Writer.Write(db)
-}
+}
--- a/web/controller/setting.go
+++ b/web/controller/setting.go
@@ -2,12 +2,11 @@ package controller

 import (
 	"errors"
+	"github.com/gin-gonic/gin"
 	"time"
 	"x-ui/web/entity"
 	"x-ui/web/service"
 	"x-ui/web/session"
-
-	"github.com/gin-gonic/gin"
 )

 type updateUserForm struct {
@@ -33,7 +32,6 @@ func (a *SettingController) initRouter(g *gin.RouterGroup) {
 	g = g.Group("/setting")

 	g.POST("/all", a.getAllSetting)
-	g.POST("/defaultSettings", a.getDefaultSettings)
 	g.POST("/update", a.updateSetting)
 	g.POST("/updateUser", a.updateUser)
 	g.POST("/restartPanel", a.restartPanel)
@@ -48,36 +46,6 @@ func (a *SettingController) getAllSetting(c *gin.Context) {
 	jsonObj(c, allSetting, nil)
 }

-func (a *SettingController) getDefaultSettings(c *gin.Context) {
-	expireDiff, err := a.settingService.GetExpireDiff()
-	if err != nil {
-		jsonMsg(c, I18n(c, "pages.setting.toasts.getSetting"), err)
-		return
-	}
-	trafficDiff, err := a.settingService.GetTrafficDiff()
-	if err != nil {
-		jsonMsg(c, I18n(c, "pages.setting.toasts.getSetting"), err)
-		return
-	}
-	defaultCert, err := a.settingService.GetCertFile()
-	if err != nil {
-		jsonMsg(c, I18n(c, "pages.setting.toasts.getSetting"), err)
-		return
-	}
-	defaultKey, err := a.settingService.GetKeyFile()
-	if err != nil {
-		jsonMsg(c, I18n(c, "pages.setting.toasts.getSetting"), err)
-		return
-	}
-	result := map[string]interface{}{
-		"expireDiff":  expireDiff,
-		"trafficDiff": trafficDiff,
-		"defaultCert": defaultCert,
-		"defaultKey":  defaultKey,
-	}
-	jsonObj(c, result, nil)
-}
-
 func (a *SettingController) updateSetting(c *gin.Context) {
 	allSetting := &entity.AllSetting{}
 	err := c.ShouldBind(allSetting)
--- a/web/controller/sub.go
+++ b/web/controller/sub.go
@@ -1,42 +0,0 @@
-package controller
-
-import (
-	"encoding/base64"
-	"strings"
-	"x-ui/web/service"
-
-	"github.com/gin-gonic/gin"
-)
-
-type SUBController struct {
-	BaseController
-
-	subService service.SubService
-}
-
-func NewSUBController(g *gin.RouterGroup) *SUBController {
-	a := &SUBController{}
-	a.initRouter(g)
-	return a
-}
-
-func (a *SUBController) initRouter(g *gin.RouterGroup) {
-	g = g.Group("/sub")
-
-	g.GET("/:subid", a.subs)
-}
-
-func (a *SUBController) subs(c *gin.Context) {
-	subId := c.Param("subid")
-	host := strings.Split(c.Request.Host, ":")[0]
-	subs, err := a.subService.GetSubs(subId, host)
-	if err != nil {
-		c.String(400, "Error!")
-	} else {
-		result := ""
-		for _, sub := range subs {
-			result += sub + "\n"
-		}
-		c.String(200, base64.StdEncoding.EncodeToString([]byte(result)))
-	}
-}
--- a/web/entity/entity.go
+++ b/web/entity/entity.go
@@ -32,16 +32,13 @@ type AllSetting struct {
 	WebCertFile        string `json:"webCertFile" form:"webCertFile"`
 	WebKeyFile         string `json:"webKeyFile" form:"webKeyFile"`
 	WebBasePath        string `json:"webBasePath" form:"webBasePath"`
-	ExpireDiff         int    `json:"expireDiff" form:"expireDiff"`
-	TrafficDiff        int    `json:"trafficDiff" form:"trafficDiff"`
 	TgBotEnable        bool   `json:"tgBotEnable" form:"tgBotEnable"`
 	TgBotToken         string `json:"tgBotToken" form:"tgBotToken"`
-	TgBotChatId        string `json:"tgBotChatId" form:"tgBotChatId"`
+	TgBotChatId        int    `json:"tgBotChatId" form:"tgBotChatId"`
 	TgRunTime          string `json:"tgRunTime" form:"tgRunTime"`
-	TgBotBackup        bool   `json:"tgBotBackup" form:"tgBotBackup"`
-	TgCpu              int    `json:"tgCpu" form:"tgCpu"`
 	XrayTemplateConfig string `json:"xrayTemplateConfig" form:"xrayTemplateConfig"`
-	TimeLocation       string `json:"timeLocation" form:"timeLocation"`
+
+	TimeLocation string `json:"timeLocation" form:"timeLocation"`
 }

 func (s *AllSetting) CheckValid() error {
--- a/web/html/common/head.html
+++ b/web/html/common/head.html
@@ -7,7 +7,6 @@
    <link rel="stylesheet" href="{{ .base_path }}assets/ant-design-vue@1.7.2/antd.min.css">
    <link rel="stylesheet" href="{{ .base_path }}assets/element-ui@2.15.0/theme-chalk/display.css">
    <link rel="stylesheet" href="{{ .base_path }}assets/css/custom.css?{{ .cur_ver }}">
-    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
    <style>
        [v-cloak] {
            display: none;
--- a/web/html/common/prompt_modal.html
+++ b/web/html/common/prompt_modal.html
@@ -1,7 +1,7 @@
 {{define "promptModal"}}
 <a-modal id="prompt-modal" v-model="promptModal.visible" :title="promptModal.title"
         :closable="true" @ok="promptModal.ok" :mask-closable="false"
-         :class="siderDrawer.isDarkTheme ? darkClass : ''"
+		 :class="siderDrawer.isDarkTheme ? darkClass : ''"
         :ok-text="promptModal.okText" cancel-text='{{ i18n "cancel" }}'>
    <a-input id="prompt-modal-input" :type="promptModal.type"
             v-model="promptModal.value"
--- a/web/html/common/qrcode_modal.html
+++ b/web/html/common/qrcode_modal.html
@@ -1,11 +1,9 @@
 {{define "qrcodeModal"}}
 <a-modal id="qrcode-modal" v-model="qrModal.visible" :title="qrModal.title"
-         :closable="true"
-         :class="siderDrawer.isDarkTheme ? darkClass : ''"
-         :footer="null"
-         width="300px">
-    <a-tag color="green" style="margin-bottom: 10px;display: block;text-align: center;" >{{ i18n "pages.inbounds.clickOnQRcode" }}</a-tag>
-    <canvas @click="copyToClipboard()" id="qrCode" style="width: 100%; height: 100%;"></canvas>
+         :closable="true" width="300px" :ok-text="qrModal.okText"
+		 :class="siderDrawer.isDarkTheme ? darkClass : ''"
+         cancel-text='{{ i18n "close" }}' :ok-button-props="{attrs:{id:'qr-modal-ok-btn'}}">
+		<canvas id="qrCode" style="width: 100%; height: 100%;"></canvas>
 </a-modal>

 <script>
@@ -15,15 +13,17 @@
        content: '',
        inbound: new Inbound(),
        dbInbound: new DBInbound(),
+        okText: '',
        copyText: '',
        qrcode: null,
        clipboard: null,
        visible: false,
-        show: function (title='', content='', dbInbound=new DBInbound(), copyText='') {
+        show: function (title='', content='', dbInbound=new DBInbound(),okText='{{ i18n "copy" }}', copyText='') {
            this.title = title;
            this.content = content;
            this.dbInbound = dbInbound;
            this.inbound = dbInbound.toInbound();
+            this.okText = okText;
            if (ObjectUtil.isEmpty(copyText)) {
                this.copyText = content;
            } else {
@@ -31,6 +31,12 @@
            }
            this.visible = true;
            qrModalApp.$nextTick(() => {
+                if (this.clipboard === null) {
+                    this.clipboard = new ClipboardJS('#qr-modal-ok-btn', {
+                        text: () => this.copyText,
+                    });
+                    this.clipboard.on('success', () => app.$message.success('{{ i18n "copied" }}'));
+                }
                if (this.qrcode === null) {
                    this.qrcode = new QRious({
                        element: document.querySelector('#qrCode'),
@@ -52,17 +58,6 @@
        data: {
            qrModal: qrModal,
        },
-        methods: {
-            copyToClipboard() {
-                this.qrModal.clipboard = new ClipboardJS('#qrCode', {
-                    text: () => this.qrModal.copyText,
-                });
-                this.qrModal.clipboard.on('success', () => {
-                    app.$message.success('{{ i18n "copied" }}')
-                    this.qrModal.clipboard.destroy();
-                });
-            }
-        },
    });

 </script>
--- a/web/html/common/text_modal.html
+++ b/web/html/common/text_modal.html
@@ -1,7 +1,7 @@
 {{define "textModal"}}
 <a-modal id="text-modal" v-model="txtModal.visible" :title="txtModal.title"
         :closable="true" ok-text='{{ i18n "copy" }}' cancel-text='{{ i18n "close" }}'
-         :class="siderDrawer.isDarkTheme ? darkClass : ''"
+		 :class="siderDrawer.isDarkTheme ? darkClass : ''"
         :ok-button-props="{attrs:{id:'txt-modal-ok-btn'}}">
    <a-button v-if="!ObjectUtil.isEmpty(txtModal.fileName)" type="primary" style="margin-bottom: 10px;"
              :href="'data:application/text;charset=utf-8,' + encodeURIComponent(txtModal.content)" :download="txtModal.fileName">
@@ -32,6 +32,7 @@
                    });
                    this.clipboard.on('success', () => app.$message.success('{{ i18n "copied" }}'));
                }
+               
            });
        },
        close: function () {
@@ -40,7 +41,7 @@
    };

    const textModalApp = new Vue({
-        delimiters: ['[[', ']]'],
+    	delimiters: ['[[', ']]'],
        el: '#text-modal',
        data: {
            txtModal: txtModal,
--- a/web/html/login.html
+++ b/web/html/login.html
@@ -39,7 +39,7 @@
        <a-layout-content>
            <a-row type="flex" justify="center">
                <a-col :xs="22" :sm="20" :md="16" :lg="12" :xl="8">
-                    <h1>{{ i18n "pages.login.title" }}</h1>
+                    <h1>3x-ui {{ i18n "pages.login.title" }}</h1>
                </a-col>
            </a-row>
            <a-row type="flex" justify="center">
@@ -63,21 +63,25 @@
                        <a-form-item>

                            <a-row justify="center" class="selectLang">
-                                <a-col :span="5"><span>Language :</span></a-col>
+                                <a-col :span="4"><span>Language : </span></a-col>

-                                <a-col :span="7">
+                                <a-col :span="6">
                                    <a-select
                                            ref="selectLang"
                                            v-model="lang"
                                            @change="setLang(lang)"
                                    >
-                                        <a-select-option  :value="l.value" label="English" v-for="l in supportLangs" >
+                                        <a-select-option  :value="l.value" label="China" v-for="l in supportLangs" >
                                            <span role="img" aria-label="l.name" v-text="l.icon"></span>
                                            &nbsp;&nbsp;<span v-text="l.name"></span>
                                        </a-select-option>
                                    </a-select>
                                </a-col>
+
                            </a-row>
+
+
+
                        </a-form-item>
                    </a-form>
                </a-col>
--- a/web/html/xui/client_bulk_modal.html
+++ b/web/html/xui/client_bulk_modal.html
@@ -1,184 +0,0 @@
-{{define "clientsBulkModal"}}
-<a-modal id="client-bulk-modal" v-model="clientsBulkModal.visible" :title="clientsBulkModal.title" @ok="clientsBulkModal.ok"
-         :confirm-loading="clientsBulkModal.confirmLoading" :closable="true" :mask-closable="false"
-         :class="siderDrawer.isDarkTheme ? darkClass : ''"
-         :ok-text="clientsBulkModal.okText" cancel-text='{{ i18n "close" }}'>
-    <a-form layout="inline">
-        <a-form-item label='{{ i18n "pages.client.method" }}'>
-            <a-select v-model="clientsBulkModal.emailMethod" buttonStyle="solid" style="width: 350px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
-                <a-select-option :value="0">Random</a-select-option>
-                <a-select-option :value="1">Random+Prefix</a-select-option>
-                <a-select-option :value="2">Random+Prefix+Num</a-select-option>
-                <a-select-option :value="3">Random+Prefix+Num+Postfix</a-select-option>
-                <a-select-option :value="4">Prefix+Num+Postfix [ BE CAREFUL! ]</a-select-option>
-            </a-select>
-        </a-form-item><br />
-        <a-form-item v-if="clientsBulkModal.emailMethod>1">
-            <span slot="label">{{ i18n "pages.client.first" }}</span>
-            <a-input-number v-model="clientsBulkModal.firstNum" :min="1"></a-input-number>
-        </a-form-item>
-        <a-form-item v-if="clientsBulkModal.emailMethod>1">
-            <span slot="label">{{ i18n "pages.client.last" }}</span>
-            <a-input-number v-model="clientsBulkModal.lastNum" :min="clientsBulkModal.firstNum"></a-input-number>
-        </a-form-item>
-        <a-form-item v-if="clientsBulkModal.emailMethod>0">
-            <span slot="label">{{ i18n "pages.client.prefix" }}</span>
-            <a-input v-model="clientsBulkModal.emailPrefix" style="width: 120px"></a-input>
-        </a-form-item>
-        <a-form-item v-if="clientsBulkModal.emailMethod>2">
-            <span slot="label">{{ i18n "pages.client.postfix" }}</span>
-            <a-input v-model="clientsBulkModal.emailPostfix" style="width: 120px"></a-input>
-        </a-form-item>
-        <a-form-item v-if="clientsBulkModal.emailMethod < 2">
-            <span slot="label">{{ i18n "pages.client.clientCount" }}</span>
-            <a-input-number v-model="clientsBulkModal.quantity" :min="1" :max="100"></a-input-number>
-        </a-form-item>
-        <a-form-item label="Subscription">
-            <a-input v-model.trim="clientsBulkModal.subId"></a-input>
-        </a-form-item>
-        <a-form-item label="Telegram ID">
-            <a-input v-model.trim="clientsBulkModal.tgId"></a-input>
-        </a-form-item>
-        <a-form-item>
-            <span slot="label">
-                <span >{{ i18n "pages.inbounds.totalFlow" }}</span>(GB)
-                <a-tooltip>
-                    <template slot="title">
-                        0 <span>{{ i18n "pages.inbounds.meansNoLimit" }}</span>
-                    </template>
-                    <a-icon type="question-circle" theme="filled"></a-icon>
-                </a-tooltip>
-            </span>
-        <a-input-number v-model="clientsBulkModal.totalGB" :min="0"></a-input-number>
-        </a-form-item>
-        <a-form-item label="{{ i18n "pages.client.delayedStart" }}">
-            <a-switch v-model="clientsBulkModal.delayedStart" @click="clientsBulkModal.expiryTime=0"></a-switch>
-        </a-form-item>
-        <a-form-item label="{{ i18n "pages.client.expireDays" }}" v-if="clientsBulkModal.delayedStart">
-            <a-input type="number" v-model.number="delayedExpireDays" :min="0"></a-input>
-        </a-form-item>
-        <a-form-item v-else>
-            <span slot="label">
-                <span >{{ i18n "pages.inbounds.expireDate" }}</span>
-                <a-tooltip>
-                    <template slot="title">
-                        <span>{{ i18n "pages.inbounds.leaveBlankToNeverExpire" }}</span>
-                    </template>
-                    <a-icon type="question-circle" theme="filled"></a-icon>
-                </a-tooltip>
-            </span>
-            <a-date-picker :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm"
-                           :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"
-                           v-model="clientsBulkModal.expiryTime" style="width: 300px;"></a-date-picker>
-        </a-form-item>
-    </a-form>
-</a-modal>
-<script>
-
-    const clientsBulkModal = {
-        visible: false,
-        confirmLoading: false,
-        title: '',
-        okText: '',
-        confirm: null,
-        dbInbound: new DBInbound(),
-        inbound: new Inbound(),
-        clients: [],
-        quantity: 1,
-        totalGB: 0,
-        expiryTime: '',
-        emailMethod: 0,
-        firstNum: 1,
-        lastNum: 1,
-        emailPrefix: "",
-        emailPostfix: "",
-        subId: "",
-        tgId: "",
-        delayedStart: false,
-        ok() {
-            method=clientsBulkModal.emailMethod;
-            if(method>1){
-                start=clientsBulkModal.firstNum;
-                end=clientsBulkModal.lastNum + 1;
-            } else {
-                start=0;
-                end=clientsBulkModal.quantity;
-            }
-            prefix = (method>0 && clientsBulkModal.emailPrefix.length>0) ? clientsBulkModal.emailPrefix : "";
-            useNum=(method>1);
-            postfix = (method>2 && clientsBulkModal.emailPostfix.length>0) ? clientsBulkModal.emailPostfix : "";
-            for (let i = start; i < end; i++) {
-                newClient = clientsBulkModal.newClient(clientsBulkModal.dbInbound.protocol);
-                if(method==4) newClient.email = "";
-                newClient.email += useNum ? prefix + i.toString() + postfix : prefix + postfix;
-                newClient.subId = clientsBulkModal.subId;
-                newClient.tgId = clientsBulkModal.tgId;
-                newClient._totalGB = clientsBulkModal.totalGB;
-                newClient._expiryTime = clientsBulkModal.expiryTime;
-                clientsBulkModal.clients.push(newClient);
-            }
-            ObjectUtil.execute(clientsBulkModal.confirm, clientsBulkModal.inbound, clientsBulkModal.dbInbound);
-        },
-        show({ title='', okText='{{ i18n "sure" }}', dbInbound=null, confirm=(inbound, dbInbound)=>{} }) {
-            this.visible = true;
-            this.title = title;
-            this.okText = okText;
-            this.confirm = confirm;
-            this.quantity = 1;
-            this.totalGB = 0;
-            this.expiryTime = 0;
-            this.emailMethod= 0;
-            this.firstNum= 1;
-            this.lastNum= 1;
-            this.emailPrefix= "";
-            this.emailPostfix= "";
-            this.subId= "";
-            this.tgId= "";
-            this.dbInbound = new DBInbound(dbInbound);
-            this.inbound = dbInbound.toInbound();
-            this.clients = this.getClients(this.inbound.protocol, this.inbound.settings);
-            this.delayedStart = false;
-        },
-        getClients(protocol, clientSettings) {
-            switch(protocol){
-                case Protocols.VMESS: return clientSettings.vmesses;
-                case Protocols.VLESS: return clientSettings.vlesses;
-                case Protocols.TROJAN: return clientSettings.trojans;
-                default: return null;
-            }
-        },
-        newClient(protocol) {
-            switch (protocol) {
-                case Protocols.VMESS: return new Inbound.VmessSettings.Vmess();
-                case Protocols.VLESS: return new Inbound.VLESSSettings.VLESS();
-                case Protocols.TROJAN: return new Inbound.TrojanSettings.Trojan();
-                default: return null;
-            }
-        },
-        close() {
-            clientsBulkModal.visible = false;
-            clientsBulkModal.loading(false);
-        },
-        loading(loading) {
-            clientsBulkModal.confirmLoading = loading;
-        },
-    };
-
-    const clientsBulkModalApp = new Vue({
-        delimiters: ['[[', ']]'],
-        el: '#client-bulk-modal',
-        data: {
-            clientsBulkModal,
-            get inbound() {
-                return this.clientsBulkModal.inbound;
-            },
-            get delayedExpireDays() {
-                return this.clientsBulkModal.expiryTime < 0 ? this.clientsBulkModal.expiryTime / -86400000 : 0;
-            },
-            set delayedExpireDays(days){
-                this.clientsBulkModal.expiryTime = -86400000 * days;
-            },
-        },
-    });
-</script>
-{{end}}
--- a/web/html/xui/client_modal.html
+++ b/web/html/xui/client_modal.html
@@ -1,145 +0,0 @@
-{{define "clientsModal"}}
-<a-modal id="client-modal" v-model="clientModal.visible" :title="clientModal.title" @ok="clientModal.ok"
-         :confirm-loading="clientModal.confirmLoading" :closable="true" :mask-closable="false"
-         :class="siderDrawer.isDarkTheme ? darkClass : ''"
-         :ok-text="clientModal.okText" cancel-text='{{ i18n "close" }}'>
-    {{template "form/client"}}
-</a-modal>
-<script>
-
-    const clientModal = {
-        visible: false,
-        confirmLoading: false,
-        title: '',
-        okText: '',
-        dbInbound: new DBInbound(),
-        inbound: new Inbound(),
-        clients: [],
-        clientStats: [],
-        index: null,
-        clientIps: null,
-        isExpired: false,
-        delayedStart: false,
-        ok() {
-            ObjectUtil.execute(clientModal.confirm, clientModal.inbound, clientModal.dbInbound, clientModal.index);
-        },
-        show({ title='', okText='{{ i18n "sure" }}', index=null, dbInbound=null, confirm=(index, dbInbound)=>{}, isEdit=false  }) {
-            this.visible = true;
-            this.title = title;
-            this.okText = okText;
-            this.isEdit = isEdit;
-            this.dbInbound = new DBInbound(dbInbound);
-            this.inbound = dbInbound.toInbound();
-            this.clients = this.getClients(this.inbound.protocol, this.inbound.settings);
-            this.index = index === null ? this.clients.length : index;
-            this.isExpired = isEdit ? this.inbound.isExpiry(this.index) : false;
-            this.delayedStart = false;
-            if (!isEdit){
-                this.addClient(this.inbound.protocol, this.clients);
-            } else {
-                if (this.clients[index].expiryTime < 0){
-                    this.delayedStart = true;
-                }
-            }
-            this.clientStats = this.dbInbound.clientStats.find(row => row.email === this.clients[this.index].email);
-            this.confirm = confirm;
-        },
-        getClients(protocol, clientSettings) {
-            switch(protocol){
-                case Protocols.VMESS: return clientSettings.vmesses;
-                case Protocols.VLESS: return clientSettings.vlesses;
-                case Protocols.TROJAN: return clientSettings.trojans;
-                default: return null;
-            }
-        },
-        addClient(protocol, clients) {
-            switch (protocol) {
-                case Protocols.VMESS: return clients.push(new Inbound.VmessSettings.Vmess());
-                case Protocols.VLESS: return clients.push(new Inbound.VLESSSettings.VLESS());
-                case Protocols.TROJAN: return clients.push(new Inbound.TrojanSettings.Trojan());
-                default: return null;
-            }
-        },
-        close() {
-            clientModal.visible = false;
-            clientModal.loading(false);
-        },
-        loading(loading) {
-            clientModal.confirmLoading = loading;
-        },
-    };
-
-    const clientModalApp = new Vue({
-        delimiters: ['[[', ']]'],
-        el: '#client-modal',
-        data: {
-            clientModal,
-            get inbound() {
-                return this.clientModal.inbound;
-            },
-            get client() {
-                return this.clientModal.clients[this.clientModal.index];
-            },
-            get clientStats() {
-                return this.clientModal.clientStats;
-            },
-            get isEdit() {
-                return this.clientModal.isEdit;
-            },
-            get isTrafficExhausted() {
-                if(!clientStats) return false
-                if(clientStats.total <= 0) return false
-                if(clientStats.up + clientStats.down < clientStats.total) return false
-                return true
-            },
-            get isExpiry() {
-                return this.clientModal.isExpired
-            },
-            get statsColor() {
-                if(!clientStats) return 'blue'
-                if(clientStats.total <= 0) return 'blue'
-                else if(clientStats.total > 0 && (clientStats.down+clientStats.up) < clientStats.total) return 'cyan'
-                else return 'red'
-            },
-            get delayedExpireDays() {
-                return this.client && this.client.expiryTime < 0 ? this.client.expiryTime / -86400000 : 0;
-            },
-            set delayedExpireDays(days){
-                this.client.expiryTime = -86400000 * days;
-            },
-        },
-        methods: {
-            getNewEmail(client) {
-                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)];
-                }
-                client.email = string;
-            },
-            async getDBClientIps(email,event) {
-                const msg = await HttpUtil.post('/xui/inbound/clientIps/'+ email);
-                if (!msg.success) {
-                    return;
-                }
-                try {
-                    ips = JSON.parse(msg.obj)
-                    ips = ips.join(",")
-                    event.target.value = ips
-                } catch (error) {
-                    // text
-                    event.target.value = msg.obj
-                }
-            },
-            async clearDBClientIps(email) {
-                const msg = await HttpUtil.post('/xui/inbound/clearClientIps/'+ email);
-                if (!msg.success) {
-                    return;
-                }
-                document.getElementById("clientIPs").value = ""
-            },
-        },
-    });
-</script>
-{{end}}
--- a/web/html/xui/common_sider.html
+++ b/web/html/xui/common_sider.html
@@ -13,8 +13,22 @@
 </a-menu-item>
 <!--<a-menu-item key="{{ .base_path }}xui/clients">-->
 <!--    <a-icon type="laptop"></a-icon>-->
-<!--    <span>Client</span>-->
+<!--    <span>client</span>-->
 <!--</a-menu-item>-->
+<a-sub-menu>
+    <template slot="title">
+        <a-icon type="link"></a-icon>
+        <span>{{ i18n "menu.link"}}</span>
+    </template>
+    <a-menu-item key="https://github.com/mhsanaei/3x-ui/">
+        <a-icon type="github"></a-icon>
+        <span>Github</span>
+    </a-menu-item>
+    <a-menu-item key="https://t.me/panel3xui">
+        <a-icon type="usergroup-add"></a-icon>
+        <span>Telegram</span>
+    </a-menu-item>
+</a-sub-menu>
 <a-menu-item key="{{ .base_path }}logout">
    <a-icon type="logout"></a-icon>
    <span>{{ i18n "menu.logout"}}</span>
@@ -27,7 +41,7 @@
    <a-menu :theme="siderDrawer.theme" mode="inline" selected-keys="">
        <a-menu-item mode="inline">
            <a-icon type="bg-colors"></a-icon>
-            <a-switch :default-checked="siderDrawer.isDarkTheme"
+            <a-switch size="small" :default-checked="siderDrawer.isDarkTheme"
            checked-children="☀"
            un-checked-children="🌙"
            @change="siderDrawer.changeTheme()"></a-switch>
@@ -41,12 +55,11 @@
 <a-drawer id="sider-drawer" placement="left" :closable="false"
          @close="siderDrawer.close()"
          :visible="siderDrawer.visible"
-          :wrap-class-name="siderDrawer.isDarkTheme ? 'ant-drawer-dark' : ''"
          :wrap-style="{ padding: 0 }">
    <div class="drawer-handle" @click="siderDrawer.change()" slot="handle">
        <a-icon :type="siderDrawer.visible ? 'close' : 'menu-fold'"></a-icon>
    </div>
-    <a-menu :theme="siderDrawer.theme" mode="inline" selected-keys="">
+    <a-menu mode="inline" selected-keys="">
        <a-menu-item mode="inline">
            <a-icon type="bg-colors"></a-icon>
            <a-switch :default-checked="siderDrawer.isDarkTheme"
@@ -55,17 +68,19 @@
            @change="siderDrawer.changeTheme()"></a-switch>
        </a-menu-item>
    </a-menu>
-    <a-menu :theme="siderDrawer.theme" mode="inline" :selected-keys="['{{ .request_uri }}']"
+    <a-menu mode="inline" :selected-keys="['{{ .request_uri }}']"
        @click="({key}) => key.startsWith('http') ? window.open(key) : location.href = key">
        {{template "menuItems" .}}
    </a-menu>
 </a-drawer>
 <script>
+
+
    const darkClass = "ant-card-dark";
    const bgDarkStyle = "background-color: #242c3a";
    const siderDrawer = {
        visible: false,
-        collapsed: false,
+		collapsed: false,
        isDarkTheme: localStorage.getItem("dark-mode") === 'true' ? true : false,
        show() {
            this.visible = true;
@@ -75,7 +90,7 @@
        },
        change() {
            this.visible = !this.visible;
-        },
+		 },
        toggleCollapsed() {
            this.collapsed = !this.collapsed;
        },
--- a/web/html/xui/form/client.html
+++ b/web/html/xui/form/client.html
@@ -1,125 +0,0 @@
-{{define "form/client"}}
-<a-form layout="inline" v-if="client">
-    <template v-if="isEdit">
-    <a-tag v-if="isExpiry || isTrafficExhausted" color="red" style="margin-bottom: 10px;display: block;text-align: center;">Account is (Expired|Traffic Ended) And Disabled</a-tag>
-    </template>
-    <a-form-item>
-        <span slot="label">
-            <span>{{ i18n "pages.inbounds.Email" }}</span>
-            <a-tooltip>
-                <template slot="title">
-                    <span>{{ i18n "pages.inbounds.EmailDesc" }}</span>
-                </template>
-                <a-icon type="sync" @click="getNewEmail(client)"></a-icon>
-            </a-tooltip>
-        </span>
-        <a-input v-model.trim="client.email" style="width: 150px;" ></a-input>
-    </a-form-item>
-    <a-form-item label="{{ i18n "pages.inbounds.enable" }}">
-        <a-switch v-model="client.enable"></a-switch>
-    </a-form-item>
-    <a-form-item label="Password" v-if="inbound.protocol === Protocols.TROJAN">
-        <a-input v-model.trim="client.password" style="width: 150px;" ></a-input>
-    </a-form-item>
-    <a-form-item label="ID" v-if="inbound.protocol === Protocols.VMESS || inbound.protocol === Protocols.VLESS">
-        <a-input v-model.trim="client.id" style="width: 300px;"></a-input>
-    </a-form-item>
-    <a-form-item label='{{ i18n "additional" }} ID' v-if="inbound.protocol === Protocols.VMESS">
-        <a-input type="number" v-model.number="client.alterId" style="width: 70px;"></a-input>
-    </a-form-item>
-	<a-form-item label="Subscription" v-if="client.email">
-        <a-input v-model.trim="client.subId"></a-input>
-    </a-form-item>
-    <a-form-item label="Telegram Username" v-if="client.email">
-        <a-input v-model.trim="client.tgId"></a-input>
-    </a-form-item>
-	<a-form-item>
-		<span slot="label">
-			<span>{{ i18n "pages.inbounds.IPLimit" }}</span>
-			<a-tooltip>
-				<template slot="title">
-				<span>{{ i18n "pages.inbounds.IPLimitDesc" }}</span>
-				</template>
-				<a-icon type="question-circle" theme="filled"></a-icon>
-			</a-tooltip>
-		</span>
-		<a-input type="number" v-model.number="client.limitIp" min="0" style="width: 70px;" ></a-input>
-	</a-form-item>
-	<a-form-item v-if="client.email && client.limitIp > 0 && isEdit">
-		<span slot="label">
-			<span>{{ i18n "pages.inbounds.IPLimitlog" }}</span>
-			<a-tooltip>
-				<template slot="title">
-				<span>{{ i18n "pages.inbounds.IPLimitlogDesc" }}</span>
-				</template>
-				<a-icon type="question-circle" theme="filled"></a-icon>
-			</a-tooltip>
-			<a-tooltip>
-				<template slot="title">
-				<span>{{ i18n "pages.inbounds.IPLimitlogclear" }}</span>
-				</template>
-				<span style="color: #FF4D4F">
-				<a-icon type="delete" @click="clearDBClientIps(client.email)"></a-icon>
-				</span>
-			</a-tooltip>
-		</span>
-		<a-form layout="block">
-			<a-textarea id="clientIPs" readonly @click="getDBClientIps(client.email,$event)" placeholder="Click To Get IPs"  :auto-size="{ minRows: 2, maxRows: 10 }">
-			</a-textarea>
-		</a-form>
-	</a-form-item>
-    <a-form-item v-if="inbound.XTLS" label="Flow">
-        <a-select v-model="client.flow" style="width: 150px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
-            <a-select-option value="">{{ i18n "none" }}</a-select-option>
-            <a-select-option v-for="key in XTLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
-        </a-select>
-    </a-form-item>
-    <a-form-item v-else-if="inbound.canEnableTlsFlow()" label="Flow" layout="inline">
-        <a-select v-model="client.flow" style="width: 150px">
-            <a-select-option value="" selected>{{ i18n "none" }}</a-select-option>
-            <a-select-option v-for="key in TLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
-        </a-select>
-    </a-form-item>
-    <a-form-item>
-        <span slot="label">
-            <span >{{ i18n "pages.inbounds.totalFlow" }}</span>(GB)
-            <a-tooltip>
-                <template slot="title">
-                    0 <span>{{ i18n "pages.inbounds.meansNoLimit" }}</span>
-                </template>
-                <a-icon type="question-circle" theme="filled"></a-icon>
-            </a-tooltip>
-        </span>
-        <a-input-number v-model="client._totalGB":min="0" style="width: 70px;"></a-input-number>
-        <template v-if="isEdit && clientStats">
-            <span>{{ i18n "usage" }}:</span>
-            <a-tag :color="statsColor">
-                [[ sizeFormat(clientStats.up) ]] / 
-                [[ sizeFormat(clientStats.down) ]]
-                ([[ sizeFormat(clientStats.up + clientStats.down) ]])
-            </a-tag>
-        </template>
-    </a-form-item>
-    <a-form-item label="{{ i18n "pages.client.delayedStart" }}">
-        <a-switch v-model="clientModal.delayedStart" @click="client._expiryTime=0"></a-switch>
-    </a-form-item>
-    <a-form-item label="{{ i18n "pages.client.expireDays" }}" v-if="clientModal.delayedStart">
-        <a-input type="number" v-model.number="delayedExpireDays" :min="0"></a-input>
-    </a-form-item>
-    <a-form-item v-else>
-        <span slot="label">
-            <span >{{ i18n "pages.inbounds.expireDate" }}</span>
-            <a-tooltip>
-                <template slot="title">
-                    <span>{{ i18n "pages.inbounds.leaveBlankToNeverExpire" }}</span>
-                </template>
-                <a-icon type="question-circle" theme="filled"></a-icon>
-            </a-tooltip>
-        </span>
-        <a-date-picker :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm"
-                       :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"
-                       v-model="client._expiryTime" style="width: 170px;"></a-date-picker>
-        <a-tag color="red" v-if="isExpiry">Expired</a-tag>
-    </a-form-item>
-</a-form>
-{{end}}
--- a/web/html/xui/form/inbound.html
+++ b/web/html/xui/form/inbound.html
@@ -8,7 +8,7 @@
        <a-switch v-model="dbInbound.enable"></a-switch>
    </a-form-item>
    <a-form-item label='{{ i18n "protocol" }}'>
-        <a-select v-model="inbound.protocol" style="width: 160px;" :disabled="isEdit" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
+        <a-select v-model="inbound.protocol" style="width: 160px;">
            <a-select-option v-for="p in Protocols" :key="p" :value="p">[[ p ]]</a-select-option>
        </a-select>
    </a-form-item>
@@ -50,7 +50,6 @@
            </a-tooltip>
        </span>
        <a-date-picker :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm"
-                       :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"
                       v-model="dbInbound._expiryTime" style="width: 300px;"></a-date-picker>
    </a-form-item>
 </a-form>
--- a/web/html/xui/form/protocol/dokodemo.html
+++ b/web/html/xui/form/protocol/dokodemo.html
@@ -7,14 +7,11 @@
        <a-input type="number" v-model.number="inbound.settings.port"></a-input>
    </a-form-item>
    <a-form-item label='{{ i18n "pages.inbounds.network"}}'>
-        <a-select v-model="inbound.settings.network" style="width: 100px;" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
-            <a-select-option value="tcp,udp">TCP+UDP</a-select-option>
-            <a-select-option value="tcp">TCP</a-select-option>
-            <a-select-option value="udp">UDP</a-select-option>
+        <a-select v-model="inbound.settings.network" style="width: 100px;">
+            <a-select-option value="tcp,udp">tcp+udp</a-select-option>
+            <a-select-option value="tcp">tcp</a-select-option>
+            <a-select-option value="udp">udp</a-select-option>
        </a-select>
    </a-form-item>
-    <a-form-item label="FollowRedirect">
-        <a-switch v-model="inbound.settings.followRedirect"></a-switch>
-    </a-form-item>
 </a-form>
 {{end}}
--- a/web/html/xui/form/protocol/shadowsocks.html
+++ b/web/html/xui/form/protocol/shadowsocks.html
@@ -1,18 +1,18 @@
 {{define "form/shadowsocks"}}
 <a-form layout="inline">
    <a-form-item label='{{ i18n "encryption" }}'>
-        <a-select v-model="inbound.settings.method" style="width: 250px;" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
+        <a-select v-model="inbound.settings.method" style="width: 165px;">
            <a-select-option v-for="method in SSMethods" :value="method">[[ method ]]</a-select-option>
        </a-select>
    </a-form-item>
    <a-form-item label='{{ i18n "password" }}'>
-        <a-input v-model.trim="inbound.settings.password" style="width: 250px;"></a-input>
+        <a-input v-model.trim="inbound.settings.password"></a-input>
    </a-form-item>
    <a-form-item label='{{ i18n "pages.inbounds.network" }}'>
-        <a-select v-model="inbound.settings.network" style="width: 100px;" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
-            <a-select-option value="tcp,udp">TCP+UDP</a-select-option>
-            <a-select-option value="tcp">TCP</a-select-option>
-            <a-select-option value="udp">UDP</a-select-option>
+        <a-select v-model="inbound.settings.network" style="width: 100px;">
+            <a-select-option value="tcp,udp">tcp+udp</a-select-option>
+            <a-select-option value="tcp">tcp</a-select-option>
+            <a-select-option value="udp">udp</a-select-option>
        </a-select>
    </a-form-item>
 </a-form>
--- a/web/html/xui/form/protocol/socks.html
+++ b/web/html/xui/form/protocol/socks.html
@@ -1,6 +1,6 @@
 {{define "form/socks"}}
 <a-form layout="inline">
-<!--    <a-form-item label="Password authentication">-->
+<!--    <a-form-item label="密码认证">-->
    <a-form-item label='{{ i18n "password" }}'>
        <a-switch :checked="inbound.settings.auth === 'password'"
                  @change="checked => inbound.settings.auth = checked ? 'password' : 'noauth'"></a-switch>
--- a/web/html/xui/form/protocol/trojan.html
+++ b/web/html/xui/form/protocol/trojan.html
@@ -1,38 +1,68 @@
 {{define "form/trojan"}}
 <a-form layout="inline">
-<a-collapse activeKey="0" v-for="(client, index) in inbound.settings.trojans.slice(0,1)" v-if="!isEdit">  
-    <a-collapse-panel header="{{ i18n "pages.inbounds.client" }}">
+<label style="color: green;">{{ i18n "clients"}}</label>
+<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-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>
                <span slot="label">
-                    <span>{{ i18n "pages.inbounds.Email" }}</span>
+                    Email
                    <a-tooltip>
                        <template slot="title">
-                            <span>{{ i18n "pages.inbounds.EmailDesc" }}</span>
+                            The Email Must Be Completely Unique
                        </template>
-                        <a-icon @click="getNewEmail(client)" type="sync"> </a-icon>
+                        <!--Renew Svg Icon-->
+                        <svg 
+                            @click="getNewEmail(trojan)"
+                            xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="anticon anticon-question-circle" viewBox="0 0 16 16"> <path d="M11.534 7h3.932a.25.25 0 0 1 .192.41l-1.966 2.36a.25.25 0 0 1-.384 0l-1.966-2.36a.25.25 0 0 1 .192-.41zm-11 2h3.932a.25.25 0 0 0 .192-.41L2.692 6.23a.25.25 0 0 0-.384 0L.342 8.59A.25.25 0 0 0 .534 9z"/> <path fill-rule="evenodd" d="M8 3c-1.552 0-2.94.707-3.857 1.818a.5.5 0 1 1-.771-.636A6.002 6.002 0 0 1 13.917 7H12.9A5.002 5.002 0 0 0 8 3zM3.1 9a5.002 5.002 0 0 0 8.757 2.182.5.5 0 1 1 .771.636A6.002 6.002 0 0 1 2.083 9H3.1z"/> </svg>
                    </a-tooltip>
                </span>
-                <a-input v-model.trim="client.email" style="width: 150px;" ></a-input>
+                <a-input v-model.trim="trojan.email" style="width: 150px;"></a-input>
            </a-form-item>
-        </a-form>
-        <a-form-item label="Password">
-            <a-input v-model.trim="client.password" style="width: 150px;"></a-input>
-        </a-form-item>
-		<a-form-item>
+			<a-form-item label="Password" >
+				<a-input v-model.trim="trojan.password" style="width: 150px;"></a-input>
+			</a-form-item>
+			<a-form-item>
                <span slot="label">
-                    <span>{{ i18n "pages.inbounds.IPLimit" }}</span>
+                    IP Count Limit
                    <a-tooltip>
                        <template slot="title">
-                            <span>{{ i18n "pages.inbounds.IPLimitDesc" }}</span>
+                            disable inbound if more than entered count (0 for disable limit ip)
                        </template>
                        <a-icon type="question-circle" theme="filled"></a-icon>
                    </a-tooltip>
                </span>
-                <a-input type="number" v-model.number="client.limitIp" min="0"  style="width: 70px;" ></a-input>
-		</a-form-item>
+                <a-input type="number" v-model.number="trojan.limitIp" min="0" style="width: 70px;"></a-input>
+            </a-form-item>
+            <a-form-item v-if="trojan.email && trojan.limitIp > 0 && isEdit">
+                <span slot="label">
+                    IP log
+                    <a-tooltip>
+                        <template slot="title">
+                            IPs history Log (before enabling inbound after it has been disabled by IP limit, you should clear the log)
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                    <a-tooltip>
+                        <template slot="title">
+                            clear the log
+                        </template>
+                        <span style="color: #FF4D4F">
+                            <a-icon type="delete" @click="clearDBClientIps(trojan.email,$event)"></a-icon>
+                        </span>
+                    </a-tooltip>
+                </span>
+                <a-form layout="block">
+                    <a-textarea readonly @click="getDBClientIps(trojan.email,$event)" placeholder="Click To Get IPs"  :auto-size="{ minRows: 2, maxRows: 10 }">
+                    </a-textarea>
+                </a-form>
+            </a-form-item>
+        </a-form>
        <a-form-item v-if="inbound.XTLS" label="Flow">
-            <a-select v-model="client.flow" style="width: 150px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
+            <a-select v-model="trojan.flow" style="width: 150px">
                <a-select-option value="">{{ i18n "none" }}</a-select-option>
                <a-select-option v-for="key in XTLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
            </a-select>
@@ -47,7 +77,7 @@
                    <a-icon type="question-circle" theme="filled"></a-icon>
                </a-tooltip>
            </span>
-            <a-input-number v-model="client._totalGB" :min="0"></a-input-number>
+            <a-input-number v-model="trojan._totalGB" :min="0"></a-input-number>
        </a-form-item>
        <a-form-item>
            <span slot="label">
@@ -60,24 +90,40 @@
                </a-tooltip>
            </span>
            <a-date-picker :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm"
-							:dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"
-                            v-model="client._expiryTime" style="width: 170px;"></a-date-picker>
+                           v-model="trojan._expiryTime" style="width: 170px;"></a-date-picker>
        </a-form-item>
+        <a-form layout="inline">
+            <a-tooltip v-if="trojan._totalGB > 0">
+                <template slot="title">
+                    {{ i18n "pages.inbounds.resetTraffic" }}
+                </template>
+                <span style="color: #FF4D4F">
+                    <a-icon type="delete" @click="resetClientTraffic(trojan,$event)"></a-icon>
+                </span>
+            </a-tooltip>
+            <a-tag color="blue">[[ sizeFormat(getUpStats(trojan.email)) ]] / [[ sizeFormat(getDownStats(trojan.email)) ]]</a-tag>
+            <a-tag v-if="trojan._totalGB > 0" color="red">used : [[ sizeFormat(getUpStats(trojan.email) + getDownStats(trojan.email)) ]]</a-tag>
+            <a-tag v-show="inbound.settings.trojans.length > 1" @click="removeClient(index, inbound.settings.trojans)">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" width="22" height="22" class="mt-2 cursor-pointer">
+                    <path fill="none" d="M0 0h24v24H0z" />
+                    <path fill="#EC4899"
+                    d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm0-9.414l2.828-2.829 1.415 1.415L13.414 12l2.829 2.828-1.415 1.415L12 13.414l-2.828 2.829-1.415-1.415L10.586 12 7.757 9.172l1.415-1.415L12 10.586z"
+                    />
+                </svg>
+            </a-tag>
+        </a-form>
    </a-collapse-panel>
 </a-collapse>
-<a-collapse v-else>
-    <a-collapse-panel :header="'{{ i18n "pages.client.clientCount"}} : ' + inbound.settings.trojans.length">
-        <table width="100%">
-            <tr class="client-table-header">
-                <th v-for="col in Object.keys(inbound.settings.trojans[0]).slice(0, 3)">[[ col ]]</th>
-            </tr>
-            <tr v-for="(client, index) in inbound.settings.trojans" :class="index % 2 == 1 ? 'client-table-odd-row' : ''">
-                <td v-for="col in Object.values(client).slice(0, 3)">[[ col ]]</td>
-            </tr>
-        </table>
-    </a-collapse-panel>
-</a-collapse>
-<template v-if="inbound.isTcp">
+<a-tag @click="addClient(inbound.protocol, inbound.settings.trojans)">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="ml-2 cursor-pointer">
+        <path fill="none" d="M0 0h24v24H0z" />
+        <path fill="green"
+        d="M11 11V7h2v4h4v2h-4v4h-2v-4H7v-2h4zm1 11C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16z"
+        />
+    </svg>
+</a-tag>
+
+<template v-if="inbound.isTcp && inbound.tls || inbound.XTLS">
    <a-form layout="inline">
        <a-form-item label="Fallbacks">
            <a-row>
@@ -89,26 +135,26 @@
        </a-form-item>
    </a-form>

-    <!-- trojan fallbacks -->
+ <!-- trojan fallbacks -->
    <a-form v-for="(fallback, index) in inbound.settings.fallbacks" layout="inline">
        <a-divider>
            fallback[[ index + 1 ]]
            <a-icon type="delete" @click="() => inbound.settings.delTrojanFallback(index)"
                    style="color: rgb(255, 77, 79);cursor: pointer;"/>
        </a-divider>
-        <a-form-item label="Name">
+        <a-form-item label="name">
            <a-input v-model="fallback.name"></a-input>
        </a-form-item>
-        <a-form-item label="Alpn">
+        <a-form-item label="alpn">
            <a-input v-model="fallback.alpn"></a-input>
        </a-form-item>
-        <a-form-item label="Path">
+        <a-form-item label="path">
            <a-input v-model="fallback.path"></a-input>
        </a-form-item>
-        <a-form-item label="Dest">
+        <a-form-item label="dest">
            <a-input v-model="fallback.dest"></a-input>
        </a-form-item>
-        <a-form-item label="xVer">
+        <a-form-item label="xver">
            <a-input type="number" v-model.number="fallback.xver"></a-input>
        </a-form-item>
        <a-divider v-if="inbound.settings.fallbacks.length - 1 === index"/>
--- a/web/html/xui/form/protocol/vless.html
+++ b/web/html/xui/form/protocol/vless.html
@@ -1,44 +1,76 @@
 {{define "form/vless"}}
 <a-form layout="inline">
-<a-collapse activeKey="0" v-for="(client, index) in inbound.settings.vlesses.slice(0,1)" v-if="!isEdit">    
-    <a-collapse-panel header="{{ i18n "pages.inbounds.client" }}">
+<label style="color: green;">{{ i18n "clients"}}</label>
+<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-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">
            <a-form-item>
                <span slot="label">
-                    <span>{{ i18n "pages.inbounds.Email" }}</span>
+                    Email
                    <a-tooltip>
                        <template slot="title">
-                            <span>{{ i18n "pages.inbounds.EmailDesc" }}</span>
+                            The Email Must Be Completely Unique
                        </template>
-                        <a-icon type="sync" @click="getNewEmail(client)"></a-icon>
+                        <!--Renew Svg Icon-->
+                        <svg 
+                            @click="getNewEmail(vless)"
+                            xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="anticon anticon-question-circle" viewBox="0 0 16 16"> <path d="M11.534 7h3.932a.25.25 0 0 1 .192.41l-1.966 2.36a.25.25 0 0 1-.384 0l-1.966-2.36a.25.25 0 0 1 .192-.41zm-11 2h3.932a.25.25 0 0 0 .192-.41L2.692 6.23a.25.25 0 0 0-.384 0L.342 8.59A.25.25 0 0 0 .534 9z"/> <path fill-rule="evenodd" d="M8 3c-1.552 0-2.94.707-3.857 1.818a.5.5 0 1 1-.771-.636A6.002 6.002 0 0 1 13.917 7H12.9A5.002 5.002 0 0 0 8 3zM3.1 9a5.002 5.002 0 0 0 8.757 2.182.5.5 0 1 1 .771.636A6.002 6.002 0 0 1 2.083 9H3.1z"/> </svg>
                    </a-tooltip>
                </span>
-                <a-input v-model.trim="client.email" style="width: 150px;" ></a-input>
+                <a-input v-model.trim="vless.email" style="width: 150px;"></a-input>
+            </a-form-item>
+			<a-form-item label="ID">
+				<a-input v-model.trim="vless.id" style="width: 300px;" ></a-input>
+			</a-form-item>
+			<a-form-item>
+                <span slot="label">
+                    IP Count Limit
+                    <a-tooltip>
+                        <template slot="title">
+                            disable inbound if more than entered count (0 for disable limit ip)
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                </span>
+                <a-input type="number" v-model.number="vless.limitIp" min="0" style="width: 70px;"></a-input>
+            </a-form-item>
+            <a-form-item v-if="vless.email && vless.limitIp > 0 && isEdit">
+                <span slot="label">
+                    IP log
+                    <a-tooltip>
+                        <template slot="title">
+                            IPs history Log (before enabling inbound after it has been disabled by IP limit, you should clear the log)
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                    <a-tooltip>
+                        <template slot="title">
+                            clear the log
+                        </template>
+                        <span style="color: #FF4D4F">
+                            <a-icon type="delete" @click="clearDBClientIps(vless.email,$event)"></a-icon>
+                        </span>
+                    </a-tooltip>
+                </span>
+                <a-form layout="block">
+
+                    <a-textarea readonly @click="getDBClientIps(vless.email,$event)" placeholder="Click To Get IPs"  :auto-size="{ minRows: 2, maxRows: 10 }">
+                    </a-textarea>
+                </a-form>
            </a-form-item>
        </a-form>
-        <a-form-item label="ID">
-            <a-input v-model.trim="client.id"  style="width: 300px;" ></a-input>
-        </a-form-item>
-		<a-form-item>
-            <span slot="label">
-                <span>{{ i18n "pages.inbounds.IPLimit" }}</span>
-                <a-tooltip>
-                    <template slot="title">
-                        <span>{{ i18n "pages.inbounds.IPLimitDesc" }}</span>
-                    </template>
-                    <a-icon type="question-circle" theme="filled"></a-icon>
-                </a-tooltip>
-            </span>
-            <a-input type="number" v-model.number="client.limitIp" min="0"  style="width: 70px;" ></a-input>
-		</a-form-item>
 		<a-form-item v-if="inbound.XTLS" label="Flow">
-            <a-select v-model="inbound.settings.vlesses[index].flow" style="width: 150px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
+            <a-select v-model="inbound.settings.vlesses[index].flow" style="width: 150px">
                <a-select-option value="" selected>{{ i18n "none" }}</a-select-option>
                <a-select-option v-for="key in XTLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
            </a-select>
        </a-form-item>
        <a-form-item v-else-if="inbound.canEnableTlsFlow()" label="Flow" layout="inline">
-            <a-select v-model="inbound.settings.vlesses[index].flow" style="width: 150px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
+            <a-select v-model="inbound.settings.vlesses[index].flow" style="width: 150px">
                <a-select-option value="" selected>{{ i18n "none" }}</a-select-option>
                <a-select-option v-for="key in TLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
            </a-select>
@@ -53,7 +85,7 @@
                    <a-icon type="question-circle" theme="filled"></a-icon>
                </a-tooltip>
            </span>
-            <a-input-number v-model="client._totalGB" :min="0"></a-input-number>
+            <a-input-number v-model="vless._totalGB" :min="0"></a-input-number>
        </a-form-item>
        <a-form-item>
            <span slot="label">
@@ -66,24 +98,41 @@
                </a-tooltip>
            </span>
            <a-date-picker :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm"
-                           :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"
-                           v-model="client._expiryTime" style="width: 170px;"></a-date-picker>
+                           v-model="vless._expiryTime" style="width: 300px;"></a-date-picker>
        </a-form-item>
+        <a-form layout="inline">
+            <a-tooltip v-if="vless._totalGB > 0">
+                <template slot="title">
+                    {{ i18n "pages.inbounds.resetTraffic" }}
+                </template>
+                <span style="color: #FF4D4F">
+                    <a-icon type="delete" @click="resetClientTraffic(vless,$event)"></a-icon>
+                </span>
+            </a-tooltip>
+            <a-tag color="blue">[[ sizeFormat(getUpStats(vless.email)) ]] / [[ sizeFormat(getDownStats(vless.email)) ]]</a-tag>
+            <a-tag v-if="vless._totalGB > 0" color="red">used : [[ sizeFormat(getUpStats(vless.email) + getDownStats(vless.email)) ]]</a-tag>
+
+            <a-tag v-show="inbound.settings.vlesses.length > 1" @click="removeClient(index, inbound.settings.vlesses)">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" width="22" height="22" class="mt-2 cursor-pointer">
+                    <path fill="none" d="M0 0h24v24H0z" />
+                    <path fill="#EC4899"
+                    d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm0-9.414l2.828-2.829 1.415 1.415L13.414 12l2.829 2.828-1.415 1.415L12 13.414l-2.828 2.829-1.415-1.415L10.586 12 7.757 9.172l1.415-1.415L12 10.586z"
+                    />
+                </svg>
+            </a-tag>
+        </a-form>
    </a-collapse-panel>
 </a-collapse>
-<a-collapse v-else>
-    <a-collapse-panel :header="'{{ i18n "pages.client.clientCount"}} : ' + inbound.settings.vlesses.length">
-        <table width="100%">
-            <tr class="client-table-header">
-                <th v-for="col in Object.keys(inbound.settings.vlesses[0]).slice(0, 3)">[[ col ]]</th>
-            </tr>
-            <tr v-for="(client, index) in inbound.settings.vlesses" :class="index % 2 == 1 ? 'client-table-odd-row' : ''">
-                <td v-for="col in Object.values(client).slice(0, 3)">[[ col ]]</td>
-            </tr>
-        </table>
-    </a-collapse-panel>
-</a-collapse>
-<template v-if="inbound.isTcp">
+<a-tag @click="addClient(inbound.protocol, inbound.settings.vlesses)">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="ml-2 cursor-pointer">
+        <path fill="none" d="M0 0h24v24H0z" />
+        <path fill="green"
+        d="M11 11V7h2v4h4v2h-4v4h-2v-4H7v-2h4zm1 11C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16z"
+        />
+    </svg>
+</a-tag>
+
+<template v-if="inbound.isTcp && inbound.tls || inbound.XTLS">
    <a-form layout="inline">
        <a-form-item label="Fallbacks">
            <a-row>
@@ -95,29 +144,29 @@
        </a-form-item>
    </a-form>

-    <!-- vless fallbacks -->
+<!-- vless fallbacks -->
    <a-form v-for="(fallback, index) in inbound.settings.fallbacks" layout="inline">
        <a-divider>
            fallback[[ index + 1 ]]
            <a-icon type="delete" @click="() => inbound.settings.delFallback(index)"
                    style="color: rgb(255, 77, 79);cursor: pointer;"/>
        </a-divider>
-        <a-form-item label="Name">
+        <a-form-item label="name">
            <a-input v-model="fallback.name"></a-input>
        </a-form-item>
-        <a-form-item label="Alpn">
+        <a-form-item label="alpn">
            <a-input v-model="fallback.alpn"></a-input>
        </a-form-item>
-        <a-form-item label="Path">
+        <a-form-item label="path">
            <a-input v-model="fallback.path"></a-input>
        </a-form-item>
-        <a-form-item label="Dest">
+        <a-form-item label="dest">
            <a-input v-model="fallback.dest"></a-input>
        </a-form-item>
-        <a-form-item label="xVer">
+        <a-form-item label="xver">
            <a-input type="number" v-model.number="fallback.xver"></a-input>
        </a-form-item>
        <a-divider v-if="inbound.settings.fallbacks.length - 1 === index"/>
    </a-form>
 </template>
-{{end}}
+{{end}}
--- a/web/html/xui/form/protocol/vmess.html
+++ b/web/html/xui/form/protocol/vmess.html
@@ -1,39 +1,67 @@
 {{define "form/vmess"}}
 <a-form layout="inline">
-<a-collapse activeKey="0" v-for="(client, index) in inbound.settings.vmesses.slice(0,1)" v-if="!isEdit">    
-    <a-collapse-panel header="{{ i18n "pages.inbounds.client" }}">
+<label style="color: green;">{{ 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-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">
            <a-form-item>
                <span slot="label">
-                    <span>{{ i18n "pages.inbounds.Email" }}</span>
+                    Email
                    <a-tooltip>
                        <template slot="title">
-                            <span>{{ i18n "pages.inbounds.EmailDesc" }}</span>
+                            The Email Must Be Completely Unique
                        </template>
-                        <a-icon type="sync" @click="getNewEmail(client)"></a-icon>
+                        <!--Renew Svg Icon-->
+                        <svg 
+                            @click="getNewEmail(vmess)"
+                            xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="anticon anticon-question-circle" viewBox="0 0 16 16"> <path d="M11.534 7h3.932a.25.25 0 0 1 .192.41l-1.966 2.36a.25.25 0 0 1-.384 0l-1.966-2.36a.25.25 0 0 1 .192-.41zm-11 2h3.932a.25.25 0 0 0 .192-.41L2.692 6.23a.25.25 0 0 0-.384 0L.342 8.59A.25.25 0 0 0 .534 9z"/> <path fill-rule="evenodd" d="M8 3c-1.552 0-2.94.707-3.857 1.818a.5.5 0 1 1-.771-.636A6.002 6.002 0 0 1 13.917 7H12.9A5.002 5.002 0 0 0 8 3zM3.1 9a5.002 5.002 0 0 0 8.757 2.182.5.5 0 1 1 .771.636A6.002 6.002 0 0 1 2.083 9H3.1z"/> </svg>
                    </a-tooltip>
                </span>
-                <a-input v-model.trim="client.email" style="width: 150px;"></a-input>
+                <a-input v-model.trim="vmess.email" style="width: 150px;"></a-input>
            </a-form-item>
-        </a-form>
-        <a-form-item label="ID">
-            <a-input v-model.trim="client.id" style="width: 300px;"></a-input>
-        </a-form-item>
-        <a-form-item label='{{ i18n "additional" }} ID'>
-            <a-input type="number" v-model.number="client.alterId" style="width: 70px;"></a-input>
-        </a-form-item>
-		<a-form-item>
+			<a-form-item label="ID">
+				<a-input v-model.trim="vmess.id" style="width: 300px;" ></a-input>
+			</a-form-item>
+			<a-form-item label='{{ i18n "additional" }} ID'>
+				<a-input type="number" v-model.number="vmess.alterId"></a-input>
+			</a-form-item>
+			<a-form-item>
                <span slot="label">
-                    <span>{{ i18n "pages.inbounds.IPLimit" }}</span>
+                    IP Count Limit
                    <a-tooltip>
                        <template slot="title">
-                            <span>{{ i18n "pages.inbounds.IPLimitDesc" }}</span>
+                            disable inbound if more than entered count (0 for disable limit ip)
                        </template>
                        <a-icon type="question-circle" theme="filled"></a-icon>
                    </a-tooltip>
                </span>
-                <a-input type="number" v-model.number="client.limitIp" min="0" style="width: 70px;"></a-input>
-		</a-form-item>
+              <a-input type="number" v-model.number="vmess.limitIp" min="0" style="width: 70px;" ></a-input>
+            </a-form-item>
+            <a-form-item v-if="vmess.email && vmess.limitIp > 0 && isEdit">
+                <span slot="label">
+                    IP Log 
+                    <a-tooltip>
+                        <template slot="title">
+                            IPs history Log (before enabling inbound after it has been disabled by IP limit, you should clear the log)
+                        </template>
+                        <a-icon type="question-circle" theme="filled"></a-icon>
+                    </a-tooltip>
+                    <a-tooltip>
+                        <template slot="title">
+                            clear the log
+                        </template>
+                        <span style="color: #FF4D4F">
+                            <a-icon type="delete" @click="clearDBClientIps(vmess.email,$event)"></a-icon>
+                        </span>
+                    </a-tooltip>
+                </span>
+                <a-textarea readonly @click="getDBClientIps(vmess.email,$event)" placeholder="Click To Get IPs"  :auto-size="{ minRows: 2, maxRows: 10 }">
+                </a-textarea>
+            </a-form-item>
+        </a-form>
        <a-form-item>
            <span slot="label">
                <span >{{ i18n "pages.inbounds.totalFlow" }}</span>(GB)
@@ -44,7 +72,7 @@
                    <a-icon type="question-circle" theme="filled"></a-icon>
                </a-tooltip>
            </span>
-            <a-input-number v-model="client._totalGB" :min="0"></a-input-number>
+            <a-input-number v-model="vmess._totalGB" :min="0"></a-input-number>
        </a-form-item>
        <a-form-item>
            <span slot="label">
@@ -57,27 +85,47 @@
                </a-tooltip>
            </span>
            <a-date-picker :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm"
-							:dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"
-							v-model="client._expiryTime" style="width: 170px;"></a-date-picker>
+                           v-model="vmess._expiryTime" style="width: 300px;"></a-date-picker>
        </a-form-item>
+        <a-form layout="inline">
+            <a-tooltip v-if="vmess._totalGB > 0">
+                <template slot="title">
+                    {{ i18n "pages.inbounds.resetTraffic" }}
+                </template>
+                <span style="color: #FF4D4F">
+                    <a-icon type="delete" @click="resetClientTraffic(vmess,$event)"></a-icon>
+                </span>
+            </a-tooltip>
+            <a-tag color="blue">[[ sizeFormat(getUpStats(vmess.email)) ]] / [[ sizeFormat(getDownStats(vmess.email)) ]]</a-tag>
+            <a-tag v-if="vmess._totalGB > 0" color="red">used : [[ sizeFormat(getUpStats(vmess.email) + getDownStats(vmess.email)) ]]</a-tag>
+                <a-tag v-show="inbound.settings.vmesses.length > 1" @click="removeClient(index, inbound.settings.vmesses)">
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" width="22" height="22" class="mt-2 cursor-pointer">
+                        <path fill="none" d="M0 0h24v24H0z" />
+                        <path fill="#EC4899"
+                        d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm0-9.414l2.828-2.829 1.415 1.415L13.414 12l2.829 2.828-1.415 1.415L12 13.414l-2.828 2.829-1.415-1.415L10.586 12 7.757 9.172l1.415-1.415L12 10.586z"
+                        />
+                    </svg>
+            </a-tag>
+        </a-form>
+
+
    </a-collapse-panel>
+
 </a-collapse>
-<a-collapse v-else>
-    <a-collapse-panel :header="'{{ i18n "pages.client.clientCount"}} : ' + inbound.settings.vmesses.length">
-        <table width="100%">
-                <tr class="client-table-header">
-                <th v-for="col in Object.keys(inbound.settings.vmesses[0]).slice(0, 3)">[[ col ]]</th>
-            </tr>
-            <tr v-for="(client, index) in inbound.settings.vmesses" :class="index % 2 == 1 ? 'client-table-odd-row' : ''">
-                <td v-for="col in Object.values(client).slice(0, 3)">[[ col ]]</td>
-            </tr>
-        </table>
-    </a-collapse-panel>
-</a-collapse>
+
+<a-tag @click="addClient(inbound.protocol, inbound.settings.vmesses)">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="ml-2 cursor-pointer">
+        <path fill="none" d="M0 0h24v24H0z" />
+        <path fill="green"
+        d="M11 11V7h2v4h4v2h-4v4h-2v-4H7v-2h4zm1 11C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16z"
+        />
+    </svg>
+</a-tag>
+
 <a-form layout="inline">
    <a-form-item label='{{ i18n "pages.inbounds.disableInsecureEncryption" }}'>
        <a-switch v-model.number="inbound.settings.disableInsecure"></a-switch>
    </a-form-item>
 </a-form>

-{{end}}
+{{end}}
--- a/web/html/xui/form/stream/stream_quic.html
+++ b/web/html/xui/form/stream/stream_quic.html
@@ -1,7 +1,7 @@
 {{define "form/streamQUIC"}}
 <a-form layout="inline">
    <a-form-item label='{{ i18n "pages.inbounds.stream.quic.encryption" }}'>
-        <a-select v-model="inbound.stream.quic.security" style="width: 165px;" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
+        <a-select v-model="inbound.stream.quic.security" style="width: 165px;">
            <a-select-option value="none">none</a-select-option>
            <a-select-option value="aes-128-gcm">aes-128-gcm</a-select-option>
            <a-select-option value="chacha20-poly1305">chacha20-poly1305</a-select-option>
@@ -11,7 +11,7 @@
        <a-input v-model.trim="inbound.stream.quic.key"></a-input>
    </a-form-item>
    <a-form-item label='{{ i18n "camouflage" }}'>
-        <a-select v-model="inbound.stream.quic.type" style="width: 280px;" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
+        <a-select v-model="inbound.stream.quic.type" style="width: 280px;">
            <a-select-option value="none">none（not camouflage）</a-select-option>
            <a-select-option value="srtp">srtp（camouflage video call）</a-select-option>
            <a-select-option value="utp">utp（camouflage BT download）</a-select-option>
--- a/web/html/xui/form/stream/stream_settings.html
+++ b/web/html/xui/form/stream/stream_settings.html
@@ -2,7 +2,7 @@
 <!-- select stream network -->
 <a-form layout="inline">
    <a-form-item label='{{ i18n "transmission" }}'>
-        <a-select v-model="inbound.stream.network" @change="streamNetworkChange" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
+        <a-select v-model="inbound.stream.network" @change="streamNetworkChange">
            <a-select-option value="tcp">TCP</a-select-option>
            <a-select-option value="kcp">KCP</a-select-option>
            <a-select-option value="ws">WS</a-select-option>
--- a/web/html/xui/form/stream/stream_tcp.html
+++ b/web/html/xui/form/stream/stream_tcp.html
@@ -4,7 +4,7 @@
    <a-form-item label="AcceptProxyProtocol">
        <a-switch v-model="inbound.stream.tcp.acceptProxyProtocol"></a-switch>
    </a-form-item>
-    <a-form-item label="HTTP {{ i18n "camouflage" }}">
+    <a-form-item label="HTTP Camouflage">
        <a-switch
                :checked="inbound.stream.tcp.type === 'http'"
                @change="checked => inbound.stream.tcp.type = checked ? 'http' : 'none'">
--- a/web/html/xui/form/tls_settings.html
+++ b/web/html/xui/form/tls_settings.html
@@ -1,38 +1,17 @@
 {{define "form/tlsSettings"}}
 <!-- tls enable -->
 <a-form layout="inline" v-if="inbound.canSetTls()">
-    <a-form-item v-if="inbound.canEnableTls()" label="TLS">
+    <a-form-item label="TLS">
        <a-switch v-model="inbound.tls">
        </a-switch>
    </a-form-item>
-    <a-form-item v-if="inbound.canEnableReality()">
-        <span slot="label">
-            Reality
-            <a-tooltip>
-                <template slot="title">
-                  <span>{{ i18n "pages.inbounds.Realitydec" }}</span>
-                </template>
-                <a-icon type="question-circle" theme="filled"></a-icon>
-            </a-tooltip>
-        </span>
-        <a-switch v-model="inbound.reality"></a-switch>
-    </a-form-item>
-    <a-form-item v-if="inbound.canEnableXTLS()">
-        <span slot="label">
-            XTLS
-            <a-tooltip>
-                <template slot="title">
-                  <span>{{ i18n "pages.inbounds.XTLSdec" }}</span>
-                </template>
-                <a-icon type="question-circle" theme="filled"></a-icon>
-            </a-tooltip>
-        </span>
+    <a-form-item v-if="inbound.canEnableXTLS()" label="XTLS">
        <a-switch v-model="inbound.XTLS"></a-switch>
    </a-form-item>
 </a-form>

 <!-- tls settings -->
-<a-form v-if="inbound.tls || inbound.XTLS" layout="inline">
+<a-form v-if="inbound.tls || inbound.XTLS"layout="inline">
    <a-form-item label="SNI" placeholder="Server Name Indication" v-if="inbound.tls">
        <a-input v-model.trim="inbound.stream.tls.settings[0].serverName"></a-input>
    </a-form-item>
@@ -43,25 +22,25 @@
        </a-select>
    </a-form-item>
    <a-form-item label="MinVersion">
-        <a-select v-model="inbound.stream.tls.minVersion" style="width: 60px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
+        <a-select v-model="inbound.stream.tls.minVersion" style="width: 60px">
            <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
        </a-select>
    </a-form-item>
    <a-form-item label="MaxVersion">
-        <a-select v-model="inbound.stream.tls.maxVersion" style="width: 60px" :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
+        <a-select v-model="inbound.stream.tls.maxVersion" style="width: 60px">
            <a-select-option v-for="key in TLS_VERSION_OPTION" :value="key">[[ key ]]</a-select-option>
        </a-select>
    </a-form-item>
-    <a-form-item label="uTLS" v-if="inbound.tls" >
-        <a-select v-model="inbound.stream.tls.settings[0].fingerprint" style="width: 135px">
-            <a-select-option value=''>None</a-select-option>
-            <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
-        </a-select>
-    </a-form-item>
+        <a-form-item label="uTLS" v-if="inbound.tls" >
+            <a-select v-model="inbound.stream.tls.settings[0].fingerprint" style="width: 135px">
+                <a-select-option value=''>None</a-select-option>
+                <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
+            </a-select>
+        </a-form-item>
    <a-form-item label='{{ i18n "domainName" }}'>
        <a-input v-model.trim="inbound.stream.tls.server"></a-input>
    </a-form-item>
-    <a-form-item label="Alpn">
+	<a-form-item label="Alpn">
        <a-checkbox-group v-model="inbound.stream.tls.alpn" style="width:200px">
            <a-checkbox v-for="key in ALPN_OPTION" :value="key">[[ key ]]</a-checkbox>
        </a-checkbox-group>
@@ -82,7 +61,6 @@
        <a-form-item label='{{ i18n "pages.inbounds.keyPath" }}'>
            <a-input v-model.trim="inbound.stream.tls.certs[0].keyFile" style="width:300px;"></a-input>
        </a-form-item>
-        <a-button @click="setDefaultCertData">{{ i18n "pages.inbounds.setDefaultCert" }}</a-button>
    </template>
    <template v-else>
        <a-form-item label='{{ i18n "pages.inbounds.publicKeyContent" }}'>
@@ -93,33 +71,4 @@
        </a-form-item>
    </template>
 </a-form>
-<a-form v-else-if="inbound.reality" layout="inline">
-    <a-form-item label="show">
-        <a-switch v-model="inbound.stream.reality.show">
-        </a-switch>
-    </a-form-item>
-    <a-form-item label="xver">
-        <a-input type="number" v-model.number="inbound.stream.reality.xver" :min="0" style="width: 60px"></a-input>
-    </a-form-item>
-    <a-form-item label="uTLS" >
-        <a-select v-model="inbound.stream.reality.fingerprint" style="width: 135px">
-            <a-select-option v-for="key in UTLS_FINGERPRINT" :value="key">[[ key ]]</a-select-option>
-        </a-select>
-    </a-form-item>
-	<a-form-item label="dest">
-        <a-input v-model.trim="inbound.stream.reality.dest" style="width: 360px"></a-input>
-    </a-form-item>
-    <a-form-item label="serverNames">
-        <a-input v-model.trim="inbound.stream.reality.serverNames" style="width: 360px"></a-input>
-    </a-form-item>
-    <a-form-item label="privateKey">
-        <a-input v-model.trim="inbound.stream.reality.privateKey" style="width: 360px"></a-input>
-    </a-form-item>
-    <a-form-item label="publicKey">
-        <a-input v-model.trim="inbound.stream.reality.publicKey" style="width: 360px"></a-input>
-    </a-form-item>
-    <a-form-item label="shortIds">
-        <a-input v-model.trim="inbound.stream.reality.shortIds"></a-input>
-    </a-form-item>
-</a-form>
 {{end}}
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/inbound_info_modal.html
@@ -3,7 +3,7 @@
    v-model="infoModal.visible" title='{{ i18n "pages.inbounds.details"}}'
    :closable="true"
    :mask-closable="true"
-    :class="siderDrawer.isDarkTheme ? darkClass : ''"
+	:class="siderDrawer.isDarkTheme ? darkClass : ''"
    :footer="null"
    width="600px"
    >
@@ -44,12 +44,12 @@
            </template>
            </table>
        </td></tr>
-            <tr colspan="2" v-if="dbInbound.hasLink()">
+            <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">
+                <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>
@@ -57,30 +57,20 @@
            </td>
        </tr>
    </table>
-    <template v-if="infoModal.clientSettings">
    <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider>
-    <table style="margin-bottom: 10px;">
-        <tr v-for="col,index in Object.keys(infoModal.clientSettings).slice(0, 3)">
-            <td>[[ col ]]</td>
-            <td><a-tag color="green">[[ infoModal.clientSettings[col] ]]</a-tag></td>
-        </tr>
+    <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>{{ i18n "status" }}</td>
-            <td>
-                <a-tag v-if="isEnable" color="blue">{{ i18n "enabled" }}</a-tag>
-                <a-tag v-else color="red">{{ i18n "disabled" }}</a-tag>
-                <a-tag v-if="!isActive" color="red">{{ i18n "depleted" }}</a-tag>
-            </td>
+            <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>
+            <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 v-if="infoModal.clientStats" :color="statsColor(infoModal.clientStats)">
+                <a-tag :color="statsColor(infoModal.clientStats)">
                    [[ sizeFormat(infoModal.clientStats['up']) ]] / 
                    [[ sizeFormat(infoModal.clientStats['down']) ]]
                    ([[ sizeFormat(infoModal.clientStats['up'] + infoModal.clientStats['down']) ]])
@@ -96,82 +86,14 @@
                        [[ DateUtil.formatMillis(infoModal.clientSettings.expiryTime) ]]
                    </a-tag>
                </template>
-                <a-tag v-else-if="infoModal.clientSettings.expiryTime < 0" color="cyan">[[ infoModal.clientSettings.expiryTime / -86400000 ]] {{ i18n "pages.client.days" }}</a-tag>
                <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>
-    <table v-if="infoModal.clientSettings.subId + infoModal.clientSettings.tgId" style="margin-bottom: 10px;">
-        <tr v-if="infoModal.clientSettings.subId">
-            <td>Subscription link</td>
-            <td><a :href="[[ subBase + infoModal.clientSettings.subId ]]" target="_blank">[[ subBase + infoModal.clientSettings.subId ]]</a></td>
-        </tr>
-        <tr v-if="infoModal.clientSettings.tgId">
-            <td>Telegram Username</td>
-            <td><a :href="[[ tgBase + infoModal.clientSettings.tgId ]]" target="_blank">@[[ infoModal.clientSettings.tgId ]]</a></td>
-        </tr>
-    </table>
-    </template>
-    <template v-else>
-        <a-divider></a-divider>
-        <table v-if="inbound.protocol == Protocols.SHADOWSOCKS" style="margin-bottom: 10px; width: 100%;">
-            <tr>
-                <th>{{ i18n "encryption" }}</th>
-                <th>{{ i18n "password" }}</th>
-                <th>{{ i18n "pages.inbounds.network" }}</th>
-            </tr><tr>
-                <td><a-tag color="green">[[ inbound.settings.method ]]</a-tag></td>
-                <td><a-tag color="blue">[[ inbound.settings.password ]]</a-tag></td>
-                <td><a-tag color="green">[[ inbound.settings.network ]]</a-tag></td>
-            </tr>
-        </table>
-        <table v-if="inbound.protocol == Protocols.DOKODEMO" style="margin-bottom: 10px; width: 100%;">
-            <tr>
-                <th>{{ i18n "pages.inbounds.targetAddress" }}</th>
-                <th>{{ i18n "pages.inbounds.destinationPort" }}</th>
-                <th>{{ i18n "pages.inbounds.network" }}</th>
-                <th>FollowRedirect</th>
-            </tr><tr>
-                <td><a-tag color="green">[[ inbound.settings.address ]]</a-tag></td>
-                <td><a-tag color="blue">[[ inbound.settings.port ]]</a-tag></td>
-                <td><a-tag color="green">[[ inbound.settings.network ]]</a-tag></td>
-                <td><a-tag color="blue">[[ inbound.settings.followRedirect ]]</a-tag></td>
-            </tr>
-        </table>
-        </table>
-        <table v-if="inbound.protocol == Protocols.SOCKS" style="margin-bottom: 10px; width: 100%;">
-            <tr>
-                <th>{{ i18n "password" }} Auth</th>
-                <th>{{ i18n "pages.inbounds.enable" }} udp</th>
-                <th>IP</th>
-            </tr><tr>
-                <td><a-tag color="green">[[ inbound.settings.auth ]]</a-tag></td>
-                <td><a-tag color="blue">[[ inbound.settings.udp]]</a-tag></td>
-                <td><a-tag color="green">[[ inbound.settings.ip ]]</a-tag></td>
-            </tr><tr v-if="inbound.settings.auth == 'password'">
-                <td> </td>
-                <td>{{ i18n "username" }}</td>
-                <td>{{ i18n "password" }}</td>
-            </tr><tr v-for="account,index in inbound.settings.accounts">
-                <td><a-tag color="green">[[ index ]]</a-tag></td>
-                <td><a-tag color="blue">[[ account.user ]]</a-tag></td>
-                <td><a-tag color="green">[[ account.pass ]]</a-tag></td>
-            </tr>
-        </table>
-        </table>
-        <table v-if="inbound.protocol == Protocols.HTTP" style="margin-bottom: 10px; width: 100%;">
-            <tr>
-                <th> </th>
-                <th>{{ i18n "username" }}</th>
-                <th>{{ i18n "password" }}</th>
-            </tr><tr v-for="account,index in inbound.settings.accounts">
-                <td><a-tag color="green">[[ index ]]</a-tag></td>
-                <td><a-tag color="blue">[[ account.user ]]</a-tag></td>
-                <td><a-tag color="green">[[ account.pass ]]</a-tag></td>
-            </tr>
-        </table>
-        </table>
-    </template>
    <div v-if="dbInbound.hasLink()">
        <a-divider>URL</a-divider>
        <p>[[ infoModal.link ]]</p>
@@ -179,35 +101,44 @@
    </div>
 </a-modal>
 <script>
+
    const infoModal = {
        visible: false,
        inbound: new Inbound(),
        dbInbound: new DBInbound(),
-        settings: null,
-        clientSettings: null,
+        clientSettings: new Inbound.Settings(),
        clientStats: [],
        upStats: 0,
        downStats: 0,
        clipboard: null,
        link: null,
-        index: null,
+        index: 0,
        isExpired: false,
-        show(dbInbound, index) {
+        show(dbInbound, index=0) {
            this.index = index;
            this.inbound = dbInbound.toInbound();
            this.dbInbound = new DBInbound(dbInbound);
            this.link = dbInbound.genLink(index);
-            this.settings = JSON.parse(this.inbound.settings);
-            this.clientSettings = this.settings.clients ? Object.values(this.settings.clients)[index] : null;
+            this.clientSettings = Object.values(JSON.parse(this.inbound.settings).clients)[index];
+            this.clientStats = dbInbound.clientStats;
            this.isExpired = this.inbound.isExpiry(index);
-            this.clientStats = this.settings.clients ? this.dbInbound.clientStats.find(row => row.email === this.clientSettings.email) : [];
+            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,
                    });
-                    this.clipboard.on('success', () => app.$message.success('{{ i18n "copied" }}'));
+                    this.clipboard.on('success', () => app.$message.success('{{ i18n "copySuccess" }}'));
                }
            });
        },
@@ -215,7 +146,6 @@
            infoModal.visible = false;
        },
    };
-
    const infoModalApp = new Vue({
        delimiters: ['[[', ']]'],
        el: '#inbound-info-modal',
@@ -226,45 +156,32 @@
            },
            get inbound() {
                return this.infoModal.inbound;
-            },
-            get isActive() {
-                if(infoModal.clientStats){
-                    return infoModal.clientStats.enable;
-                }
-                return infoModal.dbInbound.isEnable;
-            },
-            get isEnable() {
-                if(infoModal.clientSettings){
-                    return infoModal.clientSettings.enable;
-                }
-                return infoModal.dbInbound.isEnable;
-            },
-            get subBase() {
-                return window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port:"") + basePath + "sub/";
-            },
-            get tgBase() {
-                return "https://t.me/"
-            },
+            }
        },
        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" }}')
+                    app.$message.success('{{ i18n "copySuccess" }}')
                    this.infoModal.clipboard.destroy();
                });
            },
            statsColor(stats) {
-                if(!stats) return 'blue'
                if(stats['total'] === 0) return 'blue'
                else if(stats['total'] > 0 && (stats['down']+stats['up']) < stats['total']) return 'cyan'
                else return 'red'
            }
        },
-        
    });
-
 </script>
 {{end}}
--- a/web/html/xui/inbound_modal.html
+++ b/web/html/xui/inbound_modal.html
@@ -1,7 +1,7 @@
 {{define "inboundModal"}}
 <a-modal id="inbound-modal" v-model="inModal.visible" :title="inModal.title" @ok="inModal.ok"
         :confirm-loading="inModal.confirmLoading" :closable="true" :mask-closable="false"
-         :class="siderDrawer.isDarkTheme ? darkClass : ''"
+		 :class="siderDrawer.isDarkTheme ? darkClass : ''"
         :ok-text="inModal.okText" cancel-text='{{ i18n "close" }}'>
    {{template "form/inbound"}}
 </a-modal>
@@ -89,28 +89,96 @@
            removeClient(index, clients) {
                clients.splice(index, 1);
            },
+            async getDBClientIps(email, event) {
+              const msg = await HttpUtil.post('/xui/inbound/clientIps/' + email);
+              if (!msg.success) {
+                return;
+              }
+              try {
+                let ips = JSON.parse(msg.obj);
+                ips = ips.join(",");
+                event.target.value = ips;
+              } catch (error) {
+                event.target.value = msg.obj;
+              }
+            },
+            async clearDBClientIps(email,event) {
+                const msg = await HttpUtil.post('/xui/inbound/clearClientIps/'+ email);
+                if (!msg.success) {
+                    return;
+                }
+                event.target.value = ""
+            },
+            async resetClientTraffic(client, event) {
+              const msg = await HttpUtil.post(`/xui/inbound/resetClientTraffic/${client.email}`);
+              if (!msg.success) {
+                return;
+              }
+              const clientStats = this.inbound.clientStats;
+              if (clientStats.length > 0) {
+				for (let i = 0; i < clientStats.length; i++) {
+                if (clientStats[i].email === client.email) {
+                clientStats[i].up = 0;
+                clientStats[i].down = 0;
+                break; // Stop looping once we've found the matching client.
+                            
+                        }
+                    }
+                }
+            },
            isExpiry(index) {
                return this.inbound.isExpiry(index)
            },
+            getUpStats(email) {
+                clientStats = this.inbound.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(email) {
+                clientStats = this.inbound.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']
+
+                        }
+                    }
+                }
+            },
            isClientEnable(email) {
                clientStats = this.dbInbound.clientStats ? this.dbInbound.clientStats.find(stats => stats.email === email) : null
                return clientStats ? clientStats['enable'] : true
            },
-            setDefaultCertData(){
-                inModal.inbound.stream.tls.certs[0].certFile = app.defaultCert;
-                inModal.inbound.stream.tls.certs[0].keyFile = app.defaultKey;
+            getHeaderText(email) {
+                if(email == "")
+                    return "Add Client"
+                
+                return email + (this.isClientEnable(email) == true ? ' Active' : ' Deactive')
+            },
+            getHeaderStyle(email) {
+                return (this.isClientEnable(email) == true ? '' : 'deactive-client')
            },
            getNewEmail(client) {
                var chars = 'abcdefghijklmnopqrstuvwxyz1234567890';
                var string = '';
-                var len = 6 + Math.floor(Math.random() * 5);
+                var len = 7 + Math.floor(Math.random() * 5)
                for(var ii=0; ii<len; ii++){
                    string += chars[Math.floor(Math.random() * chars.length)];
                }
-                client.email = string;
+                client.email = string
            }
        },
    });

 </script>
-{{end}}
+{{end}}
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -27,38 +27,22 @@
                    <a-card hoverable style="margin-bottom: 20px;" :class="siderDrawer.isDarkTheme ? darkClass : ''">
                        <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-col :xs="24" :sm="24" :lg="12">
                                {{ i18n "clients" }}:
                                <a-tag color="green">[[ total.clients ]]</a-tag>
-                                <a-popover title="{{ i18n "disabled" }}" :overlay-class-name="siderDrawer.isDarkTheme ? 'ant-dark' : ''">
-                                    <template slot="content">
-                                        <p v-for="clientEmail in total.deactive">[[ clientEmail ]]</p>
-                                    </template>
-                                    <a-tag v-if="total.deactive.length">[[ total.deactive.length ]]</a-tag>
-                                </a-popover>
-                                <a-popover title="{{ i18n "depleted" }}" :overlay-class-name="siderDrawer.isDarkTheme ? 'ant-dark' : ''">
-                                    <template slot="content">
-                                        <p v-for="clientEmail in total.depleted">[[ clientEmail ]]</p>
-                                    </template>
-                                    <a-tag color="red" v-if="total.depleted.length">[[ total.depleted.length ]]</a-tag>
-                                </a-popover>
-                                <a-popover title="{{ i18n "depletingSoon" }}" :overlay-class-name="siderDrawer.isDarkTheme ? 'ant-dark' : ''">
-                                    <template slot="content">
-                                        <p v-for="clientEmail in total.expiring">[[ clientEmail ]]</p>
-                                    </template>
-                                    <a-tag color="orange" v-if="total.expiring.length">[[ total.expiring.length ]]</a-tag>
-                                </a-popover>
+                                <a-tag color="blue">{{ i18n "enabled" }} [[ total.active ]]</a-tag>
+                                <a-tag color="red">{{ i18n "disabled" }} [[ total.deactive ]]</a-tag>
                            </a-col>
                        </a-row>
                    </a-card>
@@ -66,11 +50,10 @@
                <transition name="list" appear>
                    <a-card hoverable :class="siderDrawer.isDarkTheme ? darkClass : ''">
                        <div slot="title">
-                            <a-button type="primary" icon="plus" @click="openAddInbound">{{ i18n "pages.inbounds.addInbound" }}</a-button>
-                            <a-button type="primary" icon="export" @click="exportAllLinks">{{ i18n "pages.inbounds.export" }}</a-button>
-                            <a-button type="primary" icon="reload" @click="resetAllTraffic">{{ i18n "pages.inbounds.resetAllTraffic" }}</a-button>
+                             <a-button type="primary" @click="openAddInbound">Add Inbound</a-button>
+							 <a-button type="primary" @click="exportAllLinks" class="copy-btn">Export Links</a-button>
                        </div>
-                        <a-input v-model.lazy="searchKey" placeholder="{{ i18n "search" }}" autofocus style="max-width: 300px"></a-input>
+						<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 }"
@@ -81,7 +64,7 @@
                                <a-icon type="edit" style="font-size: 25px" @click="openEditInbound(dbInbound.id);"></a-icon>
                                <a-dropdown :trigger="['click']">
                                    <a @click="e => e.preventDefault()">{{ i18n "pages.inbounds.operate" }}</a>
-                                    <a-menu slot="overlay" @click="a => clickAction(a, dbInbound)" :theme="siderDrawer.theme">
+                                    <a-menu slot="overlay" @click="a => clickAction(a, dbInbound)">
                                        <a-menu-item v-if="dbInbound.isSS" key="qrcode">
                                            <a-icon type="qrcode"></a-icon>
                                            {{ i18n "qrCode" }}
@@ -90,36 +73,15 @@
                                            <a-icon type="edit"></a-icon>
                                            {{ i18n "edit" }}
                                        </a-menu-item>
-                                        <template v-if="dbInbound.isTrojan || dbInbound.isVLess || dbInbound.isVMess">
-                                            <a-menu-item key="addClient">
-                                                <a-icon type="user-add"></a-icon>
-                                                {{ i18n "pages.client.add"}}
-                                            </a-menu-item>
-                                            <a-menu-item key="addBulkClient">
-                                                <a-icon type="usergroup-add"></a-icon>
-                                                {{ i18n "pages.client.bulk"}}
-                                            </a-menu-item>
-                                            <a-menu-item key="resetClients">
-                                                <a-icon type="file-done"></a-icon>
-                                                {{ i18n "pages.inbounds.resetAllClientTraffics"}}
-                                            </a-menu-item>
+                                         <template v-if="dbInbound.isTrojan || dbInbound.isVLess || dbInbound.isVMess">
                                            <a-menu-item key="export">
                                                <a-icon type="export"></a-icon>
                                                {{ i18n "pages.inbounds.export"}}
                                            </a-menu-item>
                                        </template>
-                                        <template v-else>
-                                            <a-menu-item key="showInfo">
-                                                <a-icon type="info-circle"></a-icon>
-                                                {{ i18n "info"}}
-                                            </a-menu-item>
-                                        </template>
                                        <a-menu-item key="resetTraffic">
                                            <a-icon type="retweet"></a-icon> {{ i18n "pages.inbounds.resetTraffic" }}
                                        </a-menu-item>
-                                        <a-menu-item key="clone">
-                                            <a-icon type="block"></a-icon> {{ i18n "pages.inbounds.Clone"}}
-                                        </a-menu-item>
                                        <a-menu-item key="delete">
                                            <span style="color: #FF4D4F">
                                                <a-icon type="delete"></a-icon> {{ i18n "delete"}}
@@ -129,36 +91,7 @@
                                </a-dropdown>
                            </template>
                            <template slot="protocol" slot-scope="text, dbInbound">
-                                <a-tag style="margin:0;" color="blue">[[ dbInbound.protocol ]]</a-tag>
-                                <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
-                                    <a-tag style="margin:0;" color="green">[[ dbInbound.toInbound().stream.network ]]</a-tag>
-                                    <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isTls" color="cyan">TLS</a-tag>
-                                    <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isXTLS" color="cyan">XTLS</a-tag>
-                                    <a-tag style="margin:0;" v-if="dbInbound.toInbound().stream.isReality" color="cyan">Reality</a-tag>
-                                </template>
-                            </template>
-                            <template slot="clients" slot-scope="text, dbInbound">
-                                <template v-if="clientCount[dbInbound.id]">
-                                    <a-tag style="margin:0;" color="green">[[ clientCount[dbInbound.id].clients ]]</a-tag>
-                                    <a-popover title="{{ i18n "disabled" }}" :overlay-class-name="siderDrawer.isDarkTheme ? 'ant-dark' : ''">
-                                        <template slot="content">
-                                            <p v-for="clientEmail in clientCount[dbInbound.id].deactive">[[ clientEmail ]]</p>
-                                        </template>
-                                        <a-tag style="margin:0; padding: 0 2px;" v-if="clientCount[dbInbound.id].deactive.length">[[ clientCount[dbInbound.id].deactive.length ]]</a-tag>
-                                    </a-popover>
-                                    <a-popover title="{{ i18n "depleted" }}" :overlay-class-name="siderDrawer.isDarkTheme ? 'ant-dark' : ''">
-                                        <template slot="content">
-                                            <p v-for="clientEmail in clientCount[dbInbound.id].depleted">[[ clientEmail ]]</p>
-                                        </template>
-                                        <a-tag style="margin:0; padding: 0 2px;" color="red" v-if="clientCount[dbInbound.id].depleted.length">[[ clientCount[dbInbound.id].depleted.length ]]</a-tag>
-                                    </a-popover>
-                                    <a-popover title="{{ i18n "depletingSoon" }}" :overlay-class-name="siderDrawer.isDarkTheme ? 'ant-dark' : ''">
-                                        <template slot="content">
-                                            <p v-for="clientEmail in clientCount[dbInbound.id].expiring">[[ clientEmail ]]</p>
-                                        </template>
-                                        <a-tag style="margin:0; padding: 0 2px;" color="orange" v-if="clientCount[dbInbound.id].expiring.length">[[ clientCount[dbInbound.id].expiring.length ]]</a-tag>
-                                    </a-popover>
-                                </template>
+                                <a-tag color="blue">[[ dbInbound.protocol ]]</a-tag>
                            </template>
                            <template slot="traffic" slot-scope="text, dbInbound">
                                <a-tag color="blue">[[ sizeFormat(dbInbound.up) ]] / [[ sizeFormat(dbInbound.down) ]]</a-tag>
@@ -168,8 +101,16 @@
                                </template>
                                <a-tag v-else color="green">{{ i18n "unlimited" }}</a-tag>
                            </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>
+                                    <a-tag v-if="inbounds[index].stream.isTls" color="blue">tls</a-tag>
+                                    <a-tag v-if="inbounds[index].stream.isXTls" color="blue">xtls</a-tag>
+                                </template>
+                                <template v-else>{{ i18n "none" }}</template>
+                            </template>
                            <template slot="enable" slot-scope="text, dbInbound">
-                                <a-switch v-model="dbInbound.enable" @change="switchEnable(dbInbound.id)"></a-switch>
+                                <a-switch v-model="dbInbound.enable" @change="switchEnable(dbInbound)"></a-switch>
                            </template>
                            <template slot="expiryTime" slot-scope="text, dbInbound">
                                <template v-if="dbInbound.expiryTime > 0">
@@ -190,7 +131,7 @@
                                :data-source="getInboundClients(record)"
                                :pagination="false"
                                >
-                                    {{template "client_table"}}
+                                    {{template "client_row"}}
                                </a-table>
                                <a-table
                                v-else-if="record.protocol === Protocols.TROJAN"
@@ -199,7 +140,16 @@
                                :data-source="getInboundClients(record)"
                                :pagination="false"
                                >
-                                    {{template "client_table"}}
+                                    {{template "client_row"}}
+                                </a-table>
+                                <a-table
+                                v-else
+                                :row-key="client => client.id"
+                                :columns="innerOneColumns"
+                                :data-source="record"
+                                :pagination="false"
+                                >
+                                    {{template "client_row"}}
                                </a-table>
                            </template>
                        </a-table>
@@ -223,7 +173,7 @@
        width: 40,
        scopedSlots: { customRender: 'enable' },
    }, {
-        title: "ID",
+        title: "Id",
        align: 'center',
        dataIndex: "id",
        width: 30,
@@ -232,26 +182,26 @@
        align: 'center',
        width: 80,
        dataIndex: "remark",
+    }, {
+        title: '{{ i18n "pages.inbounds.protocol" }}',
+        align: 'center',
+        width: 50,
+        scopedSlots: { customRender: 'protocol' },
    }, {
        title: '{{ i18n "pages.inbounds.port" }}',
        align: 'center',
        dataIndex: "port",
        width: 40,
-    }, {
-        title: '{{ i18n "pages.inbounds.protocol" }}',
-        align: 'left',
-        width: 80,
-        scopedSlots: { customRender: 'protocol' },
-    }, {
-        title: '{{ i18n "clients" }}',
-        align: 'left',
-        width: 50,
-        scopedSlots: { customRender: 'clients' },
    }, {
        title: '{{ i18n "pages.inbounds.traffic" }}↑|↓',
        align: 'center',
-        width: 120,
+        width: 150,
        scopedSlots: { customRender: 'traffic' },
+    },{
+        title: '{{ i18n "pages.inbounds.transportConfig" }}',
+        align: 'center',
+        width: 60,
+        scopedSlots: { customRender: 'stream' },
    }, {
        title: '{{ i18n "pages.inbounds.expireDate" }}',
        align: 'center',
@@ -260,21 +210,24 @@
    }];

    const innerColumns = [
-        { title: '{{ i18n "pages.inbounds.operate" }}', width: 70, scopedSlots: { customRender: 'actions' } },
-        { title: '{{ i18n "pages.inbounds.enable" }}', width: 30, scopedSlots: { customRender: 'enable' } },
-        { title: '{{ i18n "pages.inbounds.client" }}', width: 80, scopedSlots: { customRender: 'client' } },
-        { title: '{{ i18n "pages.inbounds.traffic" }}↑|↓', width: 120, scopedSlots: { customRender: 'traffic' } },
+        { title: '', width: 70, scopedSlots: { customRender: 'actions' } },
+        { title: '{{ i18n "pages.inbounds.client" }}', width: 60, scopedSlots: { customRender: 'client' } },
+        { title: '{{ i18n "pages.inbounds.traffic" }}↑|↓', width: 100, scopedSlots: { customRender: 'traffic' } },
        { title: '{{ i18n "pages.inbounds.expireDate" }}', width: 70, scopedSlots: { customRender: 'expiryTime' } },
-        { title: 'UID', width: 120, dataIndex: "id" },
+        { title: 'UID', width: 150, dataIndex: "id" },
+		
    ];

    const innerTrojanColumns = [
-        { title: '{{ i18n "pages.inbounds.operate" }}', width: 70, scopedSlots: { customRender: 'actions' } },
-        { title: '{{ i18n "pages.inbounds.enable" }}', width: 30, scopedSlots: { customRender: 'enable' } },
-        { title: '{{ i18n "pages.inbounds.client" }}', width: 80, scopedSlots: { customRender: 'client' } },
-        { title: '{{ i18n "pages.inbounds.traffic" }}↑|↓', width: 120, scopedSlots: { customRender: 'traffic' } },
+        { title: '', width: 70, scopedSlots: { customRender: 'actions' } },
+        { title: '{{ i18n "pages.inbounds.client" }}', width: 60, scopedSlots: { customRender: 'client' } },
+        { title: '{{ i18n "pages.inbounds.traffic" }}↑|↓', width: 100, scopedSlots: { customRender: 'traffic' } },
        { title: '{{ i18n "pages.inbounds.expireDate" }}', width: 70, scopedSlots: { customRender: 'expiryTime' } },
-        { title: 'Password', width: 120, dataIndex: "password" },
+        { title: 'Password', width: 100, dataIndex: "password" },
+    ];
+
+    const innerOneColumns = [
+        { title: '', width: 70, scopedSlots: { customRender: 'actions' } },
    ];

    const app = new Vue({
@@ -287,11 +240,6 @@
            dbInbounds: [],
            searchKey: '',
            searchedInbounds: [],
-            expireDiff: 0,
-            trafficDiff: 0,
-            defaultCert: '',
-            defaultKey: '',
-            clientCount: {},
        },
        methods: {
            loading(spinning=true) {
@@ -305,19 +253,6 @@
                    return;
                }
                this.setInbounds(msg.obj);
-                this.searchKey = '';
-            },
-            async getDefaultSettings() {
-                this.loading();
-                const msg = await HttpUtil.post('/xui/setting/defaultSettings');
-                this.loading(false);
-                if (!msg.success) {
-                    return;
-                }
-                this.expireDiff = msg.obj.expireDiff * 86400000;
-                this.trafficDiff = msg.obj.trafficDiff * 1073741824;
-                this.defaultCert = msg.obj.defaultCert;
-                this.defaultKey = msg.obj.defaultKey;
            },
            setInbounds(dbInbounds) {
                this.inbounds.splice(0);
@@ -325,48 +260,11 @@
                this.searchedInbounds.splice(0);
                for (const inbound of dbInbounds) {
                    const dbInbound = new DBInbound(inbound);
-                    to_inbound = dbInbound.toInbound()
-                    this.inbounds.push(to_inbound);
+                    this.inbounds.push(dbInbound.toInbound());
                    this.dbInbounds.push(dbInbound);
                    this.searchedInbounds.push(dbInbound);
-                    if([Protocols.VMESS, Protocols.VLESS, Protocols.TROJAN].includes(inbound.protocol) ){
-                        this.clientCount[inbound.id] = this.getClientCounts(inbound,to_inbound);
-                    }
                }
            },
-            getClientCounts(dbInbound,inbound){
-                let clientCount = 0,active = [], deactive = [], depleted = [], expiring = [];
-                clients = this.getClients(dbInbound.protocol, inbound.settings);
-                clientStats = dbInbound.clientStats
-                now = new Date().getTime()
-                if(clients){
-                    clientCount = clients.length;
-                    if(dbInbound.enable){
-                        clients.forEach(client => {
-                            client.enable ? active.push(client.email) : deactive.push(client.email);
-                        });
-                        clientStats.forEach(client => {
-                            if(!client.enable) {
-                                depleted.push(client.email);
-                            } else {
-                                if ((client.expiryTime > 0 && (client.expiryTime-now < this.expireDiff)) ||
-                                (client.total > 0 && (client.total-(client.up+client.down) < this.trafficDiff ))) expiring.push(client.email);
-                            }
-                        });
-                    } else {
-                        clients.forEach(client => {
-                            deactive.push(client.email);
-                        });
-                    }
-                }
-                return {
-                    clients: clientCount,
-                    active: active,
-                    deactive: deactive,
-                    depleted: depleted,
-                    expiring: expiring,
-                };
-            },
            searchInbounds(key) {
                if (ObjectUtil.isEmpty(key)) {
                    this.searchedInbounds = this.dbInbounds.slice();
@@ -395,67 +293,19 @@
                    case "qrcode":
                        this.showQrcode(dbInbound);
                        break;
-                    case "showInfo":
-                        this.showInfo(dbInbound);
+                    case "export":
+                        this.inboundLinks(dbInbound.id);
                        break;
                    case "edit":
                        this.openEditInbound(dbInbound.id);
                        break;
-                    case "addClient":
-                        this.openAddClient(dbInbound.id)
-                        break;
-                    case "addBulkClient":
-                        this.openAddBulkClient(dbInbound.id)
-                        break;
-                    case "export":
-                        this.inboundLinks(dbInbound.id);
-                        break;
                    case "resetTraffic":
-                        this.resetTraffic(dbInbound.id);
-                        break;
-                    case "resetClients":
-                        this.resetAllClientTraffics(dbInbound.id);
-                        break;
-                    case "clone":
-                        this.openCloneInbound(dbInbound);
+                        this.resetTraffic(dbInbound);
                        break;
                    case "delete":
-                        this.delInbound(dbInbound.id);
+                        this.delInbound(dbInbound);
                        break;
                }
-            },
-			openCloneInbound(dbInbound) {
-                this.$confirm({
-                    title: '{{ i18n "pages.inbounds.cloneInbound"}} ' + dbInbound.remark,
-                    content: '{{ i18n "pages.inbounds.cloneInboundContent"}}',
-                    okText: '{{ i18n "pages.inbounds.cloneInboundOk"}}',
-                    cancelText: '{{ i18n "cancel" }}',
-                    onOk: () => {
-                        const baseInbound = dbInbound.toInbound();
-                        dbInbound.up = 0;
-                        dbInbound.down = 0;
-                        this.cloneInbound(baseInbound, dbInbound);
-                    },
-                });
-            },
-            async cloneInbound(baseInbound, dbInbound) {
-                const inbound = new Inbound();
-                const data = {
-                    up: dbInbound.up,
-                    down: dbInbound.down,
-                    total: dbInbound.total,
-                    remark: dbInbound.remark + " - Cloned",
-                    enable: dbInbound.enable,
-                    expiryTime: dbInbound.expiryTime,
-
-                    listen: inbound.listen,
-                    port: inbound.port,
-                    protocol: baseInbound.protocol,
-                    settings: inbound.settings.toString(),
-                    streamSettings: baseInbound.stream.toString(),
-                    sniffing: baseInbound.canSniffing() ? baseInbound.sniffing.toString() : '{}',
-                };
-                await this.submit('/xui/inbound/add', data, inModal);
            },
            openAddInbound() {
                inModal.show({
@@ -470,8 +320,8 @@
                    isEdit: false
                });
            },
-            openEditInbound(dbInboundId) {
-                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
+            openEditInbound(dbInbound_id) {
+                dbInbound = this.dbInbounds.find(row => row.id === dbInbound_id);
                const inbound = dbInbound.toInbound();
                inModal.show({
                    title: '{{ i18n "pages.inbounds.modifyInbound"}}',
@@ -500,10 +350,9 @@
                    port: inbound.port,
                    protocol: inbound.protocol,
                    settings: inbound.settings.toString(),
+                    streamSettings: inbound.stream.toString(),
+                    sniffing: inbound.canSniffing() ? inbound.sniffing.toString() : '{}',
                };
-                if (inbound.canEnableStream()) data.streamSettings = inbound.stream.toString();
-                if (inbound.canSniffing()) data.sniffing = inbound.sniffing.toString();
-
                await this.submit('/xui/inbound/add', data, inModal);
            },
            async updateInbound(inbound, dbInbound) {
@@ -519,80 +368,15 @@
                    port: inbound.port,
                    protocol: inbound.protocol,
                    settings: inbound.settings.toString(),
+                    streamSettings: inbound.stream.toString(),
+                    sniffing: inbound.canSniffing() ? inbound.sniffing.toString() : '{}',
                };
-                if (inbound.canEnableStream()) data.streamSettings = inbound.stream.toString();
-                if (inbound.canSniffing()) data.sniffing = inbound.sniffing.toString();
-
                await this.submit(`/xui/inbound/update/${dbInbound.id}`, data, inModal);
            },
-            openAddClient(dbInboundId) {
-                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
-                clientModal.show({
-                    title: '{{ i18n "pages.client.add"}}',
-                    okText: '{{ i18n "pages.client.submitAdd"}}',
-                    dbInbound: dbInbound,
-                    confirm: async (inbound, dbInbound, index) => {
-                        clientModal.loading();
-                        await this.addClient(inbound, dbInbound);
-                        clientModal.close();
-                    },
-                    isEdit: false
-                });
-            },
-            openAddBulkClient(dbInboundId) {
-                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
-                clientsBulkModal.show({
-                    title: '{{ i18n "pages.client.bulk"}} ' + dbInbound.remark,
-                    okText: '{{ i18n "pages.client.bulk"}}',
-                    dbInbound: dbInbound,
-                    confirm: async (inbound, dbInbound) => {
-                        clientsBulkModal.loading();
-                        await this.addClient(inbound, dbInbound);
-                        clientsBulkModal.close();
-                    },
-                });
-            },
-            openEditClient(dbInboundId, client) {
-                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
-                clients = this.getInboundClients(dbInbound);
-                index = this.findIndexOfClient(clients, client);
-                clientModal.show({
-                    title: '{{ i18n "pages.client.edit"}}',
-                    okText: '{{ i18n "pages.client.submitEdit"}}',
-                    dbInbound: dbInbound,
-                    index: index,
-                    confirm: async (inbound, dbInbound, index) => {
-                        clientModal.loading();
-                        await this.updateClient(inbound, dbInbound, index);
-                        clientModal.close();
-                    },
-                    isEdit: true
-                });
-            },
-            findIndexOfClient(clients,client) {
-                firstKey = Object.keys(client)[0];
-                return clients.findIndex(c => c[firstKey] === client[firstKey]);
-            },
-            async addClient(inbound, dbInbound) {
-                const data = {
-                    id: dbInbound.id,
-                    settings: inbound.settings.toString(),
-                };
-                await this.submit('/xui/inbound/addClient/', data);
-            },
-            async updateClient(inbound, dbInbound, index) {
-                const data = {
-                    id: dbInbound.id,
-                    settings: inbound.settings.toString(),
-                };
-                await this.submit(`/xui/inbound/updateClient/${index}`, data);
-            },
-            resetTraffic(dbInboundId) {
-                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
+            resetTraffic(dbInbound) {
                this.$confirm({
                    title: '{{ i18n "pages.inbounds.resetTraffic"}}',
                    content: '{{ i18n "pages.inbounds.resetTrafficContent"}}',
-                    class: siderDrawer.isDarkTheme ? darkClass : '',
                    okText: '{{ i18n "reset"}}',
                    cancelText: '{{ i18n "cancel"}}',
                    onOk: () => {
@@ -603,37 +387,16 @@
                    },
                });
            },
-            delInbound(dbInboundId) {
+            delInbound(dbInbound) {
                this.$confirm({
                    title: '{{ i18n "pages.inbounds.deleteInbound"}}',
                    content: '{{ i18n "pages.inbounds.deleteInboundContent"}}',
-                    class: siderDrawer.isDarkTheme ? darkClass : '',
                    okText: '{{ i18n "delete"}}',
                    cancelText: '{{ i18n "cancel"}}',
-                    onOk: () => this.submit('/xui/inbound/del/' + dbInboundId),
+                    onOk: () => this.submit('/xui/inbound/del/' + dbInbound.id),
                });
            },
-            delClient(dbInboundId,client) {
-                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
-                newDbInbound = new DBInbound(dbInbound);
-                inbound = newDbInbound.toInbound();
-                clients = this.getClients(dbInbound.protocol, inbound.settings);
-                index = this.findIndexOfClient(clients, client);
-                clients.splice(index, 1);
-                const data = {
-                    id: dbInboundId,
-                    settings: inbound.settings.toString(),
-                };
-                this.$confirm({
-                    title: '{{ i18n "pages.inbounds.deleteInbound"}}',
-                    content: '{{ i18n "pages.inbounds.deleteInboundContent"}}',
-                    class: siderDrawer.isDarkTheme ? darkClass : '',
-                    okText: '{{ i18n "delete"}}',
-                    cancelText: '{{ i18n "cancel"}}',
-                    onOk: () => this.submit('/xui/inbound/delClient/' + client.email, data),
-                });
-            },
-            getClients(protocol, clientSettings) {
+			getClients(protocol, clientSettings) {
                switch(protocol){
                    case Protocols.VMESS: return clientSettings.vmesses;
                    case Protocols.VLESS: return clientSettings.vlesses;
@@ -641,29 +404,18 @@
                    default: return null;
                }
            },
-            showQrcode(dbInbound, clientIndex) {
+             showQrcode(dbInbound, clientIndex) {
                const link = dbInbound.genLink(clientIndex);
                qrModal.show('{{ i18n "qrCode"}}', link, dbInbound);
            },
            showInfo(dbInbound, index) {
                infoModal.show(dbInbound, index);
            },
-            switchEnable(dbInboundId) {
-                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
-                this.submit(`/xui/inbound/update/${dbInboundId}`, dbInbound);
+            switchEnable(dbInbound) {
+                this.submit(`/xui/inbound/update/${dbInbound.id}`, dbInbound);
            },
-            async switchEnableClient(dbInboundId, client) {
-                this.loading()
-                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
-                inbound = dbInbound.toInbound();
-                clients = this.getClients(dbInbound.protocol, inbound.settings);
-                index = this.findIndexOfClient(clients, client);
-                clients[index].enable = ! clients[index].enable
-                await this.updateClient(inbound, dbInbound, index);
-                this.loading(false);
-            },
-            async submit(url, data) {
-                const msg = await HttpUtil.postWithModal(url, data);
+            async submit(url, data, modal) {
+                const msg = await HttpUtil.postWithModal(url, data, modal);
                if (msg.success) {
                    await this.getDBInbounds();
                }
@@ -677,35 +429,34 @@
                    return dbInbound.toInbound().settings.trojans
                }
            },
-            resetClientTraffic(client,dbInboundId) {
+            resetClientTraffic(client,inbound,event) {
                this.$confirm({
                    title: '{{ i18n "pages.inbounds.resetTraffic"}}',
                    content: '{{ i18n "pages.inbounds.resetTrafficContent"}}',
-                    class: siderDrawer.isDarkTheme ? darkClass : '',
                    okText: '{{ i18n "reset"}}',
                    cancelText: '{{ i18n "cancel"}}',
-                    onOk: () => this.submit('/xui/inbound/' + dbInboundId + '/resetClientTraffic/'+ client.email),
-                })
-            },
-            resetAllTraffic() {
-                this.$confirm({
-                    title: '{{ i18n "pages.inbounds.resetAllTrafficTitle"}}',
-                    content: '{{ i18n "pages.inbounds.resetAllTrafficContent"}}',
-                    class: siderDrawer.isDarkTheme ? darkClass : '',
-                    okText: '{{ i18n "reset"}}',
-                    cancelText: '{{ i18n "cancel"}}',
-                    onOk: () => this.submit('/xui/inbound/resetAllTraffics'),
+                    onOk: () => {
+                        this.resetClTraffic(client,inbound,event);
+                    },
                });
            },
-            resetAllClientTraffics(dbInboundId) {
-                this.$confirm({
-                    title: '{{ i18n "pages.inbounds.resetAllClientTrafficTitle"}}',
-                    content: '{{ i18n "pages.inbounds.resetAllClientTrafficContent"}}',
-                    class: siderDrawer.isDarkTheme ? darkClass : '',
-                    okText: '{{ i18n "reset"}}',
-                    cancelText: '{{ i18n "cancel"}}',
-                    onOk: () => this.submit('/xui/inbound/resetAllClientTraffics/' + dbInboundId),
-                })
+            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)
@@ -725,13 +476,6 @@
                clientStats = dbInbound.clientStats.find(stats => stats.email === email)
                return clientStats ? clientStats.down + clientStats.up > clientStats.total : false
            },
-            isClientEnabled(dbInbound, email) {
-                clientStats = dbInbound.clientStats ? dbInbound.clientStats.find(stats => stats.email === email) : null
-                return clientStats ? clientStats['enable'] : true
-            },
-            isRemovable(dbInbound_id){
-                return this.getInboundClients(this.dbInbounds.find(row => row.id === dbInbound_id)).length > 1
-            },
            inboundLinks(dbInboundId) {
                dbInbound = this.dbInbounds.find(row => row.id === dbInboundId);
                txtModal.show('{{ i18n "pages.inbounds.export"}}',dbInbound.genInboundLinks,dbInbound.remark);
@@ -743,6 +487,10 @@
                }
                txtModal.show('{{ i18n "pages.inbounds.export"}}',copyText,'All-Inbounds');
            },
+            isClientEnabled(dbInbound, email) {
+                clientStats = dbInbound.clientStats ? dbInbound.clientStats.find(stats => stats.email === email) : null
+                return clientStats ? clientStats['enable'] : true
+            },
        },
        watch: {
            searchKey: debounce(function (newVal) {
@@ -750,30 +498,37 @@
            }, 500)
        },
        mounted() {
-            this.getDefaultSettings();
            this.getDBInbounds();
        },
        computed: {
            total() {
                let down = 0, up = 0;
-                let clients = 0, deactive = [], depleted = [], expiring = [];
+				let clients = 0, active = 0, deactive = 0;
                this.dbInbounds.forEach(dbInbound => {
                    down += dbInbound.down;
                    up += dbInbound.up;
-                    if (this.clientCount[dbInbound.id]) {
-                        clients += this.clientCount[dbInbound.id].clients;
-                        deactive = deactive.concat(this.clientCount[dbInbound.id].deactive);
-                        depleted = depleted.concat(this.clientCount[dbInbound.id].depleted);
-                        expiring = expiring.concat(this.clientCount[dbInbound.id].expiring);
+                    inbound = dbInbound.toInbound();
+                    clients = this.getClients(dbInbound.protocol, inbound.settings);
+                    if(clients){
+                        if(dbInbound.enable){
+                            isClientEnable = false;
+                            clients.forEach(client => {
+                                isClientEnable = client.email == "" ? true: this.isClientEnabled(dbInbound,client.email);
+                                isClientEnable ? active++ : deactive++;
+                            });
+                        } else {
+                            deactive += clients.length;
+                        }
+                    } else {
+                        dbInbound.enable ? active++ : deactive++;
                    }
                });
                return {
                    down: down,
                    up: up,
-                    clients: clients,
+                    clients: active + deactive,
+                    active: active,
                    deactive: deactive,
-                    depleted: depleted,
-                    expiring: expiring,
                };
            }
        },
@@ -786,7 +541,5 @@
 {{template "qrcodeModal"}}
 {{template "textModal"}}
 {{template "inboundInfoModal"}}
-{{template "clientsModal"}}
-{{template "clientsBulkModal"}}
 </body>
-</html>
+</html>
--- a/web/html/xui/inbound_client_table.html
+++ b/web/html/xui/inbound_client_table.html
@@ -1,35 +1,24 @@
-{{define "client_table"}}
+{{define "client_row"}}
 <template slot="actions" slot-scope="text, client, index">
    <a-tooltip>
        <template slot="title">{{ i18n "qrCode" }}</template>
        <a-icon style="font-size: 24px;" type="qrcode" v-if="record.hasLink()" @click="showQrcode(record,index);"></a-icon>
    </a-tooltip>
-    <a-tooltip>
-        <template slot="title">{{ i18n "pages.client.edit" }}</template>
-        <a-icon style="font-size: 24px;" type="edit" @click="openEditClient(record.id,client);"></a-icon>
-    </a-tooltip>
    <a-tooltip>
        <template slot="title">{{ i18n "info" }}</template>
        <a-icon style="font-size: 24px;" type="info-circle" @click="showInfo(record,index);"></a-icon>
    </a-tooltip>
    <a-tooltip>
        <template slot="title">{{ i18n "pages.inbounds.resetTraffic" }}</template>
-        <a-icon style="font-size: 24px;" type="retweet" @click="resetClientTraffic(client,record.id)" v-if="client.email.length > 0"></a-icon>
-    </a-tooltip>
-    <a-tooltip>
-        <template slot="title"><span style="color: #FF4D4F"> {{ i18n "delete"}}</span></template>
-        <a-icon style="font-size: 24px;" type="delete" v-if="isRemovable(record.id)" @click="delClient(record.id,client)"></a-icon>
+        <a-icon style="font-size: 24px;" type="retweet" @click="resetClientTraffic(client,record,$event)" v-if="client.email != ''"></a-icon>
    </a-tooltip>
 </template>
-<template slot="enable" slot-scope="text, client, index">
-    <a-switch v-model="client.enable" @change="switchEnableClient(record.id,client)"></a-switch>
-</template>   
 <template slot="client" slot-scope="text, client">
    [[ client.email ]]
-    <a-tag v-if="!isClientEnabled(record, client.email)" color="red">{{ i18n "depleted" }}</a-tag>
-</template>                                    
+    <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>
+  <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>
@@ -37,12 +26,11 @@
    <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">
+    <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-if="client.expiryTime < 0" color="cyan">[[ client._expiryTime ]] {{ i18n "pages.client.days" }}</a-tag>
    <a-tag v-else color="green">{{ i18n "indefinite" }}</a-tag>
 </template>
-{{end}}
+{{end}}
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -11,10 +11,6 @@
    .ant-col-sm-24 {
        margin-top: 10px;
    }
-
-    .ant-card-dark h2 {
-        color: hsla(0,0%,100%,.65);
-    }
 </style>
 <body>
 <a-layout id="app" v-cloak>
@@ -31,14 +27,14 @@
                                    <a-col :span="12" style="text-align: center">
                                        <a-progress type="dashboard" status="normal"
                                                    :stroke-color="status.cpu.color"
-                                                    :class="siderDrawer.isDarkTheme ? darkClass : ''"
+													:class="siderDrawer.isDarkTheme ? darkClass : ''"
                                                    :percent="status.cpu.percent"></a-progress>
                                        <div>CPU</div>
                                    </a-col>
                                    <a-col :span="12" style="text-align: center">
                                        <a-progress type="dashboard" status="normal"
                                                    :stroke-color="status.mem.color"
-                                                    :class="siderDrawer.isDarkTheme ? darkClass : ''"
+													:class="siderDrawer.isDarkTheme ? darkClass : ''"
                                                    :percent="status.mem.percent"></a-progress>
                                        <div>
                                            {{ i18n "pages.index.memory"}}: [[ sizeFormat(status.mem.current) ]] / [[ sizeFormat(status.mem.total) ]]
@@ -51,7 +47,7 @@
                                    <a-col :span="12" style="text-align: center">
                                        <a-progress type="dashboard" status="normal"
                                                    :stroke-color="status.swap.color"
-                                                    :class="siderDrawer.isDarkTheme ? darkClass : ''"
+													:class="siderDrawer.isDarkTheme ? darkClass : ''"
                                                    :percent="status.swap.percent"></a-progress>
                                        <div>
                                            Swap: [[ sizeFormat(status.swap.current) ]] / [[ sizeFormat(status.swap.total) ]]
@@ -60,7 +56,7 @@
                                    <a-col :span="12" style="text-align: center">
                                        <a-progress type="dashboard" status="normal"
                                                    :stroke-color="status.disk.color"
-                                                    :class="siderDrawer.isDarkTheme ? darkClass : ''"
+													:class="siderDrawer.isDarkTheme ? darkClass : ''"
                                                    :percent="status.disk.percent"></a-progress>
                                        <div>
                                            {{ i18n "pages.index.hard"}}: [[ sizeFormat(status.disk.current) ]] / [[ sizeFormat(status.disk.total) ]]
@@ -76,9 +72,18 @@
                <a-row>
                    <a-col :sm="24" :md="12">
                        <a-card hoverable :class="siderDrawer.isDarkTheme ? darkClass : ''">
-                            3x-ui: <a href="https://github.com/MHSanaei/3x-ui/releases" target="_blank"><a-tag color="green">v{{ .cur_ver }}</a-tag></a>
-                            Xray: <a-tag color="green" style="cursor: pointer;" @click="openSelectV2rayVersion">v[[ status.xray.version ]]</a-tag>
-                            Telegram: <a href="https://t.me/panel3xui" target="_blank"><a-tag color="green">@panel3xui</a-tag></a>
+                            {{ i18n "pages.index.xrayStatus" }}:
+                            <a-tag :color="status.xray.color">[[ status.xray.state ]]</a-tag>
+                            <a-tooltip v-if="status.xray.state === State.Error">
+                                <template slot="title">
+                                    <p v-for="line in status.xray.errorMsg.split('\n')">[[ line ]]</p>
+                                </template>
+                                <a-icon type="question-circle" theme="filled"></a-icon>
+                            </a-tooltip>
+                            <a-tag color="green" style="cursor: pointer;" @click="openSelectV2rayVersion">[[ status.xray.version ]]</a-tag>
+                            <a-tag color="blue" style="cursor: pointer;" @click="stopXrayService">{{ i18n "pages.index.stopXray" }}</a-tag>
+                            <a-tag color="blue" style="cursor: pointer;" @click="restartXrayService">{{ i18n "pages.index.restartXray" }}</a-tag>                    
+                            <a-tag color="blue" style="cursor: pointer;" @click="openSelectV2rayVersion">{{ i18n "pages.index.xraySwitch" }}</a-tag>
                        </a-card>
                    </a-col>
                    <a-col :sm="24" :md="12">
@@ -93,29 +98,6 @@
                            </a-tooltip>
                        </a-card>
                    </a-col>
-                    <a-col :sm="24" :md="12">
-                        <a-card hoverable :class="siderDrawer.isDarkTheme ? darkClass : ''">
-                            {{ i18n "pages.index.xrayStatus" }}:
-                            <a-tag :color="status.xray.color">[[ status.xray.state ]]</a-tag>
-                            <a-tooltip v-if="status.xray.state === State.Error">
-                                <template slot="title">
-                                    <p v-for="line in status.xray.errorMsg.split('\n')">[[ line ]]</p>
-                                </template>
-                                <a-icon type="question-circle" theme="filled"></a-icon>
-                            </a-tooltip>
-                            <a-tag color="blue" style="cursor: pointer;" @click="stopXrayService">{{ i18n "pages.index.stopXray" }}</a-tag>
-                            <a-tag color="blue" style="cursor: pointer;" @click="restartXrayService">{{ i18n "pages.index.restartXray" }}</a-tag>                    
-                            <a-tag color="blue" style="cursor: pointer;" @click="openSelectV2rayVersion">{{ i18n "pages.index.xraySwitch" }}</a-tag>
-                        </a-card>
-                    </a-col>
-                    <a-col :sm="24" :md="12">
-                        <a-card hoverable :class="siderDrawer.isDarkTheme ? darkClass : ''">
-                            {{ i18n "menu.link" }}:
-                            <a-tag color="blue" style="cursor: pointer;" @click="openLogs(20)">Log Reports</a-tag>
-                            <a-tag color="blue" style="cursor: pointer;" @click="openConfig">Config</a-tag>
-                            <a-tag color="blue" style="cursor: pointer;" @click="getBackup">Backup</a-tag>
-                        </a-card>
-                    </a-col>
                    <a-col :sm="24" :md="12">
                        <a-card hoverable :class="siderDrawer.isDarkTheme ? darkClass : ''">
                            {{ i18n "pages.index.systemLoad" }}: [[ status.loads[0] ]] | [[ status.loads[1] ]] | [[ status.loads[2] ]]
@@ -190,8 +172,7 @@
    </a-layout>
    <a-modal id="version-modal" v-model="versionModal.visible" title='{{ i18n "pages.index.xraySwitch" }}'
             :closable="true" @ok="() => versionModal.visible = false"
-             :class="siderDrawer.isDarkTheme ? darkClass : ''"
-             footer="">
+             ok-text='{{ i18n "confirm" }}' cancel-text='{{ i18n "cancel"}}'>
        <h2>{{ i18n "pages.index.xraySwitchClick"}}</h2>
        <h2>{{ i18n "pages.index.xraySwitchClickDesk"}}</h2>
        <template v-for="version, index in versionModal.versions">
@@ -201,39 +182,8 @@
            </a-tag>
        </template>
    </a-modal>
-    <a-modal id="log-modal" v-model="logModal.visible" title="X-UI logs"
-             :closable="true" @ok="() => logModal.visible = false" @cancel="() => logModal.visible = false"
-             :class="siderDrawer.isDarkTheme ? darkClass : ''"
-             width="800px"
-             footer="">
-        <a-form layout="inline">
-            <a-form-item label="Count">
-                <a-select v-model="logModal.rows"
-                style="width: 80px"
-                @change="openLogs(logModal.rows)"
-                :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''">
-                    <a-select-option value="10">10</a-select-option>
-                    <a-select-option value="20">20</a-select-option>
-                    <a-select-option value="50">50</a-select-option>
-                    <a-select-option value="100">100</a-select-option>
-                </a-select>
-            </a-form-item>
-            <a-form-item>
-                <button class="ant-btn ant-btn-primary" @click="openLogs(logModal.rows)"><a-icon type="sync"></a-icon> Reload</button>
-            </a-form-item>
-            <a-form-item>
-                <a-button type="primary" style="margin-bottom: 10px;"
-                :href="'data:application/text;charset=utf-8,' + encodeURIComponent(logModal.logs)" download="x-ui.log">
-                    {{ i18n "download" }} x-ui.log
-                </a-button>
-            </a-form-item>
-       </a-form>
-        <a-input type="textarea" v-model="logModal.logs" disabled="true"
-                :autosize="{ minRows: 10, maxRows: 22}"></a-input>
-    </a-modal>
 </a-layout>
 {{template "js" .}}
-{{template "textModal"}}
 <script>

    const State = {
@@ -325,20 +275,6 @@
        },
    };

-    const logModal = {
-        visible: false,
-        logs: '',
-        rows: 20,
-        show(logs, rows) {
-            this.visible = true;
-            this.rows = rows;
-            this.logs = logs.join("\n");
-        },
-        hide() {
-            this.visible = false;
-        },
-    };
-
    const app = new Vue({
        delimiters: ['[[', ']]'],
        el: '#app',
@@ -346,7 +282,6 @@
            siderDrawer,
            status: new Status(),
            versionModal,
-            logModal,
            spinning: false,
            loadingTip: '{{ i18n "loading"}}',
        },
@@ -378,7 +313,6 @@
                    title: '{{ i18n "pages.index.xraySwitchVersionDialog"}}',
                    content: '{{ i18n "pages.index.xraySwitchVersionDialogDesc"}}' + ` ${version}?`,
                    okText: '{{ i18n "confirm"}}',
-                    class: siderDrawer.isDarkTheme ? darkClass : '',
                    cancelText: '{{ i18n "cancel"}}',
                    onOk: async () => {
                        versionModal.hide();
@@ -388,7 +322,7 @@
                    },
                });
            },
-	        //here add stop xray function
+			//here add stop xray function
            async stopXrayService() {
                this.loading(true);
                const msg = await HttpUtil.post('server/stopXrayService');
@@ -397,7 +331,7 @@
                    return;
                }
            },
-            //here add restart xray function
+        //here add restart xray function
            async restartXrayService() {
                this.loading(true);
                const msg = await HttpUtil.post('server/restartXrayService');
@@ -406,27 +340,6 @@
                    return;
                }
            },
-            async openLogs(rows){
-                this.loading(true);
-                const msg = await HttpUtil.post('server/logs/'+rows);
-                this.loading(false);
-                if (!msg.success) {
-                    return;
-                }
-                logModal.show(msg.obj,rows);
-            },
-            async openConfig(){
-                this.loading(true);
-                const msg = await HttpUtil.post('server/getConfigJson');
-                this.loading(false);
-                if (!msg.success) {
-                    return;
-                }
-                txtModal.show('config.json',JSON.stringify(msg.obj, null, 2),'config.json');
-            },
-            getBackup(){
-                window.location = basePath + 'server/getDb';
-            }
        },
        async mounted() {
            while (true) {
--- a/web/html/xui/setting.html
+++ b/web/html/xui/setting.html
@@ -20,7 +20,7 @@
        display: block;
    }

-    :not(.ant-card-dark)>.ant-tabs-top-bar {
+	:not(.ant-card-dark)>.ant-tabs-top-bar {
        background: white;
    }
 </style>
@@ -44,8 +44,6 @@
                                <setting-list-item type="text" title='{{ i18n "pages.setting.publicKeyPath"}}' desc='{{ i18n "pages.setting.publicKeyPathDesc"}}' v-model="allSetting.webCertFile"></setting-list-item>
                                <setting-list-item type="text" title='{{ i18n "pages.setting.privateKeyPath"}}' desc='{{ i18n "pages.setting.privateKeyPathDesc"}}' v-model="allSetting.webKeyFile"></setting-list-item>
                                <setting-list-item type="text" title='{{ i18n "pages.setting.panelUrlPath"}}' desc='{{ i18n "pages.setting.panelUrlPathDesc"}}' v-model="allSetting.webBasePath"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.setting.expireTimeDiff" }}' desc='{{ i18n "pages.setting.expireTimeDiffDesc" }}'  v-model="allSetting.expireDiff" :min="0"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.setting.trafficDiff" }}' desc='{{ i18n "pages.setting.trafficDiffDesc" }}'  v-model="allSetting.trafficDiff" :min="0"></setting-list-item>
                                <a-list-item>
                                    <a-row style="padding: 20px">
                                        <a-col :lg="24" :xl="12">
@@ -58,7 +56,6 @@
                                                        ref="selectLang"
                                                        v-model="lang"
                                                        @change="setLang(lang)"
-                                                        :dropdown-class-name="siderDrawer.isDarkTheme ? 'ant-card-dark' : ''"
                                                        style="width: 100%"
                                                >
                                                    <a-select-option :value="l.value" :label="l.value" v-for="l in supportLangs">
@@ -90,30 +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">update</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="siderDrawer.isDarkTheme ? 'color: hsla(0,0%,100%,.65);': '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>
-                                <setting-list-item type="switch" title='{{ i18n "pages.setting.xrayConfigIRIp"}}' desc='{{ i18n "pages.setting.xrayConfigIRIpDesc"}}'  v-model="IRIpSettings"></setting-list-item>
-								<setting-list-item type="switch" title='{{ i18n "pages.setting.xrayConfigIRdomain"}}' desc='{{ i18n "pages.setting.xrayConfigIRdomainDesc"}}'  v-model="IRdomainSettings"></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>
@@ -121,10 +101,8 @@
                            <a-list item-layout="horizontal" :style="siderDrawer.isDarkTheme ? 'color: hsla(0,0%,100%,.65);': 'background: white;'">
                                <setting-list-item type="switch" title='{{ i18n "pages.setting.telegramBotEnable" }}' desc='{{ i18n "pages.setting.telegramBotEnableDesc" }}'  v-model="allSetting.tgBotEnable"></setting-list-item>
                                <setting-list-item type="text" title='{{ i18n "pages.setting.telegramToken"}}' desc='{{ i18n "pages.setting.telegramTokenDesc"}}'  v-model="allSetting.tgBotToken"></setting-list-item>
-                                <setting-list-item type="text" title='{{ i18n "pages.setting.telegramChatId"}}' desc='{{ i18n "pages.setting.telegramChatIdDesc"}}'  v-model="allSetting.tgBotChatId"></setting-list-item>
+                                <setting-list-item type="number" title='{{ i18n "pages.setting.telegramChatId"}}' desc='{{ i18n "pages.setting.telegramChatIdDesc"}}'  v-model.number="allSetting.tgBotChatId"></setting-list-item>
                                <setting-list-item type="text" title='{{ i18n "pages.setting.telegramNotifyTime"}}' desc='{{ i18n "pages.setting.telegramNotifyTimeDesc"}}'  v-model="allSetting.tgRunTime"></setting-list-item>
-                                <setting-list-item type="switch" title='{{ i18n "pages.setting.tgNotifyBackup" }}' desc='{{ i18n "pages.setting.tgNotifyBackupDesc" }}'  v-model="allSetting.tgBotBackup"></setting-list-item>
-                                <setting-list-item type="number" title='{{ i18n "pages.setting.tgNotifyCpu" }}' desc='{{ i18n "pages.setting.tgNotifyCpuDesc" }}'  v-model="allSetting.tgCpu" :min="0" :max="100"></setting-list-item>
                            </a-list>
                        </a-tab-pane>
                        <a-tab-pane key="5" tab='{{ i18n "pages.setting.otherSetting"}}'>
@@ -211,169 +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
-                },
-            },
-			IRIpSettings: {
-                get: function () {
-                    localIpFilter = false
-                    if(this.templateSettings != null){
-                        this.templateSettings.routing.rules.forEach(routingRule => {
-                            if(routingRule.hasOwnProperty("ip")){
-                                if (routingRule.ip[0] === "geoip:ir" && 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:ir\"],\"type\": \"field\"}"))
-                    }
-                    else {
-                        newTemplateSettings.routing.rules = [];
-                        this.templateSettings.routing.rules.forEach(routingRule => {
-                            if (routingRule.hasOwnProperty('ip')){
-                                if (routingRule.ip[0] === "geoip:ir" && routingRule.outboundTag == "blocked"){
-                                    return;
-                                }
-                            }
-                            newTemplateSettings.routing.rules.push(routingRule);
-                        });
-                    }
-                    this.templateSettings = newTemplateSettings
-                },
-            },
-			IRdomainSettings: {
-                get: function () {
-                    localdomainFilter = false
-                    if(this.templateSettings != null){
-                        this.templateSettings.routing.rules.forEach(routingRule => {
-                            if(routingRule.hasOwnProperty("domain")){
-                                if ((routingRule.domain[0] === "regexp:.+.ir$" || routingRule.domain[0] === "ext:iran.dat:ir" || routingRule.domain[0] === "ext:iran.dat:other") && routingRule.outboundTag == "blocked") {
-                                    localdomainFilter = true
-                                }
-                            }
-                        });
-                    }
-                    return localdomainFilter
-                },
-                set: function (newValue) {
-                    newTemplateSettings = JSON.parse(this.allSetting.xrayTemplateConfig);
-                    if (newValue){
-                        newTemplateSettings.routing.rules.push(JSON.parse("{\"outboundTag\": \"blocked\",\"domain\": [\"regexp:.+.ir$\", \"ext:iran.dat:ir\", \"ext:iran.dat:other\"],\"type\": \"field\"}"))
-                    }
-                    else {
-                        newTemplateSettings.routing.rules = [];
-                        this.templateSettings.routing.rules.forEach(routingRule => {
-                            if (routingRule.hasOwnProperty('domain')){
-                                if ((routingRule.domain[0] === "regexp:.+.ir$" || routingRule.domain[0] === "ext:iran.dat:ir" || routingRule.domain[0] === "ext:iran.dat:other") && routingRule.outboundTag == "blocked"){
-                                    return;
-                                }
-                            }
-                            newTemplateSettings.routing.rules.push(routingRule);
-                        });
-                    }
-                    this.templateSettings = newTemplateSettings
-                },
-            },
-			
-        }
    });

 </script>
--- a/web/job/check_clinet_ip_job.go
+++ b/web/job/check_clinet_ip_job.go
@@ -154,16 +154,14 @@ func GetInboundClientIps(clientEmail string) (*model.InboundClientIps, error) {
 	}
 	return InboundClientIps, nil
 }
-func addInboundClientIps(clientEmail string, ips []string) error {
+func addInboundClientIps(clientEmail string,ips []string) error {
 	inboundClientIps := &model.InboundClientIps{}
-	jsonIps, err := json.Marshal(ips)
+    jsonIps, err := json.Marshal(ips)
 	checkError(err)

-	// Trim any leading/trailing whitespace from clientEmail
-	clientEmail = strings.TrimSpace(clientEmail)
-
 	inboundClientIps.ClientEmail = clientEmail
 	inboundClientIps.Ips = string(jsonIps)
+	

 	db := database.GetDB()
 	tx := db.Begin()
@@ -249,46 +247,47 @@ func GetInboundByEmail(clientEmail string) (*model.Inbound, error) {
 	return inbounds, nil
 }

-func LimitDevice() {
-    var destIp, destPort, srcIp, srcPort string
-    
-    localIp,err := LocalIP()
-    checkError(err)
+func LimitDevice(){
+	
+	localIp,err := LocalIP()
+	checkError(err)

-    c := cmd.NewCmd("bash","-c","ss --tcp | grep -E '" + IPsToRegex(localIp) + "'| awk '{if($1==\"ESTAB\") print $4,$5;}'","| sort | uniq -c | sort -nr | head")
+	c := cmd.NewCmd("bash","-c","ss --tcp | grep -E '" + IPsToRegex(localIp) + "'| awk '{if($1==\"ESTAB\") print $4,$5;}'","| sort | uniq -c | sort -nr | head")

-    <-c.Start()
-    if len(c.Status().Stdout) > 0 {
-        ipRegx, _ := regexp.Compile(`[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+`)
-        portRegx, _ := regexp.Compile(`(?:(:))([0-9]..[^.][0-9]+)`)
+	<-c.Start()
+	if len(c.Status().Stdout) > 0 {
+		ipRegx, _ := regexp.Compile(`[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+`)
+		portRegx, _ := regexp.Compile(`(?:(:))([0-9]..[^.][0-9]+)`)

-        for _, row := range c.Status().Stdout {
+		for _, row := range c.Status().Stdout {
+			
+			data := strings.Split(row," ")
+			
+			destIp,destPort,srcIp,srcPort := "","","",""
+ 

-            data := strings.Split(row," ")
+			destIp = string(ipRegx.FindString(data[0]))

-            if len(data) < 2 {
-                continue // Skip this row if it doesn't have at least two elements
-            }
+			destPort = portRegx.FindString(data[0])
+			destPort = strings.Replace(destPort,":","",-1)
+			
+			
+			srcIp = string(ipRegx.FindString(data[1]))

-            destIp = string(ipRegx.FindString(data[0]))
-            destPort = portRegx.FindString(data[0])
-            destPort = strings.Replace(destPort,":","",-1)
+			srcPort = portRegx.FindString(data[1])
+			srcPort = strings.Replace(srcPort,":","",-1)

-            srcIp = string(ipRegx.FindString(data[1]))
-            srcPort = portRegx.FindString(data[1])
-            srcPort = strings.Replace(srcPort,":","",-1)
+			if(contains(disAllowedIps,srcIp)){
+				dropCmd := cmd.NewCmd("bash","-c","ss -K dport = " + srcPort)
+				dropCmd.Start()

-            if contains(disAllowedIps,srcIp){
-                dropCmd := cmd.NewCmd("bash","-c","ss -K dport = " + srcPort)
-                dropCmd.Start()
+				logger.Debug("request droped : ",srcIp,srcPort,"to",destIp,destPort)
+			} 
+		}
+	}

-                logger.Debug("request droped : ",srcIp,srcPort,"to",destIp,destPort)
-            }
-        }
-    }
 }

-
 func LocalIP() ([]string, error) {
 	// get machine ips

--- a/web/job/check_cpu_usage.go
+++ b/web/job/check_cpu_usage.go
@@ -1,30 +0,0 @@
-package job
-
-import (
-	"fmt"
-	"time"
-	"x-ui/web/service"
-
-	"github.com/shirou/gopsutil/v3/cpu"
-)
-
-type CheckCpuJob struct {
-	tgbotService   service.Tgbot
-	settingService service.SettingService
-}
-
-func NewCheckCpuJob() *CheckCpuJob {
-	return new(CheckCpuJob)
-}
-
-// Here run is a interface method of Job interface
-func (j *CheckCpuJob) Run() {
-	threshold, _ := j.settingService.GetTgCpu()
-
-	// get latest status of server
-	percent, err := cpu.Percent(1*time.Second, false)
-	if err == nil && percent[0] > float64(threshold) {
-		msg := fmt.Sprintf("🔴 CPU usage %.2f%% is more than threshold %d%%", percent[0], threshold)
-		j.tgbotService.SendMsgToTgbotAdmins(msg)
-	}
-}
--- a/web/job/stats_notify_job.go
+++ b/web/job/stats_notify_job.go
@@ -1,7 +1,15 @@
 package job

 import (
+	"fmt"
+	"net"
+	"os"
+	"time"
+	"x-ui/logger"
+	"x-ui/util/common"
 	"x-ui/web/service"
+
+	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
 )

 type LoginStatus byte
@@ -12,18 +20,229 @@ const (
 )

 type StatsNotifyJob struct {
-	xrayService  service.XrayService
-	tgbotService service.Tgbot
+	enable         bool
+	xrayService    service.XrayService
+	inboundService service.InboundService
+	settingService service.SettingService
 }

 func NewStatsNotifyJob() *StatsNotifyJob {
 	return new(StatsNotifyJob)
 }

+func (j *StatsNotifyJob) SendMsgToTgbot(msg string) {
+	//Telegram bot basic info
+	tgBottoken, err := j.settingService.GetTgBotToken()
+	if err != nil || tgBottoken == "" {
+		logger.Warning("sendMsgToTgbot failed,GetTgBotToken fail:", err)
+		return
+	}
+	tgBotid, err := j.settingService.GetTgBotChatId()
+	if err != nil {
+		logger.Warning("sendMsgToTgbot failed,GetTgBotChatId fail:", err)
+		return
+	}
+
+	bot, err := tgbotapi.NewBotAPI(tgBottoken)
+	if err != nil {
+		fmt.Println("get tgbot error:", err)
+		return
+	}
+	bot.Debug = true
+	fmt.Printf("Authorized on account %s", bot.Self.UserName)
+	info := tgbotapi.NewMessage(int64(tgBotid), msg)
+	//msg.ReplyToMessageID = int(tgBotid)
+	bot.Send(info)
+}
+
 // Here run is a interface method of Job interface
 func (j *StatsNotifyJob) Run() {
 	if !j.xrayService.IsXrayRunning() {
 		return
 	}
-	j.tgbotService.SendReport()
+	var info string
+	//get hostname
+	name, err := os.Hostname()
+	if err != nil {
+		fmt.Println("get hostname error:", err)
+		return
+	}
+	info = fmt.Sprintf("Hostname:%s\r\n", name)
+	//get ip address
+	var ip string
+	netInterfaces, err := net.Interfaces()
+	if err != nil {
+		fmt.Println("net.Interfaces failed, err:", err.Error())
+		return
+	}
+
+	for i := 0; i < len(netInterfaces); i++ {
+		if (netInterfaces[i].Flags & net.FlagUp) != 0 {
+			addrs, _ := netInterfaces[i].Addrs()
+
+			for _, address := range addrs {
+				if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
+					if ipnet.IP.To4() != nil {
+						ip = ipnet.IP.String()
+						break
+					} else {
+						ip = ipnet.IP.String()
+						break
+					}
+				}
+			}
+		}
+	}
+	info += fmt.Sprintf("IP:%s\r\n \r\n", ip)
+
+	// get traffic
+	inbouds, err := j.inboundService.GetAllInbounds()
+	if err != nil {
+		logger.Warning("StatsNotifyJob run failed:", err)
+		return
+	}
+	// NOTE:If there no any sessions here,need to notify here
+	// TODO:Sub-node push, automatic conversion format
+	for _, inbound := range inbouds {
+		info += fmt.Sprintf("Node name:%s\r\nPort:%d\r\nUpload↑:%s\r\nDownload↓:%s\r\nTotal:%s\r\n", inbound.Remark, inbound.Port, common.FormatTraffic(inbound.Up), common.FormatTraffic(inbound.Down), common.FormatTraffic((inbound.Up + inbound.Down)))
+		if inbound.ExpiryTime == 0 {
+			info += fmt.Sprintf("Expire date:unlimited\r\n \r\n")
+		} else {
+			info += fmt.Sprintf("Expire date:%s\r\n \r\n", time.Unix((inbound.ExpiryTime/1000), 0).Format("2006-01-02 15:04:05"))
+		}
+	}
+	j.SendMsgToTgbot(info)
+}
+
+func (j *StatsNotifyJob) UserLoginNotify(username string, ip string, time string, status LoginStatus) {
+	if username == "" || ip == "" || time == "" {
+		logger.Warning("UserLoginNotify failed,invalid info")
+		return
+	}
+	var msg string
+	// Get hostname
+	name, err := os.Hostname()
+	if err != nil {
+		fmt.Println("get hostname error:", err)
+		return
+	}
+	if status == LoginSuccess {
+		msg = fmt.Sprintf("Successfully logged-in to the panel\r\nHostname:%s\r\n", name)
+	} else if status == LoginFail {
+		msg = fmt.Sprintf("Login to the panel was unsuccessful\r\nHostname:%s\r\n", name)
+	}
+	msg += fmt.Sprintf("Time:%s\r\n", time)
+	msg += fmt.Sprintf("Username:%s\r\n", username)
+	msg += fmt.Sprintf("IP:%s\r\n", ip)
+	j.SendMsgToTgbot(msg)
+}
+
+var numericKeyboard = tgbotapi.NewInlineKeyboardMarkup(
+	tgbotapi.NewInlineKeyboardRow(
+		tgbotapi.NewInlineKeyboardButtonData("Get Usage", "get_usage"),
+	),
+)
+
+func (j *StatsNotifyJob) OnReceive() *StatsNotifyJob {
+	tgBottoken, err := j.settingService.GetTgBotToken()
+	if err != nil || tgBottoken == "" {
+		logger.Warning("sendMsgToTgbot failed,GetTgBotToken fail:", err)
+		return j
+	}
+	bot, err := tgbotapi.NewBotAPI(tgBottoken)
+	if err != nil {
+		fmt.Println("get tgbot error:", err)
+		return j
+	}
+	bot.Debug = false
+	u := tgbotapi.NewUpdate(0)
+	u.Timeout = 10
+
+	updates := bot.GetUpdatesChan(u)
+
+	for update := range updates {
+		if update.Message == nil {
+
+			if update.CallbackQuery != nil {
+				// Respond to the callback query, telling Telegram to show the user
+				// a message with the data received.
+				callback := tgbotapi.NewCallback(update.CallbackQuery.ID, update.CallbackQuery.Data)
+				if _, err := bot.Request(callback); err != nil {
+					logger.Warning(err)
+				}
+
+				// And finally, send a message containing the data received.
+				msg := tgbotapi.NewMessage(update.CallbackQuery.Message.Chat.ID, "")
+
+				switch update.CallbackQuery.Data {
+				case "get_usage":
+					msg.Text = "for get your usage send command like this : \n <code>/usage uuid | id</code> \n example : <code>/usage fc3239ed-8f3b-4151-ff51-b183d5182142</code>"
+					msg.ParseMode = "HTML"
+				}
+				if _, err := bot.Send(msg); err != nil {
+					logger.Warning(err)
+				}
+			}
+
+			continue
+		}
+
+		if !update.Message.IsCommand() { // ignore any non-command Messages
+			continue
+		}
+
+		// Create a new MessageConfig. We don't have text yet,
+		// so we leave it empty.
+		msg := tgbotapi.NewMessage(update.Message.Chat.ID, "")
+
+		// Extract the command from the Message.
+		switch update.Message.Command() {
+		case "help":
+			msg.Text = "What you need?"
+			msg.ReplyMarkup = numericKeyboard
+		case "start":
+			msg.Text = "Hi :) \n What you need?"
+			msg.ReplyMarkup = numericKeyboard
+
+		case "status":
+			msg.Text = "bot is ok."
+
+		case "usage":
+			msg.Text = j.getClientUsage(update.Message.CommandArguments())
+		default:
+			msg.Text = "I don't know that command, /help"
+			msg.ReplyMarkup = numericKeyboard
+
+		}
+
+		if _, err := bot.Send(msg); err != nil {
+			logger.Warning(err)
+		}
+	}
+	return j
+
+}
+func (j *StatsNotifyJob) getClientUsage(id string) string {
+	traffic, err := j.inboundService.GetClientTrafficById(id)
+	if err != nil {
+		logger.Warning(err)
+		return "something wrong!"
+	}
+	expiryTime := ""
+	if traffic.ExpiryTime == 0 {
+		expiryTime = fmt.Sprintf("unlimited")
+	} else {
+		expiryTime = fmt.Sprintf("%s", time.Unix((traffic.ExpiryTime/1000), 0).Format("2006-01-02 15:04:05"))
+	}
+	total := ""
+	if traffic.Total == 0 {
+		total = fmt.Sprintf("unlimited")
+	} else {
+		total = fmt.Sprintf("%s", common.FormatTraffic((traffic.Total)))
+	}
+	output := fmt.Sprintf("💡 Active: %t\r\n📧 Email: %s\r\n🔼 Download↑: %s\r\n🔽 Upload↓: %s\r\n🔄 Total: %s / %s\r\n📅 Expire in: %s\r\n",
+		traffic.Enable, traffic.Email, common.FormatTraffic(traffic.Up), common.FormatTraffic(traffic.Down), common.FormatTraffic((traffic.Up + traffic.Down)),
+		total, expiryTime)
+
+	return output
 }
--- a/web/job/xray_traffic_job.go
+++ b/web/job/xray_traffic_job.go
@@ -28,10 +28,11 @@ func (j *XrayTrafficJob) Run() {
 	if err != nil {
 		logger.Warning("add traffic failed:", err)
 	}
-
+	
 	err = j.inboundService.AddClientTraffic(clientTraffics)
 	if err != nil {
 		logger.Warning("add client traffic failed:", err)
 	}

+
 }
--- a/web/service/config.json
+++ b/web/service/config.json
@@ -1,8 +1,9 @@
 {
  "log": {
-    "loglevel": "warning",
+    "loglevel": "warning", 
    "access": "./access.log"
  },
+ 
  "api": {
    "services": [
      "HandlerService",
@@ -46,7 +47,6 @@
    }
  },
  "routing": {
-    "domainStrategy": "IPIfNonMatch",
    "rules": [
      {
        "inboundTag": [
@@ -56,10 +56,10 @@
        "type": "field"
      },
      {
-        "outboundTag": "blocked",
        "ip": [
          "geoip:private"
        ],
+        "outboundTag": "blocked",
        "type": "field"
      },
      {
@@ -72,4 +72,4 @@
    ]
  },
  "stats": {}
-}
+}
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -54,7 +54,7 @@ func (s *InboundService) getClients(inbound *model.Inbound) ([]model.Client, err
 	settings := map[string][]model.Client{}
 	json.Unmarshal([]byte(inbound.Settings), &settings)
 	if settings == nil {
-		return nil, fmt.Errorf("setting is null")
+		return nil, fmt.Errorf("Setting is null")
 	}

 	clients := settings["clients"]
@@ -125,18 +125,11 @@ func (s *InboundService) AddInbound(inbound *model.Inbound) (*model.Inbound, err
 		return inbound, common.NewError("Duplicate email:", existEmail)
 	}

-	clients, err := s.getClients(inbound)
-	if err != nil {
-		return inbound, err
-	}
-
 	db := database.GetDB()

 	err = db.Save(inbound).Error
 	if err == nil {
-		for _, client := range clients {
-			s.AddClientStat(inbound.Id, &client)
-		}
+		s.UpdateClientStat(inbound.Id, inbound.Settings)
 	}
 	return inbound, err
 }
@@ -175,24 +168,6 @@ func (s *InboundService) AddInbounds(inbounds []*model.Inbound) error {

 func (s *InboundService) DelInbound(id int) error {
 	db := database.GetDB()
-	err := db.Where("inbound_id = ?", id).Delete(xray.ClientTraffic{}).Error
-	if err != nil {
-		return err
-	}
-	inbound, err := s.GetInbound(id)
-	if err != nil {
-		return err
-	}
-	clients, err := s.getClients(inbound)
-	if err != nil {
-		return err
-	}
-	for _, client := range clients {
-		err := s.DelClientIPs(db, client.Email)
-		if err != nil {
-			return err
-		}
-	}
 	return db.Delete(model.Inbound{}, id).Error
 }

@@ -241,128 +216,11 @@ func (s *InboundService) UpdateInbound(inbound *model.Inbound) (*model.Inbound,
 	oldInbound.Sniffing = inbound.Sniffing
 	oldInbound.Tag = fmt.Sprintf("inbound-%v", inbound.Port)

+	s.UpdateClientStat(inbound.Id, inbound.Settings)
 	db := database.GetDB()
 	return inbound, db.Save(oldInbound).Error
 }

-func (s *InboundService) AddInboundClient(inbound *model.Inbound) error {
-	existEmail, err := s.checkEmailExistForInbound(inbound)
-	if err != nil {
-		return err
-	}
-
-	if existEmail != "" {
-		return common.NewError("Duplicate email:", existEmail)
-	}
-
-	clients, err := s.getClients(inbound)
-	if err != nil {
-		return err
-	}
-
-	oldInbound, err := s.GetInbound(inbound.Id)
-	if err != nil {
-		return err
-	}
-
-	oldClients, err := s.getClients(oldInbound)
-	if err != nil {
-		return err
-	}
-
-	oldInbound.Settings = inbound.Settings
-
-	if len(clients[len(clients)-1].Email) > 0 {
-		s.AddClientStat(inbound.Id, &clients[len(clients)-1])
-	}
-	for i := len(oldClients); i < len(clients); i++ {
-		if len(clients[i].Email) > 0 {
-			s.AddClientStat(inbound.Id, &clients[i])
-		}
-	}
-	db := database.GetDB()
-	return db.Save(oldInbound).Error
-}
-
-func (s *InboundService) DelInboundClient(inbound *model.Inbound, email string) error {
-	db := database.GetDB()
-	err := s.DelClientStat(db, email)
-	if err != nil {
-		logger.Error("Delete stats Data Error")
-		return err
-	}
-
-	oldInbound, err := s.GetInbound(inbound.Id)
-	if err != nil {
-		logger.Error("Load Old Data Error")
-		return err
-	}
-
-	oldInbound.Settings = inbound.Settings
-
-	err = s.DelClientIPs(db, email)
-	if err != nil {
-		logger.Error("Error in delete client IPs")
-		return err
-	}
-
-	return db.Save(oldInbound).Error
-}
-
-func (s *InboundService) UpdateInboundClient(inbound *model.Inbound, index int) error {
-	existEmail, err := s.checkEmailExistForInbound(inbound)
-	if err != nil {
-		return err
-	}
-	if existEmail != "" {
-		return common.NewError("Duplicate email:", existEmail)
-	}
-
-	clients, err := s.getClients(inbound)
-	if err != nil {
-		return err
-	}
-
-	oldInbound, err := s.GetInbound(inbound.Id)
-	if err != nil {
-		return err
-	}
-
-	oldClients, err := s.getClients(oldInbound)
-	if err != nil {
-		return err
-	}
-
-	oldInbound.Settings = inbound.Settings
-
-	db := database.GetDB()
-
-	if len(clients[index].Email) > 0 {
-		if len(oldClients[index].Email) > 0 {
-			err = s.UpdateClientStat(oldClients[index].Email, &clients[index])
-			if err != nil {
-				return err
-			}
-			err = s.UpdateClientIPs(db, oldClients[index].Email, clients[index].Email)
-			if err != nil {
-				return err
-			}
-		} else {
-			s.AddClientStat(inbound.Id, &clients[index])
-		}
-	} else {
-		err = s.DelClientStat(db, oldClients[index].Email)
-		if err != nil {
-			return err
-		}
-		err = s.DelClientIPs(db, oldClients[index].Email)
-		if err != nil {
-			return err
-		}
-	}
-	return db.Save(oldInbound).Error
-}
-
 func (s *InboundService) AddTraffic(traffics []*xray.Traffic) (err error) {
 	if len(traffics) == 0 {
 		return nil
@@ -394,16 +252,11 @@ func (s *InboundService) AddClientTraffic(traffics []*xray.ClientTraffic) (err e
 	if len(traffics) == 0 {
 		return nil
 	}
-
-	traffics, err = s.adjustTraffics(traffics)
-	if err != nil {
-		return err
-	}
-
 	db := database.GetDB()
+	dbInbound := db.Model(model.Inbound{})
+
 	db = db.Model(xray.ClientTraffic{})
 	tx := db.Begin()
-
 	defer func() {
 		if err != nil {
 			tx.Rollback()
@@ -411,20 +264,7 @@ func (s *InboundService) AddClientTraffic(traffics []*xray.ClientTraffic) (err e
 			tx.Commit()
 		}
 	}()
-
-	err = tx.Save(traffics).Error
-	if err != nil {
-		logger.Warning("AddClientTraffic update data ", err)
-	}
-
-	return nil
-}
-
-func (s *InboundService) adjustTraffics(traffics []*xray.ClientTraffic) (full_traffics []*xray.ClientTraffic, err error) {
-	db := database.GetDB()
-	dbInbound := db.Model(model.Inbound{})
 	txInbound := dbInbound.Begin()
-
 	defer func() {
 		if err != nil {
 			txInbound.Rollback()
@@ -433,68 +273,50 @@ func (s *InboundService) adjustTraffics(traffics []*xray.ClientTraffic) (full_tr
 		}
 	}()

-	for traffic_index, traffic := range traffics {
+	for _, traffic := range traffics {
 		inbound := &model.Inbound{}
-		client_traffic := &xray.ClientTraffic{}
-		err := db.Model(xray.ClientTraffic{}).Where("email = ?", traffic.Email).First(client_traffic).Error
+		client := &xray.ClientTraffic{}
+		err := tx.Where("email = ?", traffic.Email).First(client).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				logger.Warning(err, traffic.Email)
 			}
 			continue
 		}
-		client_traffic.Up += traffic.Up
-		client_traffic.Down += traffic.Down
-
-		err = txInbound.Where("id=?", client_traffic.InboundId).First(inbound).Error
+		err = txInbound.Where("id=?", client.InboundId).First(inbound).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				logger.Warning(err, traffic.Email)
 			}
 			continue
 		}
-		// get clients
-		clients, err := s.getClients(inbound)
-		needUpdate := false
-		if err == nil {
-			for client_index, client := range clients {
-				if traffic.Email == client.Email {
-					if client.ExpiryTime < 0 {
-						clients[client_index].ExpiryTime = (time.Now().Unix() * 1000) - client.ExpiryTime
-						needUpdate = true
-					}
-					client_traffic.ExpiryTime = client.ExpiryTime
-					client_traffic.Total = client.TotalGB
-					break
-				}
+		// get settings clients
+		settings := map[string][]model.Client{}
+		json.Unmarshal([]byte(inbound.Settings), &settings)
+		clients := settings["clients"]
+		for _, client := range clients {
+			if traffic.Email == client.Email {
+				traffic.ExpiryTime = client.ExpiryTime
+				traffic.Total = client.TotalGB
 			}
 		}
-
-		if needUpdate {
-			settings := map[string]interface{}{}
-			json.Unmarshal([]byte(inbound.Settings), &settings)
-
-			// Convert clients to []interface to update clients in settings
-			var clientsInterface []interface{}
-			for _, c := range clients {
-				clientsInterface = append(clientsInterface, interface{}(c))
-			}
-
-			settings["clients"] = clientsInterface
-			modifiedSettings, err := json.MarshalIndent(settings, "", "  ")
-			if err != nil {
-				return nil, err
-			}
-
-			err = txInbound.Where("id=?", inbound.Id).Update("settings", string(modifiedSettings)).Error
-			if err != nil {
-				return nil, err
-			}
+		if tx.Where("inbound_id = ?", inbound.Id).Where("email = ?", traffic.Email).
+			UpdateColumns(map[string]interface{}{
+				"enable":      true,
+				"expiry_time": traffic.ExpiryTime,
+				"total":       traffic.Total,
+				"up":          gorm.Expr("up + ?", traffic.Up),
+				"down":        gorm.Expr("down + ?", traffic.Down)}).RowsAffected == 0 {
+			err = tx.Create(traffic).Error
+		}
+
+		if err != nil {
+			logger.Warning("AddClientTraffic update data ", err)
+			continue
 		}

-		traffics[traffic_index] = client_traffic
 	}
-	return traffics, nil
+	return
 }

 func (s *InboundService) DisableInvalidInbounds() (int64, error) {
@@ -517,89 +339,67 @@ func (s *InboundService) DisableInvalidClients() (int64, error) {
 	count := result.RowsAffected
 	return count, err
 }
-func (s *InboundService) AddClientStat(inboundId int, client *model.Client) error {
+func (s *InboundService) UpdateClientStat(inboundId int, inboundSettings string) error {
 	db := database.GetDB()

-	clientTraffic := xray.ClientTraffic{}
-	clientTraffic.InboundId = inboundId
-	clientTraffic.Email = client.Email
-	clientTraffic.Total = client.TotalGB
-	clientTraffic.ExpiryTime = client.ExpiryTime
-	clientTraffic.Enable = true
-	clientTraffic.Up = 0
-	clientTraffic.Down = 0
-	result := db.Create(&clientTraffic)
-	err := result.Error
-	if err != nil {
-		return err
+	// get settings clients
+	settings := map[string][]model.Client{}
+	json.Unmarshal([]byte(inboundSettings), &settings)
+	clients := settings["clients"]
+	for _, client := range clients {
+		result := db.Model(xray.ClientTraffic{}).
+			Where("inbound_id = ? and email = ?", inboundId, client.Email).
+			Updates(map[string]interface{}{"enable": true, "total": client.TotalGB, "expiry_time": client.ExpiryTime})
+		if result.RowsAffected == 0 {
+			clientTraffic := xray.ClientTraffic{}
+			clientTraffic.InboundId = inboundId
+			clientTraffic.Email = client.Email
+			clientTraffic.Total = client.TotalGB
+			clientTraffic.ExpiryTime = client.ExpiryTime
+			clientTraffic.Enable = true
+			clientTraffic.Up = 0
+			clientTraffic.Down = 0
+			db.Create(&clientTraffic)
+		}
+		err := result.Error
+		if err != nil {
+			return err
+		}
+
 	}
 	return nil
 }
-func (s *InboundService) UpdateClientStat(email string, client *model.Client) error {
-	db := database.GetDB()
-
-	result := db.Model(xray.ClientTraffic{}).
-		Where("email = ?", email).
-		Updates(map[string]interface{}{
-			"enable":      true,
-			"email":       client.Email,
-			"total":       client.TotalGB,
-			"expiry_time": client.ExpiryTime})
-	err := result.Error
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *InboundService) UpdateClientIPs(tx *gorm.DB, oldEmail string, newEmail string) error {
-	return tx.Model(model.InboundClientIps{}).Where("client_email = ?", oldEmail).Update("client_email", newEmail).Error
-}
-
 func (s *InboundService) DelClientStat(tx *gorm.DB, email string) error {
 	return tx.Where("email = ?", email).Delete(xray.ClientTraffic{}).Error
 }
-
-func (s *InboundService) DelClientIPs(tx *gorm.DB, email string) error {
-	logger.Warning(email)
-	return tx.Where("client_email = ?", email).Delete(model.InboundClientIps{}).Error
+func (s *InboundService) GetInboundClientIps(clientEmail string) (string, error) {
+	db := database.GetDB()
+	InboundClientIps := &model.InboundClientIps{}
+	err := db.Model(model.InboundClientIps{}).Where("client_email = ?", clientEmail).First(InboundClientIps).Error
+	if err != nil {
+		return "", err
+	}
+	return InboundClientIps.Ips, nil
 }
-
-func (s *InboundService) ResetClientTraffic(id int, clientEmail string) error {
+func (s *InboundService) ClearClientIps(clientEmail string) (error) {
 	db := database.GetDB()

-	result := db.Model(xray.ClientTraffic{}).
-		Where("inbound_id = ? and email = ?", id, clientEmail).
-		Updates(map[string]interface{}{"enable": true, "up": 0, "down": 0})
-
+	result := db.Model(model.InboundClientIps{}).
+		Where("client_email = ?", clientEmail).
+		Update("ips", "")
 	err := result.Error

+
 	if err != nil {
 		return err
 	}
 	return nil
 }
-
-func (s *InboundService) ResetAllClientTraffics(id int) error {
+func (s *InboundService) ResetClientTraffic(clientEmail string) error {
 	db := database.GetDB()

 	result := db.Model(xray.ClientTraffic{}).
-		Where("inbound_id = ?", id).
-		Updates(map[string]interface{}{"enable": true, "up": 0, "down": 0})
-
-	err := result.Error
-
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *InboundService) ResetAllTraffics() error {
-	db := database.GetDB()
-
-	result := db.Model(model.Inbound{}).
-		Where("user_id > ?", 0).
+		Where("email = ?", clientEmail).
 		Updates(map[string]interface{}{"up": 0, "down": 0})

 	err := result.Error
@@ -609,57 +409,12 @@ func (s *InboundService) ResetAllTraffics() error {
 	}
 	return nil
 }
-
-func (s *InboundService) GetClientTrafficTgBot(tguname string) ([]*xray.ClientTraffic, error) {
-	db := database.GetDB()
-	var inbounds []*model.Inbound
-	err := db.Model(model.Inbound{}).Where("settings like ?", fmt.Sprintf(`%%"tgId": "%s"%%`, tguname)).Find(&inbounds).Error
-	if err != nil && err != gorm.ErrRecordNotFound {
-		return nil, err
-	}
-	var emails []string
-	for _, inbound := range inbounds {
-		clients, err := s.getClients(inbound)
-		if err != nil {
-			logger.Error("Unable to get clients from inbound")
-		}
-		for _, client := range clients {
-			if client.TgID == tguname {
-				emails = append(emails, client.Email)
-			}
-		}
-	}
-	var traffics []*xray.ClientTraffic
-	err = db.Model(xray.ClientTraffic{}).Where("email IN ?", emails).Find(&traffics).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			logger.Warning(err)
-			return nil, err
-		}
-	}
-	return traffics, err
-}
-
-func (s *InboundService) GetClientTrafficByEmail(email string) (traffic []*xray.ClientTraffic, err error) {
-	db := database.GetDB()
-	var traffics []*xray.ClientTraffic
-
-	err = db.Model(xray.ClientTraffic{}).Where("email like ?", "%"+email+"%").Find(&traffics).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			logger.Warning(err)
-			return nil, err
-		}
-	}
-	return traffics, err
-}
-
-func (s *InboundService) SearchClientTraffic(query string) (traffic *xray.ClientTraffic, err error) {
+func (s *InboundService) GetClientTrafficById(uuid string) (traffic *xray.ClientTraffic, err error) {
 	db := database.GetDB()
 	inbound := &model.Inbound{}
 	traffic = &xray.ClientTraffic{}

-	err = db.Model(model.Inbound{}).Where("settings like ?", "%\""+query+"\"%").First(inbound).Error
+	err = db.Model(model.Inbound{}).Where("settings like ?", "%"+uuid+"%").First(inbound).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			logger.Warning(err)
@@ -673,17 +428,9 @@ func (s *InboundService) SearchClientTraffic(query string) (traffic *xray.Client
 	json.Unmarshal([]byte(inbound.Settings), &settings)
 	clients := settings["clients"]
 	for _, client := range clients {
-		if client.ID == query && client.Email != "" {
+		if uuid == client.ID {
 			traffic.Email = client.Email
-			break
 		}
-		if client.Password == query && client.Email != "" {
-			traffic.Email = client.Email
-			break
-		}
-	}
-	if traffic.Email == "" {
-		return nil, err
 	}
 	err = db.Model(xray.ClientTraffic{}).Where("email = ?", traffic.Email).First(traffic).Error
 	if err != nil {
@@ -692,36 +439,3 @@ func (s *InboundService) SearchClientTraffic(query string) (traffic *xray.Client
 	}
 	return traffic, err
 }
-
-func (s *InboundService) GetInboundClientIps(clientEmail string) (string, error) {
-	db := database.GetDB()
-	InboundClientIps := &model.InboundClientIps{}
-	err := db.Model(model.InboundClientIps{}).Where("client_email = ?", clientEmail).First(InboundClientIps).Error
-	if err != nil {
-		return "", err
-	}
-	return InboundClientIps.Ips, nil
-}
-func (s *InboundService) ClearClientIps(clientEmail string) error {
-	db := database.GetDB()
-
-	result := db.Model(model.InboundClientIps{}).
-		Where("client_email = ?", clientEmail).
-		Update("ips", "")
-	err := result.Error
-
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *InboundService) SearchInbounds(query string) ([]*model.Inbound, error) {
-	db := database.GetDB()
-	var inbounds []*model.Inbound
-	err := db.Model(model.Inbound{}).Preload("ClientStats").Where("remark like ?", "%"+query+"%").Find(&inbounds).Error
-	if err != nil && err != gorm.ErrRecordNotFound {
-		return nil, err
-	}
-	return inbounds, nil
-}
--- a/web/service/server.go
+++ b/web/service/server.go
@@ -9,11 +9,8 @@ import (
 	"io/fs"
 	"net/http"
 	"os"
-	"os/exec"
 	"runtime"
-	"strings"
 	"time"
-	"x-ui/config"
 	"x-ui/logger"
 	"x-ui/util/sys"
 	"x-ui/xray"
@@ -146,7 +143,7 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 	} else {
 		logger.Warning("can not find io counters")
 	}
-
+	
 	status.TcpCount, err = sys.GetTCPCount()
 	if err != nil {
 		logger.Warning("get tcp connections failed:", err)
@@ -156,7 +153,7 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status {
 	if err != nil {
 		logger.Warning("get udp connections failed:", err)
 	}
-
+	
 	if s.xrayService.IsXrayRunning() {
 		status.Xray.State = Running
 		status.Xray.ErrorMsg = ""
@@ -203,24 +200,24 @@ func (s *ServerService) GetXrayVersions() ([]string, error) {

 func (s *ServerService) StopXrayService() (string error) {

-	err := s.xrayService.StopXray()
-	if err != nil {
-		logger.Error("stop xray failed:", err)
-		return err
-	}
+        err := s.xrayService.StopXray()
+                if err != nil {
+                        logger.Error("stop xray failed:", err)
+                        return err
+                }

 	return nil
 }

 func (s *ServerService) RestartXrayService() (string error) {

-	s.xrayService.StopXray()
-	defer func() {
-		err := s.xrayService.RestartXray(true)
-		if err != nil {
-			logger.Error("start xray failed:", err)
+        s.xrayService.StopXray()
+        defer func() {
+                err := s.xrayService.RestartXray(true)
+                if err != nil {
+                        logger.Error("start xray failed:", err)
 		}
-	}()
+        }()

 	return nil
 }
@@ -327,66 +324,3 @@ func (s *ServerService) UpdateXray(version string) error {
 	return nil

 }
-
-func (s *ServerService) GetLogs(count string) ([]string, error) {
-	// Define the journalctl command and its arguments
-	var cmdArgs []string
-	if runtime.GOOS == "linux" {
-		cmdArgs = []string{"journalctl", "-u", "x-ui", "--no-pager", "-n", count}
-	} else {
-		return []string{"Unsupported operating system"}, nil
-	}
-
-	// Run the command
-	cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err := cmd.Run()
-	if err != nil {
-		return nil, err
-	}
-
-	lines := strings.Split(out.String(), "\n")
-
-	return lines, nil
-}
-
-func (s *ServerService) GetConfigJson() (interface{}, error) {
-	// Open the file for reading
-	file, err := os.Open(xray.GetConfigPath())
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	// Read the file contents
-	fileContents, err := io.ReadAll(file)
-	if err != nil {
-		return nil, err
-	}
-
-	var jsonData interface{}
-	err = json.Unmarshal(fileContents, &jsonData)
-	if err != nil {
-		return nil, err
-	}
-
-	return jsonData, nil
-}
-
-func (s *ServerService) GetDb() ([]byte, error) {
-	// Open the file for reading
-	file, err := os.Open(config.GetDBPath())
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	// Read the file contents
-	fileContents, err := io.ReadAll(file)
-	if err != nil {
-		return nil, err
-	}
-
-	return fileContents, nil
-}
--- a/web/service/setting.go
+++ b/web/service/setting.go
@@ -28,15 +28,11 @@ var defaultValueMap = map[string]string{
 	"webKeyFile":         "",
 	"secret":             random.Seq(32),
 	"webBasePath":        "/",
-	"expireDiff":         "0",
-	"trafficDiff":        "0",
 	"timeLocation":       "Asia/Tehran",
 	"tgBotEnable":        "false",
 	"tgBotToken":         "",
-	"tgBotChatId":        "",
-	"tgRunTime":          "@daily",
-	"tgBotBackup":        "false",
-	"tgCpu":              "0",
+	"tgBotChatId":        "0",
+	"tgRunTime":          "",
 }

 type SettingService struct {
@@ -206,44 +202,28 @@ func (s *SettingService) SetTgBotToken(token string) error {
 	return s.setString("tgBotToken", token)
 }

-func (s *SettingService) GetTgBotChatId() (string, error) {
-	return s.getString("tgBotChatId")
+func (s *SettingService) GetTgBotChatId() (int, error) {
+	return s.getInt("tgBotChatId")
 }

-func (s *SettingService) SetTgBotChatId(chatIds string) error {
-	return s.setString("tgBotChatId", chatIds)
-}
-
-func (s *SettingService) GetTgbotenabled() (bool, error) {
-	return s.getBool("tgBotEnable")
+func (s *SettingService) SetTgBotChatId(chatId int) error {
+	return s.setInt("tgBotChatId", chatId)
 }

 func (s *SettingService) SetTgbotenabled(value bool) error {
 	return s.setBool("tgBotEnable", value)
 }

-func (s *SettingService) GetTgbotRuntime() (string, error) {
-	return s.getString("tgRunTime")
+func (s *SettingService) GetTgbotenabled() (bool, error) {
+	return s.getBool("tgBotEnable")
 }

 func (s *SettingService) SetTgbotRuntime(time string) error {
 	return s.setString("tgRunTime", time)
 }

-func (s *SettingService) GetTgBotBackup() (bool, error) {
-	return s.getBool("tgBotBackup")
-}
-
-func (s *SettingService) SetTgBotBackup(value bool) error {
-	return s.setBool("tgBotBackup", value)
-}
-
-func (s *SettingService) GetTgCpu() (int, error) {
-	return s.getInt("tgCpu")
-}
-
-func (s *SettingService) SetTgCpu(value int) error {
-	return s.setInt("tgCpu", value)
+func (s *SettingService) GetTgbotRuntime() (string, error) {
+	return s.getString("tgRunTime")
 }

 func (s *SettingService) GetPort() (int, error) {
@@ -262,22 +242,6 @@ func (s *SettingService) GetKeyFile() (string, error) {
 	return s.getString("webKeyFile")
 }

-func (s *SettingService) GetExpireDiff() (int, error) {
-	return s.getInt("expireDiff")
-}
-
-func (s *SettingService) SetExpireDiff(value int) error {
-	return s.setInt("expireDiff", value)
-}
-
-func (s *SettingService) GetTrafficDiff() (int, error) {
-	return s.getInt("trafficDiff")
-}
-
-func (s *SettingService) SetgetTrafficDiff(value int) error {
-	return s.setInt("trafficDiff", value)
-}
-
 func (s *SettingService) GetSecret() ([]byte, error) {
 	secret, err := s.getString("secret")
 	if secret == defaultValueMap["secret"] {
--- a/web/service/sub.go
+++ b/web/service/sub.go
@@ -1,555 +0,0 @@
-package service
-
-import (
-	"encoding/base64"
-	"fmt"
-	"net/url"
-	"strings"
-	"x-ui/database"
-	"x-ui/database/model"
-	"x-ui/logger"
-
-	"github.com/goccy/go-json"
-	"gorm.io/gorm"
-)
-
-type SubService struct {
-	address        string
-	inboundService InboundService
-}
-
-func (s *SubService) GetSubs(subId string, host string) ([]string, error) {
-	s.address = host
-	var result []string
-	inbounds, err := s.getInboundsBySubId(subId)
-	if err != nil {
-		return nil, err
-	}
-	for _, inbound := range inbounds {
-		clients, err := s.inboundService.getClients(inbound)
-		if err != nil {
-			logger.Error("SubService - GetSub: Unable to get clients from inbound")
-		}
-		if clients == nil {
-			continue
-		}
-		for _, client := range clients {
-			if client.SubID == subId {
-				link := s.getLink(inbound, client.Email)
-				result = append(result, link)
-			}
-		}
-	}
-	return result, nil
-}
-
-func (s *SubService) getInboundsBySubId(subId string) ([]*model.Inbound, error) {
-	db := database.GetDB()
-	var inbounds []*model.Inbound
-	err := db.Model(model.Inbound{}).Where("settings like ?", fmt.Sprintf(`%%"subId": "%s"%%`, subId)).Find(&inbounds).Error
-	if err != nil && err != gorm.ErrRecordNotFound {
-		return nil, err
-	}
-	return inbounds, nil
-}
-
-func (s *SubService) getLink(inbound *model.Inbound, email string) string {
-	switch inbound.Protocol {
-	case "vmess":
-		return s.genVmessLink(inbound, email)
-	case "vless":
-		return s.genVlessLink(inbound, email)
-	case "trojan":
-		return s.genTrojanLink(inbound, email)
-	}
-	return ""
-}
-
-func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string {
-	address := s.address
-	if inbound.Protocol != model.VMess {
-		return ""
-	}
-	var stream map[string]interface{}
-	json.Unmarshal([]byte(inbound.StreamSettings), &stream)
-	network, _ := stream["network"].(string)
-	typeStr := "none"
-	host := ""
-	path := ""
-	sni := ""
-	fp := ""
-	var alpn []string
-	allowInsecure := false
-	switch network {
-	case "tcp":
-		tcp, _ := stream["tcpSettings"].(map[string]interface{})
-		header, _ := tcp["header"].(map[string]interface{})
-		typeStr, _ = header["type"].(string)
-		if typeStr == "http" {
-			request := header["request"].(map[string]interface{})
-			requestPath, _ := request["path"].([]interface{})
-			path = requestPath[0].(string)
-			headers, _ := request["headers"].(map[string]interface{})
-			host = searchHost(headers)
-		}
-	case "kcp":
-		kcp, _ := stream["kcpSettings"].(map[string]interface{})
-		header, _ := kcp["header"].(map[string]interface{})
-		typeStr, _ = header["type"].(string)
-		path, _ = kcp["seed"].(string)
-	case "ws":
-		ws, _ := stream["wsSettings"].(map[string]interface{})
-		path = ws["path"].(string)
-		headers, _ := ws["headers"].(map[string]interface{})
-		host = searchHost(headers)
-	case "http":
-		network = "h2"
-		http, _ := stream["httpSettings"].(map[string]interface{})
-		path, _ = http["path"].(string)
-		host = searchHost(http)
-	case "quic":
-		quic, _ := stream["quicSettings"].(map[string]interface{})
-		header := quic["header"].(map[string]interface{})
-		typeStr, _ = header["type"].(string)
-		host, _ = quic["security"].(string)
-		path, _ = quic["key"].(string)
-	case "grpc":
-		grpc, _ := stream["grpcSettings"].(map[string]interface{})
-		path = grpc["serviceName"].(string)
-	}
-
-	security, _ := stream["security"].(string)
-	if security == "tls" {
-		tlsSetting, _ := stream["tlsSettings"].(map[string]interface{})
-		alpns, _ := tlsSetting["alpn"].([]interface{})
-		for _, a := range alpns {
-			alpn = append(alpn, a.(string))
-		}
-		tlsSettings, _ := searchKey(tlsSetting, "settings")
-		if tlsSetting != nil {
-			if sniValue, ok := searchKey(tlsSettings, "serverName"); ok {
-				sni, _ = sniValue.(string)
-			}
-			if fpValue, ok := searchKey(tlsSettings, "fingerprint"); ok {
-				fp, _ = fpValue.(string)
-			}
-			if insecure, ok := searchKey(tlsSettings, "allowInsecure"); ok {
-				allowInsecure, _ = insecure.(bool)
-			}
-		}
-		serverName, _ := tlsSetting["serverName"].(string)
-		if serverName != "" {
-			address = serverName
-		}
-	}
-
-	clients, _ := s.inboundService.getClients(inbound)
-	clientIndex := -1
-	for i, client := range clients {
-		if client.Email == email {
-			clientIndex = i
-			break
-		}
-	}
-
-	obj := map[string]interface{}{
-		"v":             "2",
-		"ps":            email,
-		"add":           address,
-		"port":          inbound.Port,
-		"id":            clients[clientIndex].ID,
-		"aid":           clients[clientIndex].AlterIds,
-		"net":           network,
-		"type":          typeStr,
-		"host":          host,
-		"path":          path,
-		"tls":           security,
-		"sni":           sni,
-		"fp":            fp,
-		"alpn":          strings.Join(alpn, ","),
-		"allowInsecure": allowInsecure,
-	}
-	jsonStr, _ := json.MarshalIndent(obj, "", "  ")
-	return "vmess://" + base64.StdEncoding.EncodeToString(jsonStr)
-}
-
-func (s *SubService) genVlessLink(inbound *model.Inbound, email string) string {
-	address := s.address
-	if inbound.Protocol != model.VLESS {
-		return ""
-	}
-	var stream map[string]interface{}
-	json.Unmarshal([]byte(inbound.StreamSettings), &stream)
-	clients, _ := s.inboundService.getClients(inbound)
-	clientIndex := -1
-	for i, client := range clients {
-		if client.Email == email {
-			clientIndex = i
-			break
-		}
-	}
-	uuid := clients[clientIndex].ID
-	port := inbound.Port
-	streamNetwork := stream["network"].(string)
-	params := make(map[string]string)
-	params["type"] = streamNetwork
-
-	switch streamNetwork {
-	case "tcp":
-		tcp, _ := stream["tcpSettings"].(map[string]interface{})
-		header, _ := tcp["header"].(map[string]interface{})
-		typeStr, _ := header["type"].(string)
-		if typeStr == "http" {
-			request := header["request"].(map[string]interface{})
-			requestPath, _ := request["path"].([]interface{})
-			params["path"] = requestPath[0].(string)
-			headers, _ := request["headers"].(map[string]interface{})
-			params["host"] = searchHost(headers)
-			params["headerType"] = "http"
-		}
-	case "kcp":
-		kcp, _ := stream["kcpSettings"].(map[string]interface{})
-		header, _ := kcp["header"].(map[string]interface{})
-		params["headerType"] = header["type"].(string)
-		params["seed"] = kcp["seed"].(string)
-	case "ws":
-		ws, _ := stream["wsSettings"].(map[string]interface{})
-		params["path"] = ws["path"].(string)
-		headers, _ := ws["headers"].(map[string]interface{})
-		params["host"] = searchHost(headers)
-	case "http":
-		http, _ := stream["httpSettings"].(map[string]interface{})
-		params["path"] = http["path"].(string)
-		params["host"] = searchHost(http)
-	case "quic":
-		quic, _ := stream["quicSettings"].(map[string]interface{})
-		params["quicSecurity"] = quic["security"].(string)
-		params["key"] = quic["key"].(string)
-		header := quic["header"].(map[string]interface{})
-		params["headerType"] = header["type"].(string)
-	case "grpc":
-		grpc, _ := stream["grpcSettings"].(map[string]interface{})
-		params["serviceName"] = grpc["serviceName"].(string)
-	}
-
-	security, _ := stream["security"].(string)
-	if security == "tls" {
-		params["security"] = "tls"
-		tlsSetting, _ := stream["tlsSettings"].(map[string]interface{})
-		alpns, _ := tlsSetting["alpn"].([]interface{})
-		var alpn []string
-		for _, a := range alpns {
-			alpn = append(alpn, a.(string))
-		}
-		if len(alpn) > 0 {
-			params["alpn"] = strings.Join(alpn, ",")
-		}
-		tlsSettings, _ := searchKey(tlsSetting, "settings")
-		if tlsSetting != nil {
-			if sniValue, ok := searchKey(tlsSettings, "serverName"); ok {
-				params["sni"], _ = sniValue.(string)
-			}
-			if fpValue, ok := searchKey(tlsSettings, "fingerprint"); ok {
-				params["fp"], _ = fpValue.(string)
-			}
-			if insecure, ok := searchKey(tlsSettings, "allowInsecure"); ok {
-				if insecure.(bool) {
-					params["allowInsecure"] = "1"
-				}
-			}
-		}
-
-		if streamNetwork == "tcp" && len(clients[clientIndex].Flow) > 0 {
-			params["flow"] = clients[clientIndex].Flow
-		}
-
-		serverName, _ := tlsSetting["serverName"].(string)
-		if serverName != "" {
-			address = serverName
-		}
-	}
-
-	if security == "reality" {
-		params["security"] = "reality"
-		realitySettings, _ := stream["realitySettings"].(map[string]interface{})
-		if realitySettings != nil {
-			if sniValue, ok := searchKey(realitySettings, "serverNames"); ok {
-				sNames, _ := sniValue.([]interface{})
-				params["sni"], _ = sNames[0].(string)
-			}
-			if pbkValue, ok := searchKey(realitySettings, "publicKey"); ok {
-				params["pbk"], _ = pbkValue.(string)
-			}
-			if sidValue, ok := searchKey(realitySettings, "shortIds"); ok {
-				shortIds, _ := sidValue.([]interface{})
-				params["sid"], _ = shortIds[0].(string)
-			}
-			if fpValue, ok := searchKey(realitySettings, "fingerprint"); ok {
-				params["fp"], _ = fpValue.(string)
-			}
-		}
-
-		if streamNetwork == "tcp" && len(clients[clientIndex].Flow) > 0 {
-			params["flow"] = clients[clientIndex].Flow
-		}
-	}
-
-	if security == "xtls" {
-		params["security"] = "xtls"
-		xtlsSetting, _ := stream["XTLSSettings"].(map[string]interface{})
-		alpns, _ := xtlsSetting["alpn"].([]interface{})
-		var alpn []string
-		for _, a := range alpns {
-			alpn = append(alpn, a.(string))
-		}
-		if len(alpn) > 0 {
-			params["alpn"] = strings.Join(alpn, ",")
-		}
-
-		XTLSSettings, _ := searchKey(xtlsSetting, "settings")
-		if xtlsSetting != nil {
-			if sniValue, ok := searchKey(XTLSSettings, "serverName"); ok {
-				params["sni"], _ = sniValue.(string)
-			}
-			if fpValue, ok := searchKey(XTLSSettings, "fingerprint"); ok {
-				params["fp"], _ = fpValue.(string)
-			}
-			if insecure, ok := searchKey(XTLSSettings, "allowInsecure"); ok {
-				if insecure.(bool) {
-					params["allowInsecure"] = "1"
-				}
-			}
-		}
-
-		if streamNetwork == "tcp" && len(clients[clientIndex].Flow) > 0 {
-			params["flow"] = clients[clientIndex].Flow
-		}
-
-		serverName, _ := xtlsSetting["serverName"].(string)
-		if serverName != "" {
-			address = serverName
-		}
-	}
-
-	link := fmt.Sprintf("vless://%s@%s:%d", uuid, address, port)
-	url, _ := url.Parse(link)
-	q := url.Query()
-
-	for k, v := range params {
-		q.Add(k, v)
-	}
-
-	// Set the new query values on the URL
-	url.RawQuery = q.Encode()
-
-	url.Fragment = email
-	return url.String()
-}
-
-func (s *SubService) genTrojanLink(inbound *model.Inbound, email string) string {
-	address := s.address
-	if inbound.Protocol != model.Trojan {
-		return ""
-	}
-	var stream map[string]interface{}
-	json.Unmarshal([]byte(inbound.StreamSettings), &stream)
-	clients, _ := s.inboundService.getClients(inbound)
-	clientIndex := -1
-	for i, client := range clients {
-		if client.Email == email {
-			clientIndex = i
-			break
-		}
-	}
-	password := clients[clientIndex].Password
-	port := inbound.Port
-	streamNetwork := stream["network"].(string)
-	params := make(map[string]string)
-	params["type"] = streamNetwork
-
-	switch streamNetwork {
-	case "tcp":
-		tcp, _ := stream["tcpSettings"].(map[string]interface{})
-		header, _ := tcp["header"].(map[string]interface{})
-		typeStr, _ := header["type"].(string)
-		if typeStr == "http" {
-			request := header["request"].(map[string]interface{})
-			requestPath, _ := request["path"].([]interface{})
-			params["path"] = requestPath[0].(string)
-			headers, _ := request["headers"].(map[string]interface{})
-			params["host"] = searchHost(headers)
-			params["headerType"] = "http"
-		}
-	case "kcp":
-		kcp, _ := stream["kcpSettings"].(map[string]interface{})
-		header, _ := kcp["header"].(map[string]interface{})
-		params["headerType"] = header["type"].(string)
-		params["seed"] = kcp["seed"].(string)
-	case "ws":
-		ws, _ := stream["wsSettings"].(map[string]interface{})
-		params["path"] = ws["path"].(string)
-		headers, _ := ws["headers"].(map[string]interface{})
-		params["host"] = searchHost(headers)
-	case "http":
-		http, _ := stream["httpSettings"].(map[string]interface{})
-		params["path"] = http["path"].(string)
-		params["host"] = searchHost(http)
-	case "quic":
-		quic, _ := stream["quicSettings"].(map[string]interface{})
-		params["quicSecurity"] = quic["security"].(string)
-		params["key"] = quic["key"].(string)
-		header := quic["header"].(map[string]interface{})
-		params["headerType"] = header["type"].(string)
-	case "grpc":
-		grpc, _ := stream["grpcSettings"].(map[string]interface{})
-		params["serviceName"] = grpc["serviceName"].(string)
-	}
-
-	security, _ := stream["security"].(string)
-	if security == "tls" {
-		params["security"] = "tls"
-		tlsSetting, _ := stream["tlsSettings"].(map[string]interface{})
-		alpns, _ := tlsSetting["alpn"].([]interface{})
-		var alpn []string
-		for _, a := range alpns {
-			alpn = append(alpn, a.(string))
-		}
-		if len(alpn) > 0 {
-			params["alpn"] = strings.Join(alpn, ",")
-		}
-		tlsSettings, _ := searchKey(tlsSetting, "settings")
-		if tlsSetting != nil {
-			if sniValue, ok := searchKey(tlsSettings, "serverName"); ok {
-				params["sni"], _ = sniValue.(string)
-			}
-			if fpValue, ok := searchKey(tlsSettings, "fingerprint"); ok {
-				params["fp"], _ = fpValue.(string)
-			}
-			if insecure, ok := searchKey(tlsSettings, "allowInsecure"); ok {
-				if insecure.(bool) {
-					params["allowInsecure"] = "1"
-				}
-			}
-		}
-
-		serverName, _ := tlsSetting["serverName"].(string)
-		if serverName != "" {
-			address = serverName
-		}
-	}
-
-	if security == "reality" {
-		params["security"] = "reality"
-		realitySettings, _ := stream["realitySettings"].(map[string]interface{})
-		if realitySettings != nil {
-			if sniValue, ok := searchKey(realitySettings, "serverNames"); ok {
-				sNames, _ := sniValue.([]interface{})
-				params["sni"], _ = sNames[0].(string)
-			}
-			if pbkValue, ok := searchKey(realitySettings, "publicKey"); ok {
-				params["pbk"], _ = pbkValue.(string)
-			}
-			if sidValue, ok := searchKey(realitySettings, "shortIds"); ok {
-				shortIds, _ := sidValue.([]interface{})
-				params["sid"], _ = shortIds[0].(string)
-			}
-			if fpValue, ok := searchKey(realitySettings, "fingerprint"); ok {
-				params["fp"], _ = fpValue.(string)
-			}
-		}
-
-		if streamNetwork == "tcp" && len(clients[clientIndex].Flow) > 0 {
-			params["flow"] = clients[clientIndex].Flow
-		}
-	}
-
-	if security == "xtls" {
-		params["security"] = "xtls"
-		xtlsSetting, _ := stream["XTLSSettings"].(map[string]interface{})
-		alpns, _ := xtlsSetting["alpn"].([]interface{})
-		var alpn []string
-		for _, a := range alpns {
-			alpn = append(alpn, a.(string))
-		}
-		if len(alpn) > 0 {
-			params["alpn"] = strings.Join(alpn, ",")
-		}
-
-		XTLSSettings, _ := searchKey(xtlsSetting, "settings")
-		if xtlsSetting != nil {
-			if sniValue, ok := searchKey(XTLSSettings, "serverName"); ok {
-				params["sni"], _ = sniValue.(string)
-			}
-			if fpValue, ok := searchKey(XTLSSettings, "fingerprint"); ok {
-				params["fp"], _ = fpValue.(string)
-			}
-			if insecure, ok := searchKey(XTLSSettings, "allowInsecure"); ok {
-				if insecure.(bool) {
-					params["allowInsecure"] = "1"
-				}
-			}
-		}
-
-		if streamNetwork == "tcp" && len(clients[clientIndex].Flow) > 0 {
-			params["flow"] = clients[clientIndex].Flow
-		}
-
-		serverName, _ := xtlsSetting["serverName"].(string)
-		if serverName != "" {
-			address = serverName
-		}
-	}
-
-	link := fmt.Sprintf("trojan://%s@%s:%d", password, address, port)
-
-	url, _ := url.Parse(link)
-	q := url.Query()
-
-	for k, v := range params {
-		q.Add(k, v)
-	}
-
-	// Set the new query values on the URL
-	url.RawQuery = q.Encode()
-
-	url.Fragment = email
-	return url.String()
-}
-
-func searchKey(data interface{}, key string) (interface{}, bool) {
-	switch val := data.(type) {
-	case map[string]interface{}:
-		for k, v := range val {
-			if k == key {
-				return v, true
-			}
-			if result, ok := searchKey(v, key); ok {
-				return result, true
-			}
-		}
-	case []interface{}:
-		for _, v := range val {
-			if result, ok := searchKey(v, key); ok {
-				return result, true
-			}
-		}
-	}
-	return nil, false
-}
-
-func searchHost(headers interface{}) string {
-	data, _ := headers.(map[string]interface{})
-	for k, v := range data {
-		if strings.EqualFold(k, "host") {
-			switch v.(type) {
-			case []interface{}:
-				hosts, _ := v.([]interface{})
-				return hosts[0].(string)
-			case interface{}:
-				return v.(string)
-			}
-		}
-	}
-
-	return ""
-}
--- a/web/service/tgbot.go
+++ b/web/service/tgbot.go
@@ -1,612 +0,0 @@
-package service
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-	"x-ui/config"
-	"x-ui/database/model"
-	"x-ui/logger"
-	"x-ui/util/common"
-	"x-ui/xray"
-
-	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
-)
-
-var bot *tgbotapi.BotAPI
-var adminIds []int64
-var isRunning bool
-
-type LoginStatus byte
-
-const (
-	LoginSuccess LoginStatus = 1
-	LoginFail    LoginStatus = 0
-)
-
-type Tgbot struct {
-	inboundService InboundService
-	settingService SettingService
-	serverService  ServerService
-	lastStatus     *Status
-}
-
-func (t *Tgbot) NewTgbot() *Tgbot {
-	return new(Tgbot)
-}
-
-func (t *Tgbot) Start() error {
-	tgBottoken, err := t.settingService.GetTgBotToken()
-	if err != nil || tgBottoken == "" {
-		logger.Warning("Get TgBotToken failed:", err)
-		return err
-	}
-
-	tgBotid, err := t.settingService.GetTgBotChatId()
-	if err != nil {
-		logger.Warning("Get GetTgBotChatId failed:", err)
-		return err
-	}
-
-	for _, adminId := range strings.Split(tgBotid, ",") {
-		id, err := strconv.Atoi(adminId)
-		if err != nil {
-			logger.Warning("Failed to get IDs from GetTgBotChatId:", err)
-			return err
-		}
-		adminIds = append(adminIds, int64(id))
-	}
-
-	bot, err = tgbotapi.NewBotAPI(tgBottoken)
-	if err != nil {
-		fmt.Println("Get tgbot's api error:", err)
-		return err
-	}
-	bot.Debug = false
-
-	// listen for TG bot income messages
-	if !isRunning {
-		logger.Info("Starting Telegram receiver ...")
-		go t.OnReceive()
-		isRunning = true
-	}
-
-	return nil
-}
-
-func (t *Tgbot) IsRunnging() bool {
-	return isRunning
-}
-
-func (t *Tgbot) Stop() {
-	bot.StopReceivingUpdates()
-	logger.Info("Stop Telegram receiver ...")
-	isRunning = false
-	adminIds = nil
-}
-
-func (t *Tgbot) OnReceive() {
-	u := tgbotapi.NewUpdate(0)
-	u.Timeout = 10
-
-	updates := bot.GetUpdatesChan(u)
-
-	for update := range updates {
-		tgId := update.FromChat().ID
-		chatId := update.FromChat().ChatConfig().ChatID
-		isAdmin := checkAdmin(tgId)
-		if update.Message == nil {
-			if update.CallbackQuery != nil {
-				t.asnwerCallback(update.CallbackQuery, isAdmin)
-			}
-		} else {
-			if update.Message.IsCommand() {
-				t.answerCommand(update.Message, chatId, isAdmin)
-			}
-		}
-	}
-}
-
-func (t *Tgbot) answerCommand(message *tgbotapi.Message, chatId int64, isAdmin bool) {
-	msg := ""
-	// Extract the command from the Message.
-	switch message.Command() {
-	case "help":
-		msg = "This bot is providing you some specefic data from the server.\n\n Please choose:"
-	case "start":
-		msg = "Hello <i>" + message.From.FirstName + "</i> 👋"
-		if isAdmin {
-			hostname, _ := os.Hostname()
-			msg += "\nWelcome to <b>" + hostname + "</b> management bot"
-		}
-		msg += "\n\nI can do some magics for you, please choose:"
-	case "status":
-		msg = "bot is ok ✅"
-	case "usage":
-		if len(message.CommandArguments()) > 1 {
-			if isAdmin {
-				t.searchClient(chatId, message.CommandArguments())
-			} else {
-				t.searchForClient(chatId, message.CommandArguments())
-			}
-		} else {
-			msg = "❗Please provide a text for search!"
-		}
-	case "inbound":
-		if isAdmin {
-			t.searchInbound(chatId, message.CommandArguments())
-		} else {
-			msg = "❗ Unknown command"
-		}
-	default:
-		msg = "❗ Unknown command"
-	}
-	t.SendAnswer(chatId, msg, isAdmin)
-}
-
-func (t *Tgbot) asnwerCallback(callbackQuery *tgbotapi.CallbackQuery, isAdmin bool) {
-	// Respond to the callback query, telling Telegram to show the user
-	// a message with the data received.
-	callback := tgbotapi.NewCallback(callbackQuery.ID, callbackQuery.Data)
-	if _, err := bot.Request(callback); err != nil {
-		logger.Warning(err)
-	}
-
-	switch callbackQuery.Data {
-	case "get_usage":
-		t.SendMsgToTgbot(callbackQuery.From.ID, t.getServerUsage())
-	case "inbounds":
-		t.SendMsgToTgbot(callbackQuery.From.ID, t.getInboundUsages())
-	case "deplete_soon":
-		t.SendMsgToTgbot(callbackQuery.From.ID, t.getExhausted())
-	case "get_backup":
-		t.sendBackup(callbackQuery.From.ID)
-	case "client_traffic":
-		t.getClientUsage(callbackQuery.From.ID, callbackQuery.From.UserName)
-	case "client_commands":
-		t.SendMsgToTgbot(callbackQuery.From.ID, "To search for statistics, just use folowing command:\r\n \r\n<code>/usage [UID|Passowrd]</code>\r\n \r\nUse UID for vmess/vless and Password for Trojan.")
-	case "commands":
-		t.SendMsgToTgbot(callbackQuery.From.ID, "Search for a client email:\r\n<code>/usage email</code>\r\n \r\nSearch for inbounds (with client stats):\r\n<code>/inbound [remark]</code>")
-	}
-}
-
-func checkAdmin(tgId int64) bool {
-	for _, adminId := range adminIds {
-		if adminId == tgId {
-			return true
-		}
-	}
-	return false
-}
-
-func (t *Tgbot) SendAnswer(chatId int64, msg string, isAdmin bool) {
-	var numericKeyboard = tgbotapi.NewInlineKeyboardMarkup(
-		tgbotapi.NewInlineKeyboardRow(
-			tgbotapi.NewInlineKeyboardButtonData("Server Usage", "get_usage"),
-			tgbotapi.NewInlineKeyboardButtonData("Get DB Backup", "get_backup"),
-		),
-		tgbotapi.NewInlineKeyboardRow(
-			tgbotapi.NewInlineKeyboardButtonData("Get Inbounds", "inbounds"),
-			tgbotapi.NewInlineKeyboardButtonData("Deplete soon", "deplete_soon"),
-		),
-		tgbotapi.NewInlineKeyboardRow(
-			tgbotapi.NewInlineKeyboardButtonData("Commands", "commands"),
-		),
-	)
-	var numericKeyboardClient = tgbotapi.NewInlineKeyboardMarkup(
-		tgbotapi.NewInlineKeyboardRow(
-			tgbotapi.NewInlineKeyboardButtonData("Get Usage", "client_traffic"),
-			tgbotapi.NewInlineKeyboardButtonData("Commands", "client_commands"),
-		),
-	)
-	msgConfig := tgbotapi.NewMessage(chatId, msg)
-	msgConfig.ParseMode = "HTML"
-	if isAdmin {
-		msgConfig.ReplyMarkup = numericKeyboard
-	} else {
-		msgConfig.ReplyMarkup = numericKeyboardClient
-	}
-	_, err := bot.Send(msgConfig)
-	if err != nil {
-		logger.Warning("Error sending telegram message :", err)
-	}
-}
-
-func (t *Tgbot) SendMsgToTgbot(tgid int64, msg string) {
-	var allMessages []string
-	limit := 2000
-	// paging message if it is big
-	if len(msg) > limit {
-		messages := strings.Split(msg, "\r\n \r\n")
-		lastIndex := -1
-		for _, message := range messages {
-			if (len(allMessages) == 0) || (len(allMessages[lastIndex])+len(message) > limit) {
-				allMessages = append(allMessages, message)
-				lastIndex++
-			} else {
-				allMessages[lastIndex] += "\r\n \r\n" + message
-			}
-		}
-	} else {
-		allMessages = append(allMessages, msg)
-	}
-	for _, message := range allMessages {
-		info := tgbotapi.NewMessage(tgid, message)
-		info.ParseMode = "HTML"
-		_, err := bot.Send(info)
-		if err != nil {
-			logger.Warning("Error sending telegram message :", err)
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-}
-
-func (t *Tgbot) SendMsgToTgbotAdmins(msg string) {
-	for _, adminId := range adminIds {
-		t.SendMsgToTgbot(adminId, msg)
-	}
-}
-
-func (t *Tgbot) SendReport() {
-	runTime, err := t.settingService.GetTgbotRuntime()
-	if err == nil && len(runTime) > 0 {
-		t.SendMsgToTgbotAdmins("🕰 Scheduled reports: " + runTime + "\r\nDate-Time: " + time.Now().Format("2006-01-02 15:04:05"))
-	}
-	info := t.getServerUsage()
-	t.SendMsgToTgbotAdmins(info)
-	exhausted := t.getExhausted()
-	t.SendMsgToTgbotAdmins(exhausted)
-	backupEnable, err := t.settingService.GetTgBotBackup()
-	if err == nil && backupEnable {
-		for _, adminId := range adminIds {
-			t.sendBackup(int64(adminId))
-		}
-	}
-}
-
-func (t *Tgbot) getServerUsage() string {
-	var info string
-	//get hostname
-	name, err := os.Hostname()
-	if err != nil {
-		logger.Error("get hostname error:", err)
-		name = ""
-	}
-	info = fmt.Sprintf("💻 Hostname: %s\r\n", name)
-	info += fmt.Sprintf("🚀X-UI Version: %s\r\n", config.GetVersion())
-	//get ip address
-	var ip string
-	var ipv6 string
-	netInterfaces, err := net.Interfaces()
-	if err != nil {
-		logger.Error("net.Interfaces failed, err:", err.Error())
-		info += "🌐 IP: Unknown\r\n \r\n"
-	} else {
-		for i := 0; i < len(netInterfaces); i++ {
-			if (netInterfaces[i].Flags & net.FlagUp) != 0 {
-				addrs, _ := netInterfaces[i].Addrs()
-
-				for _, address := range addrs {
-					if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
-						if ipnet.IP.To4() != nil {
-							ip += ipnet.IP.String() + " "
-						} else if ipnet.IP.To16() != nil && !ipnet.IP.IsLinkLocalUnicast() {
-							ipv6 += ipnet.IP.String() + " "
-						}
-					}
-				}
-			}
-		}
-		info += fmt.Sprintf("🌐IP: %s\r\n🌐IPv6: %s\r\n", ip, ipv6)
-	}
-
-	// get latest status of server
-	t.lastStatus = t.serverService.GetStatus(t.lastStatus)
-	info += fmt.Sprintf("🔌Server Uptime: %d days\r\n", int(t.lastStatus.Uptime/86400))
-	info += fmt.Sprintf("📈Server Load: %.1f, %.1f, %.1f\r\n", t.lastStatus.Loads[0], t.lastStatus.Loads[1], t.lastStatus.Loads[2])
-	info += fmt.Sprintf("📋Server Memory: %s/%s\r\n", common.FormatTraffic(int64(t.lastStatus.Mem.Current)), common.FormatTraffic(int64(t.lastStatus.Mem.Total)))
-	info += fmt.Sprintf("🔹TcpCount: %d\r\n", t.lastStatus.TcpCount)
-	info += fmt.Sprintf("🔸UdpCount: %d\r\n", t.lastStatus.UdpCount)
-	info += fmt.Sprintf("🚦Traffic: %s (↑%s,↓%s)\r\n", common.FormatTraffic(int64(t.lastStatus.NetTraffic.Sent+t.lastStatus.NetTraffic.Recv)), common.FormatTraffic(int64(t.lastStatus.NetTraffic.Sent)), common.FormatTraffic(int64(t.lastStatus.NetTraffic.Recv)))
-	info += fmt.Sprintf("ℹXray status: %s", t.lastStatus.Xray.State)
-
-	return info
-}
-
-func (t *Tgbot) UserLoginNotify(username string, ip string, time string, status LoginStatus) {
-	if username == "" || ip == "" || time == "" {
-		logger.Warning("UserLoginNotify failed,invalid info")
-		return
-	}
-	var msg string
-	// Get hostname
-	name, err := os.Hostname()
-	if err != nil {
-		logger.Warning("get hostname error:", err)
-		return
-	}
-	if status == LoginSuccess {
-		msg = fmt.Sprintf("✅ Successfully logged-in to the panel\r\nHostname:%s\r\n", name)
-	} else if status == LoginFail {
-		msg = fmt.Sprintf("❗ Login to the panel was unsuccessful\r\nHostname:%s\r\n", name)
-	}
-	msg += fmt.Sprintf("⏰ Time:%s\r\n", time)
-	msg += fmt.Sprintf("🆔 Username:%s\r\n", username)
-	msg += fmt.Sprintf("🌐 IP:%s\r\n", ip)
-	t.SendMsgToTgbotAdmins(msg)
-}
-
-func (t *Tgbot) getInboundUsages() string {
-	info := ""
-	// get traffic
-	inbouds, err := t.inboundService.GetAllInbounds()
-	if err != nil {
-		logger.Warning("GetAllInbounds run failed:", err)
-		info += "❌ Failed to get inbounds"
-	} else {
-		// NOTE:If there no any sessions here,need to notify here
-		// TODO:Sub-node push, automatic conversion format
-		for _, inbound := range inbouds {
-			info += fmt.Sprintf("📍Inbound:%s\r\nPort:%d\r\n", inbound.Remark, inbound.Port)
-			info += fmt.Sprintf("Traffic: %s (↑%s,↓%s)\r\n", common.FormatTraffic((inbound.Up + inbound.Down)), common.FormatTraffic(inbound.Up), common.FormatTraffic(inbound.Down))
-			if inbound.ExpiryTime == 0 {
-				info += "Expire date: ♾ Unlimited\r\n \r\n"
-			} else {
-				info += fmt.Sprintf("Expire date:%s\r\n \r\n", time.Unix((inbound.ExpiryTime/1000), 0).Format("2006-01-02 15:04:05"))
-			}
-		}
-	}
-	return info
-}
-
-func (t *Tgbot) getClientUsage(chatId int64, tgUserName string) {
-	if len(tgUserName) == 0 {
-		msg := "Your configuration is not found!\nYou should configure your telegram username and ask Admin to add it to your configuration."
-		t.SendMsgToTgbot(chatId, msg)
-		return
-	}
-	traffics, err := t.inboundService.GetClientTrafficTgBot(tgUserName)
-	if err != nil {
-		logger.Warning(err)
-		msg := "❌ Something went wrong!"
-		t.SendMsgToTgbot(chatId, msg)
-		return
-	}
-	if len(traffics) == 0 {
-		msg := "Your configuration is not found!\nPlease ask your Admin to use your telegram username in your configuration(s).\n\nYour username: <b>@" + tgUserName + "</b>"
-		t.SendMsgToTgbot(chatId, msg)
-		return
-	}
-	for _, traffic := range traffics {
-		expiryTime := ""
-		if traffic.ExpiryTime == 0 {
-			expiryTime = "♾Unlimited"
-		} else if traffic.ExpiryTime < 0 {
-			expiryTime = fmt.Sprintf("%d days", traffic.ExpiryTime/-86400000)
-		} else {
-			expiryTime = time.Unix((traffic.ExpiryTime / 1000), 0).Format("2006-01-02 15:04:05")
-		}
-		total := ""
-		if traffic.Total == 0 {
-			total = "♾Unlimited"
-		} else {
-			total = common.FormatTraffic((traffic.Total))
-		}
-		output := fmt.Sprintf("💡 Active: %t\r\n📧 Email: %s\r\n🔼 Upload↑: %s\r\n🔽 Download↓: %s\r\n🔄 Total: %s / %s\r\n📅 Expire in: %s\r\n",
-			traffic.Enable, traffic.Email, common.FormatTraffic(traffic.Up), common.FormatTraffic(traffic.Down), common.FormatTraffic((traffic.Up + traffic.Down)),
-			total, expiryTime)
-		t.SendMsgToTgbot(chatId, output)
-	}
-	t.SendAnswer(chatId, "Please choose:", false)
-}
-
-func (t *Tgbot) searchClient(chatId int64, email string) {
-	traffics, err := t.inboundService.GetClientTrafficByEmail(email)
-	if err != nil {
-		logger.Warning(err)
-		msg := "❌ Something went wrong!"
-		t.SendMsgToTgbot(chatId, msg)
-		return
-	}
-	if len(traffics) == 0 {
-		msg := "No result!"
-		t.SendMsgToTgbot(chatId, msg)
-		return
-	}
-	for _, traffic := range traffics {
-		expiryTime := ""
-		if traffic.ExpiryTime == 0 {
-			expiryTime = "♾Unlimited"
-		} else if traffic.ExpiryTime < 0 {
-			expiryTime = fmt.Sprintf("%d days", traffic.ExpiryTime/-86400000)
-		} else {
-			expiryTime = time.Unix((traffic.ExpiryTime / 1000), 0).Format("2006-01-02 15:04:05")
-		}
-		total := ""
-		if traffic.Total == 0 {
-			total = "♾Unlimited"
-		} else {
-			total = common.FormatTraffic((traffic.Total))
-		}
-		output := fmt.Sprintf("💡 Active: %t\r\n📧 Email: %s\r\n🔼 Upload↑: %s\r\n🔽 Download↓: %s\r\n🔄 Total: %s / %s\r\n📅 Expire in: %s\r\n",
-			traffic.Enable, traffic.Email, common.FormatTraffic(traffic.Up), common.FormatTraffic(traffic.Down), common.FormatTraffic((traffic.Up + traffic.Down)),
-			total, expiryTime)
-		t.SendMsgToTgbot(chatId, output)
-	}
-}
-
-func (t *Tgbot) searchInbound(chatId int64, remark string) {
-	inbouds, err := t.inboundService.SearchInbounds(remark)
-	if err != nil {
-		logger.Warning(err)
-		msg := "❌ Something went wrong!"
-		t.SendMsgToTgbot(chatId, msg)
-		return
-	}
-	for _, inbound := range inbouds {
-		info := ""
-		info += fmt.Sprintf("📍Inbound:%s\r\nPort:%d\r\n", inbound.Remark, inbound.Port)
-		info += fmt.Sprintf("Traffic: %s (↑%s,↓%s)\r\n", common.FormatTraffic((inbound.Up + inbound.Down)), common.FormatTraffic(inbound.Up), common.FormatTraffic(inbound.Down))
-		if inbound.ExpiryTime == 0 {
-			info += "Expire date: ♾ Unlimited\r\n \r\n"
-		} else {
-			info += fmt.Sprintf("Expire date:%s\r\n \r\n", time.Unix((inbound.ExpiryTime/1000), 0).Format("2006-01-02 15:04:05"))
-		}
-		t.SendMsgToTgbot(chatId, info)
-		for _, traffic := range inbound.ClientStats {
-			expiryTime := ""
-			if traffic.ExpiryTime == 0 {
-				expiryTime = "♾Unlimited"
-			} else if traffic.ExpiryTime < 0 {
-				expiryTime = fmt.Sprintf("%d days", traffic.ExpiryTime/-86400000)
-			} else {
-				expiryTime = time.Unix((traffic.ExpiryTime / 1000), 0).Format("2006-01-02 15:04:05")
-			}
-			total := ""
-			if traffic.Total == 0 {
-				total = "♾Unlimited"
-			} else {
-				total = common.FormatTraffic((traffic.Total))
-			}
-			output := fmt.Sprintf("💡 Active: %t\r\n📧 Email: %s\r\n🔼 Upload↑: %s\r\n🔽 Download↓: %s\r\n🔄 Total: %s / %s\r\n📅 Expire in: %s\r\n",
-				traffic.Enable, traffic.Email, common.FormatTraffic(traffic.Up), common.FormatTraffic(traffic.Down), common.FormatTraffic((traffic.Up + traffic.Down)),
-				total, expiryTime)
-			t.SendMsgToTgbot(chatId, output)
-		}
-	}
-}
-
-func (t *Tgbot) searchForClient(chatId int64, query string) {
-	traffic, err := t.inboundService.SearchClientTraffic(query)
-	if err != nil {
-		logger.Warning(err)
-		msg := "❌ Something went wrong!"
-		t.SendMsgToTgbot(chatId, msg)
-		return
-	}
-	if traffic == nil {
-		msg := "No result!"
-		t.SendMsgToTgbot(chatId, msg)
-		return
-	}
-	expiryTime := ""
-	if traffic.ExpiryTime == 0 {
-		expiryTime = "♾Unlimited"
-	} else if traffic.ExpiryTime < 0 {
-		expiryTime = fmt.Sprintf("%d days", traffic.ExpiryTime/-86400000)
-	} else {
-		expiryTime = time.Unix((traffic.ExpiryTime / 1000), 0).Format("2006-01-02 15:04:05")
-	}
-	total := ""
-	if traffic.Total == 0 {
-		total = "♾Unlimited"
-	} else {
-		total = common.FormatTraffic((traffic.Total))
-	}
-	output := fmt.Sprintf("💡 Active: %t\r\n📧 Email: %s\r\n🔼 Upload↑: %s\r\n🔽 Download↓: %s\r\n🔄 Total: %s / %s\r\n📅 Expire in: %s\r\n",
-		traffic.Enable, traffic.Email, common.FormatTraffic(traffic.Up), common.FormatTraffic(traffic.Down), common.FormatTraffic((traffic.Up + traffic.Down)),
-		total, expiryTime)
-	t.SendMsgToTgbot(chatId, output)
-}
-
-func (t *Tgbot) getExhausted() string {
-	trDiff := int64(0)
-	exDiff := int64(0)
-	now := time.Now().Unix() * 1000
-	var exhaustedInbounds []model.Inbound
-	var exhaustedClients []xray.ClientTraffic
-	var disabledInbounds []model.Inbound
-	var disabledClients []xray.ClientTraffic
-	output := ""
-	TrafficThreshold, err := t.settingService.GetTrafficDiff()
-	if err == nil && TrafficThreshold > 0 {
-		trDiff = int64(TrafficThreshold) * 1073741824
-	}
-	ExpireThreshold, err := t.settingService.GetExpireDiff()
-	if err == nil && ExpireThreshold > 0 {
-		exDiff = int64(ExpireThreshold) * 86400000
-	}
-	inbounds, err := t.inboundService.GetAllInbounds()
-	if err != nil {
-		logger.Warning("Unable to load Inbounds", err)
-	}
-	for _, inbound := range inbounds {
-		if inbound.Enable {
-			if (inbound.ExpiryTime > 0 && (inbound.ExpiryTime-now < exDiff)) ||
-				(inbound.Total > 0 && (inbound.Total-(inbound.Up+inbound.Down) < trDiff)) {
-				exhaustedInbounds = append(exhaustedInbounds, *inbound)
-			}
-			if len(inbound.ClientStats) > 0 {
-				for _, client := range inbound.ClientStats {
-					if client.Enable {
-						if (client.ExpiryTime > 0 && (client.ExpiryTime-now < exDiff)) ||
-							(client.Total > 0 && (client.Total-(client.Up+client.Down) < trDiff)) {
-							exhaustedClients = append(exhaustedClients, client)
-						}
-					} else {
-						disabledClients = append(disabledClients, client)
-					}
-				}
-			}
-		} else {
-			disabledInbounds = append(disabledInbounds, *inbound)
-		}
-	}
-	output += fmt.Sprintf("Exhausted Inbounds count:\r\n🛑 Disabled: %d\r\n🔜 Deplete soon: %d\r\n \r\n", len(disabledInbounds), len(exhaustedInbounds))
-	if len(exhaustedInbounds) > 0 {
-		output += "Exhausted Inbounds:\r\n"
-		for _, inbound := range exhaustedInbounds {
-			output += fmt.Sprintf("📍Inbound:%s\r\nPort:%d\r\nTraffic: %s (↑%s,↓%s)\r\n", inbound.Remark, inbound.Port, common.FormatTraffic((inbound.Up + inbound.Down)), common.FormatTraffic(inbound.Up), common.FormatTraffic(inbound.Down))
-			if inbound.ExpiryTime == 0 {
-				output += "Expire date: ♾Unlimited\r\n \r\n"
-			} else {
-				output += fmt.Sprintf("Expire date:%s\r\n \r\n", time.Unix((inbound.ExpiryTime/1000), 0).Format("2006-01-02 15:04:05"))
-			}
-		}
-	}
-	output += fmt.Sprintf("Exhausted Clients count:\r\n🛑 Exhausted: %d\r\n🔜 Deplete soon: %d\r\n \r\n", len(disabledClients), len(exhaustedClients))
-	if len(exhaustedClients) > 0 {
-		output += "Exhausted Clients:\r\n"
-		for _, traffic := range exhaustedClients {
-			expiryTime := ""
-			if traffic.ExpiryTime == 0 {
-				expiryTime = "♾Unlimited"
-			} else if traffic.ExpiryTime < 0 {
-				expiryTime += fmt.Sprintf("%d days", traffic.ExpiryTime/-86400000)
-			} else {
-				expiryTime = time.Unix((traffic.ExpiryTime / 1000), 0).Format("2006-01-02 15:04:05")
-			}
-			total := ""
-			if traffic.Total == 0 {
-				total = "♾Unlimited"
-			} else {
-				total = common.FormatTraffic((traffic.Total))
-			}
-			output += fmt.Sprintf("💡 Active: %t\r\n📧 Email: %s\r\n🔼 Upload↑: %s\r\n🔽 Download↓: %s\r\n🔄 Total: %s / %s\r\n📅 Expire date: %s\r\n \r\n",
-				traffic.Enable, traffic.Email, common.FormatTraffic(traffic.Up), common.FormatTraffic(traffic.Down), common.FormatTraffic((traffic.Up + traffic.Down)),
-				total, expiryTime)
-		}
-	}
-
-	return output
-}
-
-func (t *Tgbot) sendBackup(chatId int64) {
-	sendingTime := time.Now().Format("2006-01-02 15:04:05")
-	t.SendMsgToTgbot(chatId, "Backup time: "+sendingTime)
-	file := tgbotapi.FilePath(config.GetDBPath())
-	msg := tgbotapi.NewDocument(chatId, file)
-	_, err := bot.Send(msg)
-	if err != nil {
-		logger.Warning("Error in uploading backup: ", err)
-	}
-	file = tgbotapi.FilePath(xray.GetConfigPath())
-	msg = tgbotapi.NewDocument(chatId, file)
-	_, err = bot.Send(msg)
-	if err != nil {
-		logger.Warning("Error in uploading config.json: ", err)
-	}
-}
--- a/web/service/xray.go
+++ b/web/service/xray.go
@@ -84,16 +84,15 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
 		clients, ok := settings["clients"].([]interface{})
 		if ok {
 			// check users active or not
+
 			clientStats := inbound.ClientStats
 			for _, clientTraffic := range clientStats {

-				indexDecrease := 0
 				for index, client := range clients {
 					c := client.(map[string]interface{})
 					if c["email"] == clientTraffic.Email {
 						if !clientTraffic.Enable {
-							clients = RemoveIndex(clients, index-indexDecrease)
-							indexDecrease++
+							clients = RemoveIndex(clients, index)
 							logger.Info("Remove Inbound User", c["email"], "due the expire or traffic limit")

 						}
@@ -102,27 +101,7 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
 				}

 			}
-
-			// clear client config for additional parameters
-			var final_clients []interface{}
-			for _, client := range clients {
-
-				c := client.(map[string]interface{})
-
-				if c["enable"] != nil {
-					if enable, ok := c["enable"].(bool); ok && !enable {
-						continue
-					}
-				}
-				for key := range c {
-					if key != "email" && key != "id" && key != "password" && key != "flow" && key != "alterId" {
-						delete(c, key)
-					}
-				}
-				final_clients = append(final_clients, interface{}(c))
-			}
-
-			settings["clients"] = final_clients
+			settings["clients"] = clients
 			modifiedSettings, err := json.Marshal(settings)
 			if err != nil {
 				return nil, err
@@ -181,5 +160,5 @@ func (s *XrayService) SetToNeedRestart() {
 }

 func (s *XrayService) IsNeedRestartAndSetFalse() bool {
-	return isNeedXrayRestart.CompareAndSwap(true, false)
+	return isNeedXrayRestart.CAS(true, false)
 }
--- a/web/translation/translate.en_US.toml
+++ b/web/translation/translate.en_US.toml
@@ -1,5 +1,5 @@
-"username" = "Username"
-"password" = "Password"
+"username" = "username"
+"password" = "password"
 "login" = "Login"
 "confirm" = "Confirm"
 "cancel" = "Cancel"
@@ -10,8 +10,6 @@
 "remark" = "Remark"
 "enable" = "Enable"
 "protocol" = "Protocol"
-"search" = "Search"
-
 "loading" = "Loading"
 "second" = "Second"
 "minute" = "Minute"
@@ -22,7 +20,6 @@
 "unlimited" = "Unlimited"
 "none" = "None"
 "qrCode" = "QR Code"
-"info" = "More information"
 "edit" = "Edit"
 "delete" = "Delete"
 "reset" = "Reset"
@@ -33,21 +30,21 @@
 "host" = "Host"
 "path" = "Path"
 "camouflage" = "Camouflage"
-"status" = "Status"
 "enabled" = "Enabled"
 "disabled" = "Disabled"
-"depleted" = "Depleted"
-"depletingSoon" = "Depleting soon"
-"domainName" = "Domain name"
+"domainName" = "Domain Name"
 "additional" = "Alter"
 "monitor" = "Listen IP"
-"certificate" = "Certificat"
+"certificate" = "Certificate"
 "fail" = "Fail"
-"success" = " Success"
-"getVersion" = "Get version"
+"success" = "Success"
+"getVersion" = "Get Version"
 "install" = "Install"
+"used" = "Used"
 "clients" = "Clients"
+"search" = "Search"
 "usage" = "Usage"
+"info" = "Details"

 [menu]
 "dashboard" = "System Status"
@@ -64,17 +61,18 @@
 "invalidFormData" = "Input Data Format Is Invalid"
 "emptyUsername" = "Please Enter Username"
 "emptyPassword" = "Please Enter Password"
-"wrongUsernameOrPassword" = "Invalid username or password"
+"wrongUsernameOrPassword" = "invalid username or password"
 "successLogin" = "Login"

+
 [pages.index]
 "title" = "System Status"
 "memory" = "Memory"
 "hard" = "Hard Disk"
 "xrayStatus" = "Xray Status"
-"stopXray" = "Stop"
-"restartXray" = "Restart"
 "xraySwitch" = "Switch Version"
+"restartXray" = "Restart"
+"stopXray" = "Stop"
 "xraySwitchClick" = "Click on the version you want to switch"
 "xraySwitchClickDesk" = "Please choose carefully, older versions may have incompatible configurations"
 "operationHours" = "Operation Hours"
@@ -86,15 +84,16 @@
 "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]
+"export" = "Export"
 "title" = "Inbounds"
-"totalDownUp" = "Total uploads/downloads"
-"totalUsage" = "Total usage"
-"inboundCount" = "Number of inbound"
+"totalDownUp" = "Total Uploads/Downloads"
+"totalUsage" = "Total Usage"
+"inboundCount" = "Number Of Inbound"
 "operate" = "Actions"
 "enable" = "Enable"
 "remark" = "Remark"
@@ -103,11 +102,11 @@
 "traffic" = "Traffic"
 "details" = "Details"
 "transportConfig" = "Transport"
-"expireDate" = "Expire date"
-"resetTraffic" = "Reset traffic"
+"expireDate" = "Expire Date"
+"resetTraffic" = "Reset Traffic"
 "addInbound" = "Add Inbound"
 "addTo" = "Add To"
-"revise" = "Revise"
+"revise" = "Save"
 "modifyInbound" = "Modify InBound"
 "deleteInbound" = "Delete Inbound"
 "deleteInboundContent" = "Are you sure you want to delete inbound?"
@@ -116,81 +115,44 @@
 "address" = "Address"
 "network" = "Network"
 "destinationPort" = "Destination port"
-"targetAddress" = "Target address"
+"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 Traffic"
 "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 path"
-"publicKeyContent" = "Public key content"
-"keyPath" = "Private Key path"
-"keyContent" = "Private Key content"
-"clickOnQRcode" = "Click on QR Code to Copy"
+"certificatePath" = "Certificate File Path"
+"certificateContent" = "Certificate File Content"
+"publicKeyPath" = "Public Key Path"
+"publicKeyContent" = "public Key Content"
+"keyPath" = "Private key Path"
+"keyContent" = "Private Key Content"
 "client" = "Client"
-"export" = "Export links"
-"Clone" = "Clone"
-"cloneInbound" = "Create"
-"cloneInboundContent" = "All items of this inbound except Port, Listening IP, Clients will be applied to the clone"
-"cloneInboundOk" = "Creating a clone from"
-"resetAllTraffic" = "Reset All Inbounds Traffic"
-"resetAllTrafficTitle" = "Reset all inbounds traffic"
-"resetAllTrafficContent" = "Are you sure to reset all inbounds traffic ?"
-"resetAllTrafficOkText" = "Confirm"
-"resetAllTrafficCancelText" = "Cancel"
-"IPLimit" = "IP Limit"
-"IPLimitDesc" = "disable inbound if more than entered count (0 for disable limit ip)"
-"resetAllClientTraffics" = "Reset Clients Traffic"
-"resetAllClientTrafficTitle" = "Reset all clients traffic"
-"resetAllClientTrafficContent" = "Are you sure to reset all traffics of this inbound's clients ?"
-"Email" = "Email"
-"EmailDesc" = "The Email Must Be Completely Unique"
-"IPLimitlog" = "IP Log"
-"IPLimitlogDesc" = "IPs history Log (before enabling inbound after it has been disabled by IP limit, you should clear the log)"
-"IPLimitlogclear" = "Clear The Log"
-"setDefaultCert" = "Set cert from panel"
-"XTLSdec" = "Xray core needs to be 1.7.5 and below"
-"Realitydec" = "Xray core needs to be 1.8.0 and above"
+"uid" = "UID"

-[pages.client]
-"add" = "Add client"
-"edit" = "Edit client"
-"submitAdd" = "Add client"
-"submitEdit" = "Save changes"
-"clientCount" = "Number of clients"
-"bulk" = "Add bulk"
-"method" = "Method"
-"first" = "First"
-"last" = "Last"
-"prefix" = "Prefix"
-"postfix" = "postfix"
-"delayedStart" = "Start after first use"
-"expireDays" = "Expire days"
-"days" = "day(s)"

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

 [pages.inbounds.stream.general]
-"requestHeader" = "Request header"
+"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"

+
 [pages.setting]
 "title" = "Setting"
 "save" = "Save"
@@ -207,7 +169,7 @@
 "panelPortDesc" = "Restart the panel to take effect"
 "publicKeyPath" = "Panel certificate public key file path"
 "publicKeyPathDesc" = "Fill in an absolute path starting with '/', restart the panel to take effect"
-"privateKeyPath" = "Panel certificate private key file path"
+"privateKeyPath" = "Panel certificate key file path"
 "privateKeyPathDesc" = "Fill in an absolute path starting with '/', restart the panel to take effect"
 "panelUrlPath" = "panel url root path"
 "panelUrlPathDesc" = "Must start with '/' and end with '/', restart the panel to take effect"
@@ -215,46 +177,22 @@
 "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 ranges to connect"
-"xrayConfigPrivateIpDesc" = "Change the configuration temlate to avoid connecting with private IP ranges, restart the panel to take effect"
-"xrayConfigIRIp" = "Ban Iran IP ranges to connect"
-"xrayConfigIRIpDesc" = "Change the configuration temlate to avoid connecting with Iran IP ranges, restart the panel to take effect"
-"xrayConfigIRdomain" = "Ban IR domains to connect"
-"xrayConfigIRdomainDesc" = "Change the configuration temlate to avoid connecting with IR domains, 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"
 "telegramTokenDesc" = "Restart the panel to take effect"
-"telegramChatId" = "Telegram Admin ChatIds"
-"telegramChatIdDesc" = "Multi chatIDs separated by comma. Restart the panel to take effect"
+"telegramChatId" = "Telegram ChatId"
+"telegramChatIdDesc" = "Restart the panel to take effect"
 "telegramNotifyTime" = "Telegram bot notification time"
-"telegramNotifyTimeDesc" = "Using Crontab timing format. Restart the panel to take effect"
-"tgNotifyBackup" = "Database backup"
-"tgNotifyBackupDesc" = "Sending database backup file with report notification. Restart the panel to take effect"
-"expireTimeDiff" = "Exhaustion time threshold"
-"expireTimeDiffDesc" = "Detect exhaustion before expiration (unit:day)"
-"trafficDiff" = "Exhaustion traffic threshold"
-"trafficDiffDesc" = "Detect exhaustion before finishing traffic (unit:GB)"
-"tgNotifyCpu" = "CPU percentage alert threshold"
-"tgNotifyCpuDesc" = "This telegram bot will send you a notification if CPU usage is more than this percentage (unit:%)"
+"telegramNotifyTimeDesc" = "Using Crontab timing format, restart the panel to take effect"
 "timeZonee" = "Time Zone"
 "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,8 +10,6 @@
 "remark" = "نام"
 "enable" = "فعال"
 "protocol" = "پروتکل"
-"search" = "جستجو"
-
 "loading" = "در حال بروزرسانی..."
 "second" = "ثانیه"
 "minute" = "دقیقه"
@@ -22,7 +20,6 @@
 "unlimited" = "نامحدود"
 "none" = "هیچ"
 "qrCode" = "QR کد"
-"info" = "اطلاعات بیشتر"
 "edit" = "ویرایش"
 "delete" = "حذف"
 "reset" = "ریست"
@@ -33,21 +30,21 @@
 "host" = "آدرس"
 "path" = "مسیر"
 "camouflage" = "استتار"
-"status" = "وضعیت"
-"enabled" = "فعال"
-"disabled" = "غیرفعال"
-"depleted" = "منقضی"
-"depletingSoon" = "در حال انقضا"
+"enabled" = "فعال شد"
+"disabled" = "غیرفعال شد"
 "domainName" = "آدرس دامنه"
 "additional" = "آی دی جایگزین"
 "monitor" = "آی پی اتصال"
-"certificate" = "گواهی دیجیتال"
+"certificate" = "سرتیفیکیت"
 "fail" = "خطا"
 "success" = " موفق"
 "getVersion" = "دریافت ورژن"
 "install" = "نصب"
+"used" = "استفاده شده"
 "clients" = "کاربران"
+"search" = "جستجو"
 "usage" = "استفاده"
+"info" = "جزئیات"

 [menu]
 "dashboard" = "وضعیت سیستم"
@@ -67,30 +64,33 @@
 "wrongUsernameOrPassword" = "نام کاربری و رمز عبور اشتباه میباشد"
 "successLogin" = "خوش آمدید"

+
 [pages.index]
 "title" = "وضعیت سیستم"
 "memory" = "حافظه رم"
 "hard" = "حافظه دیسک"
 "xrayStatus" = "وضعیت Xray"
-"stopXray" = "توقف"
-"restartXray" = "شروع مجدد"
 "xraySwitch" = "تغییر ورژن"
+"restartXray" = "راه اندازی مجدد"
+"stopXray" = "توقف"
 "xraySwitchClick" = "ورژن مورد نظر را انتخاب کنید"
 "xraySwitchClickDesk" = "لطفا با دقت انتخاب کنید ، در صورت انتخاب اشتباه امکان قطعی سیستم وجود دارد ."
-"operationHours" = "مدت فعالیت"
-"operationHoursDesc" = "مدت فعالیت سیستم بعد از روشن شدن"
-"systemLoad" = "بار روی سیستم"
+"operationHours" = "ساعت فعال"
+"operationHoursDesc" = "ساعت فعال بعد از شروع سیستم"
+"systemLoad" = "سرعت لود سیستم"
 "connectionCount" = "تعداد کانکشن ها"
 "connectionCountDesc" = "تعداد کانکشن ها برای کل شبکه"
 "upSpeed" = "سرعت آپلود در حال حاضر سیستم"
 "downSpeed" = "سرعت دانلود در حال حاضر سیستم"
 "totalSent" = "جمع کل ترافیک آپلود مصرفی"
 "totalReceive" = "جمع کل ترافیک دانلود مصرفی"
-"xraySwitchVersionDialog" = "تغییر ورژن"
+"xraySwitchVersionDialog" = "تغییر ورژن Xray"
 "xraySwitchVersionDialogDesc" = "آیا از تغییر ورژن مطمئن هستین"
 "dontRefreshh" = "در حال نصب ، لطفا رفرش نکنید "

+
 [pages.inbounds]
+"export" = "استخراج لینکها"
 "title" = "کاربران"
 "totalDownUp" = "جمع آپلود/دانلود"
 "totalUsage" = "جمع کل"
@@ -107,7 +107,7 @@
 "resetTraffic" = "ریست ترافیک"
 "addInbound" = "اضافه کردن سرویس"
 "addTo" = "اضافه کردن"
-"revise" = "ویرایش"
+"revise" = "ذخیره"
 "modifyInbound" = "ویرایش سرویس"
 "deleteInbound" = "حذف سرویس"
 "deleteInboundContent" = "آیا مطمئن به حذف سرویس هستید ؟"
@@ -125,49 +125,12 @@
 "noRecommendKeepDefault" = "توصیه می شود به عنوان پیش فرض حفظ شود"
 "certificatePath" = "مسیر فایل گواهی"
 "certificateContent" = "محتوای فایل گواهی"
-"publicKeyPath" = "مسیر کلید عمومی"
-"publicKeyContent" = "محتوای کلید عمومی"
-"keyPath" = "مسیر کلید خصوصی"
-"keyContent" = "محتوای کلید خصوصی"
-"clickOnQRcode" = "برای کپی بر روی کد تصویری کلیک کنید"
+"publicKeyPath" = "مسیر فایل Certificate.crt"
+"publicKeyContent" = "محتوای Certificate.crt"
+"keyPath" = "مسیر فایل Private.key"
+"keyContent" = "محتوای Private.key"
 "client" = "کاربر"
-"export" = "استخراج لینکها"
-"Clone" = "شبیه سازی"
-"cloneInbound" = "ایجاد"
-"cloneInboundContent" = "همه موارد این ورودی بجز پورت ، ای پی و کلاینت ها شبیه سازی خواهند شد"
-"cloneInboundOk" = "ساختن شبیه ساز"
-"resetAllTraffic" = "ریست ترافیک کل سرویس ها"
-"resetAllTrafficTitle" = "ریست ترافیک کل سرویس ها"
-"resetAllTrafficContent" = "آیا مطمئن هستید که میخواهید تمام ترافیک سرویس ها را ریست کنید؟"
-"resetAllClientTraffics" = "ریست ترافیک کاربران"
-"resetAllClientTrafficTitle" = "ریست ترافیک کل کاربران"
-"resetAllClientTrafficContent" = "آیا مطمئن هستید که میخواهید تمام ترافیک کاربران این سرویس را ریست کنید؟"
-"IPLimit" = "محدودیت ای پی"
-"IPLimitDesc" = "غیرفعال کردن ورودی در صورت بیش از تعداد وارد شده (0 برای غیرفعال کردن محدودیت ای پی )"
-"Email" = "ایمیل"
-"EmailDesc" = "ایمیل باید کاملا منحصر به فرد باشد"
-"IPLimitlog" = "گزارش ها"
-"IPLimitlogDesc" = "گزارش سابقه ای پی (قبل از فعال کردن ورودی پس از غیرفعال شدن توسط محدودیت ای پی، باید گزارش را پاک کنید)"
-"IPLimitlogclear" = "پاک کردن گزارش ها"
-"setDefaultCert" = "استفاده از گواهی پنل"
-"XTLSdec" = "هسته Xray باید 1.7.5 و کمتر باشد"
-"Realitydec" = "هسته Xray باید 1.8.0 و بالاتر باشد"
-
-[pages.client]
-"add" = "کاربر جدید"
-"edit" = "ویرایش کاربر"
-"submitAdd" = "اضافه کردن"
-"submitEdit" = "ذخیره تغییرات"
-"clientCount" = "تعداد کاربران"
-"bulk" = "انبوه سازی"
-"method" = "روش"
-"first" = "از"
-"last" = "تا"
-"prefix" = "پیشوند"
-"postfix" = "پسوند"
-"delayedStart" = "شروع بعد از اولین استفاده"
-"expireDays" = "روزهای اعتبار"
-"days" = "(روز)"
+"uid" = "UID"

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

+
 [pages.setting]
 "title" = "تنظیمات"
 "save" = "ذخیره"
@@ -203,9 +167,9 @@
 "panelListeningIPDesc" = "برای استفاده از تمام IP ها به طور پیش فرض خالی بگذارید. پنل را مجدداً راه اندازی کنید تا اعمال شود"
 "panelPort" = "پورت پنل"
 "panelPortDesc" = "پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"publicKeyPath" = "مسیر فایل گواهی کلید عمومی پنل"
+"publicKeyPath" = "مسیر فایل پنل Certificate.crt"
 "publicKeyPathDesc" = "باید یک مسیر مطلق باشد که با / شروع می شود . پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"privateKeyPath" = "مسیر فایل گواهی کلید خصوصی پنل"
+"privateKeyPath" = "مسیر فایل پنل private.key"
 "privateKeyPathDesc" = "باید یک مسیر مطلق باشد که با / شروع می شود . پنل را مجدداً راه اندازی کنید تا اعمال شود"
 "panelUrlPath" = "آدرس روت پنل"
 "panelUrlPathDesc" = "باید با '/' شروع شود و با '/' تمام شود. پنل را مجدداً راه اندازی کنید تا اعمال شود"
@@ -213,40 +177,16 @@
 "currentPassword" = "رمز عبور فعلی"
 "newUsername" = "نام کاربری جدید"
 "newPassword" = "رمز عبور جدید"
-"advancedTemplate" = "بخش های پیشرفته الگو"
-"completeTemplate" = "الگوی کامل تنظیمات ایکس ری"
-"xrayConfigTemplate" = "تنظیمات الگو ایکس ری"
-"xrayConfigTemplateDesc" = "فایل پیکربندی ایکس ری نهایی بر اساس این الگو ایجاد میشود. لطفاً این را تغییر ندهید مگر اینکه دقیقاً بدانید که چه کاری انجام می دهید! پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"xrayConfigTorrent" = "فیلتر کردن بیت تورنت"
-"xrayConfigTorrentDesc" = "الگوی تنظیمات را برای فیلتر کردن پروتکل بیت تورنت برای کاربران تغییر میدهد.  پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"xrayConfigPrivateIp" = "جلوگیری از اتصال آی پی های نامعتبر"
-"xrayConfigPrivateIpDesc" = "الگوی تنظیمات را برای فیلتر کردن اتصال آی پی های نامعتبر و بسته های سرگردان تغییر میدهد.  پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"xrayConfigIRIp" = "جلوگیری از اتصال آی پی های ایران"
-"xrayConfigIRIpDesc" = "الگوی تنظیمات را برای فیلتر کردن اتصال آی پی های ایران تغییر میدهد.  پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"xrayConfigIRdomain" = "جلوگیری از اتصال دامنه های ایران"
-"xrayConfigIRdomainDesc" = "الگوی تنظیمات را برای فیلتر کردن اتصال دامنه های ایران تغییر میدهد.  پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"xrayConfigInbounds" = "تنظیمات ورودی"
-"xrayConfigInboundsDesc" = "میتوانید الگوی تنظیمات را برای ورودی های خاص تنظیم نمایید.  پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"xrayConfigOutbounds" = "تنظیمات خروجی"
-"xrayConfigOutboundsDesc" = "میتوانید الگوی تنظیمات را برای خروجی اینترنت تنظیم نمایید.  پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"xrayConfigRoutings" = "تنظیمات قوانین مسیریابی"
-"xrayConfigRoutingsDesc" = "میتوانید الگوی تنظیمات را برای مسیریابی تنظیم نمایید.  پنل را مجدداً راه اندازی کنید تا اعمال شود"
+"xrayConfigTemplate" = "تنظیمات قالب Xray"
+"xrayConfigTemplateDesc" = "فایل پیکربندی xray نهایی را بر اساس این الگو ایجاد کنید. لطفاً این را تغییر ندهید مگر اینکه دقیقاً بدانید که چه کاری انجام می دهید! پنل را مجدداً راه اندازی کنید تا اعمال شود"
 "telegramBotEnable" = "فعالسازی ربات تلگرام"
 "telegramBotEnableDesc" = "پنل را مجدداً راه اندازی کنید تا اعمال شود"
 "telegramToken" = "توکن تلگرام"
 "telegramTokenDesc" = "پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"telegramChatId" = "آی دی تلگرام مدیریت"
-"telegramChatIdDesc" = "با استفاده از کاما میتونید چند آی دی را از هم جدا کنید. پنل را مجدداً راه اندازی کنید تا اعمال شود"
+"telegramChatId" = "آی دی تلگرام مدیریت . از ربات  @getidsbot آی دی خود را دریافت کنید"
+"telegramChatIdDesc" = "پنل را مجدداً راه اندازی کنید تا اعمال شود"
 "telegramNotifyTime" = "مدت زمان نوتیفیکیشن ربات تلگرام"
-"telegramNotifyTimeDesc" = "از فرمت زمان بندی لینوکس استفاده کنید . پنل را مجدداً راه اندازی کنید تا اعمال شود"
-"tgNotifyBackup" = "پشتیبان گیری از پایگاه داده"
-"tgNotifyBackupDesc" = "ارسال کپی فایل پایگاه داده به همراه گزارش دوره ای"
-"expireTimeDiff" = "آستانه زمان باقی مانده"
-"expireTimeDiffDesc" = "فاصله زمانی هشدار تا رسیدن به زمان انقضا (واحد: روز)"
-"trafficDiff" = "آستانه ترافیک باقی مانده"
-"trafficDiffDesc" = "فاصله زمانی هشدار تا رسیدن به اتمام ترافیک (واحد: گیگابایت)"
-"tgNotifyCpu" = "آستانه هشدار درصد پردازنده"
-"tgNotifyCpuDesc" = "این ربات تلگرام در صورت استفاده پردازنده بیشتر از این درصد برای شما پیام ارسال می کند.(واحد: درصد)"
+"telegramNotifyTimeDesc" = "از فرمت زمان بندی Crontab استفاده کنید . پنل را مجدداً راه اندازی کنید تا اعمال شود"
 "timeZonee" = "منظقه زمانی"
 "timeZoneDesc" = "وظایف برنامه ریزی شده بر اساس این منطقه زمانی اجرا می شوند. پنل را مجدداً راه اندازی می کند تا اعمال شود"

--- a/web/translation/translate.zh_Hans.toml
+++ b/web/translation/translate.zh_Hans.toml
@@ -10,8 +10,6 @@
 "remark" = "备注"
 "enable" = "启用"
 "protocol" = "协议"
-"search" = "搜尋"
-
 "loading" = "加载中"
 "second" = "秒"
 "minute" = "分钟"
@@ -22,7 +20,6 @@
 "unlimited" = "无限制"
 "none" = "无"
 "qrCode" = "二维码"
-"info" = "更多信息"
 "edit" = "编辑"
 "delete" = "删除"
 "reset" = "重置"
@@ -33,11 +30,8 @@
 "host" = "主持人"
 "path" = "小路"
 "camouflage" = "伪装"
-"status" = "状态"
 "enabled" = "开启"
 "disabled" = "关闭"
-"depleted" = "耗尽"
-"depletingSoon" = "即将耗尽"
 "domainName" = "域名"
 "additional" = "额外"
 "monitor" = "监听"
@@ -46,8 +40,11 @@
 "success" = "成功"
 "getVersion" = "获取版本"
 "install" = "安装"
+"used" = "用过的"
 "clients" = "客户端"
+"search" = "搜索"
 "usage" = "用法"
+"info" = "细节"

 [menu]
 "dashboard" = "系统状态"
@@ -72,9 +69,9 @@
 "memory" = "内存"
 "hard" = "硬盘"
 "xrayStatus" = "xray 状态"
-"stopXray" = "停止"
-"restartXray" = "重启"
 "xraySwitch" = "切换版本"
+"restartXray" = "重新开始"
+"stopXray" = "停止"
 "xraySwitchClick" = "点击你想切换的版本"
 "xraySwitchClickDesk" = "请谨慎选择，旧版本可能配置不兼容"
 "operationHours" = "运行时间"
@@ -90,7 +87,9 @@
 "xraySwitchVersionDialogDesc" = "是否切换 xray 版本至"
 "dontRefreshh" = "安装中，请不要刷新此页面"

+
 [pages.inbounds]
+"export" = "导出链接"
 "title" = "入站列表"
 "totalDownUp" = "总上传 / 下载"
 "totalUsage" = "总用量"
@@ -129,45 +128,9 @@
 "publicKeyContent" = "公钥内容"
 "keyPath" = "密钥文件路径"
 "keyContent" = "密钥内容"
-"clickOnQRcode" = "点击二维码复制"
 "client" = "客户"
-"export" = "导出链接"
-"Clone" = "克隆"
-"cloneInbound" = "创造"
-"cloneInboundContent" = "此入站的所有项目除 Port、Listening IP、Clients 将应用于克隆"
-"cloneInboundOk" = "从创建克隆"
-"resetAllTraffic" = "重置所有入站流量"
-"resetAllTrafficTitle" = "重置所有入站流量"
-"resetAllTrafficContent" = "您确定要重置所有入站流量吗？"
-"resetAllClientTraffics" = "重置客户端流量"
-"resetAllClientTrafficTitle" = "重置所有客户端流量"
-"resetAllClientTrafficContent" = "您确定要重置此入站客户端的所有流量吗？"
-"IPLimit" = "IP限制"
-"IPLimitDesc" = "如果超过输入的计数则禁用入站（0 表示禁用限制 ip）"
-"Email" = "电子邮件"
-"EmailDesc" = "电子邮件必须完全唯"
-"IPLimitlog" = "IP日志"
-"IPLimitlogDesc" = "IP 历史日志 （通过IP限制禁用inbound之前，需要清空日志）"
-"IPLimitlogclear" = "清除日志"
-"setDefaultCert" = "从面板设置证书"
-"XTLSdec" = "Xray核心需要1.7.5及以下版本"
-"Realitydec" = "Xray核心需要1.8.0及以上版本"
+"uid" = "UID"

-[pages.client]
-"add" = "添加客户端"
-"edit" = "编辑客户"
-"submitAdd" = "添加客户端"
-"submitEdit" = "保存修改"
-"clientCount" = "客户数量"
-"bulk" = "批量创建"
-"method" = "方法"
-"first" = "第一"
-"last" = "最后"
-"prefix" = "前缀"
-"postfix" = "后缀"
-"delayedStart" = "首次使用后开始"
-"expireDays" = "过期天数"
-"days" = "天"

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

+
 [pages.setting]
 "title" = "设置"
 "save" = "保存配置"
@@ -213,40 +177,16 @@
 "currentPassword" = "原密码"
 "newUsername" = "新用户名"
 "newPassword" = "新密码"
-"advancedTemplate" = "高级模板部件"
-"completeTemplate" = "Xray 配置的完整模板"
-"xrayConfigTemplate" = "xray 配置模板"
-"xrayConfigTemplateDesc" = "以该模型为基础生成最终的xray配置文件，重新启动面板生成效率"
-"xrayConfigTorrent" = "禁止使用 bittorrent"
-"xrayConfigTorrentDesc" = "更改配置模板避免用户使用bittorrent，重启面板生效"
-"xrayConfigPrivateIp" = "禁止私人 ip 范围连接"
-"xrayConfigPrivateIpDesc" = "更改配置模板以避免连接私有 IP 范围，重启面板生效"
-"xrayConfigIRIp" = "禁止伊朗 IP 范围连接"
-"xrayConfigIRIpDesc" = "修改配置模板避免连接伊朗IP范围，重启面板生效"
-"xrayConfigIRdomain" = "禁止伊朗域连接"
-"xrayConfigIRdomainDesc" = "修改配置模板避免连接伊朗域名，重启面板生效"
-"xrayConfigInbounds" = "入站配置"
-"xrayConfigInboundsDesc" = "更改配置模板接受特殊客户端，重启面板生效"
-"xrayConfigOutbounds" = "出站配置"
-"xrayConfigOutboundsDesc" = "更改配置模板定义此服务器的传出方式，重启面板生效"
-"xrayConfigRoutings" = "路由规则配置"
-"xrayConfigRoutingsDesc" = "更改配置模板为该服务器定义路由规则，重启面板生效"
+"xrayConfigTemplate" = "xray 配置模版"
+"xrayConfigTemplateDesc" = "以该模版为基础生成最终的 xray 配置文件，重启面板生效"
 "telegramBotEnable" = "启用电报机器人"
 "telegramBotEnableDesc" = "重启面板生效"
 "telegramToken" = "电报机器人TOKEN"
 "telegramTokenDesc" = "重启面板生效"
-"telegramChatId" = "以逗号分隔的多个 chatID 重启面板生效"
+"telegramChatId" = "电报机器人ChatId"
 "telegramChatIdDesc" = "重启面板生效"
 "telegramNotifyTime" = "电报机器人通知时间"
 "telegramNotifyTimeDesc" = "采用Crontab定时格式,重启面板生效"
-"tgNotifyBackup" = "数据库备份"
-"tgNotifyBackupDesc" = "正在发送数据库备份文件和报告通知。重启面板生效"
-"expireTimeDiff" = "耗尽时间阈值"
-"expireTimeDiffDesc" = "到期前检测耗尽（单位：天）"
-"trafficDiff" = "耗尽流量阈值"
-"trafficDiffDesc" = "完成流量前检测耗尽（单位：GB）"
-"tgNotifyCpu" = "CPU 百分比警报阈值"
-"tgNotifyCpuDesc" = "如果 CPU 使用率超过此百分比（单位：%），此 talegram bot 将向您发送通知"
 "timeZonee" = "时区"
 "timeZoneDesc" = "定时任务按照该时区的时间运行，重启面板生效"

--- a/web/web.go
+++ b/web/web.go
@@ -21,11 +21,11 @@ import (
 	"x-ui/web/network"
 	"x-ui/web/service"

+	"github.com/pelletier/go-toml/v2"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-contrib/sessions/cookie"
 	"github.com/gin-gonic/gin"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
-	"github.com/pelletier/go-toml/v2"
 	"github.com/robfig/cron/v3"
 	"golang.org/x/text/language"
 )
@@ -33,9 +33,6 @@ import (
 //go:embed assets/*
 var assetsFS embed.FS

-//go:embed assets/favicon.ico
-var favicon []byte
-
 //go:embed html/*
 var htmlFS embed.FS

@@ -88,11 +85,10 @@ type Server struct {
 	server *controller.ServerController
 	xui    *controller.XUIController
 	api    *controller.APIController
-	sub    *controller.SUBController

 	xrayService    service.XrayService
 	settingService service.SettingService
-	tgbotService   service.Tgbot
+	inboundService service.InboundService

 	cron *cron.Cron

@@ -161,11 +157,6 @@ func (s *Server) initRouter() (*gin.Engine, error) {

 	engine := gin.Default()

-	// Add favicon
-	engine.GET("/favicon.ico", func(c *gin.Context) {
-		c.Data(200, "image/x-icon", favicon)
-	})
-
 	secret, err := s.settingService.GetSecret()
 	if err != nil {
 		return nil, err
@@ -217,7 +208,6 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 	s.server = controller.NewServerController(g)
 	s.xui = controller.NewXUIController(g)
 	s.api = controller.NewAPIController(g)
-	s.sub = controller.NewSUBController(g)

 	return engine, nil
 }
@@ -338,13 +328,8 @@ func (s *Server) startTask() {
 			logger.Warning("Add NewStatsNotifyJob error", err)
 			return
 		}
-
-		// Check CPU load and alarm to TgBot if threshold passes
-		cpuThreshold, err := s.settingService.GetTgCpu()
-		if (err == nil) && (cpuThreshold > 0) {
-			s.cron.AddJob("@every 10s", job.NewCheckCpuJob())
-		}
-
+		// listen for TG bot income messages
+		go job.NewStatsNotifyJob().OnReceive()
 	} else {
 		s.cron.Remove(entry)
 	}
@@ -421,12 +406,6 @@ func (s *Server) Start() (err error) {
 		s.httpServer.Serve(listener)
 	}()

-	isTgbotenabled, err := s.settingService.GetTgbotenabled()
-	if (err == nil) && (isTgbotenabled) {
-		tgBot := s.tgbotService.NewTgbot()
-		tgBot.Start()
-	}
-
 	return nil
 }

@@ -436,9 +415,6 @@ func (s *Server) Stop() error {
 	if s.cron != nil {
 		s.cron.Stop()
 	}
-	if s.tgbotService.IsRunnging() {
-		s.tgbotService.Stop()
-	}
 	var err1 error
 	var err2 error
 	if s.httpServer != nil {
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -454,72 +454,6 @@ ssl_cert_issue() {
    fi
 }

-open_ports() {
-if ! command -v ufw &> /dev/null
-then
-    echo "ufw firewall is not installed. Installing now..."
-    sudo apt-get update
-    sudo apt-get install -y ufw
-else
-    echo "ufw firewall is already installed"
-fi
-
-  # Check if the firewall is inactive
-  if sudo ufw status | grep -q "Status: active"; then
-    echo "firewall is already active"
-  else
-    # Open the necessary ports
-    sudo ufw allow ssh
-    sudo ufw allow http
-    sudo ufw allow https
-    sudo ufw allow 2053/tcp
-
-    # Enable the firewall
-    sudo ufw --force enable
-  fi
-
-  # Prompt the user to enter a list of ports
-  read -p "Enter the ports you want to open (e.g. 80,443,2053 or range 400-500): " ports
-
-  # Check if the input is valid
-  if ! [[ $ports =~ ^([0-9]+|[0-9]+-[0-9]+)(,([0-9]+|[0-9]+-[0-9]+))*$ ]]; then
-     echo "Error: Invalid input. Please enter a comma-separated list of ports or a range of ports (e.g. 80,443,2053 or 400-500)." >&2; exit 1
-  fi
-
-  # Open the specified ports using ufw
-  IFS=',' read -ra PORT_LIST <<< "$ports"
-  for port in "${PORT_LIST[@]}"; do
-    if [[ $port == *-* ]]; then
-      # Split the range into start and end ports
-      start_port=$(echo $port | cut -d'-' -f1)
-      end_port=$(echo $port | cut -d'-' -f2)
-      # Loop through the range and open each port
-      for ((i=start_port; i<=end_port; i++)); do
-        sudo ufw allow $i
-      done
-    else
-      sudo ufw allow "$port"
-    fi
-  done
-
-  # Confirm that the ports are open
-  sudo ufw status | grep $ports
-}
-
-
-
-update_geo(){
-    systemctl stop x-ui
-    cd /usr/local/x-ui/bin
-    rm -f geoip.dat geosite.dat iran.dat
-    wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
-    wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
-    wget -N https://github.com/bootmortis/iran-hosted-domains/releases/latest/download/iran.dat
-    systemctl start x-ui
-    echo -e "${green}Geosite and Geoip have been updated successfully!${plain}"
-before_show_menu
-}
-
 install_acme() {
    cd ~
    LOGI "install acme..."
@@ -556,7 +490,14 @@ ssl_cert_issue_standalone() {
    else
        LOGI "install socat succeed..."
    fi
-
+    #creat a directory for install cert
+    certPath=/root/cert
+    if [ ! -d "$certPath" ]; then
+        mkdir $certPath
+    else
+        rm -rf $certPath
+        mkdir $certPath
+    fi
    #get the domain here,and we need verify it
    local domain=""
    read -p "please input your domain:" domain
@@ -571,16 +512,6 @@ ssl_cert_issue_standalone() {
    else
        LOGI "your domain is ready for issuing cert now..."
    fi
-	
-	#create a directory for install cert
-	certPath="/root/cert/${domain}"
-	if [ ! -d "$certPath" ]; then
-		mkdir -p "$certPath"
-	else
-		rm -rf "$certPath"
-		mkdir -p "$certPath"
-	fi
-	
    #get needed port here
    local WebPort=80
    read -p "please choose which port do you use,default will be 80 port:" WebPort
@@ -600,9 +531,9 @@ ssl_cert_issue_standalone() {
        LOGE "issue certs succeed,installing certs..."
    fi
    #install cert
-    ~/.acme.sh/acme.sh --installcert -d ${domain} \
-        --key-file /root/cert/${domain}/privkey.pem \
-        --fullchain-file /root/cert/${domain}/fullchain.pem
+    ~/.acme.sh/acme.sh --installcert -d ${domain} --ca-file /root/cert/ca.cer \
+        --cert-file /root/cert/${domain}.cer --key-file /root/cert/${domain}.key \
+        --fullchain-file /root/cert/fullchain.cer

    if [ $? -ne 0 ]; then
        LOGE "install certs failed,exit"
@@ -611,18 +542,17 @@ ssl_cert_issue_standalone() {
    else
        LOGI "install certs succeed,enable auto renew..."
    fi
-	
-	~/.acme.sh/acme.sh --upgrade --auto-upgrade
-	if [ $? -ne 0 ]; then
-		LOGE "auto renew failed, certs details:"
-		ls -lah cert/*
-		chmod 755 $certPath/*
-		exit 1
-	else
-		LOGI "auto renew succeed, certs details:"
-		ls -lah cert/*
-		chmod 755 $certPath/*
-	fi
+    ~/.acme.sh/acme.sh --upgrade --auto-upgrade
+    if [ $? -ne 0 ]; then
+        LOGE "auto renew failed,certs details:"
+        ls -lah cert
+        chmod 755 $certPath
+        exit 1
+    else
+        LOGI "auto renew succeed,certs details:"
+        ls -lah cert
+        chmod 755 $certPath
+    fi

 }

@@ -643,7 +573,13 @@ ssl_cert_issue_by_cloudflare() {
        CF_Domain=""
        CF_GlobalKey=""
        CF_AccountEmail=""
-        
+        certPath=/root/cert
+        if [ ! -d "$certPath" ]; then
+            mkdir $certPath
+        else
+            rm -rf $certPath
+            mkdir $certPath
+        fi
        LOGD "please input your domain:"
        read -p "Input your domain here:" CF_Domain
        LOGD "your domain is:${CF_Domain},check it..."
@@ -657,16 +593,6 @@ ssl_cert_issue_by_cloudflare() {
        else
            LOGI "your domain is ready for issuing cert now..."
        fi
-		
-		#create a directory for install cert
-		certPath="/root/cert/${CF_Domain}"
-		if [ ! -d "$certPath" ]; then
-			mkdir -p "$certPath"
-		else
-			rm -rf "$certPath"
-			mkdir -p "$certPath"
-		fi
-	
        LOGD "please inout your cloudflare global API key:"
        read -p "Input your key here:" CF_GlobalKey
        LOGD "your cloudflare global API key is:${CF_GlobalKey}"
@@ -685,72 +611,34 @@ ssl_cert_issue_by_cloudflare() {
            LOGE "issue cert failed,exit"
            rm -rf ~/.acme.sh/${CF_Domain}
            exit 1
-		else
-			LOGI "Certificate issued Successfully, Installing..."
-		fi
-		~/.acme.sh/acme.sh --installcert -d ${CF_Domain} -d *.${CF_Domain} \
-			--key-file /root/cert/${CF_Domain}/privkey.pem \
-			--fullchain-file /root/cert/${CF_Domain}/fullchain.pem
-
-		if [ $? -ne 0 ]; then
-			LOGE "install cert failed,exit"
-			rm -rf ~/.acme.sh/${CF_Domain}
-			exit 1
-		else
-			LOGI "Certificate installed Successfully,Turning on automatic updates..."
-		fi
-		~/.acme.sh/acme.sh --upgrade --auto-upgrade
-		if [ $? -ne 0 ]; then
-			LOGE "auto renew failed, certs details:"
-			ls -lah cert/*
-			chmod 755 $certPath/*
-			exit 1
-		else
-			LOGI "auto renew succeed, certs details:"
-			ls -lah cert/*
-			chmod 755 $certPath/*
-		fi
+        else
+            LOGI "Certificate issued Successfully, Installing..."
+        fi
+        ~/.acme.sh/acme.sh --installcert -d ${CF_Domain} -d *.${CF_Domain} --ca-file /root/cert/ca.cer \
+            --cert-file /root/cert/${CF_Domain}.cer --key-file /root/cert/${CF_Domain}.key \
+            --fullchain-file /root/cert/fullchain.cer
+        if [ $? -ne 0 ]; then
+            LOGE "install cert failed,exit"
+            rm -rf ~/.acme.sh/${CF_Domain}
+            exit 1
+        else
+            LOGI "Certificate installed Successfully,Turning on automatic updates..."
+        fi
+        ~/.acme.sh/acme.sh --upgrade --auto-upgrade
+        if [ $? -ne 0 ]; then
+            LOGE "Auto update setup Failed, script exiting..."
+            ls -lah cert
+            chmod 755 $certPath
+            exit 1
+        else
+            LOGI "The certificate is installed and auto-renewal is turned on, Specific information is as follows"
+            ls -lah cert
+            chmod 755 $certPath
+        fi
    else
        show_menu
    fi
 }
-google_recaptcha() {
-  curl -O https://raw.githubusercontent.com/jinwyp/one_click_script/master/install_kernel.sh && chmod +x ./install_kernel.sh && ./install_kernel.sh
-  echo ""
-  before_show_menu
-}
-
-run_speedtest() {
-    # Check if Speedtest is already installed
-    if ! command -v speedtest &> /dev/null; then
-        # If not installed, install it
-        if command -v dnf &> /dev/null; then
-            sudo dnf install -y curl
-            curl -s https://install.speedtest.net/app/cli/install.rpm.sh | sudo bash
-            sudo dnf install -y speedtest
-        elif command -v yum &> /dev/null; then
-            sudo yum install -y curl
-            curl -s https://install.speedtest.net/app/cli/install.rpm.sh | sudo bash
-            sudo yum install -y speedtest
-        elif command -v apt-get &> /dev/null; then
-            sudo apt-get update && sudo apt-get install -y curl
-            curl -s https://install.speedtest.net/app/cli/install.deb.sh | sudo bash
-            sudo apt-get install -y speedtest
-        elif command -v apt &> /dev/null; then
-            sudo apt update && sudo apt install -y curl
-            curl -s https://install.speedtest.net/app/cli/install.deb.sh | sudo bash
-            sudo apt install -y speedtest
-        else
-            echo "Error: Package manager not found. You may need to install Speedtest manually."
-            return 1
-        fi
-    fi
-
-    # Run Speedtest
-    speedtest
-}
-
-

 show_usage() {
    echo "x-ui control menu usages: "
@@ -793,14 +681,10 @@ show_menu() {
  ${green}14.${plain} Disabel x-ui On System Startup
 ————————————————
  ${green}15.${plain} Enable BBR 
-  ${green}16.${plain} Apply for an SSL Certificate
-  ${green}17.${plain} Update Geo Files
-  ${green}18.${plain} Active Firewall and open ports
-  ${green}19.${plain} Fixing Google reCAPTCHA
-  ${green}20.${plain} Speedtest by Ookla
+  ${green}16.${plain} Issuse Certs
 "
    show_status
-    echo && read -p "Please enter your selection [0-20]: " num
+    echo && read -p "Please enter your selection [0-16]: " num

    case "${num}" in
    0)
@@ -854,20 +738,8 @@ show_menu() {
    16)
        ssl_cert_issue
        ;;
-    17)
-        update_geo
-        ;;
-    18)
-        open_ports
-        ;;
-    19)
-        google_recaptcha
-        ;;
-	20)
-        run_speedtest
-        ;;
    *)
-        LOGE "Please enter the correct number [0-20]"
+        LOGE "Please enter the correct number [0-16]"
        ;;
    esac
 }
@@ -1 +1 @@
 .2.2
 .0.9