update tips

optimize logic code;

Makefile

@@ -3,10 +3,11 @@ export CGO_ENABLED=0
 export GOOS=linux
 export GOARCH=amd64
 
-build: frps-multiuser
-	cp ./config/frps-multiuser.ini ./bin/frps-multiuser.ini
+build: frps-panel
+	cp ./config/frps-panel.toml ./bin/frps-panel.toml
+	cp ./config/frps-tokens.toml ./bin/frps-tokens.toml
 	cp -r ./assets/ ./bin/assets/
 
-frps-multiuser:
+frps-panel:
 	rm -rf ./bin
-	go build -o ./bin/frps-multiuser ./cmd/frps-multiuser
+	go build -o ./bin/frps-panel ./cmd/frps-panel

Makefile.cross-compiles

@@ -5,20 +5,21 @@ package: copy
 	sh ./package.sh
 
 copy: build
-	cp ./config/frps-multiuser.ini ./release/frps-multiuser.ini
+	cp ./config/frps-panel.toml ./release/frps-panel.toml
+	cp ./config/frps-tokens.toml ./release/frps-tokens.toml
 	cp -r ./assets/ ./release/assets/
 
 build:
-	env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-darwin-amd64 ./cmd/frps-multiuser
-	env CGO_ENABLED=0 GOOS=freebsd GOARCH=386 go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-freebsd-386 ./cmd/frps-multiuser
-	env CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-freebsd-amd64 ./cmd/frps-multiuser
-	env CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-linux-386 ./cmd/frps-multiuser
-	env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-linux-amd64 ./cmd/frps-multiuser
-	env CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-linux-arm ./cmd/frps-multiuser
-	env CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-linux-arm64 ./cmd/frps-multiuser
-	env CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-windows-386.exe ./cmd/frps-multiuser
-	env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-windows-amd64.exe ./cmd/frps-multiuser
-	env CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-linux-mips64 ./cmd/frps-multiuser
-	env CGO_ENABLED=0 GOOS=linux GOARCH=mips64le go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-linux-mips64le ./cmd/frps-multiuser
-	env CGO_ENABLED=0 GOOS=linux GOARCH=mips GOMIPS=softfloat go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-linux-mips ./cmd/frps-multiuser
-	env CGO_ENABLED=0 GOOS=linux GOARCH=mipsle GOMIPS=softfloat go build -ldflags "$(LDFLAGS)" -o ./release/frps-multiuser-linux-mipsle ./cmd/frps-multiuser
+	env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-darwin-amd64 ./cmd/frps-panel
+	env CGO_ENABLED=0 GOOS=freebsd GOARCH=386 go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-freebsd-386 ./cmd/frps-panel
+	env CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-freebsd-amd64 ./cmd/frps-panel
+	env CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-linux-386 ./cmd/frps-panel
+	env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-linux-amd64 ./cmd/frps-panel
+	env CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-linux-arm ./cmd/frps-panel
+	env CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-linux-arm64 ./cmd/frps-panel
+	env CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-windows-386.exe ./cmd/frps-panel
+	env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-windows-amd64.exe ./cmd/frps-panel
+	env CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-linux-mips64 ./cmd/frps-panel
+	env CGO_ENABLED=0 GOOS=linux GOARCH=mips64le go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-linux-mips64le ./cmd/frps-panel
+	env CGO_ENABLED=0 GOOS=linux GOARCH=mips GOMIPS=softfloat go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-linux-mips ./cmd/frps-panel
+	env CGO_ENABLED=0 GOOS=linux GOARCH=mipsle GOMIPS=softfloat go build -ldflags "$(LDFLAGS)" -o ./release/frps-panel-linux-mipsle ./cmd/frps-panel

README.md

@@ -1,39 +1,34 @@
-# frps-multiuser
+# frps-panel
 
 [README](README.md) | [中文文档](README_zh.md)
 
-frp server plugin to support multiple users for [frp](https://github.com/fatedier/frp).
+frp server plugin to show server info and support multiple users for [frp](https://github.com/fatedier/frp).
 
-frps-multiuser will run as one single process and accept HTTP requests from frps.
+frps-panel will run as one single process and accept HTTP requests from frps.
 
+![支持英文](screenshots/i18n.png)
+![登录页面](screenshots/login.png)
+![服务器信息](screenshots/server%20info.png)
 ![用户列表](screenshots/user%20list.png)
 ![新增列表](screenshots/new%20user.png)
-![支持英文](screenshots/i18n.png)
+![代理列表](screenshots/proxy%20list.png)
+![代理流量统计](screenshots/proxy%20traffic%20statistics.png)
 ![自动深色模式](screenshots/dark%20mode.png)
 
-## update notes
-
-+ **the default tokens file is frps-multiuser.ini now,ini file support comment**
-+ **remove `-l`,it configure in `frps-multiuser.ini` now**
-+ **change `-f` to `-c`,the same as `frps`**
-+ **if \[users\] section is empty,the authentication will only be handle by frps**
-+ **if user under \[disabled\] section ,and the value is `disable`, it means that user is be disabled, and can not connect to server**
-+ **add a manage ui, and change color mode base on browser**
-+ **you can dynamic `add`,`remove`,`disable` or `enable` user now**
-+ **you can limit `ports`,`domains` and `subdomains` for each user now**
-
-***when a user is dynamic been `remove` or `disable`,it will take some time to be effective***
-***the limit of `ports`、`domains`、`subdomains` only effective at `NewProxy`***
-
 ### Features
 
-* Support multiple user authentication by tokens saved in file.
-* Support dynamic `add`,`remove`,`disable` or `enable` user
-* Limit `ports`,`domains` and `subdomains` for each user
++ **Show frp server info**
++ **Support multiple user authentication by tokens saved in file.**
++ **Dynamic `add`,`remove`,`disable` or `enable` user now**
++ **Limit `ports`,`domains` and `subdomains` for each user now**
+
+***when a user is dynamic been `remove` or `disable`,it will take some time to be effective***
+
+***the limit of `ports`、`domains`、`subdomains` only effective at `NewProxy`***
 
 ### Download
 
-Download frps-multiuser binary file from [Release](../../releases).
+Download frps-panel binary file from [Release](../../releases).
 
 ### Requirements
 
@@ -41,49 +36,60 @@ frp version >= v0.31.0
 
 ### Usage
 
-1. Create file `frps-multiuser.ini` including all support usernames and tokens.
+1. Create file `frps-panel.toml` including common config.
 
-```ini
+```toml
+#frps-panel.toml
 [common]
-;plugin listen ip
-plugin_addr = 127.0.0.1
-;plugin listen port
+# frps panel config info
+plugin_addr = "127.0.0.1"
 plugin_port = 7200
-;the username of manage ui,optional
-admin_user  = admin
-;the password of manage ui,optional
-admin_pwd   = admin
+#admin_user = "admin"
+#admin_pwd = "admin"
+# specified login state keep time
+admin_keep_time = 0
 
-[users]
-;user user1 with meta_token 123
-user1 = 123
-;user user2 with meta_token abc
-user2 = abc
+# enable tls
+tls_mode = false
+# tls_cert_file = "cert.crt"
+# tls_key_file = "cert.key"
 
-[ports]
-;user1 can only use ports 8080,9090 to 9010 ,other ports will fail to create proxy (frpc can normally startup)
-user1=8080,9090-9010
-
-[domains]
-;user1 can only use domain web01.user1.com ,other domain will fail to create proxy (frpc can normally startup)
-user1=web01.user1.com
-
-[subdomains]
-;user1 can only use subdomain web01 ,other subdomain will fail to create proxy (frpc can normally startup)
-user1=web01
-
-[disabled]
-;user2 is disabled,when frpc use this user to connect with frps,if frpc is not startup,it cannot startup,if it's already startup,it will always show error logs on console
-user2 = disable
+# frp dashboard info
+dashboard_addr = "127.0.0.1"
+dashboard_port = 7500
+dashboard_user = "admin"
+dashboard_pwd = "admin"
 ```
 
-   One user each line. Username and token are split by `=`.
+2. Create file `frps-tokens.toml` to save users,it should be the same place with `frps-panel.toml`.this file will auto create by system.
 
-2. Run frps-multiuser:
+```toml
+#frps-tokens.toml
+[tokens]
+   [tokens.user1]
+      user = "user1"
+      token = "token1"
+      comment = "user1 with token1"
+      ports = [8080, "10000-10200"]
+      domains = ["web01.domain.com", "web02.domain.com"]
+      subdomains = ["web01", "web02"]
+      enable = true
+   [tokens.user2]
+      user = "user2"
+      token = "token2"
+      comment = "user2 with token2"
+      ports = [9080]
+      domains = ["web11.domain.com", "web12.domain.com"]
+      subdomains = ["web11", "web12"]
+      enable = false
+```
 
-   `./frps-multiuser -c ./frps-multiuser.ini`
 
-3. Register plugin in frps.
+3. Run frps-panel:
+
+   `./frps-panel -c ./frps-panel.toml`
+
+4. Register plugin in frps.
 
 ```ini
 # frps.ini
@@ -91,12 +97,13 @@ user2 = disable
 bind_port = 7000
 
 [plugin.multiuser]
+; if you set tls_mode = true, you should change addr value to https://127.0.0.1:7200
 addr = 127.0.0.1:7200
 path = /handler
 ops = Login,NewWorkConn,NewUserConn,NewProxy,Ping
 ```
 
-4. Specify username and meta_token in frpc configure file.
+5. Specify username and meta_token in frpc configure file.
 
    For user1:
 
@@ -130,15 +137,44 @@ local_port = 22
 remote_port = 6000
 ```
 
+6. Manage your users in browser via: http://127.0.0.1:7200 or https://127.0.0.1:7200
+
+## Run as service
+
+this example is for `ubuntu` and with `root` user
+
++ 1.unzip `frps-panel.zip` to dir `/root/frps-panel`
++ 2.touch a file with command `touch frps-panel.service` in dir `/root/frps-panel`.the file content is:
+```ini
+[Unit]
+Description = frp multiuser service
+After = network.target syslog.target
+Wants = network.target
+
+[Service]
+Type = simple
+# config of frps-panel.toml,you should change the file path
+Environment=FRPS_PANEL_OPTS="-c /root/frps-panel/frps-panel.toml"
+# command of run frps-panel,you should change the file path
+ExecStart = /root/frps-panel/frps-panel $FRPS_PANEL_OPTS
+
+[Install]
+WantedBy = multi-user.target
+```
++ 3.copy `frps-panel.service` to `/etc/systemd/system/` with command `cp /root/frps-panel.service /etc/systemd/system/`
++ 4.reload service with command `systemctl daemon-reload`
++ 5.start service with command `service frps-panel start`
+
 ## Issues & Ideas
 
 ___If you want visit mange ui from internet, you should change `plugin_addr` to `0.0.0.0`___
 
-If you have any issues or ideas, put it on [issues](https://github.com/yhl452493373/frps-multiuser/issues). I will try my best to achieve it.
+If you have any issues or ideas, put it on [issues](https://github.com/yhl452493373/frps-panel/issues). I will try my best to achieve it.
 
 ## Credits
 
 + [frp](https://github.com/fatedier/frp)
 + [fp-multiuser](https://github.com/gofrp/fp-multiuser)
 + [layui](https://github.com/layui/layui)
-+ [layui-theme-dark](https://github.com/Sight-wcg/layui-theme-dark)
++ [layui-theme-dark](https://github.com/Sight-wcg/layui-theme-dark)
++ [echarts](https://github.com/apache/echarts)

README_zh.md

@@ -1,35 +1,31 @@
-# frps-multiuser
+# frps-panel
 
 [README](README.md) | [中文文档](README_zh.md)
 
-frps-multiuser 是 [frp](https://github.com/fatedier/frp) 的一个服务端插件，用于支持多用户鉴权。
+frps-panel 是 [frp](https://github.com/fatedier/frp) 的一个服务端插件，用于查看服务器信息以及支持多用户鉴权。
 
-frps-multiuser 会以一个单独的进程运行，并接收 frps 发送过来的 HTTP 请求。
+frps-panel 会以一个单独的进程运行，并接收 frps 发送过来的 HTTP 请求。
 
+![支持英文](screenshots/i18n.png)
+![登录页面](screenshots/login.png)
+![服务器信息](screenshots/server%20info.png)
 ![用户列表](screenshots/user%20list.png)
 ![新增列表](screenshots/new%20user.png)
-![支持英文](screenshots/i18n.png)
+![代理列表](screenshots/proxy%20list.png)
+![代理流量统计](screenshots/proxy%20traffic%20statistics.png)
 ![自动深色模式](screenshots/dark%20mode.png)
 
-## 更新说明
-
-+ **配置文件改为ini格式，便于增加注释**
-+ **删除-l参数，其需要的配置由`frps-multiuser.ini`决定**
-+ **指定配置文件的参数由`-f`改为`-c`，和`frps`一致**
-+ **配置文件中，\[users\]节下如无用户信息，则直接由frps的token认证**
-+ **配置文件中，\[disabled\]节下用户名对应的值如果为`disable`，则说明该账户被禁用，无法连接到服务器**
-+ **增加了管理界面，并且会根据浏览器主题自动切换深色或浅色模式**
-+ **新增动态`添加`、`删除`、`禁用`、`启用`用户**
-+ **新增对用户的`端口`、`域名`、`二级域名`进行限制**
-
-***用户被`删除`或`禁用`后，不会马上生效，需要等一段时间***
-***用户`端口`、`域名`、`二级域名`限制仅在建立新连接(`NewProxy`)时生效***
 
 ### 功能
 
-* 通过配置文件配置所有支持的用户名和 Token，只允许匹配的 frpc 客户端登录。
-* 动态`添加`、`删除`、`禁用`、`启用`用户
-* 对每个用户进行`端口`、`域名`、`二级域名`限制
++ **支持展示服务器信息**
++ **支持多用户鉴权**
++ **动态`添加`、`删除`、`禁用`、`启用`用户**
++ **对用户的`端口`、`域名`、`二级域名`进行限制**
+
+***用户被`删除`或`禁用`后，不会马上生效，需要等一段时间***
+
+***用户`端口`、`域名`、`二级域名`限制仅在建立新连接(`NewProxy`)时生效***
 
 ### 下载
 
@@ -41,49 +37,59 @@ frps-multiuser 会以一个单独的进程运行，并接收 frps 发送过来
 
 ### 使用示例
 
-1. 创建 `frps-multiuser.ini` 文件，内容为所有支持的用户名和 token。
+1. 创建 `frps-panel.toml` 文件，内容为基础配置。
 
-```ini
+```toml
+# frps-panel.toml
 [common]
-;插件监听地址
-plugin_addr = 127.0.0.1
-;插件端口
+# frps panel config info
+plugin_addr = "127.0.0.1"
 plugin_port = 7200
-;插件管理页面账号,可选
-admin_user  = admin
-;插件管理页面密码,与账号一起进行鉴权,可选
-admin_pwd   = admin
+#admin_user = "admin"
+#admin_pwd = "admin"
+# specified login state keep time
+admin_keep_time = 0
 
-[users]
-;user1的meta_token为123
-user1 = 123
-;user2的meta_token为abc
-user2 = abc
+# enable tls
+tls_mode = false
+# tls_cert_file = "cert.crt"
+# tls_key_file = "cert.key"
 
-[ports]
-;user1只能使用8080,9090到9010端口,其他端口则建立连接时返回失败(不影响客户端启动)
-user1=8080,9090-9010
-
-[domains]
-;user1只能使用web01.yyy.zzz域名,配置了其他域名则建立连接时返回失败(不影响客户端启动)
-user1=web01.user1.com
-
-[subdomains]
-;user1只能使用web01.xxx.yyy.zzz域名,配置了其他三级域名则建立连接时返回失败(不影响客户端启动)
-user1=web01
-
-[disabled]
-;user2被禁用,frpc使用此账户与frps通信时,如果未启动则无法启动,如果已启动,则会一直打印错误日志
-user2 = disable
+# frp dashboard info
+dashboard_addr = "127.0.0.1"
+dashboard_port = 7500
+dashboard_user = "admin"
+dashboard_pwd = "admin"
 ```
 
-    每一个用户占一行，用户名和 token 之间以 `=` 号分隔。
+2. 创建`frps-tokens.toml`文件，其内容为系统中的用户，该文件位置和`frps-panel.toml`相同。如不创建此文件，在增加用户时会自动创建。
 
-2. 运行 frps-multiuser，指定监听地址以及 token 存储文件路径。
+```toml
+#frps-tokens.toml
+[tokens]
+   [tokens.user1]
+      user = "user1"
+      token = "token1"
+      comment = "user1 with token1"
+      ports = [8080, "10000-10200"]
+      domains = ["web01.domain.com", "web02.domain.com"]
+      subdomains = ["web01", "web02"]
+      enable = true
+   [tokens.user2]
+      user = "user2"
+      token = "token2"
+      comment = "user2 with token2"
+      ports = [9080]
+      domains = ["web11.domain.com", "web12.domain.com"]
+      subdomains = ["web11", "web12"]
+      enable = false
+```
 
-    `./frps-multiuser -c ./frps-multiuser.ini`
+3. 运行 frps-panel，指定监听地址以及 token 存储文件路径。
 
-3. 在 frps 的配置文件中注册插件，并启动。
+    `./frps-panel -c ./frps-panel.toml`
+
+4. 在 frps 的配置文件中注册插件，并启动。
 
 ```ini
 # frps.ini
@@ -96,7 +102,7 @@ path = /handler
 ops = Login,NewWorkConn,NewUserConn,NewProxy,Ping
 ```
 
-4. 在 frpc 中指定用户名，在 meta 中指定 token，用户名以及 `meta_token` 的内容需要和之前创建的 token 文件匹配。
+5. 在 frpc 中指定用户名，在 meta 中指定 token，用户名以及 `meta_token` 的内容需要和之前创建的 token 文件匹配。
 
     user1 的配置:
 
@@ -130,15 +136,44 @@ local_port = 22
 remote_port = 6000
 ```
 
+6.浏览器中输入地址: http://127.0.0.1:7200 或 https://127.0.0.1:7200 进入管理页面进行用户管理
+
+## 以服务的形式运行
+
+本实例是在 `ubuntu` 下， 以 `root` 用户执操作
+
++ 1、解压 `frps-panel.zip` 到目录 `/root/frps-panel`
++ 2、在目录 `/root/frps-panel` 下 用命令创建文件：`touch frps-panel.service`。创建后修改文件内容：
+```ini
+[Unit]
+Description = frp multiuser service
+After = network.target syslog.target
+Wants = network.target
+
+[Service]
+Type = simple
+# 启动frps-panel的配置文件路径，需修改为您的frps-panel.toml的路径
+Environment=FRPS_PANEL_OPTS="-c /root/frps-panel/frps-panel.toml"
+# 启动frps-panel的命令，需修改为您的frps-panel的安装路径
+ExecStart = /root/frps-panel/frps-panel $FRPS_PANEL_OPTS
+
+[Install]
+WantedBy = multi-user.target
+```
++ 3、复制服务文件： `cp /root/frps-panel.service /etc/systemd/system/`
++ 4、重载服务： `systemctl daemon-reload`
++ 5、启动服务： `service frps-panel start`
+
 ## 使用
 
 ___如果要从外网访问管理界面, 需要把配置中的 `plugin_addr` 改为 `0.0.0.0`___
 
-如果使用中有问题或者有其他想法，在[issues](https://github.com/yhl452493373/frps-multiuser/issues)上提出来。 如果我能搞定的话，我尽量搞。
+如果使用中有问题或者有其他想法，在[issues](https://github.com/yhl452493373/frps-panel/issues)上提出来。 如果我能搞定的话，我尽量搞。
 
 ## 致谢
 
 + [frp](https://github.com/fatedier/frp)
 + [fp-multiuser](https://github.com/gofrp/fp-multiuser)
 + [layui](https://github.com/layui/layui)
-+ [layui-theme-dark](https://github.com/Sight-wcg/layui-theme-dark)
++ [layui-theme-dark](https://github.com/Sight-wcg/layui-theme-dark)
++ [echarts](https://github.com/apache/echarts)

assets/lang/en.json

@@ -1,5 +1,5 @@
 {
-  "User Manage": "User Manage",
+  "Frps Panel": "Frps Panel",
   "User": "User",
   "Token": "Token",
   "Notes": "Notes",
@@ -29,6 +29,7 @@
   "Other error": "Other error",
   "Param error": "Param error",
   "User exist": "User exist",
+  "User not exist": "User not exist",
   "User format error": "User cannot be empty or include space char. It only allowed alphanumeric and underline.",
   "Token format error": "Token cannot be empty or include space char. It allow include those special char: _!@#$%^&*()",
   "Please check at least one user": "Please Check at least one user",
@@ -45,5 +46,58 @@
   "Subdomains is invalid": "Subdomains is invalid",
   "Comment is invalid": "Comment is invalid, it cannot include line breaks",
   "Not limit": "Not limit",
-  "None": "None"
+  "None": "None",
+  "Server Info": "Server Info",
+  "Users": "Users",
+  "Proxies": "Proxies",
+  "Name": "Name",
+  "Port": "Port",
+  "Connections": "Connections",
+  "Traffic In": "Traffic In",
+  "Traffic Out": "Traffic Out",
+  "Client Version": "Client Version",
+  "Traffic Statistics": "Traffic Statistics",
+  "Type": "Type",
+  "Domains": "Domains",
+  "SubDomain": "SubDomain",
+  "Locations": "Locations",
+  "HostRewrite": "HostRewrite",
+  "Encryption": "Encryption",
+  "Compression": "Compression",
+  "Addr": "Addr",
+  "online": "online",
+  "offline": "offline",
+  "true": "Yes",
+  "false": "No",
+  "Last Start": "Last Start",
+  "Last Close": "Last Close",
+  "Network Traffic": "Network Traffic",
+  "today": "today",
+  "now": "now",
+  "Version": "Version",
+  "Bind Port": "Bind Port",
+  "KCP Bind Port": "KCP Bind Port",
+  "QUIC Bind Port": "QUIC Bind Port",
+  "HTTP Port": "HTTP Port",
+  "HTTPS Port": "HTTPS Port",
+  "TCPMUX Port": "TCPMUX Port",
+  "Subdomain Host": "Subdomain Host",
+  "Max Pool Count": "Max Pool Count",
+  "Max Ports Per Client": "Max Ports Per Client",
+  "Heart Beat Timeout": "Heart Beat Timeout",
+  "Allow Ports": "Allow Ports",
+  "TLS Only": "TLS Only",
+  "Current Connections": "Current Connections",
+  "Client Counts": "Client Counts",
+  "Proxy Counts": "Proxy Counts",
+  "Not Set": "Not Set",
+  "Proxy": "Proxies",
+  "Username": "Username",
+  "Password": "Password",
+  "Login": "Login",
+  "Please input username": "Please input username",
+  "Please input password": "Please input password",
+  "Login success": "Login success",
+  "Username or password incorrect": "Username or password incorrect",
+  "Token invalid": "Token invalid"
 }

assets/lang/zh.json

@@ -1,5 +1,5 @@
 {
-  "User Manage": "用户管理",
+  "Frps Panel": "Frps 面板",
   "User": "用户名(user)",
   "Token": "凭证(meta_token)",
   "Notes": "备注",
@@ -20,15 +20,16 @@
   "Operation": "操作",
   "Confirm": "确定",
   "Cancel": "取消",
-  "Confirm to remove user": "确定删除用户 ?",
-  "Confirm to disable user": "确定禁用用户 ?",
-  "Confirm to enable user": "确定启用用户 ?",
+  "Confirm to remove user": "确定删除用户?",
+  "Confirm to disable user": "确定禁用用户?",
+  "Confirm to enable user": "确定启用用户?",
   "Operate success": "操作成功",
   "Operate failed": "操作失败",
   "Operate error": "操作异常",
   "Other error": "其他异常",
   "Param error": "参数异常",
   "User exist": "用户已经存在",
+  "User not exist": "用户不存在",
   "User format error": "用户不能为空或包含空格。只允许英文数字、字母、下划线",
   "Token format error": "Token不能为空或包含空格。允许的特殊符号：_!@#$%^&*()",
   "Please check at least one user": "请选中需要操作的用户",
@@ -45,5 +46,58 @@
   "Subdomains is invalid": "子域名不正确",
   "Comment is invalid": "备注不正确,不能包含换行",
   "Not limit": "无限制",
-  "None": "无"
+  "None": "无",
+  "Server Info": "服务器信息",
+  "Users": "用户列表",
+  "Proxies": "代理列表",
+  "Name": "名称",
+  "Port": "端口",
+  "Connections": "连接数",
+  "Traffic In": "入站流量",
+  "Traffic Out": "出站流量",
+  "Client Version": "客户端版本",
+  "Traffic Statistics": "流量统计",
+  "Type": "连接类型",
+  "Domains": "自定义域名",
+  "SubDomain": "二级域名",
+  "Locations": "路由",
+  "HostRewrite": "自定义请求头",
+  "Encryption": "数据加密",
+  "Compression": "数据压缩",
+  "Addr": "使用端口",
+  "online": "在线",
+  "offline": "离线",
+  "true": "是",
+  "false": "否",
+  "Last Start": "上次连接时间",
+  "Last Close": "上次断开时间",
+  "Network Traffic": "网络流量",
+  "today": "今日",
+  "now": "当前",
+  "Version": "版本号",
+  "Bind Port": "TCP 端口",
+  "KCP Bind Port": "KCP 端口",
+  "QUIC Bind Port": "QUIC 端口",
+  "HTTP Port": "HTTP 端口",
+  "HTTPS Port": "HTTPS 端口",
+  "TCPMUX Port": "TCPMUX 端口",
+  "Subdomain Host": "二级域名后缀",
+  "Max Pool Count": "每个代理最大连接池大小",
+  "Max Ports Per Client": "单个客户端最大同时存在代理数",
+  "Heart Beat Timeout": "心跳连接超时时间",
+  "Allow Ports": "端口限制",
+  "TLS Only": "仅接受启用 TLS 的客户端",
+  "Current Connections": "当前连接数",
+  "Client Counts": "客户端总数",
+  "Proxy Counts": "代理总数",
+  "Not Set": "未配置",
+  "Proxy": "代理数量",
+  "Username": "用户名",
+  "Password": "密码",
+  "Login": "登录",
+  "Please input username": "请填写用户名",
+  "Please input password": "请填写密码",
+  "Login success": "登录成功",
+  "Username or password incorrect": "用户名或密码错误",
+  "Token invalid": "登录信息无效"
 }

assets/static/css/color.css

@@ -0,0 +1,250 @@
+::-webkit-scrollbar-thumb {
+    background: rgba(199, 199, 199, 0.8);
+}
+
+.layui-bg-blue {
+    background-color: #58b7ff !important;
+}
+
+.layui-btn {
+    background-color: #409eff;
+}
+
+.layui-layer-btn .layui-layer-btn0 {
+    background-color: #409eff;
+}
+
+.layui-btn-primary {
+    background-color: transparent;
+}
+
+.layui-btn-primary:hover {
+    border-color: #79bbff;
+}
+
+.layui-input:focus,
+.layui-textarea:focus {
+    border-color: #79bbff !important;
+    box-shadow: none;
+}
+
+.layui-form-danger + .layui-form-select .layui-input,
+.layui-form-danger:focus {
+    border-color: #ff5722 !important;
+}
+
+.layui-laypage .layui-laypage-curr .layui-laypage-em {
+    background-color: #409eff;
+}
+
+.layui-laypage input:focus, .layui-laypage select:focus {
+    border-color: #79bbff !important;
+    box-shadow: none;
+}
+
+.layui-table-view .layui-table td[data-edit]:hover:after {
+    border-color: #79bbff;
+}
+
+.layui-form-checkbox[lay-skin=primary]:hover > i {
+    border-color: #79bbff;
+}
+
+.layui-form-checkbox[lay-skin=primary] > .layui-icon-indeterminate:before {
+    background-color: #79bbff;
+}
+
+.layui-form-checkbox[lay-skin=primary] > .layui-icon-indeterminate {
+    border-color: #79bbff;
+}
+
+.layui-form-checked[lay-skin=primary] > i {
+    background-color: #409eff;
+    border-color: #409eff !important;
+}
+
+.layui-table-checked {
+    background-color: #ecf5ff;
+}
+
+.layui-table-checked:hover {
+    background-color: #d9ecff;
+}
+
+.layui-table-cell-c:hover {
+    border-color: #79bbff;
+}
+
+.layui-table-checked.layui-table-click,
+.layui-table-checked.layui-table-hover {
+    background-color: #d9ecff;
+}
+
+.layui-nav-tree .layui-nav-child dd.layui-this,
+.layui-nav-tree .layui-nav-child dd.layui-this a,
+.layui-nav-tree .layui-this,
+.layui-nav-tree .layui-this > a,
+.layui-nav-tree .layui-this > a:hover {
+    background-color: #409eff;
+}
+
+.layui-nav-tree .layui-nav-bar {
+    background-color: #409eff;
+}
+
+.proxy-expand .layui-row .layui-row > div:first-child {
+    color: #99a9bf;
+}
+
+section.server-info .text-row .text-col:first-child {
+    color: #99a9bf;
+}
+
+section.proxy-list .proxy-info .layui-row .layui-row > div:first-child {
+    color: #99a9bf;
+}
+
+.online,
+.offline {
+    border-radius: 4px;
+    padding: 2px 10px;
+    font-size: 12px;
+    border-width: 1px;
+    border-style: solid;
+}
+
+.online {
+    color: #67c23a;
+    background-color: #f0f9eb;
+    border-color: #e1f3d8;
+}
+
+.offline {
+    color: #f56c6c;
+    background-color: #fef0f0;
+    border-color: #fde2e2;
+}
+
+.version a,
+.version span {
+    color: #99a9bf;
+}
+
+.login-title,
+.login-title a {
+    color: #333 !important;
+}
+
+@media (prefers-color-scheme: dark) {
+    ::-webkit-scrollbar-thumb {
+        background: rgba(107, 107, 107, 0.8);
+    }
+
+    .login-title,
+    .login-title a {
+        color: #99a9bf !important;
+    }
+
+    .layui-bg-blue {
+        background-color: #395c74 !important;
+    }
+
+    .layui-btn {
+        background-color: #4f80a1;
+    }
+
+    .layui-layer-btn .layui-layer-btn0 {
+        background-color: #4f80a1;
+    }
+
+    .layui-btn-primary {
+        background-color: transparent;
+        border-color: #484849;
+    }
+
+    .layui-btn-primary:hover {
+        border-color: #5f5f60;
+    }
+
+    .layui-input:focus,
+    .layui-textarea:focus {
+        border-color: #5f5f60 !important;
+        box-shadow: none;
+    }
+
+    .layui-laypage .layui-laypage-curr .layui-laypage-em {
+        background-color: #4f80a1;
+    }
+
+    .layui-laypage input:focus, .layui-laypage select:focus {
+        border-color: #5f5f60 !important;
+        box-shadow: none;
+    }
+
+    .layui-table-view .layui-table td[data-edit]:hover:after {
+        border-color: #5f5f60;
+    }
+
+    .layui-form-danger + .layui-form-select .layui-input,
+    .layui-form-danger:focus {
+        border-color: #ff5722 !important;
+    }
+
+    .layui-form-checkbox[lay-skin=primary]:hover > i {
+        border-color: #5f5f60;
+    }
+
+    .layui-form-checkbox[lay-skin=primary] > .layui-icon-indeterminate:before {
+        background-color: #5f5f60;
+    }
+
+    .layui-form-checkbox[lay-skin=primary] > .layui-icon-indeterminate {
+        border-color: #5f5f60;
+    }
+
+    .layui-form-checked[lay-skin=primary] > i {
+        background-color: #484849;
+        border-color: #484849 !important;
+    }
+
+    .layui-table-checked {
+        background-color: rgba(255, 255, 255, .04);
+    }
+
+    .layui-table-checked:hover {
+        background-color: rgba(255, 255, 255, .08);
+    }
+
+    .layui-table-cell-c:hover {
+        border-color: #5f5f60;
+    }
+
+    .layui-table-checked.layui-table-click,
+    .layui-table-checked.layui-table-hover {
+        background-color: #5f5f60;
+    }
+
+    .layui-nav-tree .layui-nav-child dd.layui-this,
+    .layui-nav-tree .layui-nav-child dd.layui-this a,
+    .layui-nav-tree .layui-this,
+    .layui-nav-tree .layui-this > a,
+    .layui-nav-tree .layui-this > a:hover {
+        background-color: #4f80a1;
+    }
+
+    .layui-nav-tree .layui-nav-bar {
+        background-color: #4f80a1;
+    }
+
+    .online {
+        color: #67c23a;
+        background-color: #1c2518;
+        border-color: #25371c;
+    }
+
+    .offline {
+        color: #f56c6c;
+        background-color: #2b1d1d;
+        border-color: #412626;
+    }
+}

assets/static/css/index.css

@@ -1,8 +1,85 @@
-body {
-    padding: 15px;
+::-webkit-scrollbar {
+    width: 8px;
+    height: 8px;
+}
+
+::-webkit-scrollbar-thumb {
+    border-radius: 4px;
+    transition: 0.3s ease-in-out;
+}
+
+html, body {
+    padding: 0;
     word-break: break-all;
 }
 
+section {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    padding: 15px;
+    overflow: hidden;
+    box-sizing: border-box;
+}
+
+.layui-layout-admin .layui-body {
+    padding: 0;
+}
+
+.layui-header {
+    line-height: 60px;
+    font-size: 16px;
+}
+
+.layui-layout-admin .layui-side {
+    width: 225px !important;
+}
+
+.layui-side-scroll {
+    width: 245px !important;
+    position: absolute !important;
+    top: 0 !important;
+    bottom: 24px !important;
+    height: auto !important;
+}
+
+.layui-logo {
+    width: 225px !important;
+}
+
+.layui-title {
+    position: absolute;
+    left: 225px !important;
+    right: 0;
+    top: 0;
+    height: 100%;
+    padding: 0 15px;
+    box-sizing: border-box;
+    display: flex;
+}
+
+.layui-title #title {
+    flex: 1;
+    display: inline-block;
+}
+
+.layui-title #logout{
+    display: inline-block;
+    font-size: 20px;
+    font-weight: bold;
+    cursor: pointer;
+}
+
+.layui-nav.layui-nav-tree {
+    width: 225px !important;
+}
+
+.layui-body {
+    left: 225px;
+}
+
 #searchForm input {
     height: 30px;
     line-height: 28px;
@@ -44,10 +121,90 @@ body {
     line-height: 20px;
 }
 
-.layui-btn-container{
+.layui-btn-container {
     height: 30px;
 }
 
-.layui-layer-btn > a[class^=layui-layer-btn]{
+.layui-layer-btn > a[class^=layui-layer-btn] {
     line-height: 28px;
 }
+
+.layui-table-page {
+    margin-bottom: 0;
+}
+
+section.server-info {
+    display: flex;
+}
+
+section.server-info .text-info,
+section.server-info .chart-info {
+    flex: 1;
+}
+
+section.server-info .text-info {
+    padding: 0 20px;
+}
+
+section.server-info .text-row {
+    display: flex;
+    font-size: 14px;
+    line-height: 40px;
+}
+
+section.server-info .text-row .text-col {
+    flex: 1;
+}
+
+section.server-info .chart-info {
+    display: flex;
+    flex-direction: column;
+}
+
+section.server-info .chart-info > .chart-traffic,
+section.server-info .chart-info > .chart-count {
+    display: flex;
+    justify-content: center;
+}
+
+section.server-info .chart-info > .chart-count {
+    margin-top: 30px;
+}
+
+section.server-info .chart-info #trafficPieChart,
+section.server-info .chart-info #countPieChart {
+    width: 400px;
+    height: 250px;
+}
+
+.toggle-proxy-info-arrow {
+    display: inline-block;
+    transition-duration: 0.2s;
+}
+
+.toggle-proxy-info-arrow.open {
+    transform: rotate(90deg);
+}
+
+.proxy-info .layui-row {
+    font-size: 14px !important;
+    padding: 10px;
+}
+
+.proxy-info .layui-col-xs6 .layui-row {
+    padding: 0;
+}
+
+#trafficBarChart {
+    height: 100%;
+}
+
+.version {
+    height: 24px;
+    line-height: 24px;
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    text-align: center;
+    font-size: 12px;
+}

assets/static/css/layui-theme-dark.css

@@ -443,10 +443,6 @@
     border-left: 5px solid var(--lay-color-border-4)
   }
 
-  .layui-text pre > code:not(.layui-code) {
-    background-color: var(--lay-color-bg-white)
-  }
-
   /* 字体颜色 */
   .layui-font-red {
     color: var(--lay-color-red-6) !important
@@ -595,7 +591,7 @@
   }
 
   /* 数字输入框动态点缀  */
-  .layui-input-wrap .layui-input-number .layui-icon:first-child {
+  .layui-input-wrap .layui-input-number .layui-icon-up {
     border-bottom-color: var(--lay-color-border-1)
   }
 
@@ -1042,6 +1038,7 @@
     background-color: var(--lay-color-bg-5)
   }
 
+  /* 单元格多行展开风格  */
   .layui-table-cell-c {
     background-color: var(--lay-color-gray-13);
     color: var(--lay-color-text-1);
@@ -1052,6 +1049,25 @@
     border-color: var(--lay-color-secondary-hover);
   }
 
+  /* 单元格 TIPS 展开风格  */
+  body .layui-table-tips .layui-layer-content {
+    box-shadow: var(--lay-shadow-3)
+  }
+
+  .layui-table-tips-main {
+    background-color: var(--lay-color-bg-5);
+    color: var(--lay-color-text-3)
+  }
+
+  .layui-table-tips-c {
+    background-color: var(--lay-color-gray-13);
+    color: var(--lay-color-text-1)
+  }
+
+  .layui-table-tips-c:hover {
+    background-color: var(--lay-color-gray-10)
+  }
+
   /** 文件上传 **/
   .layui-upload-choose {
     color: var(--lay-color-gray-8)
@@ -1411,7 +1427,7 @@
   .layui-code {
     border: 1px solid var(--lay-color-border-2);
     background-color: var(--lay-color-bg-white);
-    color: var(--lay-color-black-5)
+    color: var(--lay-color-text-2)
   }
 
   /** 穿梭框 **/
@@ -1634,37 +1650,58 @@
   /*code 不处理*/
   .layui-code-view {
     border: 1px solid var(--lay-color-border-1);
+  }
+
+  .layui-code-view:not(.layui-code-hl) {
     background-color: var(--lay-color-bg-2);
     color: var(--lay-color-text-2);
-    border-left-width: 6px;
   }
 
-  .layui-code-title {
-    border-bottom: 1px solid var(--lay-color-border-2)
-  }
-
-  .layui-code-title > .layui-code-about {
-    color: #c5c5c5
-  }
-
-  .layui-code-view > .layui-code-ol > li {
-    border-left: 1px solid var(--lay-color-border-2);
+  .layui-code-header {
+    border-bottom: 1px solid var(--lay-color-border-1);
     background-color: var(--lay-color-bg-2)
   }
 
-  .layui-code-view > .layui-code-ul > li {
-    background-color: var(--lay-color-bg-2)
+  .layui-code-header > .layui-code-header-about {
+    color: var(--lay-color-text-2);
   }
 
-  .layui-code-dark {
-    border: 1px solid #3d3d3d;
-    border-left-color: #656565;
-    background-color: #3d3d3d;
-    color: var(--lay-color-gray-8)
+  .layui-code-view:not(.layui-code-hl) .layui-code-ln-side {
+    border-color: var(--lay-color-border-1);
+    background-color: var(--lay-color-bg-2);
   }
 
-  .layui-code-dark > .layui-code-ol > li, .layui-code-dark > .layui-code-ul > li {
-    background-color: #3f3f3f
+  .layui-code-nowrap > .layui-code-ln-side {
+    background: none !important;
+  }
+
+  .layui-code-fixbar > span {
+    color: var(--lay-color-text-3);
+  }
+
+  .layui-code-fixbar > span:hover {
+    color: var(--lay-color-secondary-hover);
+  }
+
+  .layui-code-theme-dark {
+    border-color: rgb(126 122 122 / 15%);
+    background-color: #1f1f1f;
+    color: #ccc;
+  }
+
+  .layui-code-theme-dark > .layui-code-ln-side {
+    border-right-color: #2a2a2a;
+    background: none;
+    color: #6e7681;
+  }
+
+  .layui-code-view.layui-code-hl > .layui-code-ln-side {
+    background-color: transparent;
+  }
+
+  .layui-code-theme-dark.layui-code-hl,
+  .layui-code-theme-dark.layui-code-hl > .layui-code-ln-side {
+    border-color: rgb(126 122 122 / 15%);
   }
 
   .layui-code-full {
@@ -2183,12 +2220,4 @@
   .layui-slider-input .layui-input {
     background-color: var(--lay-color-bg-2);
   }
-
-  a {
-    color: var(--lay-color-text-1)
-  }
-
-  .layui-code, pre > code {
-    background-color: var(--lay-color-bg-2)
-  }
 }

assets/static/css/login.css

@@ -0,0 +1,30 @@
+html, body {
+    width: 100%;
+    height: 100%;
+}
+
+body {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+
+.login-title {
+    text-align: center;
+    margin-bottom: 50px;
+}
+
+.login-title .title-text {
+    font-size: 24px;
+    text-align: center;
+    font-weight: bold;
+}
+
+.login-title .title-version {
+    font-size: 12px;
+}
+
+.login-container {
+    width: 320px;
+    margin: 0 auto;
+}

assets/static/js/index-proxy-list.js

@@ -0,0 +1,260 @@
+var loadProxyInfo = (function ($) {
+    var size = filesize.partial({base: 2, standard: "jedec"});
+    var i18n = {};
+
+    /**
+     * get proxy info
+     * @param lang {{}} language json
+     * @param title page title
+     * @param proxyType proxy type
+     */
+    function loadProxyInfo(lang, title, proxyType) {
+        i18n = lang;
+        $("#title").text(title);
+        $('#content').empty();
+        var loading = layui.layer.load();
+
+        $.getJSON('/proxy/api/proxy/' + proxyType).done(function (result) {
+            if (result.success) {
+                $('#content').html($('#proxyListTableTemplate').html());
+                renderProxyListTable(JSON.parse(result.data)['proxies'], proxyType);
+            } else {
+                layui.layer.msg(result.message);
+            }
+        }).always(function () {
+            layui.layer.close(loading);
+        });
+    }
+
+    /**
+     * render proxy list table
+     * @param data proxy data
+     * @param proxyType proxy type
+     */
+    function renderProxyListTable(data, proxyType) {
+        proxyType = proxyType.toLowerCase();
+        data.forEach(function (temp) {
+            temp.conf = temp.conf || {
+                remote_port: 0,
+                use_encryption: false,
+                use_compression: false,
+                custom_domains: null,
+                subdomain: null,
+                locations: null,
+                host_header_rewrite: null
+            };
+
+            temp.client_version = temp.client_version || '-';
+            temp.conf.custom_domains = temp.conf.custom_domains || '-';
+            temp.conf.subdomain = temp.conf.subdomain || '-';
+            temp.conf.locations = temp.conf.locations || '-';
+            temp.conf.host_header_rewrite = temp.conf.host_header_rewrite || '-';
+
+            if (temp.conf.custom_domains !== '-') {
+                temp.conf.custom_domains = JSON.stringify(temp.conf.custom_domains);
+            }
+            if (proxyType === 'http') {
+                temp.conf.remote_port = http_port;
+            } else if (proxyType === 'https') {
+                temp.conf.remote_port = https_port;
+            }
+        });
+        var $section = $('#content > section');
+        var cols = [
+            {field: 'id', type: 'space', width: 60, align: 'center', templet: '#toggleProxyInfoArrowTemplate'},
+            {field: 'name', title: i18n['Name'], sort: true},
+            {
+                field: 'port',
+                title: i18n['Port'],
+                width: '12%',
+                sort: true,
+                templet: '<span>{{= d.conf.remote_port }}</span>'
+            },
+            {field: 'cur_conns', title: i18n['Connections'], minWidth: 140, width: '12%', sort: true},
+            {
+                field: 'today_traffic_in',
+                title: i18n['TrafficIn'],
+                minWidth: 140,
+                width: '12%',
+                sort: true,
+                templet: function (d) {
+                    return size(d.today_traffic_in);
+                }
+            },
+            {
+                field: 'today_traffic_out',
+                title: i18n['TrafficOut'],
+                minWidth: 140,
+                width: '12%',
+                sort: true,
+                templet: function (d) {
+                    return size(d.today_traffic_out);
+                }
+            },
+            {field: 'client_version', title: i18n['ClientVersion'], minWidth: 140, width: '12%', sort: true},
+            {
+                field: 'status', title: i18n['Status'], width: '12%', sort: true, templet: function (d) {
+                    return '<span class="' + d.status + '">' + i18n[d.status] + '</span>';
+                }
+            }
+        ];
+
+        var proxyListTable = layui.table.render({
+            elem: '#proxyListTable',
+            height: $section.height(),
+            text: {none: i18n['EmptyData']},
+            cols: [cols],
+            page: navigator.language.indexOf("zh") !== -1,
+            data: data,
+            initSort: {
+                field: 'name',
+                type: 'asc'
+            },
+            done: function (res, curr, count, origin) {
+                //向每一行tr后面追加显示子table的tr
+                var $tr = $('.layui-table-view[lay-id=' + this.id + '] tbody tr');
+                var expandTrTemplateHtml = $('#expandTrTemplate').html();
+                for (var i = 0; i < $tr.length; i++) {
+                    var datum = res.data[i];
+                    var useEncryption = datum.conf.use_encryption;
+                    var useCompression = datum.conf.use_compression;
+                    datum.conf.use_encryption = i18n[useEncryption];
+                    datum.conf.use_compression = i18n[useCompression];
+                    var html = layui.laytpl(expandTrTemplateHtml).render({
+                        index: i,
+                        colspan: cols.length - 1,
+                        proxyType: proxyType,
+                        data: datum
+                    });
+                    $($tr[i]).after(html);
+                }
+            }
+        });
+
+        layui.table.on('tool(proxyListTable)', function (obj) {
+            var index = obj.index;
+            $(this).toggleClass('open');
+            var open = $(this).hasClass('open');
+            $('#childTr_' + index).toggleClass('layui-hide', !open);
+            proxyListTable.resize();
+        });
+
+        window.onresize = function () {
+            proxyListTable.resize();
+        }
+    }
+
+    /**
+     * load traffic statistics data
+     */
+    function loadTrafficStatistics() {
+        var proxyName = $(this).closest('.layui-row').find('input').val();
+        var loading = layui.layer.load();
+        $.getJSON('/proxy/api/traffic/' + proxyName).done(function (result) {
+            if (result.success) {
+                renderTrafficChart(JSON.parse(result.data));
+            } else {
+                layui.layer.msg(result.message);
+            }
+        }).always(function () {
+            layui.layer.close(loading);
+        });
+    }
+
+    /**
+     * render traffic statistics chart
+     * @param data traffic data
+     */
+    function renderTrafficChart(data) {
+        var html = layui.laytpl($('#trafficStaticTemplate').html()).render();
+        var dates = [];
+        var now = new Date();
+        for (var i = 0; i < data.traffic_in.length; i++) {
+            dates.push(now.getFullYear() + "/" + (now.getMonth() + 1) + "/" + now.getDate());
+            now.setDate(now.getDate() - 1);
+        }
+        layui.layer.open({
+            title: i18n['TrafficStatistics'],
+            type: 1,
+            content: html,
+            area: ['800px', '400px'],
+            success: function () {
+                var chartDom = document.getElementById('trafficBarChart');
+                var chart = echarts.init(chartDom);
+                var option = {
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow',
+                        },
+                        formatter: function (data) {
+                            var html = ''
+                            if (data.length > 0) {
+                                html += data[0].name + '<br/>'
+                            }
+                            for (var v of data) {
+                                var colorEl = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:' + v.color + '"></span>'
+                                html += colorEl + v.seriesName + ': ' + size(v.value) + '<br/>'
+                            }
+                            return html
+                        }
+                    },
+                    legend: {
+                        data: [i18n['TrafficIn'], i18n['TrafficOut']],
+                        textStyle: {
+                            textBorderColor: '#fff',
+                            textBorderWidth: 2
+                        }
+                    },
+                    grid: {
+                        left: '3%',
+                        right: '4%',
+                        bottom: '3%',
+                        containLabel: true,
+                    },
+                    xAxis: [
+                        {
+                            type: 'category',
+                            data: dates.reverse()
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value',
+                            axisLabel: {
+                                formatter: function (value) {
+                                    return size(value)
+                                }
+                            }
+                        }
+                    ],
+                    series: [
+                        {
+                            name: i18n['TrafficIn'],
+                            type: 'bar',
+                            data: data.traffic_in.reverse(),
+                        },
+                        {
+                            name: i18n['TrafficOut'],
+                            type: 'bar',
+                            data: data.traffic_out.reverse(),
+                        }
+                    ]
+                };
+
+                option && chart.setOption(option);
+            }
+        });
+    }
+
+    /**
+     * document event
+     */
+    (function bindDocumentEvent() {
+        $(document).on('click.trafficStatistics', '.traffic-statistics', function () {
+            loadTrafficStatistics.call(this);
+        });
+    })();
+
+    return loadProxyInfo;
+})(layui.$);

assets/static/js/index-server-info.js

@@ -0,0 +1,190 @@
+var loadServerInfo = (function ($) {
+    var size = filesize.partial({base: 2, standard: "jedec"});
+    var i18n = {};
+
+    /**
+     * get server info
+     * @param lang {{}} language json
+     * @param title page title
+     */
+    function loadServerInfo(lang, title) {
+        i18n = lang;
+        $("#title").text(title);
+        $('#content').empty();
+        var loading = layui.layer.load();
+
+        $.getJSON('/proxy/api/serverinfo').done(function (result) {
+            if (result.success) {
+                var data = JSON.parse(result.data);
+                data.proxy_counts = 0;
+                http_port = data.vhost_http_port;
+                https_port = data.vhost_https_port;
+                for (var proxy in data.proxy_type_count) {
+                    data.proxy_counts = data.proxy_counts + data.proxy_type_count[proxy];
+                }
+                data.bind_port = data.bind_port || i18n['Disable'];
+                data.kcp_bind_port = data.kcp_bind_port || i18n['Disable'];
+                data.quic_bind_port = data.quic_bind_port || i18n['Disable'];
+                data.vhost_http_port = data.vhost_http_port || i18n['Disable'];
+                data.vhost_https_port = data.vhost_https_port || i18n['Disable'];
+                data.tcpmux_httpconnect_port = data.tcpmux_httpconnect_port || i18n['Disable'];
+                data.subdomain_host = data.subdomain_host || i18n['NotSet'];
+                data.max_pool_count = data.max_pool_count || i18n['NotSet'];
+                data.max_ports_per_client = data.max_ports_per_client || i18n['NotLimit'];
+                data.heart_beat_timeout = data.heart_beat_timeout || i18n['NotSet'];
+                data.allow_ports_str = data.allow_ports_str || i18n['NotLimit'];
+                data.tls_only = i18n[data.tls_only || false];
+                renderServerInfo(data);
+            } else {
+                layui.layer.msg(result.message);
+            }
+        }).always(function () {
+            layui.layer.close(loading);
+        });
+    }
+
+    /**
+     * render server info page
+     * @param data server info data
+     */
+    function renderServerInfo(data) {
+        var html = layui.laytpl($('#serverInfoTemplate').html()).render(data);
+        $('#content').html(html);
+        $('#frpVersion').text(data.version);
+
+        renderTrafficChart(data);
+        renderCountChart(data);
+    }
+
+    /**
+     * render traffic chart with echarts
+     * @param data traffic data
+     */
+    function renderTrafficChart(data) {
+        var chartLegend = [i18n['TrafficIn'], i18n['TrafficOut']];
+        var chartData = [
+            {value: data.total_traffic_in, name: i18n['TrafficIn']},
+            {value: data.total_traffic_out, name: i18n['TrafficOut']}
+        ];
+        var chartDom = document.getElementById('trafficPieChart');
+        var chart = echarts.init(chartDom);
+        var option = {
+            title: {
+                text: i18n['NetworkTraffic'],
+                subtext: i18n['today'],
+                left: 'center',
+                textStyle: {
+                    textBorderColor: '#fff',
+                    textBorderWidth: 2
+                },
+                subtextStyle: {
+                    textBorderColor: '#fff',
+                    textBorderWidth: 2
+                }
+            },
+            tooltip: {
+                trigger: 'item',
+                formatter: function (v) {
+                    return size(v.value) + ' (' + v.percent + '%)';
+                },
+            },
+            legend: {
+                orient: 'vertical',
+                left: 'left',
+                data: chartLegend,
+                textStyle: {
+                    textBorderColor: '#fff',
+                    textBorderWidth: 2
+                }
+            },
+            series: [
+                {
+                    type: 'pie',
+                    radius: '55%',
+                    center: ['50%', '60%'],
+                    data: chartData,
+                    emphasis: {
+                        itemStyle: {
+                            shadowBlur: 10,
+                            shadowOffsetX: 0,
+                            shadowColor: 'rgba(0, 0, 0, 0.5)'
+                        }
+                    }
+                }
+            ]
+        };
+
+        option && chart.setOption(option);
+    }
+
+    /**
+     * render proxy count chat with echarts
+     * @param data proxy count data
+     */
+    function renderCountChart(data) {
+        var proxies = data.proxy_type_count;
+        var chartLegend = [];
+        var chartData = [];
+
+        for (var type in proxies) {
+            var temp = {
+                name: type.toUpperCase(),
+                value: proxies[type]
+            };
+            chartLegend.push(type.toUpperCase());
+            chartData.push(temp);
+        }
+
+        var chartDom = document.getElementById('countPieChart');
+        var chart = echarts.init(chartDom);
+        var option = {
+            title: {
+                text: i18n['Proxy'],
+                subtext: i18n['now'],
+                left: 'center',
+                textStyle: {
+                    textBorderColor: '#fff',
+                    textBorderWidth: 2
+                },
+                subtextStyle: {
+                    textBorderColor: '#fff',
+                    textBorderWidth: 2
+                }
+            },
+            tooltip: {
+                trigger: 'item',
+                formatter: function (v) {
+                    return v.value + ' (' + v.percent + '%)';
+                }
+            },
+            legend: {
+                orient: 'vertical',
+                left: 'left',
+                data: chartLegend,
+                textStyle: {
+                    textBorderColor: '#fff',
+                    textBorderWidth: 2
+                }
+            },
+            series: [
+                {
+                    type: 'pie',
+                    radius: '55%',
+                    center: ['50%', '60%'],
+                    data: chartData,
+                    emphasis: {
+                        itemStyle: {
+                            shadowBlur: 10,
+                            shadowOffsetX: 0,
+                            shadowColor: 'rgba(0, 0, 0, 0.5)'
+                        }
+                    }
+                }
+            ]
+        };
+
+        option && chart.setOption(option);
+    }
+
+    return loadServerInfo;
+})(layui.$);

assets/static/js/index-user-list.js

@@ -0,0 +1,730 @@
+var loadUserList = (function ($) {
+    var i18n = {};
+    var apiType = {
+        Remove: 1,
+        Enable: 2,
+        Disable: 3
+    };
+    var verifyRules = {
+        user: function (value, item) {
+            var result = verifyUser(value);
+            if (!result.valid) {
+                return i18n['UserFormatError'];
+            }
+            if (item != null) {
+                if (typeof item === "function") {
+                    item && item(result.trim);
+                } else {
+                    $(item).val(result.trim);
+                }
+            }
+        },
+        token: function (value, item) {
+            var result = verifyToken(value);
+            if (!result.valid) {
+                return i18n['TokenFormatError'];
+            }
+            if (item != null) {
+                if (typeof item === "function") {
+                    item && item(result.trim);
+                } else {
+                    $(item).val(result.trim);
+                }
+            }
+        },
+        comment: function (value, item) {
+            var result = verifyComment(value);
+            if (!result.valid) {
+                return i18n['CommentInvalid'];
+            }
+            if (item != null) {
+                if (typeof item === "function") {
+                    item && item(result.trim);
+                } else {
+                    $(item).val(result.trim);
+                }
+            }
+        },
+        ports: function (value, item) {
+            var result = verifyPorts(value);
+            if (!result.valid) {
+                return i18n['PortsInvalid'];
+            }
+            if (item != null) {
+                if (typeof item === "function") {
+                    item && item(result.trim);
+                } else {
+                    $(item).val(result.trim);
+                }
+            }
+        },
+        domains: function (value, item) {
+            var result = verifyDomains(value);
+            if (!result.valid) {
+                return i18n['DomainsInvalid'];
+            }
+            if (item != null) {
+                if (typeof item === "function") {
+                    item && item(result.trim);
+                } else {
+                    $(item).val(result.trim);
+                }
+            }
+        },
+        subdomains: function (value, item) {
+            var result = verifySubdomains(value);
+            if (!result.valid) {
+                return i18n['SubdomainsInvalid'];
+            }
+            if (item != null) {
+                if (typeof item === "function") {
+                    item && item(result.trim);
+                } else {
+                    $(item).val(result.trim);
+                }
+            }
+        }
+    };
+
+    /**
+     * verify user value
+     * @param username
+     */
+    function verifyUser(username) {
+        var valid = true;
+        if (username.trim() === '' || !/^\w+$/.test(username)) {
+            valid = false;
+        }
+        return {
+            valid: valid,
+            trim: username.trim()
+        };
+    }
+
+    /**
+     * verify token value
+     * @param token
+     */
+    function verifyToken(token) {
+        var valid = true;
+        if (token.trim() === '' || !/^[\w!@#$%^&*()]+$/.test(token)) {
+            valid = false;
+        }
+        return {
+            valid: valid,
+            trim: token.trim()
+        };
+    }
+
+    /**
+     * verify comment is valid
+     * @param comment
+     *
+     * @return {{valid:boolean, trim:string}}
+     */
+    function verifyComment(comment) {
+        var valid = true;
+        if (comment.trim() !== '' && /[\n\t\r]/.test(comment)) {
+            valid = false;
+        }
+        return {
+            valid: valid,
+            trim: comment.trim().replace(/[\n\t\r]/g, '')
+        };
+    }
+
+    /**
+     * verify ports is valid
+     * @param ports
+     *
+     * @return {{valid:boolean, trim:string}}
+     */
+    function verifyPorts(ports) {
+        var valid = true;
+        if (ports.trim() !== '') {
+            try {
+                ports.split(",").forEach(function (port) {
+                    if (/^\s*\d{1,5}\s*$/.test(port)) {
+                        if (parseInt(port) < 1 || parseInt(port) > 65535) {
+                            valid = false;
+                        }
+                    } else if (/^\s*\d{1,5}\s*-\s*\d{1,5}\s*$/.test(port)) {
+                        var portRange = port.split('-');
+                        if (parseInt(portRange[0]) < 1 || parseInt(portRange[0]) > 65535) {
+                            valid = false;
+                        } else if (parseInt(portRange[1]) < 1 || parseInt(portRange[1]) > 65535) {
+                            valid = false;
+                        } else if (parseInt(portRange[0]) > parseInt(portRange[1])) {
+                            valid = false;
+                        }
+                    } else {
+                        valid = false;
+                    }
+                    if (valid === false) {
+                        throw 'break';
+                    }
+                });
+            } catch (e) {
+            }
+        }
+        return {
+            valid: valid,
+            trim: ports.replace(/\s/g, '')
+        };
+    }
+
+    /**
+     * verify domains is valid
+     * @param domains
+     *
+     * @return {{valid:boolean, trim:string}}
+     */
+    function verifyDomains(domains) {
+        var valid = true;
+        if (domains.trim() !== '') {
+            try {
+                domains.split(',').forEach(function (domain) {
+                    if (!/^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-zA-Z]{2,}$/.test(domain.trim())) {
+                        valid = false;
+                        throw 'break';
+                    }
+                });
+            } catch (e) {
+            }
+        }
+        return {
+            valid: valid,
+            trim: domains.replace(/\s/g, '')
+        };
+    }
+
+    /**
+     * verify subdomains is valid
+     * @param subdomains
+     *
+     * @return {{valid:boolean, trim:string}}
+     */
+    function verifySubdomains(subdomains) {
+        var valid = true;
+        if (subdomains.trim() !== '') {
+            try {
+                subdomains.split(',').forEach(function (subdomain) {
+                    if (!/^[a-zA-z0-9][a-zA-z0-9-]{0,19}$/.test(subdomain.trim())) {
+                        valid = false;
+                        throw 'break';
+                    }
+                });
+            } catch (e) {
+            }
+        }
+        return {
+            valid: valid,
+            trim: subdomains.replace(/\s/g, '')
+        };
+    }
+
+    /**
+     * set verify rule of layui.form
+     */
+    (function setFormVerifyRule() {
+        layui.form.verify(verifyRules);
+    })();
+
+    /**
+     * load i18n language
+     * @param lang {{}} language json
+     * @param title page title
+     */
+    function loadUserList(lang, title) {
+        i18n = lang;
+        $("#title").text(title);
+        var html = layui.laytpl($('#userListTemplate').html()).render();
+        $('#content').html(html);
+
+        var $section = $('#content > section');
+        layui.table.render({
+            elem: '#tokenTable',
+            height: $section.height() - $('#searchForm').height() + 8,
+            text: {none: i18n['EmptyData']},
+            url: '/tokens',
+            method: 'get',
+            where: {},
+            dataType: 'json',
+            editTrigger: 'dblclick',
+            page: {
+                layout: navigator.language.indexOf("zh") === -1 ? ['first', 'prev', 'next', 'last'] : ['prev', 'page', 'next', 'skip', 'count', 'limit']
+            },
+            toolbar: '#userListToolbarTemplate',
+            defaultToolbar: false,
+            cols: [[
+                {type: 'checkbox'},
+                {field: 'user', title: i18n['User'], width: 150, sort: true},
+                {field: 'token', title: i18n['Token'], width: 200, sort: true, edit: true},
+                {field: 'comment', title: i18n['Notes'], sort: true, edit: 'textarea'},
+                {field: 'ports', title: i18n['AllowedPorts'], sort: true, edit: 'textarea'},
+                {field: 'domains', title: i18n['AllowedDomains'], sort: true, edit: 'textarea'},
+                {field: 'subdomains', title: i18n['AllowedSubdomains'], sort: true, edit: 'textarea'},
+                {
+                    field: 'enable',
+                    title: i18n['Status'],
+                    width: 100,
+                    templet: '<span>{{d.enable? "' + i18n['Enable'] + '":"' + i18n['Disable'] + '"}}</span>',
+                    sort: true
+                },
+                {title: i18n['Operation'], width: 150, toolbar: '#userListOperationTemplate'}
+            ]],
+            parseData: function (res) {
+                res.data.forEach(function (data) {
+                    data.ports = data.ports.join(',');
+                    data.domains = data.domains.join(',');
+                    data.subdomains = data.subdomains.join(',');
+                });
+            }
+        });
+
+        bindFormEvent();
+    }
+
+    /**
+     * bind event of {{@link layui.form}}
+     */
+    function bindFormEvent() {
+        layui.table.on('edit(tokenTable)', function (obj) {
+            var field = obj.field;
+            var value = obj.value;
+            var oldValue = obj.oldValue;
+
+            var before = $.extend(true, {}, obj.data);
+            var after = $.extend(true, {}, obj.data);
+            var verifyMsg = false;
+            if (field === 'token') {
+                verifyMsg = verifyRules.token(value, function (trim) {
+                    updateTableField(obj, field, trim)
+                });
+                if (verifyMsg) {
+                    layui.layer.msg(verifyMsg);
+                    return obj.reedit();
+                }
+
+                before.token = oldValue;
+                after.token = value;
+            } else if (field === 'comment') {
+                verifyMsg = verifyRules.comment(value, function (trim) {
+                    updateTableField(obj, field, trim)
+                });
+                if (verifyMsg) {
+                    layui.layer.msg(verifyMsg);
+                    return obj.reedit();
+                }
+
+                before.comment = oldValue;
+                after.comment = value;
+            } else if (field === 'ports') {
+                verifyMsg = verifyRules.ports(value, function (trim) {
+                    updateTableField(obj, field, trim)
+                });
+                if (verifyMsg) {
+                    layui.layer.msg(verifyMsg);
+                    return obj.reedit();
+                }
+
+                before.ports = oldValue;
+                after.ports = value;
+            } else if (field === 'domains') {
+                verifyMsg = verifyRules.domains(value, function (trim) {
+                    updateTableField(obj, field, trim)
+                });
+                if (verifyMsg) {
+                    layui.layer.msg(verifyMsg);
+                    return obj.reedit();
+                }
+
+                before.domains = oldValue;
+                after.domains = value;
+            } else if (field === 'subdomains') {
+                verifyMsg = verifyRules.subdomains(value, function (trim) {
+                    updateTableField(obj, field, trim)
+                });
+                if (verifyMsg) {
+                    layui.layer.msg(verifyMsg);
+                    return obj.reedit();
+                }
+
+                before.subdomains = oldValue;
+                after.subdomains = value;
+            }
+
+            before.ports = before.ports.split(',')
+            before.domains = before.domains.split(',')
+            before.subdomains = before.subdomains.split(',')
+            after.ports = after.ports.split(',')
+            after.domains = after.domains.split(',')
+            after.subdomains = after.subdomains.split(',')
+
+            update(before, after);
+        });
+
+        layui.table.on('toolbar(tokenTable)', function (obj) {
+            var id = obj.config.id;
+            var checkStatus = layui.table.checkStatus(id);
+            var data = checkStatus.data;
+
+            data.forEach(function (temp) {
+                temp.ports = temp.ports.split(',')
+                temp.ports.forEach(function (port, index) {
+                    if (/^\d+$/.test(String(port))) {
+                        temp.ports[index] = parseInt(String(port));
+                    }
+                });
+
+                temp.domains = temp.domains.split(',')
+                temp.subdomains = temp.subdomains.split(',')
+            });
+
+            switch (obj.event) {
+                case 'add':
+                    addPopup();
+                    break
+                case 'remove':
+                    batchRemovePopup(data);
+                    break
+                case 'disable':
+                    batchDisablePopup(data);
+                    break
+                case 'enable':
+                    batchEnablePopup(data);
+                    break
+            }
+        });
+
+        layui.table.on('tool(tokenTable)', function (obj) {
+            var data = obj.data;
+
+            data.ports = data.ports.split(',')
+            data.ports.forEach(function (port, index) {
+                if (/^\d+$/.test(String(port))) {
+                    data.ports[index] = parseInt(String(port));
+                }
+            });
+            data.domains = data.domains.split(',')
+            data.subdomains = data.subdomains.split(',')
+            switch (obj.event) {
+                case 'remove':
+                    removePopup(data);
+                    break;
+                case 'disable':
+                    disablePopup(data);
+                    break;
+                case 'enable':
+                    enablePopup(data);
+                    break
+            }
+        });
+    }
+
+    /**
+     * update layui table data
+     * @param obj table update obj
+     * @param field update field
+     * @param trim new value
+     */
+    function updateTableField(obj, field, trim) {
+        var newData = {};
+        newData[field] = trim;
+        obj.update(newData);
+    }
+
+    /**
+     * add user popup
+     */
+    function addPopup() {
+        layui.layer.open({
+            type: 1,
+            title: i18n['NewUser'],
+            area: ['500px'],
+            content: layui.laytpl(document.getElementById('addUserTemplate').innerHTML).render(),
+            btn: [i18n['Confirm'], i18n['Cancel']],
+            btn1: function (index) {
+                if (layui.form.validate('#addUserForm')) {
+                    var formData = layui.form.val('addUserForm');
+                    if (formData.ports != null) {
+                        formData.ports = formData.ports.split(',')
+                        formData.ports.forEach(function (port, index) {
+                            if (/^\d+$/.test(String(port))) {
+                                formData.ports[index] = parseInt(String(port));
+                            }
+                        })
+                    }
+                    if (formData.domains != null) {
+                        formData.domains = formData.domains.split(',')
+                    }
+                    if (formData.subdomains != null) {
+                        formData.subdomains = formData.subdomains.split(',')
+                    }
+                    add(formData, index);
+                }
+            },
+            btn2: function (index) {
+                layui.layer.close(index);
+            }
+        });
+    }
+
+    /**
+     * add user action
+     * @param data {{user:string, token:string, comment:string, enable:boolean, ports:[string|number], domains:[string], subdomains:[string]}} user data
+     * @param index popup index
+     */
+    function add(data, index) {
+        var loading = layui.layer.load();
+        $.ajax({
+            url: '/add',
+            type: 'post',
+            contentType: 'application/json',
+            data: JSON.stringify(data),
+            success: function (result) {
+                if (result.success) {
+                    reloadTable();
+                    layui.layer.close(index);
+                    layui.layer.msg(i18n['OperateSuccess'], function (index) {
+                        layui.layer.close(index);
+                    });
+                } else {
+                    errorMsg(result);
+                }
+            },
+            complete: function () {
+                layui.layer.close(loading);
+            }
+        });
+    }
+
+    /**
+     * update user action
+     * @param before {{user:string, token:string, comment:string, enable:boolean, ports:[string|number], domains:[string], subdomains:[string]}} data before update
+     * @param after {{user:string, token:string, comment:string, enable:boolean, ports:[string|number], domains:[string], subdomains:[string]}} data after update
+     */
+    function update(before, after) {
+        before.ports.forEach(function (port, index) {
+            if (/^\d+$/.test(String(port))) {
+                before.ports[index] = parseInt(String(port));
+            }
+        });
+        after.ports.forEach(function (port, index) {
+            if (/^\d+$/.test(String(port)) && typeof port === "string") {
+                after.ports[index] = parseInt(String(port));
+            }
+        });
+        var loading = layui.layer.load();
+        $.ajax({
+            url: '/update',
+            type: 'post',
+            contentType: 'application/json',
+            data: JSON.stringify({
+                before: before,
+                after: after,
+            }),
+            success: function (result) {
+                if (result.success) {
+                    layui.layer.msg(i18n['OperateSuccess']);
+                } else {
+                    errorMsg(result);
+                }
+            },
+            complete: function () {
+                layui.layer.close(loading);
+            }
+        });
+    }
+
+    /**
+     * batch remove user popup
+     * @param data {[{user:string, token:string, comment:string, enable:boolean, ports:[string|number], domains:[string], subdomains:[string]}]} user data list
+     */
+    function batchRemovePopup(data) {
+        if (data.length === 0) {
+            layui.layer.msg(i18n['ShouldCheckUser']);
+            return;
+        }
+        layui.layer.confirm(i18n['ConfirmRemoveUser'], {
+            title: i18n['OperationConfirm'],
+            btn: [i18n['Confirm'], i18n['Cancel']]
+        }, function (index) {
+            operate(apiType.Remove, data, index);
+        });
+    }
+
+    /**
+     * batch disable user popup
+     * @param data {[{user:string, token:string, comment:string, enable:boolean, ports:[string|number], domains:[string], subdomains:[string]}]} user data list
+     */
+    function batchDisablePopup(data) {
+        if (data.length === 0) {
+            layui.layer.msg(i18n['ShouldCheckUser']);
+            return;
+        }
+        layui.layer.confirm(i18n['ConfirmDisableUser'], {
+            title: i18n['OperationConfirm'],
+            btn: [i18n['Confirm'], i18n['Cancel']]
+        }, function (index) {
+            operate(apiType.Disable, data, index);
+        });
+    }
+
+    /**
+     * batch enable user popup
+     * @param data {[{user:string, token:string, comment:string, enable:boolean, ports:[string|number], domains:[string], subdomains:[string]}]} user data list
+     */
+    function batchEnablePopup(data) {
+        if (data.length === 0) {
+            layui.layer.msg(i18n['ShouldCheckUser']);
+            return;
+        }
+        layui.layer.confirm(i18n['ConfirmEnableUser'], {
+            title: i18n['OperationConfirm'],
+            btn: [i18n['Confirm'], i18n['Cancel']]
+        }, function (index) {
+            operate(apiType.Enable, data, index);
+        });
+    }
+
+    /**
+     * remove one user popup
+     * @param data {{user:string, token:string, comment:string, enable:boolean, ports:[string|number], domains:[string], subdomains:[string]}} user data
+     */
+    function removePopup(data) {
+        layui.layer.confirm(i18n['ConfirmRemoveUser'], {
+            title: i18n['OperationConfirm'],
+            btn: [i18n['Confirm'], i18n['Cancel']]
+        }, function (index) {
+            operate(apiType.Remove, [data], index);
+        });
+    }
+
+    /**
+     * disable one user popup
+     * @param data {{user:string, token:string, comment:string, enable:boolean, ports:[string|number], domains:[string], subdomains:[string]}} user data
+     */
+    function disablePopup(data) {
+        layui.layer.confirm(i18n['ConfirmDisableUser'], {
+            title: i18n['OperationConfirm'],
+            btn: [i18n['Confirm'], i18n['Cancel']]
+        }, function (index) {
+            operate(apiType.Disable, [data], index);
+        });
+    }
+
+    /**
+     * enable one user popup
+     * @param data {{user:string, token:string, comment:string, enable:boolean, ports:[string|number], domains:[string], subdomains:[string]}} user data
+     */
+    function enablePopup(data) {
+        layui.layer.confirm(i18n['ConfirmEnableUser'], {
+            title: i18n['OperationConfirm'],
+            btn: [i18n['Confirm'], i18n['Cancel']]
+        }, function (index) {
+            operate(apiType.Enable, [data], index);
+        });
+    }
+
+    /**
+     * operate actions
+     * @param type {apiType} action type
+     * @param data {[{user:string, token:string, comment:string, enable:boolean, ports:[string|number], domains:[string], subdomains:[string]}]} user data list
+     * @param index popup index
+     */
+    function operate(type, data, index) {
+        var url;
+        var extendMessage = '';
+        if (type === apiType.Remove) {
+            url = "/remove";
+            extendMessage = ', ' + i18n['RemoveUser'] + i18n['TakeTimeMakeEffective'];
+        } else if (type === apiType.Disable) {
+            url = "/disable";
+            extendMessage = ', ' + i18n['RemoveUser'] + i18n['TakeTimeMakeEffective'];
+        } else if (type === apiType.Enable) {
+            url = "/enable";
+        } else {
+            layer.layer.msg(i18n['OperateError']);
+            return;
+        }
+        var loading = layui.layer.load();
+        $.post({
+            url: url,
+            type: 'post',
+            contentType: 'application/json',
+            data: JSON.stringify({
+                users: data
+            }),
+            success: function (result) {
+                if (result.success) {
+                    reloadTable();
+                    layui.layer.close(index);
+                    layui.layer.msg(i18n['OperateSuccess'] + extendMessage, function (index) {
+                        layui.layer.close(index);
+                    });
+                } else {
+                    errorMsg(result);
+                }
+            },
+            complete: function () {
+                layui.layer.close(loading);
+            }
+        });
+    }
+
+    /**
+     * reload user table
+     */
+    function reloadTable() {
+        var searchData = layui.form.val('searchForm');
+        layui.table.reloadData('tokenTable', {
+            where: searchData
+        }, true)
+    }
+
+    /**
+     * show error message popup
+     * @param result
+     */
+    function errorMsg(result) {
+        var reason = i18n['OtherError'];
+        if (result.code === 1)
+            reason = i18n['ParamError'];
+        else if (result.code === 2)
+            reason = i18n['UserExist'];
+        else if (result.code === 3)
+            reason = i18n['UserNotExist'];
+        else if (result.code === 4)
+            reason = i18n['ParamError'];
+        else if (result.code === 5)
+            reason = i18n['UserFormatError'];
+        else if (result.code === 6)
+            reason = i18n['TokenFormatError'];
+        else if (result.code === 7)
+            reason = i18n['CommentInvalid'];
+        else if (result.code === 8)
+            reason = i18n['PortsInvalid'];
+        else if (result.code === 9)
+            reason = i18n['DomainsInvalid'];
+        else if (result.code === 10)
+            reason = i18n['SubdomainsInvalid'];
+        layui.layer.msg(i18n['OperateFailed'] + ',' + reason)
+    }
+
+    /**
+     * document event
+     */
+    (function bindDocumentEvent() {
+        $(document).on('click.search', '#searchBtn', function () {
+            reloadTable();
+            return false;
+        }).on('click.reset', '#resetBtn', function () {
+            $('#searchForm')[0].reset();
+            reloadTable();
+            return false;
+        });
+    })();
+
+    return loadUserList;
+})(layui.$)

assets/static/js/index.js

@@ -1,640 +1,50 @@
-var $ = layui.$;
-$(function () {
-    var apiType = {
-        Remove: 1,
-        Enable: 2,
-        Disable: 3
-    }
-
-    /**
-     * verify user value
-     * @param username
-     */
-    function verifyUser(username) {
-        var valid = true;
-        if (username.trim() === '' || !/^\w+$/.test(username)) {
-            valid = false;
-        }
-        return {
-            valid: valid,
-            trim: username
-        };
-    }
-
-    /**
-     * verify token value
-     * @param token
-     */
-    function verifyToken(token) {
-        var valid = true;
-        if (token.trim() === '' || !/^[\w!@#$%^&*()]+$/.test(token)) {
-            valid = false;
-        }
-        return {
-            valid: valid,
-            trim: token.trim()
-        };
-    }
-
-    /**
-     * verify comment is valid
-     * @param comment
-     *
-     * @return {{valid:boolean, trim:string}}
-     */
-    function verifyComment(comment) {
-        var valid = true;
-        if (comment.trim() !== '' && /[\n\t\r]/.test(comment)) {
-            valid = false;
-        }
-        return {
-            valid: valid,
-            trim: comment.replace(/[\n\t\r]/g, '')
-        };
-    }
-
-    /**
-     * verify ports is valid
-     * @param ports
-     *
-     * @return {{valid:boolean, trim:string}}
-     */
-    function verifyPorts(ports) {
-        var valid = true;
-        if (ports.trim() !== '') {
-            try {
-                ports.split(",").forEach(function (port) {
-                    if (/^\s*\d{1,5}\s*$/.test(port)) {
-                        if (parseInt(port) < 1 || parseInt(port) > 65535) {
-                            valid = false;
+var http_port, https_port;
+(function ($) {
+    $(function () {
+        function init() {
+            var langLoading = layui.layer.load()
+            $.getJSON('/lang.json').done(function (lang) {
+                $.ajaxSetup({
+                    error: function (xhr,) {
+                        if (xhr.status === 401) {
+                            layui.layer.msg(lang['TokenInvalid'], function () {
+                                window.location.reload();
+                            });
                         }
-                    } else if (/^\s*\d{1,5}\s*-\s*\d{1,5}\s*$/.test(port)) {
-                        var portRange = port.split('-');
-                        if (parseInt(portRange[0]) < 1 || parseInt(portRange[0]) > 65535) {
-                            valid = false;
-                        } else if (parseInt(portRange[1]) < 1 || parseInt(portRange[1]) > 65535) {
-                            valid = false;
-                        } else if (parseInt(portRange[0]) > parseInt(portRange[1])) {
-                            valid = false;
+                    },
+                })
+
+                layui.element.on('nav(leftNav)', function (elem) {
+                    var id = elem.attr('id');
+                    var title = elem.text();
+                    if (id === 'serverInfo') {
+                        loadServerInfo(lang, title.trim());
+                    } else if (id === 'userList') {
+                        loadUserList(lang, title.trim());
+                    } else if (elem.closest('.layui-nav-item').attr('id') === 'proxyList') {
+                        if (id != null && id.trim() !== '') {
+                            var suffix = elem.closest('.layui-nav-item').children('a').text().trim();
+                            loadProxyInfo(lang, title + " " + suffix, id);
                         }
-                    } else {
-                        valid = false;
-                    }
-                    if (valid === false) {
-                        throw 'break';
                     }
                 });
-            } catch (e) {
-            }
+
+                $('#leftNav .layui-this > a').click();
+            }).always(function () {
+                layui.layer.close(langLoading);
+            });
         }
-        return {
-            valid: valid,
-            trim: ports.replace(/\s/g, '')
-        };
-    }
 
-    /**
-     * verify domains is valid
-     * @param domains
-     *
-     * @return {{valid:boolean, trim:string}}
-     */
-    function verifyDomains(domains) {
-        var valid = true;
-        if (domains.trim() !== '') {
-            try {
-                domains.split(',').forEach(function (domain) {
-                    if (!/^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}){1,3}$/.test(domain.trim())) {
-                        valid = false;
-                        throw 'break';
-                    }
-                });
-            } catch (e) {
-            }
+        function logout() {
+            $.get("/logout", function (result) {
+                window.location.reload();
+            });
         }
-        return {
-            valid: valid,
-            trim: domains.replace(/\s/g, '')
-        };
-    }
 
-    /**
-     * verify subdomains is valid
-     * @param subdomains
-     *
-     * @return {{valid:boolean, trim:string}}
-     */
-    function verifySubdomains(subdomains) {
-        var valid = true;
-        if (subdomains.trim() !== '') {
-            try {
-                subdomains.split(',').forEach(function (subdomain) {
-                    if (!/^[a-zA-z0-9][a-zA-Z0-9-]{0,19}$/.test(subdomain.trim())) {
-                        valid = false;
-                        throw 'break';
-                    }
-                });
-            } catch (e) {
-            }
-        }
-        return {
-            valid: valid,
-            trim: subdomains.replace(/\s/g, '')
-        };
-    }
-
-    /**
-     * load i18n language
-     * @param lang {{}}
-     */
-    function langLoaded(lang) {
-        //set verify rules
-        var verifyRules = {
-            user: function (value, item) {
-                var result = verifyUser(value);
-                if (!result.valid) {
-                    return lang['UserFormatError'];
-                }
-                if (item != null) {
-                    if (typeof item === "function") {
-                        item && item(result.trim);
-                    } else {
-                        $(item).val(result.trim);
-                    }
-                }
-            },
-            token: function (value, item) {
-                var result = verifyToken(value);
-                if (!result.valid) {
-                    return lang['TokenFormatError'];
-                }
-                if (item != null) {
-                    if (typeof item === "function") {
-                        item && item(result.trim);
-                    } else {
-                        $(item).val(result.trim);
-                    }
-                }
-            },
-            comment: function (value, item) {
-                var result = verifyComment(value);
-                if (!result.valid) {
-                    return lang['CommentInvalid'];
-                }
-                if (item != null) {
-                    if (typeof item === "function") {
-                        item && item(result.trim);
-                    } else {
-                        $(item).val(result.trim);
-                    }
-                }
-            },
-            ports: function (value, item) {
-                var result = verifyPorts(value);
-                if (!result.valid) {
-                    return lang['PortsInvalid'];
-                }
-                if (item != null) {
-                    if (typeof item === "function") {
-                        item && item(result.trim);
-                    } else {
-                        $(item).val(result.trim);
-                    }
-                }
-            },
-            domains: function (value, item) {
-                var result = verifyDomains(value);
-                if (!result.valid) {
-                    return lang['DomainsInvalid'];
-                }
-                if (item != null) {
-                    if (typeof item === "function") {
-                        item && item(result.trim);
-                    } else {
-                        $(item).val(result.trim);
-                    }
-                }
-            },
-            subdomains: function (value, item) {
-                var result = verifySubdomains(value);
-                if (!result.valid) {
-                    return lang['SubdomainsInvalid'];
-                }
-                if (item != null) {
-                    if (typeof item === "function") {
-                        item && item(result.trim);
-                    } else {
-                        $(item).val(result.trim);
-                    }
-                }
-            }
-        };
-
-        layui.form.set({
-            verIncludeRequired: true,
-            verify: verifyRules
+        $(document).on('click.logout', '#logout', function () {
+            logout();
         });
 
-        layui.table.render({
-            elem: '#tokenTable',
-            url: '/tokens',
-            method: 'get',
-            where: {},
-            dataType: 'json',
-            editTrigger: 'dblclick',
-            page: navigator.language.indexOf("zh") === 0,
-            toolbar: '#toolbarTemplate',
-            defaultToolbar: false,
-            text: {none: lang['EmptyData']},
-            cols: [[
-                {type: 'checkbox'},
-                {field: 'user', title: lang['User'], width: 150, sort: true},
-                {field: 'token', title: lang['Token'], width: 200, sort: true, edit: true},
-                {field: 'comment', title: lang['Notes'], sort: true, edit: 'textarea'},
-                {field: 'ports', title: lang['AllowedPorts'], sort: true, edit: 'textarea'},
-                {field: 'domains', title: lang['AllowedDomains'], sort: true, edit: 'textarea'},
-                {field: 'subdomains', title: lang['AllowedSubdomains'], sort: true, edit: 'textarea'},
-                {
-                    field: 'status',
-                    title: lang['Status'],
-                    width: 100,
-                    templet: '<span>{{d.status? "' + lang['Enable'] + '":"' + lang['Disable'] + '"}}</span>',
-                    sort: true
-                },
-                {title: lang['Operation'], width: 150, toolbar: '#operationTemplate'}
-            ]]
-        });
-
-        /**
-         * update layui table data
-         * @param obj table update obj
-         * @param field update field
-         * @param trim new value
-         */
-        function updateTableField(obj, field, trim) {
-            var newData = {};
-            newData[field] = trim;
-            obj.update(newData);
-        }
-
-        layui.table.on('edit(tokenTable)', function (obj) {
-            var field = obj.field;
-            var value = obj.value;
-            var oldValue = obj.oldValue;
-            var before = $.extend(true, {}, obj.data);
-            var after = $.extend(true, {}, obj.data);
-            var verifyMsg = false;
-            if (field === 'token') {
-                verifyMsg = verifyRules.token(value, function (trim) {
-                    updateTableField(obj, field, trim)
-                });
-                if (verifyMsg) {
-                    layui.layer.msg(verifyMsg);
-                    return obj.reedit();
-                }
-
-                before.token = oldValue;
-                after.token = value;
-            } else if (field === 'comment') {
-                verifyMsg = verifyRules.comment(value, function (trim) {
-                    updateTableField(obj, field, trim)
-                });
-                if (verifyMsg) {
-                    layui.layer.msg(verifyMsg);
-                    return obj.reedit();
-                }
-
-                before.comment = oldValue;
-                after.comment = value;
-            } else if (field === 'ports') {
-                verifyMsg = verifyRules.ports(value, function (trim) {
-                    updateTableField(obj, field, trim)
-                });
-                if (verifyMsg) {
-                    layui.layer.msg(verifyMsg);
-                    return obj.reedit();
-                }
-
-                before.ports = oldValue;
-                after.ports = value;
-            } else if (field === 'domains') {
-                verifyMsg = verifyRules.domains(value, function (trim) {
-                    updateTableField(obj, field, trim)
-                });
-                if (verifyMsg) {
-                    layui.layer.msg(verifyMsg);
-                    return obj.reedit();
-                }
-
-                before.domains = oldValue;
-                after.domains = value;
-            } else if (field === 'subdomains') {
-                verifyMsg = verifyRules.subdomains(value, function (trim) {
-                    updateTableField(obj, field, trim)
-                });
-                if (verifyMsg) {
-                    layui.layer.msg(verifyMsg);
-                    return obj.reedit();
-                }
-
-                before.subdomains = oldValue;
-                after.subdomains = value;
-            }
-
-            update(before, after);
-        });
-
-        layui.table.on('toolbar(tokenTable)', function (obj) {
-            var id = obj.config.id;
-            var checkStatus = layui.table.checkStatus(id);
-            switch (obj.event) {
-                case 'add':
-                    addPopup();
-                    break
-                case 'remove':
-                    batchRemovePopup(checkStatus.data);
-                    break
-                case 'disable':
-                    batchDisablePopup(checkStatus.data);
-                    break
-                case 'enable':
-                    batchEnablePopup(checkStatus.data);
-                    break
-            }
-        });
-        layui.table.on('tool(tokenTable)', function (obj) {
-            var data = obj.data;
-            switch (obj.event) {
-                case 'remove':
-                    removePopup(data);
-                    break;
-                case 'disable':
-                    disablePopup(data);
-                    break;
-                case 'enable':
-                    enablePopup(data);
-                    break
-            }
-        });
-
-        /**
-         * add user popup
-         */
-        function addPopup() {
-            layui.layer.open({
-                type: 1,
-                title: lang['NewUser'],
-                area: ['500px'],
-                content: layui.laytpl(document.getElementById('addTemplate').innerHTML).render(),
-                btn: [lang['Confirm'], lang['Cancel']],
-                btn1: function (index) {
-                    if (layui.form.validate('#addUserForm')) {
-                        add(layui.form.val('addUserForm'), index);
-                    }
-                },
-                btn2: function (index) {
-                    layui.layer.close(index);
-                }
-            });
-        }
-
-        /**
-         * add user action
-         * @param data {{user:string, token:string, comment:string, status:boolean, ports:string, domains:string, subdomains:string}} user data
-         * @param index popup index
-         */
-        function add(data, index) {
-            var loading = layui.layer.load();
-            $.ajax({
-                url: '/add',
-                type: 'post',
-                contentType: 'application/json',
-                data: JSON.stringify(data),
-                success: function (result) {
-                    if (result.success) {
-                        reloadTable();
-                        layui.layer.close(index);
-                        layui.layer.msg(lang['OperateSuccess'], function (index) {
-                            layui.layer.close(index);
-                        });
-                    } else {
-                        errorMsg(result);
-                    }
-                },
-                complete: function () {
-                    layui.layer.close(loading);
-                }
-            });
-        }
-
-        /**
-         * update user action
-         * @param before {{user:string, token:string, comment:string, status:boolean, ports:string, domains:string, subdomains:string}} data before update
-         * @param after {{user:string, token:string, comment:string, status:boolean, ports:string, domains:string, subdomains:string}} data after update
-         */
-        function update(before, after) {
-            var loading = layui.layer.load();
-            $.ajax({
-                url: '/update',
-                type: 'post',
-                contentType: 'application/json',
-                data: JSON.stringify({
-                    before: before,
-                    after: after,
-                }),
-                success: function (result) {
-                    if (result.success) {
-                        layui.layer.msg(lang['OperateSuccess']);
-                    } else {
-                        errorMsg(result);
-                    }
-                },
-                complete: function () {
-                    layui.layer.close(loading);
-                }
-            });
-        }
-
-        /**
-         * batch remove user popup
-         * @param data {[{user:string, token:string, comment:string, status:boolean, ports:string, domains:string, subdomains:string}]} user data list
-         */
-        function batchRemovePopup(data) {
-            if (data.length === 0) {
-                layui.layer.msg(lang['ShouldCheckUser']);
-                return;
-            }
-            layui.layer.confirm(lang['ConfirmRemoveUser'], {
-                title: lang['OperationConfirm'],
-                btn: [lang['Confirm'], lang['Cancel']]
-            }, function (index) {
-                operate(apiType.Remove, data, index);
-            });
-        }
-
-        /**
-         * batch disable user popup
-         * @param data {[{user:string, token:string, comment:string, status:boolean, ports:string, domains:string, subdomains:string}]} user data list
-         */
-        function batchDisablePopup(data) {
-            if (data.length === 0) {
-                layui.layer.msg(lang['ShouldCheckUser']);
-                return;
-            }
-            layui.layer.confirm(lang['ConfirmDisableUser'], {
-                title: lang['OperationConfirm'],
-                btn: [lang['Confirm'], lang['Cancel']]
-            }, function (index) {
-                operate(apiType.Disable, data, index);
-            });
-        }
-
-        /**
-         * batch enable user popup
-         * @param data {[{user:string, token:string, comment:string, status:boolean, ports:string, domains:string, subdomains:string}]} user data list
-         */
-        function batchEnablePopup(data) {
-            if (data.length === 0) {
-                layui.layer.msg(lang['ShouldCheckUser']);
-                return;
-            }
-            layui.layer.confirm(lang['ConfirmEnableUser'], {
-                title: lang['OperationConfirm'],
-                btn: [lang['Confirm'], lang['Cancel']]
-            }, function (index) {
-                operate(apiType.Enable, data, index);
-            });
-        }
-
-        /**
-         * remove one user popup
-         * @param data {{user:string, token:string, comment:string, status:boolean, ports:string, domains:string, subdomains:string}} user data
-         */
-        function removePopup(data) {
-            layui.layer.confirm(lang['ConfirmRemoveUser'], {
-                title: lang['OperationConfirm'],
-                btn: [lang['Confirm'], lang['Cancel']]
-            }, function (index) {
-                operate(apiType.Remove, [data], index);
-            });
-        }
-
-        /**
-         * disable one user popup
-         * @param data {{user:string, token:string, comment:string, status:boolean, ports:string, domains:string, subdomains:string}} user data
-         */
-        function disablePopup(data) {
-            layui.layer.confirm(lang['ConfirmDisableUser'], {
-                title: lang['OperationConfirm'],
-                btn: [lang['Confirm'], lang['Cancel']]
-            }, function (index) {
-                operate(apiType.Disable, [data], index);
-            });
-        }
-
-        /**
-         * enable one user popup
-         * @param data {{user:string, token:string, comment:string, status:boolean, ports:string, domains:string, subdomains:string}} user data
-         */
-        function enablePopup(data) {
-            layui.layer.confirm(lang['ConfirmEnableUser'], {
-                title: lang['OperationConfirm'],
-                btn: [lang['Confirm'], lang['Cancel']]
-            }, function (index) {
-                operate(apiType.Enable, [data], index);
-            });
-        }
-
-        /**
-         * operate actions
-         * @param type {apiType} action type
-         * @param data {[{user:string, token:string, comment:string, status:boolean, ports:string, domains:string, subdomains:string}]} user data list
-         * @param index popup index
-         */
-        function operate(type, data, index) {
-            var url;
-            var extendMessage = '';
-            if (type === apiType.Remove) {
-                url = "/remove";
-                extendMessage = ', ' + lang['RemoveUser'] + lang['TakeTimeMakeEffective'];
-            } else if (type === apiType.Disable) {
-                url = "/disable";
-                extendMessage = ', ' + lang['RemoveUser'] + lang['TakeTimeMakeEffective'];
-            } else if (type === apiType.Enable) {
-                url = "/enable";
-            } else {
-                layer.layer.msg(lang['OperateError']);
-                return;
-            }
-            var loading = layui.layer.load();
-            $.post({
-                url: url,
-                type: 'post',
-                contentType: 'application/json',
-                data: JSON.stringify({
-                    users: data
-                }),
-                success: function (result) {
-                    if (result.success) {
-                        reloadTable();
-                        layui.layer.close(index);
-                        layui.layer.msg(lang['OperateSuccess'] + extendMessage, function (index) {
-                            layui.layer.close(index);
-                        });
-                    } else {
-                        errorMsg(result);
-                    }
-                },
-                complete: function () {
-                    layui.layer.close(loading);
-                }
-            });
-        }
-
-        /**
-         * reload user table
-         */
-        function reloadTable() {
-            var searchData = layui.form.val('searchForm');
-            layui.table.reloadData('tokenTable', {
-                where: searchData
-            }, true)
-        }
-
-        /**
-         * show error message popup
-         * @param result
-         */
-        function errorMsg(result) {
-            var reason = lang['Other Error'];
-            if (result.code === 1)
-                reason = lang['ParamError'];
-            else if (result.code === 2)
-                reason = lang['UserExist'];
-            else if (result.code === 3)
-                reason = lang['ParamError'];
-            else if (result.code === 4)
-                reason = lang['UserFormatError'];
-            else if (result.code === 5)
-                reason = lang['TokenFormatError'];
-            layui.layer.msg(lang['OperateFailed'] + ',' + reason)
-        }
-
-        /**
-         * click event
-         */
-        $(document).on('click.search', '#searchBtn', function () {
-            reloadTable();
-            return false;
-        }).on('click.reset', '#resetBtn', function () {
-            $('#searchForm')[0].reset();
-            reloadTable();
-            return false;
-        });
-    }
-
-    var langLoading = layui.layer.load()
-    $.getJSON('/lang').done(langLoaded).always(function () {
-        layui.layer.close(langLoading);
+        init();
     });
-});
+})(layui.$);

assets/static/js/login.js

@@ -0,0 +1,33 @@
+(function ($) {
+    $(function () {
+        function login() {
+            if (!layui.form.validate('#loginForm')) {
+                return;
+            }
+
+            $.ajax({
+                url: "/login",
+                type: 'post',
+                data: {
+                    username: $('#username').val(),
+                    password: $('#password').val()
+                },
+                success: function (result) {
+                    if (result.success) {
+                        window.location.reload();
+                    } else {
+                        layui.layer.msg(result.message);
+                    }
+                }
+            });
+        }
+
+        $(document).on('click.login', '#login', function () {
+            login();
+        }).on('keydown', function (e) {
+            if (e.keyCode === 13) {
+                login();
+            }
+        });
+    })
+})(layui.$)

assets/static/lib/filesize.min.js

@@ -0,0 +1,6 @@
+/*!
+ 2022 Jason Mulligan <jason.mulligan@avoidwork.com>
+ @version 9.0.11
+*/
+!function(i,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(i="undefined"!=typeof globalThis?globalThis:i||self).filesize=t()}(this,(function(){"use strict";function i(t){return i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(i){return typeof i}:function(i){return i&&"function"==typeof Symbol&&i.constructor===Symbol&&i!==Symbol.prototype?"symbol":typeof i},i(t)}var t="array",o="bits",e="byte",n="bytes",r="",b="exponent",l="function",a="iec",d="Invalid number",f="Invalid rounding method",u="jedec",s="object",c=".",p="round",y="kbit",m="string",v={symbol:{iec:{bits:["bit","Kibit","Mibit","Gibit","Tibit","Pibit","Eibit","Zibit","Yibit"],bytes:["B","KiB","MiB","GiB","TiB","PiB","EiB","ZiB","YiB"]},jedec:{bits:["bit","Kbit","Mbit","Gbit","Tbit","Pbit","Ebit","Zbit","Ybit"],bytes:["B","KB","MB","GB","TB","PB","EB","ZB","YB"]}},fullform:{iec:["","kibi","mebi","gibi","tebi","pebi","exbi","zebi","yobi"],jedec:["","kilo","mega","giga","tera","peta","exa","zetta","yotta"]}};function g(g){var h=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},B=h.bits,M=void 0!==B&&B,S=h.pad,T=void 0!==S&&S,w=h.base,x=void 0===w?-1:w,E=h.round,j=void 0===E?2:E,N=h.locale,P=void 0===N?r:N,k=h.localeOptions,G=void 0===k?{}:k,K=h.separator,Y=void 0===K?r:K,Z=h.spacer,z=void 0===Z?" ":Z,I=h.symbols,L=void 0===I?{}:I,O=h.standard,q=void 0===O?r:O,A=h.output,C=void 0===A?m:A,D=h.fullform,F=void 0!==D&&D,H=h.fullforms,J=void 0===H?[]:H,Q=h.exponent,R=void 0===Q?-1:Q,U=h.roundingMethod,V=void 0===U?p:U,W=h.precision,X=void 0===W?0:W,$=R,_=Number(g),ii=[],ti=0,oi=r;-1===x&&0===q.length?(x=10,q=u):-1===x&&q.length>0?x=(q=q===a?a:u)===a?2:10:q=10===(x=2===x?2:10)||q===u?u:a;var ei=10===x?1e3:1024,ni=!0===F,ri=_<0,bi=Math[V];if(isNaN(g))throw new TypeError(d);if(i(bi)!==l)throw new TypeError(f);if(ri&&(_=-_),(-1===$||isNaN($))&&($=Math.floor(Math.log(_)/Math.log(ei)))<0&&($=0),$>8&&(X>0&&(X+=8-$),$=8),C===b)return $;if(0===_)ii[0]=0,oi=ii[1]=v.symbol[q][M?o:n][$];else{ti=_/(2===x?Math.pow(2,10*$):Math.pow(1e3,$)),M&&(ti*=8)>=ei&&$<8&&(ti/=ei,$++);var li=Math.pow(10,$>0?j:0);ii[0]=bi(ti*li)/li,ii[0]===ei&&$<8&&-1===R&&(ii[0]=1,$++),oi=ii[1]=10===x&&1===$?M?y:"kB":v.symbol[q][M?o:n][$]}if(ri&&(ii[0]=-ii[0]),X>0&&(ii[0]=ii[0].toPrecision(X)),ii[1]=L[ii[1]]||ii[1],!0===P?ii[0]=ii[0].toLocaleString():P.length>0?ii[0]=ii[0].toLocaleString(P,G):Y.length>0&&(ii[0]=ii[0].toString().replace(c,Y)),T&&!1===Number.isInteger(ii[0])&&j>0){var ai=Y||c,di=ii[0].toString().split(ai),fi=di[1]||r,ui=fi.length,si=j-ui;ii[0]="".concat(di[0]).concat(ai).concat(fi.padEnd(ui+si,"0"))}return ni&&(ii[1]=J[$]?J[$]:v.fullform[q][$]+(M?"bit":e)+(1===ii[0]?r:"s")),C===t?ii:C===s?{value:ii[0],symbol:ii[1],exponent:$,unit:oi}:ii.join(z)}return g.partial=function(i){return function(t){return g(t,i)}},g}));
+//# sourceMappingURL=filesize.min.js.map

assets/templates/index.html

@@ -1,14 +1,20 @@
-<!--suppress HtmlFormInputWithoutLabel -->
 <!DOCTYPE html>
+<html lang="en">
 <head>
-    <title>${ .UserManage }</title>
-    <link rel="stylesheet" href="./static/layui/css/layui.css">
-    <link rel="stylesheet" href="./static/css/layui-theme-dark.css">
-    <link rel="stylesheet" href="./static/css/index.css">
-    <script src="./static/layui/layui.js"></script>
-    <script src="./static/js/index.js"></script>
+    <title>${ .FrpsPanel }</title>
+    <link rel="stylesheet" href="./static/lib/layui/css/layui.css?v=${ .version }">
+    <link rel="stylesheet" href="./static/css/layui-theme-dark.css?v=${ .version }">
+    <link rel="stylesheet" href="./static/css/index.css?v=${ .version }">
+    <link rel="stylesheet" href="./static/css/color.css?v=${ .version }">
+    <script src="./static/lib/layui/layui.js?v=${ .version }"></script>
+    <script src="./static/lib/echarts.min.js?v=${ .version }"></script>
+    <script src="./static/lib/filesize.min.js?v=${ .version }"></script>
+    <script src="./static/js/index-server-info.js?v=${ .version }"></script>
+    <script src="./static/js/index-user-list.js?v=${ .version }"></script>
+    <script src="./static/js/index-proxy-list.js?v=${ .version }"></script>
+    <script src="./static/js/index.js?v=${ .version }"></script>
     <style>
-        .layui-table-cell:empty::after {
+        section.user-list .layui-table-cell:empty::after {
             content: '${ .NotLimit }';
         }
 
@@ -18,43 +24,184 @@
     </style>
 </head>
 <body>
-<form class="layui-form layui-row layui-col-space16" id="searchForm" lay-filter="searchForm">
-    <div class="layui-col-md3">
-        <div class="layui-input-wrap">
-            <div class="layui-input-prefix">
-                <i class="layui-icon layui-icon-username"></i>
+<div class="layui-layout layui-layout-admin">
+    <div class="layui-header layui-bg-blue">
+        <div class="layui-logo layui-bg-black">${ .FrpsPanel }</div>
+        <div class="layui-title">
+            <span id="title"></span>
+            ${ if .showExit }
+            <span class="layui-icon layui-icon-logout" id="logout"></span>
+            ${ end }
+        </div>
+    </div>
+    <div class="layui-side layui-bg-black">
+        <div class="layui-side-scroll">
+            <ul class="layui-nav layui-nav-tree" lay-filter="leftNav" id="leftNav">
+                <li class="layui-nav-item layui-this">
+                    <a href="javascript:void(0)" id="serverInfo">${ .ServerInfo }</a>
+                </li>
+                <li class="layui-nav-item">
+                    <a href="javascript:void(0)" id="userList">${ .Users }</a>
+                </li>
+                <li class="layui-nav-item layui-nav-itemed" id="proxyList">
+                    <a class="" href="javascript:void(0)">${ .Proxies }</a>
+                    <dl class="layui-nav-child">
+                        <dd>
+                            <a href="javascript:void(0)" id="tcp">TCP</a>
+                        </dd>
+                        <dd>
+                            <a href="javascript:void(0)" id="udp">UDP</a>
+                        </dd>
+                        <dd>
+                            <a href="javascript:void(0)" id="http">HTTP</a>
+                        </dd>
+                        <dd>
+                            <a href="javascript:void(0)" id="https">HTTPS</a>
+                        </dd>
+                        <dd>
+                            <a href="javascript:void(0)" id="stcp">STCP</a>
+                        </dd>
+                        <dd>
+                            <a href="javascript:void(0)" id="sudp">SUDP</a>
+                        </dd>
+                    </dl>
+                </li>
+            </ul>
+        </div>
+        <div class="version">
+            <a href="https://github.com/fatedier/frp" target="_blank">Frp <span id="frpVersion"></span></a>
+            <span> | </span>
+            <a href="https://github.com/yhl452493373/frps-panel" target="_blank">${ .FrpsPanel } ${ .version }</a>
+        </div>
+    </div>
+    <div class="layui-body" id="content"></div>
+</div>
+
+<!--服务器信息模板-->
+<script type="text/html" id="serverInfoTemplate">
+    <section class="server-info">
+        <div class="text-info">
+            <div class="text-row">
+                <div class="text-col">${ .Version }</div>
+                <div class="text-col">{{= d.version }}</div>
             </div>
-            <input type="text" name="user" placeholder="${ .User }" class="layui-input" autocomplete="off"
-                   lay-affix="clear">
-        </div>
-    </div>
-    <div class="layui-col-md3">
-        <div class="layui-input-wrap">
-            <div class="layui-input-prefix">
-                <i class="layui-icon layui-icon-vercode"></i>
+            <div class="text-row">
+                <div class="text-col">${ .BindPort }</div>
+                <div class="text-col">{{= d.bind_port }}</div>
             </div>
-            <input type="text" name="token" placeholder="${ .Token }" class="layui-input" autocomplete="off"
-                   lay-affix="clear">
-        </div>
-    </div>
-    <div class="layui-col-md3">
-        <div class="layui-input-wrap">
-            <div class="layui-input-prefix">
-                <i class="layui-icon layui-icon-note"></i>
+            <div class="text-row">
+                <div class="text-col">${ .KCPBindPort }</div>
+                <div class="text-col">{{= d.kcp_bind_port }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .QUICBindPort }</div>
+                <div class="text-col">{{= d.quic_bind_port }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .HTTPPort }</div>
+                <div class="text-col">{{= d.vhost_http_port }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .HTTPSPort }</div>
+                <div class="text-col">{{= d.vhost_https_port }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .TCPMUXPort }</div>
+                <div class="text-col">{{= d.tcpmux_httpconnect_port }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .SubdomainHost }</div>
+                <div class="text-col">{{= d.subdomain_host }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .MaxPoolCount }</div>
+                <div class="text-col">{{= d.max_pool_count }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .MaxPortsPerClient }</div>
+                <div class="text-col">{{= d.max_ports_per_client }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .HeartBeatTimeout }</div>
+                <div class="text-col">{{= d.heart_beat_timeout }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .AllowPorts }</div>
+                <div class="text-col">{{= d.allow_ports_str }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .TLSOnly }</div>
+                <div class="text-col">{{= d.tls_only }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .CurrentConnections }</div>
+                <div class="text-col">{{= d.cur_conns }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .ClientCounts }</div>
+                <div class="text-col">{{= d.client_counts }}</div>
+            </div>
+            <div class="text-row">
+                <div class="text-col">${ .ProxyCounts }</div>
+                <div class="text-col">{{= d.proxy_counts }}</div>
             </div>
-            <input type="text" name="comment" placeholder="${ .Notes }" class="layui-input" autocomplete="off"
-                   lay-affix="clear">
         </div>
-    </div>
-    <div class="layui-col-md3">
-        <div class="layui-btn-container">
-            <button class="layui-btn layui-btn-sm" id="searchBtn">${ .Search }</button>
-            <button class="layui-btn layui-btn-sm layui-btn-primary" type="reset" id="resetBtn">${ .Reset }</button>
+        <div class="chart-info">
+            <div class="chart-traffic">
+                <div id="trafficPieChart"></div>
+            </div>
+            <div class="chart-count">
+                <div id="countPieChart"></div>
+            </div>
         </div>
-    </div>
-</form>
-<table id="tokenTable" lay-filter="tokenTable"></table>
-<script type="text/html" id="toolbarTemplate">
+    </section>
+</script>
+
+<!--用户列表模板-->
+<script type="text/html" id="userListTemplate">
+    <section class="user-list">
+        <form class="layui-form layui-row layui-col-space16" id="searchForm" lay-filter="searchForm">
+            <div class="layui-col-md3">
+                <div class="layui-input-wrap">
+                    <div class="layui-input-prefix">
+                        <i class="layui-icon layui-icon-username"></i>
+                    </div>
+                    <input type="text" name="user" placeholder="${ .User }" class="layui-input" autocomplete="off"
+                           lay-affix="clear">
+                </div>
+            </div>
+            <div class="layui-col-md3">
+                <div class="layui-input-wrap">
+                    <div class="layui-input-prefix">
+                        <i class="layui-icon layui-icon-vercode"></i>
+                    </div>
+                    <input type="text" name="token" placeholder="${ .Token }" class="layui-input" autocomplete="off"
+                           lay-affix="clear">
+                </div>
+            </div>
+            <div class="layui-col-md3">
+                <div class="layui-input-wrap">
+                    <div class="layui-input-prefix">
+                        <i class="layui-icon layui-icon-note"></i>
+                    </div>
+                    <input type="text" name="comment" placeholder="${ .Notes }" class="layui-input" autocomplete="off"
+                           lay-affix="clear">
+                </div>
+            </div>
+            <div class="layui-col-md3">
+                <div class="layui-btn-container">
+                    <button class="layui-btn layui-btn-sm" id="searchBtn">${ .Search }</button>
+                    <button class="layui-btn layui-btn-sm layui-btn-primary" type="reset" id="resetBtn">${ .Reset }
+                    </button>
+                </div>
+            </div>
+        </form>
+        <table id="tokenTable" lay-filter="tokenTable"></table>
+    </section>
+</script>
+
+<!--用户列表-表格工具条按钮模板-->
+<script type="text/html" id="userListToolbarTemplate">
     <div class="layui-btn-container">
         <button class="layui-btn layui-btn-sm" lay-event="add">${ .NewUser }</button>
         <button class="layui-btn layui-btn-sm" lay-event="remove">${ .RemoveUser }</button>
@@ -62,17 +209,21 @@
         <button class="layui-btn layui-btn-sm" lay-event="enable">${ .EnableUser }</button>
     </div>
 </script>
-<script type="text/html" id="operationTemplate">
+
+<!--用户列表-操作按钮模板-->
+<script type="text/html" id="userListOperationTemplate">
     <div class="layui-clear-space">
         <a class="layui-btn layui-btn-xs" lay-event="remove">${ .Remove }</a>
-        {{# if (d.status) { }}
+        {{# if (d.enable) { }}
         <a class="layui-btn layui-btn-xs" lay-event="disable">${ .Disable }</a>
         {{# } else { }}
         <a class="layui-btn layui-btn-xs" lay-event="enable">${ .Enable }</a>
         {{# } }}
     </div>
 </script>
-<script type="text/html" id="addTemplate">
+
+<!--用户列表-添加用户表单模板-->
+<script type="text/html" id="addUserTemplate">
     <form class="layui-form" id="addUserForm" lay-filter="addUserForm">
         <div class="layui-form-item">
             <label class="layui-form-label">${ .User }</label>
@@ -118,5 +269,165 @@
         </div>
     </form>
 </script>
+
+<!--代理列表-代理表格模板-->
+<script type="text/html" id="proxyListTableTemplate">
+    <section class="proxy-list">
+        <table id="proxyListTable" lay-filter="proxyListTable"></table>
+    </section>
+</script>
+
+<!--代理列表-代理表格展示代理详情的箭头模板-->
+<script type="text/html" id="toggleProxyInfoArrowTemplate">
+    <i class='layui-icon layui-icon-triangle-r toggle-proxy-info-arrow' data-index='{{ d.LAY_INDEX }}'
+       lay-event='toggleProxyInfo'></i>
+</script>
+
+<!--代理列表-代理列表每行展开后的表格模板-->
+<script type="text/html" id="expandTrTemplate">
+    <tr class="layui-hide proxy-info" id="childTr_{{= d.index }}">
+        <td></td>
+        <td colspan="{{= d.colspan }}">
+            <div class="layui-row">
+                <div class="layui-col-xs12">
+                    <div class="layui-row">
+                        <div class="layui-col-md12">
+                            <input type="hidden" value="{{= d.data.name }}">
+                            <div class="layui-btn traffic-statistics">${ .TrafficStatistics }</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {{# if (d.proxyType === 'http' || d.proxyType === 'https') { }}
+            <div class="layui-row">
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .Name }</div>
+                        <div class="layui-col-md9">{{= d.data.name }}</div>
+                    </div>
+                </div>
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .Type }</div>
+                        <div class="layui-col-md9">{{= d.proxyType.toUpperCase() }}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .Domains }</div>
+                        <div class="layui-col-md9">{{= d.data.conf.custom_domains }}</div>
+                    </div>
+                </div>
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .SubDomain }</div>
+                        <div class="layui-col-md9">{{= d.data.conf.subdomain }}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .Locations }</div>
+                        <div class="layui-col-md9">{{= d.data.conf.locations }}</div>
+                    </div>
+                </div>
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .HostRewrite }</div>
+                        <div class="layui-col-md9">{{= d.data.conf.host_header_rewrite }}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .Encryption }</div>
+                        <div class="layui-col-md9">{{= d.data.conf.use_encryption }}</div>
+                    </div>
+                </div>
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .Compression }</div>
+                        <div class="layui-col-md9">{{= d.data.conf.use_compression }}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .LastStart }</div>
+                        <div class="layui-col-md9">{{= d.data.last_start_time }}</div>
+                    </div>
+                </div>
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .LastClose }</div>
+                        <div class="layui-col-md9">{{= d.data.last_close_time }}</div>
+                    </div>
+                </div>
+            </div>
+            {{# } else { }}
+            <div class="layui-row">
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .Name }</div>
+                        <div class="layui-col-md9">{{= d.data.name }}</div>
+                    </div>
+                </div>
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .Type }</div>
+                        <div class="layui-col-md9">{{= d.proxyType.toUpperCase() }}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .Addr }</div>
+                        <div class="layui-col-md9">{{= d.data.conf.remote_port }}</div>
+                    </div>
+                </div>
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .Encryption }</div>
+                        <div class="layui-col-md9">{{= d.data.conf.use_encryption }}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .Compression }</div>
+                        <div class="layui-col-md9">{{= d.data.conf.use_compression }}</div>
+                    </div>
+                </div>
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .LastStart }</div>
+                        <div class="layui-col-md9">{{= d.data.last_start_time }}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-row">
+                <div class="layui-col-xs6">
+                    <div class="layui-row">
+                        <div class="layui-col-md3">${ .LastClose }</div>
+                        <div class="layui-col-md9">{{= d.data.last_close_time }}</div>
+                    </div>
+                </div>
+            </div>
+            {{# } }}
+        </td>
+    </tr>
+</script>
+
+<!--代理列表-每个代理的最近7天流量统计模板-->
+<script type="text/html" id="trafficStaticTemplate">
+    <div id="trafficBarChart"></div>
+</script>
 </body>
-</html>
+</html>

assets/templates/login.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="">
+<head>
+    <title>Login</title>
+    <link rel="stylesheet" href="./static/lib/layui/css/layui.css?v=${ .version }">
+    <link rel="stylesheet" href="./static/css/layui-theme-dark.css?v=${ .version }">
+    <link rel="stylesheet" href="./static/css/color.css?v=${ .version }">
+    <link rel="stylesheet" href="./static/css/login.css?v=${ .version }">
+    <script src="./static/lib/layui/layui.js?v=${ .version }"></script>
+    <script src="./static/js/login.js?v=${ .version }"></script>
+</head>
+<body>
+<div class="login-title">
+    <a href="https://github.com/yhl452493373/frps-panel" target="_blank">
+        <span class="title-text">${ .FrpsPanel }</span>
+        <span class="title-version">${ .version }</span>
+    </a>
+</div>
+<div class="layui-form login-container" id="loginForm">
+    <div class="layui-form-item">
+        <div class="layui-input-wrap">
+            <div class="layui-input-prefix">
+                <i class="layui-icon layui-icon-username"></i>
+            </div>
+            <input type="text" id="username" value="" lay-verify="required" placeholder="${ .Username }"
+                   lay-reqtext="${ .PleaseInputUsername }" autocomplete="off" class="layui-input" lay-affix="clear">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-wrap">
+            <div class="layui-input-prefix">
+                <i class="layui-icon layui-icon-password"></i>
+            </div>
+            <input type="password" id="password" value="" lay-verify="required" placeholder="${ .Password }"
+                   lay-reqtext="${ .PleaseInputPassword }" autocomplete="off" class="layui-input" lay-affix="eye">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <button class="layui-btn layui-btn-fluid" id="login">${ .Login }</button>
+    </div>
+</div>
+</body>
+</html>

cmd/frps-multiuser/cmd.go

@@ -1,192 +0,0 @@
-package main
-
-import (
-	"errors"
-	"frps-multiuser/pkg/server"
-	"frps-multiuser/pkg/server/controller"
-	"github.com/spf13/cobra"
-	"gopkg.in/ini.v1"
-	"io/fs"
-	"log"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-)
-
-const version = "0.0.2"
-
-var (
-	showVersion bool
-	configFile  string
-)
-
-func init() {
-	rootCmd.PersistentFlags().BoolVarP(&showVersion, "version", "v", false, "version of frps-multiuser")
-	rootCmd.PersistentFlags().StringVarP(&configFile, "config", "c", "./frps-multiuser.ini", "config file of frps-multiuser")
-}
-
-var rootCmd = &cobra.Command{
-	Use:   "frps-multiuser",
-	Short: "frps-multiuser is the server plugin of frp to support multiple users.",
-	RunE: func(cmd *cobra.Command, args []string) error {
-		if showVersion {
-			log.Println(version)
-			return nil
-		}
-		executable, err := os.Executable()
-		if err != nil {
-			log.Printf("error get program path: %v", err)
-			return err
-		}
-		rootDir := filepath.Dir(executable)
-
-		common, tokens, ports, domains, subdomains, iniFile, err := ParseConfigFile(configFile)
-		if err != nil {
-			log.Printf("fail to start frps-multiuser : %v", err)
-			return err
-		}
-		s, err := server.New(
-			rootDir,
-			controller.HandleController{
-				CommonInfo: common,
-				Tokens:     tokens,
-				Ports:      ports,
-				Domains:    domains,
-				Subdomains: subdomains,
-				ConfigFile: configFile,
-				IniFile:    iniFile,
-			})
-		if err != nil {
-			return err
-		}
-		err = s.Run()
-		if err != nil {
-			return err
-		}
-		return nil
-	},
-}
-
-func Execute() {
-	if err := rootCmd.Execute(); err != nil {
-		os.Exit(1)
-	}
-}
-
-func ParseConfigFile(file string) (controller.CommonInfo, map[string]controller.TokenInfo, map[string][]string, map[string][]string, map[string][]string, *ini.File, error) {
-	common := controller.CommonInfo{}
-	users := make(map[string]controller.TokenInfo)
-	ports := make(map[string][]string)
-	domains := make(map[string][]string)
-	subdomains := make(map[string][]string)
-
-	iniFile, err := ini.LoadSources(ini.LoadOptions{
-		Insensitive:         false,
-		InsensitiveSections: false,
-		InsensitiveKeys:     false,
-		IgnoreInlineComment: true,
-		AllowBooleanKeys:    true,
-	}, file)
-	if err != nil {
-		var pathError *fs.PathError
-		if errors.As(err, &pathError) {
-			log.Printf("token file %s not found", file)
-		} else {
-			log.Printf("fail to parse token file %s : %v", file, err)
-		}
-		return common, nil, nil, nil, nil, iniFile, err
-	}
-
-	commonSection, err := iniFile.GetSection("common")
-	if err != nil {
-		log.Printf("fail to get [common] section from file %s : %v", file, err)
-		return common, nil, nil, nil, nil, iniFile, err
-	}
-	pluginAddr := commonSection.Key("plugin_addr").Value()
-	if len(pluginAddr) != 0 {
-		common.PluginAddr = pluginAddr
-	} else {
-		common.PluginAddr = "0.0.0.0"
-	}
-	pluginPort := commonSection.Key("plugin_port").Value()
-	if len(pluginPort) != 0 {
-		port, err := strconv.Atoi(pluginPort)
-		if err != nil {
-			return common, nil, nil, nil, nil, iniFile, err
-		}
-		common.PluginPort = port
-	} else {
-		common.PluginPort = 7200
-	}
-	common.User = commonSection.Key("admin_user").Value()
-	common.Pwd = commonSection.Key("admin_pwd").Value()
-
-	portsSection, err := iniFile.GetSection("ports")
-	if err != nil {
-		log.Printf("fail to get [ports] section from file %s : %v", file, err)
-		return common, nil, nil, nil, nil, iniFile, err
-	}
-	for _, key := range portsSection.Keys() {
-		user := key.Name()
-		value := key.Value()
-		port := strings.Split(controller.TrimAllSpaceReg.ReplaceAllString(value, ""), ",")
-		ports[user] = port
-	}
-
-	domainsSection, err := iniFile.GetSection("domains")
-	if err != nil {
-		log.Printf("fail to get [domains] section from file %s : %v", file, err)
-		return common, nil, nil, nil, nil, iniFile, err
-	}
-	for _, key := range domainsSection.Keys() {
-		user := key.Name()
-		value := key.Value()
-		domain := strings.Split(controller.TrimAllSpaceReg.ReplaceAllString(value, ""), ",")
-		domains[user] = domain
-	}
-
-	subdomainsSection, err := iniFile.GetSection("subdomains")
-	if err != nil {
-		log.Printf("fail to get [subdomains] section from file %s : %v", file, err)
-		return common, nil, nil, nil, nil, iniFile, err
-	}
-	for _, key := range subdomainsSection.Keys() {
-		user := key.Name()
-		value := key.Value()
-		subdomain := strings.Split(controller.TrimAllSpaceReg.ReplaceAllString(value, ""), ",")
-		subdomains[user] = subdomain
-	}
-
-	usersSection, err := iniFile.GetSection("users")
-	if err != nil {
-		log.Printf("fail to get [users] section from file %s : %v", file, err)
-		return common, nil, nil, nil, nil, iniFile, err
-	}
-
-	disabledSection, err := iniFile.GetSection("disabled")
-	if err != nil {
-		log.Printf("fail to get [disabled] section from file %s : %v", file, err)
-		return common, nil, nil, nil, nil, iniFile, err
-	}
-
-	keys := usersSection.Keys()
-	for _, key := range keys {
-		comment, found := strings.CutPrefix(key.Comment, ";")
-		if !found {
-			comment, found = strings.CutPrefix(comment, "#")
-		}
-		token := controller.TokenInfo{
-			User:       key.Name(),
-			Token:      key.Value(),
-			Comment:    comment,
-			Ports:      strings.Join(ports[key.Name()], ","),
-			Domains:    strings.Join(domains[key.Name()], ","),
-			Subdomains: strings.Join(subdomains[key.Name()], ","),
-			Status:     !(disabledSection.HasKey(key.Name()) && disabledSection.Key(key.Name()).Value() == "disable"),
-		}
-		users[token.User] = token
-	}
-
-	return common, users, ports, domains, subdomains, iniFile, nil
-}

cmd/frps-panel/cmd.go

@@ -0,0 +1,116 @@
+package main
+
+import (
+	"errors"
+	"frps-panel/pkg/server"
+	"frps-panel/pkg/server/controller"
+	"github.com/BurntSushi/toml"
+	"github.com/spf13/cobra"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+const version = "1.7.0"
+
+var (
+	showVersion bool
+	configFile  string
+)
+
+func init() {
+	rootCmd.PersistentFlags().BoolVarP(&showVersion, "version", "v", false, "version of frps-panel")
+	rootCmd.PersistentFlags().StringVarP(&configFile, "config", "c", "./frps-panel.toml", "config file of frps-panel")
+}
+
+var rootCmd = &cobra.Command{
+	Use:   "frps-panel",
+	Short: "frps-panel is the server plugin of frp to support multiple users.",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		if showVersion {
+			log.Println(version)
+			return nil
+		}
+		executable, err := os.Executable()
+		if err != nil {
+			log.Printf("error get program path: %v", err)
+			return err
+		}
+		rootDir := filepath.Dir(executable)
+
+		configDir := filepath.Dir(configFile)
+		tokensFile := filepath.Join(configDir, "frps-tokens.toml")
+
+		config, tls, err := parseConfigFile(configFile, tokensFile)
+		if err != nil {
+			log.Printf("fail to start frps-panel : %v", err)
+			return err
+		}
+
+		s, err := server.New(
+			rootDir,
+			config,
+			tls,
+		)
+		if err != nil {
+			return err
+		}
+		err = s.Run()
+		if err != nil {
+			return err
+		}
+		return nil
+	},
+}
+
+func Execute() {
+	if err := rootCmd.Execute(); err != nil {
+		os.Exit(1)
+	}
+}
+
+func parseConfigFile(configFile, tokensFile string) (controller.HandleController, server.TLS, error) {
+	var common controller.Common
+	var tokens controller.Tokens
+	_, err := toml.DecodeFile(configFile, &common)
+	if err != nil {
+		log.Fatalf("decode config file %v error: %v", configFile, err)
+	}
+
+	_, err = toml.DecodeFile(tokensFile, &tokens)
+	if err != nil {
+		if errors.Is(err, os.ErrNotExist) {
+			tokens = controller.Tokens{Tokens: make(map[string]controller.TokenInfo)}
+		} else {
+			log.Fatalf("decode token file %v error: %v", tokensFile, err)
+		}
+	}
+
+	common.Common.DashboardTls = strings.HasPrefix("https://", strings.ToLower(common.Common.DashboardAddr))
+
+	tls := server.TLS{
+		Enable:   common.Common.TlsMode,
+		Protocol: "HTTP",
+		Cert:     common.Common.TlsCertFile,
+		Key:      common.Common.TlsKeyFile,
+	}
+
+	if tls.Enable {
+		tls.Protocol = "HTTPS"
+
+		if strings.TrimSpace(tls.Cert) == "" || strings.TrimSpace(tls.Key) == "" {
+			tls.Enable = false
+			tls.Protocol = "HTTP"
+			log.Printf("fail to enable tls: tls cert or key not exist, use http as default.")
+		}
+	}
+
+	return controller.HandleController{
+		CommonInfo: common.Common,
+		Tokens:     tokens.Tokens,
+		Version:    version,
+		ConfigFile: configFile,
+		TokensFile: tokensFile,
+	}, tls, nil
+}

config/cert.crt

@@ -0,0 +1,46 @@
+-----BEGIN CERTIFICATE-----
+MIIDwDCCAqigAwIBAgIIYb+7dG3vm+swDQYJKoZIhvcNAQELBQAwejELMAkGA1UE
+BhMCQ04xFzAVBgNVBAoTDktleU1hbmFnZXIub3JnMTEwLwYDVQQLEyhLZXlNYW5h
+Z2VyIFRlc3QgUm9vdCAtIEZvciBUZXN0IFVzZSBPbmx5MR8wHQYDVQQDExZLZXlN
+YW5hZ2VyIFRlc3QgUlNBIENBMB4XDTIzMDkxMTA5NTY0NloXDTI0MDkxMTA5NTY0
+NlowJjELMAkGA1UEBhMCQ04xFzAVBgNVBAMTDmxvY2FsaG9zdDo3MjAwMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqp/BNnNx4OGqJHNLN0GX8MDUO4PI
+WJ9rq6by65i2RXd4t51yyOH68l/TNmfCXcUQ91SvBBD+P2dK2gkZOlprDOS3tO+G
+sCTAAEf/tv1+N2ZqDUPKwaIH60seDJd2a3A97KtfySFVrCUrlTeB/tPL5XMBFwTT
+xPvfV6RULAaK6lJGdrM9/k/vYfneE+ZY5Bo1b7kaqZLOz9LW3icarPGcFDIes/Lu
+d3sCbpjza0bAKFy594vIdwqjRY4OHdubwXV3wV/AxgA0tQNyYADFwa3YeSvBsfFq
+PortWOAYKrg86RJJ8ilQumNiEs6FSYnSatbjMkKh7q9EerJf/exlW1IzDQIDAQAB
+o4GdMIGaMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+BQUHAwIwHQYDVR0OBBYEFJFGsaMxKCw1E2r2NC+PxdiI4p/VMB8GA1UdIwQYMBaA
+FIBNaqqKRqtaWv5Us+XACf5jiY2rMCkGA1UdEQQiMCCCDmxvY2FsaG9zdDo3MjAw
+gg4xMjcuMC4wLjE6NzIwMDANBgkqhkiG9w0BAQsFAAOCAQEAhuNAScvlzJKL4aAm
+bPl6Yru85GZZk+QmL8tICT9rxfq5L/5RhZXuTIqBDLB+ETHq5yQdiUJTphMpq2i3
+UZUzSMkUFokLROKWaENJz82RWYPUGNLqUO7vTIy2HGd4qOYjWDlHba7d9UIRTcKx
+1pd4rqXRTka1rprmoBcSNgcFDcKmctgliOPFqa9V89xrWSznahNqRqdkvbzuuHFz
+oZHKsTBzZ65Mk/E5+EdOYgEPg4kBfBMP7LXabUYCON1ArekRUHS1QJ0yCrzDpUxu
+0XnFTHaoBtP2o7tqmRQk78/8UkqOkz8241p2Tl8n3YZDiJbrv6okTPe+c/m9xD37
+2kwdDg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2jCCAsKgAwIBAgIIcAbJXpLHgDkwDQYJKoZIhvcNAQELBQAwezELMAkGA1UE
+BhMCQ04xFzAVBgNVBAoTDktleU1hbmFnZXIub3JnMTEwLwYDVQQLEyhLZXlNYW5h
+Z2VyIFRlc3QgUm9vdCAtIEZvciBUZXN0IFVzZSBPbmx5MSAwHgYDVQQDExdLZXlN
+YW5hZ2VyIFRlc3QgUm9vdCBDQTAeFw0yMzA5MTEwOTEzNTFaFw0zMzA5MTEwOTEz
+NTFaMHoxCzAJBgNVBAYTAkNOMRcwFQYDVQQKEw5LZXlNYW5hZ2VyLm9yZzExMC8G
+A1UECxMoS2V5TWFuYWdlciBUZXN0IFJvb3QgLSBGb3IgVGVzdCBVc2UgT25seTEf
+MB0GA1UEAxMWS2V5TWFuYWdlciBUZXN0IFJTQSBDQTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANfE1y7r94k5LeDncCnOfjItWXWWuNAzJFXsd0620cON
+5jXCYfVGdRqPkpHtLml1OiMtnSyxxqIASCsxn+puvXPy12FJkTq8D5GtuuLk/8oI
+iiGvFTbVR1C63ZwYQ/MOjMbmlICNVNFYDZfPbALLaZbvtd2q9xc/bq0zd9P6cfW4
+GKZyGNwmrNukUtXkIdPIaUiNRiseHwwyR//bJh9GFhCw5jpVK5bnDT1PZYFKww0J
+qv5kA9fCY/Xm635MfRsvNI+2RMOBhKgblWGmDCaJMOglgyao3AVK8ajrNrlAoTHC
+9Lcm4dQc2p0KUVfRitLio2ANKM3oh8q2qHPFrAnvjzcCAwEAAaNjMGEwDgYDVR0P
+AQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFIBNaqqKRqtaWv5U
+s+XACf5jiY2rMB8GA1UdIwQYMBaAFEOl8mT1ZXKyUe00w/jyQQKMYUQAMA0GCSqG
+SIb3DQEBCwUAA4IBAQCouCabkdzZKiGMKlrCE0y/eDNqBUwdERWD+Xrxhm/K13bg
+gJJXZsWWr2/iumbWkc3N9W5J2gyFc+iO79VrVMzlq2Kfbhy5XY5gioC8n1BL4FPs
+lmOGtO/8NubZhjTVrE/wH2iDcC9vfE5EAM/axnQXA1DjuEhyRnZe40lTXnA37vc1
+f0hizePrPiMNpzJLZ9kj9pvOYRc7h+Oe04fz+iG5iSlJ/s4y81o0oOJkDLatfveC
++L2ZqbiagZTsBYiL68Y612n7UDH2tUpyE6hCxYlNb+hCMFLakRHfp/IHcz6oHxvV
+kyJ5FwVvwn9fy4QOi/NsfASdb4AnyqRkJKNSlqWw
+-----END CERTIFICATE-----

config/cert.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAqp/BNnNx4OGqJHNLN0GX8MDUO4PIWJ9rq6by65i2RXd4t51y
+yOH68l/TNmfCXcUQ91SvBBD+P2dK2gkZOlprDOS3tO+GsCTAAEf/tv1+N2ZqDUPK
+waIH60seDJd2a3A97KtfySFVrCUrlTeB/tPL5XMBFwTTxPvfV6RULAaK6lJGdrM9
+/k/vYfneE+ZY5Bo1b7kaqZLOz9LW3icarPGcFDIes/Lud3sCbpjza0bAKFy594vI
+dwqjRY4OHdubwXV3wV/AxgA0tQNyYADFwa3YeSvBsfFqPortWOAYKrg86RJJ8ilQ
+umNiEs6FSYnSatbjMkKh7q9EerJf/exlW1IzDQIDAQABAoIBAFcIGBEDQAI6eYQQ
+PzyXO751TYxyAv6Zit1K0jw0cDzs3Omj6UnoYw3ArUbiFDWqcKYITyGe3WFP+dFP
+tMucFWDFRaOITkaI6Fr8XsZjdT8jAVN00faFBM8TSOeZVrEk1qFjJP+9/ipJ53o8
+jxWByU5npBWuw6qF432b98dhKvisW5Uu1hw8z935ld7uk3nF2mWAxzrTq8GE+Mn5
+Ic0yDmxnd/6rgUuAVtfGMDsKCks7P0J4bvxIG8fDnWh40SwNffrlHZ1Fz/yqJCCl
+tzkbQnX7lp4JGq1NkubgIchQ5pJzoqzWSShr72tyipjpTBIKDWT6TMapp0Y+veJX
+jl4fXs0CgYEA2kBFyO+/BSjOLmlftvos1YqrJD9eSy9ydSY9jRF/6qX1AWbbmH2c
+rIN+kLeQtoFP87BMpMU1qDhmqbXx+WLaMYU0RTB8oNhriUbXE2hs7ndGm/FS8yzu
+wG0xHBT8Bm8WA/5/bmFbjUCA7eSKYczYrHFd/aaf5HKGtGFJx8jz4t8CgYEAyCKm
+vqJ1WGK2Ql/hN1Gw3/rmyzgPqMgfq0gi7cQ3bRY/txK5vWHcDQdIywpxmmMWpkzy
+UX3m9hMb2ao01riFngIhBJslong0ExLSv50bi9evCAL0dZCQFPaBCgjNoMRjofGq
+SE0fJMDEOqcEt2fEAH8Fa4FUw9MKAypV++H7s5MCgYEA1gZpaN8Sp/CYIJNdNYao
+KNDPe8BYq8pfp9pUSd57XpRYa4N+nU+xMMvSdgBNfWvaB9M/leV+9PQ6WPr/y9vQ
+tPc3hxJBZUpWSkyZ5YJmMIPvTkWdXrMVfsaVfkBl1bliEZClTo1SxnYW+TNBMR88
+6/5QecnIyrI0vvcY7z51TGkCgYB8CpYEc5Z9WHkUPG7PJY+V0uE2tSFnf9m5BDW5
+3jJoJzEIW8/JJB0J6ijgxzFP+fgwzGInxfvfKkrJpqenKaiPHUyvmSVDRHMqGzGJ
+12saSmzOb15qe1YB2CJ0QK6J5Q7HcYwT0dDqq5szqw7OSb7+e7u1POx3jpaXDadL
+PW4OhwKBgHcZWsXJUaKesNJbeGeRKmQHooSdrE69gika1HU7GYmTV3JwvAFrHSNF
+EGMMTmWc6nTh63ADO/f+dpAoJVOQM/OhEVVyfvlByLEFeieGegwyREWVYajW+6Dt
+Ztrafmyvn+r3yhWN9g+p1yQTeVLw23ir9cYhP8OqnL4d89c3o+r3
+-----END RSA PRIVATE KEY-----

config/frps-multiuser.ini

@@ -1,22 +0,0 @@
-; basic options
-[common]
-plugin_addr = 127.0.0.1
-plugin_port = 7200
-admin_user  = admin
-admin_pwd   = admin
-
-; user tokens
-[users]
-user1 = token1
-
-; user been disabled
-[disabled]
-
-; user allowed ports. it will be used when a new proxy connect on
-[ports]
-
-; user allowed domains. it will be used when a new proxy connect on
-[domains]
-
-; user allowed subdomains. it will be used when a new proxy connect on
-[subdomains]

config/frps-panel.toml

@@ -0,0 +1,21 @@
+# basic options
+[common]
+# frps panel config info
+plugin_addr = "127.0.0.1"
+plugin_port = 7200
+#admin_user = "admin"
+#admin_pwd = "admin"
+# specified login state keep time
+admin_keep_time = 0
+
+# enable tls
+tls_mode = true
+tls_cert_file = "cert.crt"
+tls_key_file = "cert.key"
+
+# frp dashboard info
+dashboard_addr = "127.0.0.1"
+dashboard_port = 7500
+dashboard_user = "admin"
+dashboard_pwd = "admin"
+

config/frps-tokens.toml

@@ -0,0 +1,17 @@
+[tokens]
+    [tokens.user1]
+        user = "user1"
+        token = "token1"
+        comment = "user1 with token1"
+        ports = [8080, "10000-10200"]
+        domains = ["web01.domain.com", "web02.domain.com"]
+        subdomains = ["web01", "web02"]
+        enable = false
+    [tokens.user2]
+        user = "user2"
+        token = "token2"
+        comment = "user2 with token2"
+        ports = [9080]
+        domains = ["web11.domain.com", "web12.domain.com"]
+        subdomains = ["web11", "web12"]
+        enable = false

go.mod

@@ -1,13 +1,16 @@
-module frps-multiuser
+module frps-panel
 
 go 1.21
 
 require (
+	github.com/BurntSushi/toml v1.0.0
 	github.com/fatedier/frp v0.34.1
 	github.com/gin-contrib/i18n v1.0.0
+	github.com/gin-contrib/sessions v0.0.5
 	github.com/gin-gonic/gin v1.9.1
+	github.com/pelletier/go-toml/v2 v2.0.9
 	github.com/spf13/cobra v0.0.3
-	gopkg.in/ini.v1 v1.67.0
+	golang.org/x/text v0.11.0
 )
 
 require (
@@ -22,6 +25,9 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.1 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/gorilla/context v1.1.1 // indirect
+	github.com/gorilla/securecookie v1.1.1 // indirect
+	github.com/gorilla/sessions v1.2.1 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
@@ -30,7 +36,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/nicksnyder/go-i18n/v2 v2.2.1 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.9 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
@@ -38,7 +43,6 @@ require (
 	golang.org/x/crypto v0.11.0 // indirect
 	golang.org/x/net v0.12.0 // indirect
 	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -46,6 +46,8 @@ github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gin-contrib/i18n v1.0.0 h1:e5uEOmaAr09Iyr4vuWuvvpByjmvxGDO7iSkmiFpSsk0=
 github.com/gin-contrib/i18n v1.0.0/go.mod h1:yyyTArpVZeXCFT/kbLbD5CS192+OZ8Y+angnJjvnB98=
+github.com/gin-contrib/sessions v0.0.5 h1:CATtfHmLMQrMNpJRgzjWXD7worTh7g7ritsQfmF+0jE=
+github.com/gin-contrib/sessions v0.0.5/go.mod h1:vYAuaUPqie3WUSsft6HUlCjlwwoJQs97miaG2+7neKY=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
@@ -95,7 +97,13 @@ github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
+github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
@@ -293,8 +301,6 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
-gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

package.sh

@@ -1,12 +1,19 @@
 #!/bin/bash
+version=$(cat cmd/frps-panel/cmd.go | grep 'const version' | egrep -o '[0-9.]+')
 cd ./release || exit
 rm -rf *.zip
-list=$(ls frps-multiuser-*)
+list=$(ls frps-panel-*)
 echo "$list"
 for binFile in $list
   do
-    cp "$binFile" frps-multiuser
-    zip -r "$binFile".zip frps-multiuser frps-multiuser.ini assets -x "*.git*" "*.idea*" "*.DS_Store" "*.contentFlavour"
-    rm -rf "$binFile" frps-multiuser
+    tmpFile=frps-panel
+    newBinFile=$binFile
+    if echo "$binFile" | grep  -q -E "\.exe";then
+      tmpFile=frps-panel.exe
+      newBinFile=${newBinFile%%.exe*}
+    fi
+    cp "$binFile" "$tmpFile"
+    zip -r "$newBinFile-$version".zip "$tmpFile" frps-panel.toml frps-tokens.toml assets -x "*.git*" "*.idea*" "*.DS_Store" "*.contentFlavour"
+    rm -rf "$binFile" "$tmpFile"
   done
-  rm -rf frps-multiuser.ini assets
+  rm -rf frps-panel.toml frps-tokens.toml assets

pkg/server/controller/authorizer.go

@@ -0,0 +1,104 @@
+package controller
+
+import (
+	"encoding/base64"
+	"fmt"
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-gonic/gin"
+	"net/http"
+	"strings"
+	"time"
+)
+
+func (c *HandleController) BasicAuth() gin.HandlerFunc {
+	return func(context *gin.Context) {
+		if trimString(c.CommonInfo.AdminUser) == "" || trimString(c.CommonInfo.AdminPwd) == "" {
+			if context.Request.RequestURI == LoginUrl {
+				context.Redirect(http.StatusTemporaryRedirect, LoginSuccessUrl)
+			}
+			return
+		}
+
+		session := sessions.Default(context)
+		auth := session.Get(AuthName)
+
+		if auth != nil {
+			if c.CommonInfo.AdminKeepTime > 0 {
+				cookie, _ := context.Request.Cookie(SessionName)
+				if cookie != nil {
+					//important thx https://blog.csdn.net/zhanghongxia8285/article/details/107321838/
+					cookie.Expires = time.Now().Add(time.Second * time.Duration(c.CommonInfo.AdminKeepTime))
+					http.SetCookie(context.Writer, cookie)
+				}
+			}
+
+			username, password, _ := parseBasicAuth(fmt.Sprintf("%v", auth))
+
+			usernameMatch := username == c.CommonInfo.AdminUser
+			passwordMatch := password == c.CommonInfo.AdminPwd
+
+			if usernameMatch && passwordMatch {
+				context.Next()
+				return
+			}
+		}
+
+		isAjax := context.GetHeader("X-Requested-With") == "XMLHttpRequest"
+
+		if !isAjax && context.Request.RequestURI != LoginUrl {
+			context.Redirect(http.StatusTemporaryRedirect, LoginUrl)
+		} else {
+			context.AbortWithStatus(http.StatusUnauthorized)
+		}
+	}
+}
+
+func (c *HandleController) LoginAuth(username, password string, context *gin.Context) bool {
+	if trimString(c.CommonInfo.AdminUser) == "" || trimString(c.CommonInfo.AdminPwd) == "" {
+		return true
+	}
+
+	session := sessions.Default(context)
+
+	sessionAuth := session.Get(AuthName)
+	internalAuth := encodeBasicAuth(c.CommonInfo.AdminUser, c.CommonInfo.AdminPwd)
+
+	if sessionAuth == internalAuth {
+		return true
+	} else {
+		basicAuth := encodeBasicAuth(username, password)
+		if basicAuth == internalAuth {
+			session.Set(AuthName, basicAuth)
+			_ = session.Save()
+			return true
+		} else {
+			session.Delete(AuthName)
+			_ = session.Save()
+			return false
+		}
+	}
+}
+
+func ClearAuth(context *gin.Context) {
+	session := sessions.Default(context)
+	session.Delete(AuthName)
+	_ = session.Save()
+}
+
+func parseBasicAuth(auth string) (username, password string, ok bool) {
+	c, err := base64.StdEncoding.DecodeString(auth)
+	if err != nil {
+		return "", "", false
+	}
+	cs := string(c)
+	username, password, ok = strings.Cut(cs, ":")
+	if !ok {
+		return "", "", false
+	}
+	return username, password, true
+}
+
+func encodeBasicAuth(username, password string) string {
+	authString := fmt.Sprintf("%s:%s", username, password)
+	return base64.StdEncoding.EncodeToString([]byte(authString))
+}

pkg/server/controller/controller.go

@@ -1,101 +1,21 @@
 package controller
 
 import (
+	"crypto/tls"
 	"encoding/json"
 	"errors"
 	"fmt"
 	plugin "github.com/fatedier/frp/pkg/plugin/server"
 	ginI18n "github.com/gin-contrib/i18n"
 	"github.com/gin-gonic/gin"
+	"io"
 	"log"
 	"net/http"
-	"regexp"
 	"sort"
+	"strconv"
 	"strings"
 )
 
-const (
-	Success          = 0
-	ParamError       = 1
-	UserExist        = 2
-	SaveError        = 3
-	UserFormatError  = 4
-	TokenFormatError = 5
-)
-
-var UserFormatReg = regexp.MustCompile("^\\w+$")
-var TokenFormatReg = regexp.MustCompile("^[\\w!@#$%^&*()]+$")
-var TrimAllSpaceReg = regexp.MustCompile("[\\n\\t\\r\\s]")
-var TrimBreakLineReg = regexp.MustCompile("[\\n\\t\\r]")
-
-type Response struct {
-	Msg string `json:"msg"`
-}
-
-type HTTPError struct {
-	Code int
-	Err  error
-}
-
-type CommonInfo struct {
-	PluginAddr string
-	PluginPort int
-	User       string
-	Pwd        string
-}
-
-type TokenInfo struct {
-	User       string `json:"user" form:"user"`
-	Token      string `json:"token" form:"token"`
-	Comment    string `json:"comment" form:"comment"`
-	Ports      string `json:"ports" from:"ports"`
-	Domains    string `json:"domains" from:"domains"`
-	Subdomains string `json:"subdomains" from:"subdomains"`
-	Status     bool   `json:"status" form:"status"`
-}
-
-type TokenResponse struct {
-	Code  int         `json:"code"`
-	Msg   string      `json:"msg"`
-	Count int         `json:"count"`
-	Data  []TokenInfo `json:"data"`
-}
-
-type OperationResponse struct {
-	Success bool   `json:"success"`
-	Code    int    `json:"code"`
-	Message string `json:"message"`
-}
-
-type TokenSearch struct {
-	TokenInfo
-	Page  int `form:"page"`
-	Limit int `form:"limit"`
-}
-
-type TokenUpdate struct {
-	Before TokenInfo `json:"before"`
-	After  TokenInfo `json:"after"`
-}
-
-type TokenRemove struct {
-	Users []TokenInfo `json:"users"`
-}
-
-type TokenDisable struct {
-	TokenRemove
-}
-
-type TokenEnable struct {
-	TokenDisable
-}
-
-func (e *HTTPError) Error() string {
-	return e.Err.Error()
-}
-
-type HandlerFunc func(ctx *gin.Context) (interface{}, error)
-
 func (c *HandleController) MakeHandlerFunc() gin.HandlerFunc {
 	return func(context *gin.Context) {
 		var response plugin.Response
@@ -103,19 +23,13 @@ func (c *HandleController) MakeHandlerFunc() gin.HandlerFunc {
 
 		request := plugin.Request{}
 		if err := context.BindJSON(&request); err != nil {
-			_ = context.Error(&HTTPError{
-				Code: http.StatusBadRequest,
-				Err:  err,
-			})
+			_ = context.AbortWithError(http.StatusBadRequest, err)
 			return
 		}
 
 		jsonStr, err := json.Marshal(request.Content)
 		if err != nil {
-			_ = context.Error(&HTTPError{
-				Code: http.StatusBadRequest,
-				Err:  err,
-			})
+			_ = context.AbortWithError(http.StatusBadRequest, err)
 			return
 		}
 
@@ -160,10 +74,55 @@ func (c *HandleController) MakeHandlerFunc() gin.HandlerFunc {
 	}
 }
 
-func (c *HandleController) MakeManagerFunc() func(context *gin.Context) {
+func (c *HandleController) MakeLoginFunc() func(context *gin.Context) {
+	return func(context *gin.Context) {
+		if context.Request.Method == "GET" {
+			if c.LoginAuth("", "", context) {
+				if context.Request.RequestURI == LoginUrl {
+					context.Redirect(http.StatusTemporaryRedirect, LoginSuccessUrl)
+				}
+				return
+			}
+			context.HTML(http.StatusOK, "login.html", gin.H{
+				"version":             c.Version,
+				"FrpsPanel":           ginI18n.MustGetMessage(context, "Frps Panel"),
+				"Username":            ginI18n.MustGetMessage(context, "Username"),
+				"Password":            ginI18n.MustGetMessage(context, "Password"),
+				"Login":               ginI18n.MustGetMessage(context, "Login"),
+				"PleaseInputUsername": ginI18n.MustGetMessage(context, "Please input username"),
+				"PleaseInputPassword": ginI18n.MustGetMessage(context, "Please input password"),
+			})
+		} else if context.Request.Method == "POST" {
+			username := context.PostForm("username")
+			password := context.PostForm("password")
+			if c.LoginAuth(username, password, context) {
+				context.JSON(http.StatusOK, gin.H{
+					"success": true,
+					"message": ginI18n.MustGetMessage(context, "Login success"),
+				})
+			} else {
+				context.JSON(http.StatusOK, gin.H{
+					"success": false,
+					"message": ginI18n.MustGetMessage(context, "Username or password incorrect"),
+				})
+			}
+		}
+	}
+}
+
+func (c *HandleController) MakeLogoutFunc() func(context *gin.Context) {
+	return func(context *gin.Context) {
+		ClearAuth(context)
+		context.Redirect(http.StatusTemporaryRedirect, LogoutSuccessUrl)
+	}
+}
+
+func (c *HandleController) MakeIndexFunc() func(context *gin.Context) {
 	return func(context *gin.Context) {
 		context.HTML(http.StatusOK, "index.html", gin.H{
-			"UserManage":                   ginI18n.MustGetMessage(context, "User Manage"),
+			"version":                      c.Version,
+			"showExit":                     trimString(c.CommonInfo.AdminUser) != "" && trimString(c.CommonInfo.AdminPwd) != "",
+			"FrpsPanel":                    ginI18n.MustGetMessage(context, "Frps Panel"),
 			"User":                         ginI18n.MustGetMessage(context, "User"),
 			"Token":                        ginI18n.MustGetMessage(context, "Token"),
 			"Notes":                        ginI18n.MustGetMessage(context, "Notes"),
@@ -187,6 +146,37 @@ func (c *HandleController) MakeManagerFunc() func(context *gin.Context) {
 			"PleaseInputAllowedSubdomains": ginI18n.MustGetMessage(context, "Please input allowed subdomains"),
 			"NotLimit":                     ginI18n.MustGetMessage(context, "Not limit"),
 			"None":                         ginI18n.MustGetMessage(context, "None"),
+			"ServerInfo":                   ginI18n.MustGetMessage(context, "Server Info"),
+			"Users":                        ginI18n.MustGetMessage(context, "Users"),
+			"Proxies":                      ginI18n.MustGetMessage(context, "Proxies"),
+			"TrafficStatistics":            ginI18n.MustGetMessage(context, "Traffic Statistics"),
+			"Name":                         ginI18n.MustGetMessage(context, "Name"),
+			"Type":                         ginI18n.MustGetMessage(context, "Type"),
+			"Domains":                      ginI18n.MustGetMessage(context, "Domains"),
+			"SubDomain":                    ginI18n.MustGetMessage(context, "SubDomain"),
+			"Locations":                    ginI18n.MustGetMessage(context, "Locations"),
+			"HostRewrite":                  ginI18n.MustGetMessage(context, "HostRewrite"),
+			"Encryption":                   ginI18n.MustGetMessage(context, "Encryption"),
+			"Compression":                  ginI18n.MustGetMessage(context, "Compression"),
+			"Addr":                         ginI18n.MustGetMessage(context, "Addr"),
+			"LastStart":                    ginI18n.MustGetMessage(context, "Last Start"),
+			"LastClose":                    ginI18n.MustGetMessage(context, "Last Close"),
+			"Version":                      ginI18n.MustGetMessage(context, "Version"),
+			"BindPort":                     ginI18n.MustGetMessage(context, "Bind Port"),
+			"KCPBindPort":                  ginI18n.MustGetMessage(context, "KCP Bind Port"),
+			"QUICBindPort":                 ginI18n.MustGetMessage(context, "QUIC Bind Port"),
+			"HTTPPort":                     ginI18n.MustGetMessage(context, "HTTP Port"),
+			"HTTPSPort":                    ginI18n.MustGetMessage(context, "HTTPS Port"),
+			"TCPMUXPort":                   ginI18n.MustGetMessage(context, "TCPMUX Port"),
+			"SubdomainHost":                ginI18n.MustGetMessage(context, "Subdomain Host"),
+			"MaxPoolCount":                 ginI18n.MustGetMessage(context, "Max Pool Count"),
+			"MaxPortsPerClient":            ginI18n.MustGetMessage(context, "Max Ports Per Client"),
+			"HeartBeatTimeout":             ginI18n.MustGetMessage(context, "Heart Beat Timeout"),
+			"AllowPorts":                   ginI18n.MustGetMessage(context, "Allow Ports"),
+			"TLSOnly":                      ginI18n.MustGetMessage(context, "TLS Only"),
+			"CurrentConnections":           ginI18n.MustGetMessage(context, "Current Connections"),
+			"ClientCounts":                 ginI18n.MustGetMessage(context, "Client Counts"),
+			"ProxyCounts":                  ginI18n.MustGetMessage(context, "Proxy Counts"),
 		})
 	}
 }
@@ -214,11 +204,13 @@ func (c *HandleController) MakeLangFunc() func(context *gin.Context) {
 			"OperateError":          ginI18n.MustGetMessage(context, "Operate error"),
 			"OperateFailed":         ginI18n.MustGetMessage(context, "Operate failed"),
 			"UserExist":             ginI18n.MustGetMessage(context, "User exist"),
+			"UserNotExist":          ginI18n.MustGetMessage(context, "User not exist"),
 			"UserFormatError":       ginI18n.MustGetMessage(context, "User format error"),
 			"TokenFormatError":      ginI18n.MustGetMessage(context, "Token format error"),
 			"ShouldCheckUser":       ginI18n.MustGetMessage(context, "Please check at least one user"),
 			"OperationConfirm":      ginI18n.MustGetMessage(context, "Operation confirm"),
 			"EmptyData":             ginI18n.MustGetMessage(context, "Empty data"),
+			"NotLimit":              ginI18n.MustGetMessage(context, "Not limit"),
 			"AllowedPorts":          ginI18n.MustGetMessage(context, "Allowed ports"),
 			"AllowedDomains":        ginI18n.MustGetMessage(context, "Allowed domains"),
 			"AllowedSubdomains":     ginI18n.MustGetMessage(context, "Allowed subdomains"),
@@ -227,6 +219,25 @@ func (c *HandleController) MakeLangFunc() func(context *gin.Context) {
 			"SubdomainsInvalid":     ginI18n.MustGetMessage(context, "Subdomains is invalid"),
 			"CommentInvalid":        ginI18n.MustGetMessage(context, "Comment is invalid"),
 			"ParamError":            ginI18n.MustGetMessage(context, "Param error"),
+			"OtherError":            ginI18n.MustGetMessage(context, "Other error"),
+			"Name":                  ginI18n.MustGetMessage(context, "Name"),
+			"Port":                  ginI18n.MustGetMessage(context, "Port"),
+			"Connections":           ginI18n.MustGetMessage(context, "Connections"),
+			"TrafficIn":             ginI18n.MustGetMessage(context, "Traffic In"),
+			"TrafficOut":            ginI18n.MustGetMessage(context, "Traffic Out"),
+			"ClientVersion":         ginI18n.MustGetMessage(context, "Client Version"),
+			"TrafficStatistics":     ginI18n.MustGetMessage(context, "Traffic Statistics"),
+			"online":                ginI18n.MustGetMessage(context, "online"),
+			"offline":               ginI18n.MustGetMessage(context, "offline"),
+			"true":                  ginI18n.MustGetMessage(context, "true"),
+			"false":                 ginI18n.MustGetMessage(context, "false"),
+			"NetworkTraffic":        ginI18n.MustGetMessage(context, "Network Traffic"),
+			"today":                 ginI18n.MustGetMessage(context, "today"),
+			"now":                   ginI18n.MustGetMessage(context, "now"),
+			"Proxies":               ginI18n.MustGetMessage(context, "Proxies"),
+			"NotSet":                ginI18n.MustGetMessage(context, "Not Set"),
+			"Proxy":                 ginI18n.MustGetMessage(context, "Proxy"),
+			"TokenInvalid":          ginI18n.MustGetMessage(context, "Token invalid"),
 		})
 	}
 }
@@ -276,34 +287,10 @@ func (c *HandleController) MakeQueryTokensFunc() func(context *gin.Context) {
 	}
 }
 
-func filter(main TokenInfo, sub TokenInfo) bool {
-	replaceSpaceUser := TrimAllSpaceReg.ReplaceAllString(sub.User, "")
-	if len(replaceSpaceUser) != 0 {
-		if !strings.Contains(main.User, replaceSpaceUser) {
-			return false
-		}
-	}
-
-	replaceSpaceToken := TrimAllSpaceReg.ReplaceAllString(sub.Token, "")
-	if len(replaceSpaceToken) != 0 {
-		if !strings.Contains(main.Token, replaceSpaceToken) {
-			return false
-		}
-	}
-
-	replaceSpaceComment := TrimAllSpaceReg.ReplaceAllString(sub.Comment, "")
-	if len(replaceSpaceComment) != 0 {
-		if !strings.Contains(main.Comment, replaceSpaceComment) {
-			return false
-		}
-	}
-	return true
-}
-
 func (c *HandleController) MakeAddTokenFunc() func(context *gin.Context) {
 	return func(context *gin.Context) {
 		info := TokenInfo{
-			Status: true,
+			Enable: true,
 		}
 		response := OperationResponse{
 			Success: true,
@@ -312,72 +299,34 @@ func (c *HandleController) MakeAddTokenFunc() func(context *gin.Context) {
 		}
 		err := context.BindJSON(&info)
 		if err != nil {
-			log.Printf("user add failed, param error : %v", err)
 			response.Success = false
 			response.Code = ParamError
-			response.Message = "user add failed, param error "
+			response.Message = fmt.Sprintf("user add failed, param error : %v", err)
+			log.Printf(response.Message)
 			context.JSON(http.StatusOK, &response)
 			return
 		}
-		if !UserFormatReg.MatchString(info.User) {
-			log.Printf("user add failed, user format error")
-			response.Success = false
-			response.Code = UserFormatError
-			response.Message = fmt.Sprintf("user add failed, user format error")
-			context.JSON(http.StatusOK, &response)
+
+		result := c.verifyToken(info, TOKEN_ADD)
+
+		if !result.Success {
+			context.JSON(http.StatusOK, &result)
 			return
 		}
-		if _, exist := c.Tokens[info.User]; exist {
-			log.Printf("user add failed, user [%v] exist", info.User)
-			response.Success = false
-			response.Code = UserExist
-			response.Message = fmt.Sprintf("user add failed, user [%s] exist ", info.User)
-			context.JSON(http.StatusOK, &response)
-			return
-		}
-		if !TokenFormatReg.MatchString(info.Token) {
-			log.Printf("user add failed, token format error")
-			response.Success = false
-			response.Code = TokenFormatError
-			response.Message = fmt.Sprintf("user add failed, token format error")
-			context.JSON(http.StatusOK, &response)
-			return
-		}
-		replaceSpaceToken := TrimAllSpaceReg.ReplaceAllString(info.Token, "")
-		info.Token = replaceSpaceToken
+
+		info.Comment = cleanString(info.Comment)
+		info.Ports = cleanPorts(info.Ports)
+		info.Domains = cleanStrings(info.Domains)
+		info.Subdomains = cleanStrings(info.Subdomains)
+
 		c.Tokens[info.User] = info
 
-		usersSection, _ := c.IniFile.GetSection("users")
-		key, err := usersSection.NewKey(info.User, info.Token)
-		key.Comment = info.Comment
-
-		replaceSpacePorts := TrimAllSpaceReg.ReplaceAllString(info.Ports, "")
-		if len(replaceSpacePorts) != 0 {
-			portsSection, _ := c.IniFile.GetSection("ports")
-			key, err = portsSection.NewKey(info.User, replaceSpacePorts)
-			key.Comment = fmt.Sprintf("user %s allowed ports", info.User)
-		}
-
-		replaceSpaceDomains := TrimAllSpaceReg.ReplaceAllString(info.Domains, "")
-		if len(replaceSpaceDomains) != 0 {
-			domainsSection, _ := c.IniFile.GetSection("domains")
-			key, err = domainsSection.NewKey(info.User, replaceSpaceDomains)
-			key.Comment = fmt.Sprintf("user %s allowed domains", info.User)
-		}
-
-		replaceSpaceSubdomains := TrimAllSpaceReg.ReplaceAllString(info.Subdomains, "")
-		if len(replaceSpaceSubdomains) != 0 {
-			subdomainsSection, _ := c.IniFile.GetSection("subdomains")
-			key, err = subdomainsSection.NewKey(info.User, replaceSpaceSubdomains)
-			key.Comment = fmt.Sprintf("user %s allowed subdomains", info.User)
-		}
-
-		err = c.IniFile.SaveTo(c.ConfigFile)
+		err = c.saveToken()
 		if err != nil {
-			log.Printf("add failed, error : %v", err)
 			response.Success = false
 			response.Code = SaveError
-			response.Message = "user add failed"
+			response.Message = fmt.Sprintf("user add failed, error : %v", err)
+			log.Printf(response.Message)
 			context.JSON(http.StatusOK, &response)
 			return
 		}
@@ -396,88 +345,46 @@ func (c *HandleController) MakeUpdateTokensFunc() func(context *gin.Context) {
 		update := TokenUpdate{}
 		err := context.BindJSON(&update)
 		if err != nil {
-			log.Printf("update failed, param error : %v", err)
 			response.Success = false
 			response.Code = ParamError
-			response.Message = "user update failed, param error "
+			response.Message = fmt.Sprintf("update failed, param error : %v", err)
+			log.Printf(response.Message)
 			context.JSON(http.StatusOK, &response)
 			return
 		}
 
-		after := update.After
 		before := update.Before
+		after := update.After
 
-		usersSection, _ := c.IniFile.GetSection("users")
-		key, err := usersSection.GetKey(before.User)
-		comment := TrimBreakLineReg.ReplaceAllString(after.Comment, "")
-		after.Comment = comment
-		key.Comment = comment
-
-		if !TokenFormatReg.MatchString(after.Token) {
-			log.Printf("update failed, token format error")
+		if before.User != after.User {
 			response.Success = false
-			response.Code = TokenFormatError
-			response.Message = "user update failed, token format error "
+			response.Code = ParamError
+			response.Message = fmt.Sprintf("update failed, user should be same : before -> %v, after -> %v", before.User, after.User)
+			log.Printf(response.Message)
 			context.JSON(http.StatusOK, &response)
 			return
 		}
-		replaceSpaceToken := TrimAllSpaceReg.ReplaceAllString(after.Token, "")
-		after.Token = replaceSpaceToken
-		key.SetValue(replaceSpaceToken)
 
-		if before.Ports != after.Ports {
-			portsSection, _ := c.IniFile.GetSection("ports")
-			replaceSpacePorts := TrimAllSpaceReg.ReplaceAllString(after.Ports, "")
-			after.Ports = replaceSpacePorts
-			ports := strings.Split(replaceSpacePorts, ",")
-			if len(replaceSpacePorts) != 0 {
-				key, err = portsSection.NewKey(after.User, replaceSpacePorts)
-				key.Comment = fmt.Sprintf("user %s allowed ports", after.User)
-				c.Ports[after.User] = ports
-			} else {
-				portsSection.DeleteKey(after.User)
-				delete(c.Ports, after.User)
-			}
+		result := c.verifyToken(after, TOKEN_UPDATE)
+
+		if !result.Success {
+			context.JSON(http.StatusOK, &result)
+			return
 		}
 
-		if before.Domains != after.Domains {
-			domainsSection, _ := c.IniFile.GetSection("domains")
-			replaceSpaceDomains := TrimAllSpaceReg.ReplaceAllString(after.Domains, "")
-			after.Domains = replaceSpaceDomains
-			domains := strings.Split(replaceSpaceDomains, ",")
-			if len(replaceSpaceDomains) != 0 {
-				key, err = domainsSection.NewKey(after.User, replaceSpaceDomains)
-				key.Comment = fmt.Sprintf("user %s allowed domains", after.User)
-				c.Domains[after.User] = domains
-			} else {
-				domainsSection.DeleteKey(after.User)
-				delete(c.Domains, after.User)
-			}
-		}
-
-		if before.Subdomains != after.Subdomains {
-			subdomainsSection, _ := c.IniFile.GetSection("subdomains")
-			replaceSpaceSubdomains := TrimAllSpaceReg.ReplaceAllString(after.Subdomains, "")
-			after.Subdomains = replaceSpaceSubdomains
-			subdomains := strings.Split(replaceSpaceSubdomains, ",")
-			if len(replaceSpaceSubdomains) != 0 {
-				key, err = subdomainsSection.NewKey(after.User, replaceSpaceSubdomains)
-				key.Comment = fmt.Sprintf("user %s allowed subdomains", after.User)
-				c.Subdomains[after.User] = subdomains
-			} else {
-				subdomainsSection.DeleteKey(after.User)
-				delete(c.Subdomains, after.User)
-			}
-		}
+		after.Comment = cleanString(after.Comment)
+		after.Ports = cleanPorts(after.Ports)
+		after.Domains = cleanStrings(after.Domains)
+		after.Subdomains = cleanStrings(after.Subdomains)
 
 		c.Tokens[after.User] = after
 
-		err = c.IniFile.SaveTo(c.ConfigFile)
+		err = c.saveToken()
 		if err != nil {
-			log.Printf("user update failed, error : %v", err)
 			response.Success = false
 			response.Code = SaveError
-			response.Message = "user update failed"
+			response.Message = fmt.Sprintf("user update failed, error : %v", err)
+			log.Printf(response.Message)
 			context.JSON(http.StatusOK, &response)
 			return
 		}
@@ -496,44 +403,33 @@ func (c *HandleController) MakeRemoveTokensFunc() func(context *gin.Context) {
 		remove := TokenRemove{}
 		err := context.BindJSON(&remove)
 		if err != nil {
-			log.Printf("user remove failed, param error : %v", err)
 			response.Success = false
 			response.Code = ParamError
-			response.Message = "user remove failed, param error "
+			response.Message = fmt.Sprintf("user remove failed, param error : %v", err)
+			log.Printf(response.Message)
 			context.JSON(http.StatusOK, &response)
 			return
 		}
 
-		usersSection, _ := c.IniFile.GetSection("users")
+		for _, user := range remove.Users {
+			result := c.verifyToken(user, TOKEN_REMOVE)
+
+			if !result.Success {
+				context.JSON(http.StatusOK, &result)
+				return
+			}
+		}
+
 		for _, user := range remove.Users {
 			delete(c.Tokens, user.User)
-			usersSection.DeleteKey(user.User)
 		}
 
-		portsSection, _ := c.IniFile.GetSection("ports")
-		for _, user := range remove.Users {
-			delete(c.Ports, user.User)
-			portsSection.DeleteKey(user.User)
-		}
-
-		domainsSection, _ := c.IniFile.GetSection("domains")
-		for _, user := range remove.Users {
-			delete(c.Domains, user.User)
-			domainsSection.DeleteKey(user.User)
-		}
-
-		subdomainsSection, _ := c.IniFile.GetSection("subdomains")
-		for _, user := range remove.Users {
-			delete(c.Subdomains, user.User)
-			subdomainsSection.DeleteKey(user.User)
-		}
-
-		err = c.IniFile.SaveTo(c.ConfigFile)
+		err = c.saveToken()
 		if err != nil {
-			log.Printf("user remove failed, error : %v", err)
 			response.Success = false
 			response.Code = SaveError
-			response.Message = "user remove failed"
+			response.Message = fmt.Sprintf("user update failed, error : %v", err)
+			log.Printf(response.Message)
 			context.JSON(http.StatusOK, &response)
 			return
 		}
@@ -552,38 +448,36 @@ func (c *HandleController) MakeDisableTokensFunc() func(context *gin.Context) {
 		disable := TokenDisable{}
 		err := context.BindJSON(&disable)
 		if err != nil {
-			log.Printf("disable failed, param error : %v", err)
 			response.Success = false
 			response.Code = ParamError
-			response.Message = "disable failed, param error "
+			response.Message = fmt.Sprintf("disable failed, param error : %v", err)
+			log.Printf(response.Message)
 			context.JSON(http.StatusOK, &response)
 			return
 		}
 
-		section, _ := c.IniFile.GetSection("disabled")
 		for _, user := range disable.Users {
-			section.DeleteKey(user.User)
-			token := c.Tokens[user.User]
-			token.Status = false
-			c.Tokens[user.User] = token
-			key, err := section.NewKey(user.User, "disable")
-			if err != nil {
-				log.Printf("disable failed, error : %v", err)
-				response.Success = false
-				response.Code = SaveError
-				response.Message = "disable failed"
-				context.JSON(http.StatusOK, &response)
+			result := c.verifyToken(user, TOKEN_DISABLE)
+
+			if !result.Success {
+				context.JSON(http.StatusOK, &result)
 				return
 			}
-			key.Comment = fmt.Sprintf("disable user '%s'", user.User)
 		}
 
-		err = c.IniFile.SaveTo(c.ConfigFile)
+		for _, user := range disable.Users {
+			token := c.Tokens[user.User]
+			token.Enable = false
+			c.Tokens[user.User] = token
+		}
+
+		err = c.saveToken()
+
 		if err != nil {
-			log.Printf("disable failed, error : %v", err)
 			response.Success = false
 			response.Code = SaveError
-			response.Message = "disable failed"
+			response.Message = fmt.Sprintf("disable failed, error : %v", err)
+			log.Printf(response.Message)
 			context.JSON(http.StatusOK, &response)
 			return
 		}
@@ -602,23 +496,31 @@ func (c *HandleController) MakeEnableTokensFunc() func(context *gin.Context) {
 		enable := TokenEnable{}
 		err := context.BindJSON(&enable)
 		if err != nil {
-			log.Printf("enable failed, param error : %v", err)
 			response.Success = false
 			response.Code = ParamError
-			response.Message = "enable failed, param error "
+			response.Message = fmt.Sprintf("enable failed, param error : %v", err)
+			log.Printf(response.Message)
 			context.JSON(http.StatusOK, &response)
 			return
 		}
 
-		section, _ := c.IniFile.GetSection("disabled")
 		for _, user := range enable.Users {
-			section.DeleteKey(user.User)
+			result := c.verifyToken(user, TOKEN_ENABLE)
+
+			if !result.Success {
+				context.JSON(http.StatusOK, &result)
+				return
+			}
+		}
+
+		for _, user := range enable.Users {
 			token := c.Tokens[user.User]
-			token.Status = true
+			token.Enable = true
 			c.Tokens[user.User] = token
 		}
 
-		err = c.IniFile.SaveTo(c.ConfigFile)
+		err = c.saveToken()
+
 		if err != nil {
 			log.Printf("enable failed, error : %v", err)
 			response.Success = false
@@ -631,3 +533,70 @@ func (c *HandleController) MakeEnableTokensFunc() func(context *gin.Context) {
 		context.JSON(http.StatusOK, &response)
 	}
 }
+
+func (c *HandleController) MakeProxyFunc() func(context *gin.Context) {
+	return func(context *gin.Context) {
+		var client *http.Client
+		var protocol string
+
+		if c.CommonInfo.DashboardTls {
+			client = &http.Client{
+				Transport: &http.Transport{
+					TLSClientConfig: &tls.Config{
+						InsecureSkipVerify: true,
+					},
+				},
+			}
+			protocol = "https://"
+		} else {
+			client = http.DefaultClient
+			protocol = "http://"
+		}
+
+		res := ProxyResponse{}
+		host := c.CommonInfo.DashboardAddr
+		port := c.CommonInfo.DashboardPort
+		requestUrl := protocol + host + ":" + strconv.Itoa(port) + context.Param("serverApi")
+		request, _ := http.NewRequest("GET", requestUrl, nil)
+		username := c.CommonInfo.DashboardUser
+		password := c.CommonInfo.DashboardPwd
+		if trimString(username) != "" && trimString(password) != "" {
+			request.SetBasicAuth(username, password)
+			log.Printf("Proxy to %s", requestUrl)
+		}
+
+		response, err := client.Do(request)
+
+		if err != nil {
+			res.Code = FrpServerError
+			res.Success = false
+			res.Message = err.Error()
+			log.Print(err)
+			context.JSON(http.StatusOK, &res)
+			return
+		}
+
+		res.Code = response.StatusCode
+		body, err := io.ReadAll(response.Body)
+
+		if err != nil {
+			res.Success = false
+			res.Message = err.Error()
+		} else {
+			if res.Code == http.StatusOK {
+				res.Success = true
+				res.Data = string(body)
+				res.Message = fmt.Sprintf("Proxy to %s success", requestUrl)
+			} else {
+				res.Success = false
+				if res.Code == http.StatusNotFound {
+					res.Message = fmt.Sprintf("Proxy to %s error: url not found", requestUrl)
+				} else {
+					res.Message = fmt.Sprintf("Proxy to %s error: %s", requestUrl, string(body))
+				}
+			}
+		}
+		log.Printf(res.Message)
+		context.JSON(http.StatusOK, &res)
+	}
+}

pkg/server/controller/handler.go

@@ -3,59 +3,11 @@ package controller
 import (
 	"fmt"
 	plugin "github.com/fatedier/frp/pkg/plugin/server"
-	"github.com/gin-gonic/gin"
-	"gopkg.in/ini.v1"
 	"log"
-	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
 )
 
-type HandleController struct {
-	CommonInfo CommonInfo
-	Tokens     map[string]TokenInfo
-	Ports      map[string][]string
-	Domains    map[string][]string
-	Subdomains map[string][]string
-	ConfigFile string
-	IniFile    *ini.File
-}
-
-func NewHandleController(config *HandleController) *HandleController {
-	return config
-}
-
-func (c *HandleController) Register(rootDir string, engine *gin.Engine) {
-	assets := filepath.Join(rootDir, "assets")
-	_, err := os.Stat(assets)
-	if err != nil && !os.IsExist(err) {
-		assets = "./assets"
-	}
-
-	engine.Delims("${", "}")
-	engine.LoadHTMLGlob(filepath.Join(assets, "templates/*"))
-	engine.POST("/handler", c.MakeHandlerFunc())
-
-	var group *gin.RouterGroup
-	if len(c.CommonInfo.User) != 0 {
-		group = engine.Group("/", gin.BasicAuthForRealm(gin.Accounts{
-			c.CommonInfo.User: c.CommonInfo.Pwd,
-		}, "Restricted"))
-	} else {
-		group = engine.Group("/")
-	}
-	group.Static("/static", filepath.Join(assets, "static"))
-	group.GET("/", c.MakeManagerFunc())
-	group.GET("/lang", c.MakeLangFunc())
-	group.GET("/tokens", c.MakeQueryTokensFunc())
-	group.POST("/add", c.MakeAddTokenFunc())
-	group.POST("/update", c.MakeUpdateTokensFunc())
-	group.POST("/remove", c.MakeRemoveTokensFunc())
-	group.POST("/disable", c.MakeDisableTokensFunc())
-	group.POST("/enable", c.MakeEnableTokensFunc())
-}
-
 func (c *HandleController) HandleLogin(content *plugin.LoginContent) plugin.Response {
 	token := content.Metas["token"]
 	user := content.User
@@ -98,7 +50,7 @@ func (c *HandleController) JudgeToken(user string, token string) plugin.Response
 		res.Reject = true
 		res.RejectReason = "user or meta token can not be empty"
 	} else if info, exist := c.Tokens[user]; exist {
-		if !info.Status {
+		if !info.Enable {
 			res.Reject = true
 			res.RejectReason = fmt.Sprintf("user [%s] is disabled", user)
 		} else {
@@ -125,8 +77,7 @@ func (c *HandleController) JudgePort(content *plugin.NewProxyContent) plugin.Res
 		"tcp", "tcpmux", "udp", "http", "https",
 	}
 	proxyType := content.ProxyType
-
-	if StringIndexOf(proxyType, supportProxyTypes) == -1 {
+	if stringContains(proxyType, supportProxyTypes) {
 		log.Printf("proxy type [%v] not support, plugin do nothing", proxyType)
 		res.Unchange = true
 		return res
@@ -140,38 +91,47 @@ func (c *HandleController) JudgePort(content *plugin.NewProxyContent) plugin.Res
 	portAllowed := true
 	if proxyType == "tcp" || proxyType == "udp" {
 		portAllowed = false
-		if _, exist := c.Ports[user]; exist {
-			for _, port := range c.Ports[user] {
-				if strings.Contains(port, "-") {
-					allowedRanges := strings.Split(port, "-")
-					if len(allowedRanges) != 2 {
-						portErr = fmt.Errorf("user [%v] port range [%v] format error", user, port)
-						break
-					}
-					start, err := strconv.Atoi(strings.TrimSpace(allowedRanges[0]))
-					if err != nil {
-						portErr = fmt.Errorf("user [%v] port rang [%v] start port [%v] is not a number", user, port, allowedRanges[0])
-						break
-					}
-					end, err := strconv.Atoi(strings.TrimSpace(allowedRanges[1]))
-					if err != nil {
-						portErr = fmt.Errorf("user [%v] port rang [%v] end port [%v] is not a number", user, port, allowedRanges[0])
-						break
-					}
-					if max(userPort, start) == userPort && min(userPort, end) == userPort {
-						portAllowed = true
-						break
+		if token, exist := c.Tokens[user]; exist {
+			for _, port := range token.Ports {
+				if str, ok := port.(string); ok {
+					if strings.Contains(str, "-") {
+						allowedRanges := strings.Split(str, "-")
+						if len(allowedRanges) != 2 {
+							portErr = fmt.Errorf("user [%v] port range [%v] format error", user, port)
+							break
+						}
+						start, err := strconv.Atoi(trimString(allowedRanges[0]))
+						if err != nil {
+							portErr = fmt.Errorf("user [%v] port rang [%v] start port [%v] is not a number", user, port, allowedRanges[0])
+							break
+						}
+						end, err := strconv.Atoi(trimString(allowedRanges[1]))
+						if err != nil {
+							portErr = fmt.Errorf("user [%v] port rang [%v] end port [%v] is not a number", user, port, allowedRanges[0])
+							break
+						}
+						if max(userPort, start) == userPort && min(userPort, end) == userPort {
+							portAllowed = true
+							break
+						}
+					} else {
+						allowed, err := strconv.Atoi(str)
+						if err != nil {
+							portErr = fmt.Errorf("user [%v] allowed port [%v] is not a number", user, port)
+						}
+						if allowed == userPort {
+							portAllowed = true
+							break
+						}
 					}
 				} else {
-					allowed, err := strconv.Atoi(port)
-					if err != nil {
-						portErr = fmt.Errorf("user [%v] allowed port [%v] is not a number", user, port)
-					}
+					allowed := port
 					if allowed == userPort {
 						portAllowed = true
 						break
 					}
 				}
+
 			}
 		} else {
 			portAllowed = true
@@ -187,9 +147,9 @@ func (c *HandleController) JudgePort(content *plugin.NewProxyContent) plugin.Res
 	domainAllowed := true
 	if proxyType == "http" || proxyType == "https" || proxyType == "tcpmux" {
 		if portAllowed {
-			if _, exist := c.Domains[user]; exist {
+			if token, exist := c.Tokens[user]; exist {
 				for _, userDomain := range userDomains {
-					if StringIndexOf(userDomain, c.Domains[user]) == -1 {
+					if stringContains(userDomain, token.Domains) {
 						domainAllowed = false
 						break
 					}
@@ -206,8 +166,8 @@ func (c *HandleController) JudgePort(content *plugin.NewProxyContent) plugin.Res
 	if proxyType == "http" || proxyType == "https" {
 		subdomainAllowed = false
 		if portAllowed && domainAllowed {
-			if _, exist := c.Subdomains[user]; exist {
-				for _, subdomain := range c.Subdomains[user] {
+			if token, exist := c.Tokens[user]; exist {
+				for _, subdomain := range token.Subdomains {
 					if subdomain == userSubdomain {
 						subdomainAllowed = true
 						break
@@ -231,12 +191,3 @@ func (c *HandleController) JudgePort(content *plugin.NewProxyContent) plugin.Res
 	}
 	return res
 }
-
-func StringIndexOf(element string, data []string) int {
-	for k, v := range data {
-		if element == v {
-			return k
-		}
-	}
-	return -1
-}

pkg/server/controller/register.go

@@ -0,0 +1,54 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"os"
+	"path/filepath"
+)
+
+type HandleController struct {
+	CommonInfo CommonInfo
+	Tokens     map[string]TokenInfo
+	Version    string
+	ConfigFile string
+	TokensFile string
+}
+
+func NewHandleController(config *HandleController) *HandleController {
+	return config
+}
+
+func (c *HandleController) Register(rootDir string, engine *gin.Engine) {
+	assets := filepath.Join(rootDir, "assets")
+	_, err := os.Stat(assets)
+	if err != nil && !os.IsExist(err) {
+		assets = "./assets"
+	}
+
+	engine.Delims("${", "}")
+	engine.LoadHTMLGlob(filepath.Join(assets, "templates/*"))
+	engine.POST("/handler", c.MakeHandlerFunc())
+	engine.Static("/static", filepath.Join(assets, "static"))
+	engine.GET("/lang.json", c.MakeLangFunc())
+	engine.GET(LoginUrl, c.MakeLoginFunc())
+	engine.POST(LoginUrl, c.MakeLoginFunc())
+	engine.GET(LogoutUrl, c.MakeLogoutFunc())
+
+	var group *gin.RouterGroup
+	if len(c.CommonInfo.AdminUser) != 0 {
+		//group = engine.Group("/", gin.BasicAuthForRealm(gin.Accounts{
+		//	c.CommonInfo.User: c.CommonInfo.Pwd,
+		//}, "Restricted"))
+		group = engine.Group("/", c.BasicAuth())
+	} else {
+		group = engine.Group("/")
+	}
+	group.GET("/", c.MakeIndexFunc())
+	group.GET("/tokens", c.MakeQueryTokensFunc())
+	group.POST("/add", c.MakeAddTokenFunc())
+	group.POST("/update", c.MakeUpdateTokensFunc())
+	group.POST("/remove", c.MakeRemoveTokensFunc())
+	group.POST("/disable", c.MakeDisableTokensFunc())
+	group.POST("/enable", c.MakeEnableTokensFunc())
+	group.GET("/proxy/*serverApi", c.MakeProxyFunc())
+}

pkg/server/controller/utils.go

@@ -0,0 +1,222 @@
+package controller
+
+import (
+	"fmt"
+	"github.com/BurntSushi/toml"
+	"log"
+	"os"
+	"strings"
+)
+
+func filter(main TokenInfo, sub TokenInfo) bool {
+	replaceSpaceUser := trimAllSpace.ReplaceAllString(sub.User, "")
+	if len(replaceSpaceUser) != 0 {
+		if !strings.Contains(main.User, replaceSpaceUser) {
+			return false
+		}
+	}
+
+	replaceSpaceToken := trimAllSpace.ReplaceAllString(sub.Token, "")
+	if len(replaceSpaceToken) != 0 {
+		if !strings.Contains(main.Token, replaceSpaceToken) {
+			return false
+		}
+	}
+
+	replaceSpaceComment := trimAllSpace.ReplaceAllString(sub.Comment, "")
+	if len(replaceSpaceComment) != 0 {
+		if !strings.Contains(main.Comment, replaceSpaceComment) {
+			return false
+		}
+	}
+	return true
+}
+
+func trimString(str string) string {
+	return strings.TrimSpace(str)
+}
+
+func (c *HandleController) verifyToken(token TokenInfo, operate int) OperationResponse {
+	response := OperationResponse{
+		Success: true,
+		Code:    Success,
+		Message: "operate success",
+	}
+
+	var (
+		validateExist      = false
+		validateNotExist   = false
+		validateUser       = false
+		validateToken      = false
+		validateComment    = false
+		validatePorts      = false
+		validateDomains    = false
+		validateSubdomains = false
+	)
+
+	if operate == TOKEN_ADD {
+		validateExist = true
+		validateUser = true
+		validateToken = true
+		validateComment = true
+		validatePorts = true
+		validateDomains = true
+		validateSubdomains = true
+	} else if operate == TOKEN_UPDATE {
+		validateNotExist = true
+		validateUser = true
+		validateToken = true
+		validateComment = true
+		validatePorts = true
+		validateDomains = true
+		validateSubdomains = true
+	} else if operate == TOKEN_ENABLE || operate == TOKEN_DISABLE || operate == TOKEN_REMOVE {
+		validateNotExist = true
+	}
+
+	if validateUser && !userFormat.MatchString(token.User) {
+		response.Success = false
+		response.Code = UserFormatError
+		response.Message = fmt.Sprintf("operate failed, user [%s] format error", token.User)
+		log.Printf(response.Message)
+		return response
+	}
+
+	if validateExist {
+		if _, exist := c.Tokens[token.User]; exist {
+			response.Success = false
+			response.Code = UserExist
+			response.Message = fmt.Sprintf("operate failed, user [%s] exist ", token.User)
+			log.Printf(response.Message)
+			return response
+		}
+	}
+
+	if validateNotExist {
+		if _, exist := c.Tokens[token.User]; !exist {
+			response.Success = false
+			response.Code = UserNotExist
+			response.Message = fmt.Sprintf("operate failed, user [%s] not exist ", token.User)
+			log.Printf(response.Message)
+			return response
+		}
+	}
+
+	if validateToken && !tokenFormat.MatchString(token.Token) {
+		response.Success = false
+		response.Code = TokenFormatError
+		response.Message = fmt.Sprintf("operate failed, token [%s] format error", token.Token)
+		log.Printf(response.Message)
+		return response
+	}
+
+	trimmedComment := trimString(token.Comment)
+	if validateComment && trimmedComment != "" && commentFormat.MatchString(trimmedComment) {
+		response.Success = false
+		response.Code = CommentFormatError
+		response.Message = fmt.Sprintf("operate failed, comment [%s] format error", token.Comment)
+		log.Printf(response.Message)
+		return response
+	}
+
+	if validatePorts {
+		for _, port := range token.Ports {
+			if str, ok := port.(string); ok {
+				trimmedPort := trimString(str)
+				if trimmedPort != "" && !portsFormatSingle.MatchString(trimmedPort) && !portsFormatRange.MatchString(trimmedPort) {
+					response.Success = false
+					response.Code = PortsFormatError
+					response.Message = fmt.Sprintf("operate failed, ports [%v] format error", token.Ports)
+					log.Printf(response.Message)
+					return response
+				}
+			}
+		}
+	}
+
+	if validateDomains {
+		for _, domain := range token.Domains {
+			trimmedDomain := trimString(domain)
+			if trimmedDomain != "" && !domainFormat.MatchString(trimmedDomain) {
+				response.Success = false
+				response.Code = DomainsFormatError
+				response.Message = fmt.Sprintf("operate failed, domains [%v] format error", token.Domains)
+				log.Printf(response.Message)
+				return response
+			}
+		}
+	}
+
+	if validateSubdomains {
+		for _, subdomain := range token.Subdomains {
+			trimmedSubdomain := trimString(subdomain)
+			if trimmedSubdomain != "" && !subdomainFormat.MatchString(trimmedSubdomain) {
+				response.Success = false
+				response.Code = SubdomainsFormatError
+				response.Message = fmt.Sprintf("operate failed, subdomains [%v] format error", token.Subdomains)
+				log.Printf(response.Message)
+				return response
+			}
+		}
+	}
+
+	return response
+}
+
+func cleanPorts(ports []any) []any {
+	cleanedPorts := make([]any, len(ports))
+	for i, port := range ports {
+		if str, ok := port.(string); ok {
+			cleanedPorts[i] = cleanString(str)
+		} else {
+			//float64, for JSON numbers
+			cleanedPorts[i] = int(port.(float64))
+		}
+	}
+	return cleanedPorts
+}
+
+func cleanStrings(originalStrings []string) []string {
+	cleanedStrings := make([]string, len(originalStrings))
+	for i, str := range originalStrings {
+		cleanedStrings[i] = cleanString(str)
+	}
+	return cleanedStrings
+}
+
+func cleanString(originalString string) string {
+	return trimString(originalString)
+}
+
+func stringContains(element string, data []string) bool {
+	for _, v := range data {
+		if element == v {
+			return true
+		}
+	}
+	return false
+}
+
+func tokensList(tokens map[string]TokenInfo) Tokens {
+	return Tokens{
+		tokens,
+	}
+}
+
+func (c *HandleController) saveToken() error {
+	tokenFile, err := os.Create(c.TokensFile)
+	if err != nil {
+		log.Printf("error to crate file %v: %v", c.TokensFile, err)
+	}
+
+	encoder := toml.NewEncoder(tokenFile)
+	encoder.Indent = "    "
+	if err = encoder.Encode(tokensList(c.Tokens)); err != nil {
+		log.Printf("error to encode tokens: %v", err)
+	}
+	if err = tokenFile.Close(); err != nil {
+		log.Printf("error to close file %v: %v", c.TokensFile, err)
+	}
+
+	return err
+}

pkg/server/controller/variables.go

@@ -0,0 +1,136 @@
+package controller
+
+import (
+	"regexp"
+)
+
+const (
+	Success int = iota
+	ParamError
+	UserExist
+	UserNotExist
+	SaveError
+	UserFormatError
+	TokenFormatError
+	CommentFormatError
+	PortsFormatError
+	DomainsFormatError
+	SubdomainsFormatError
+	FrpServerError
+)
+
+const (
+	TOKEN_ADD int = iota
+	TOKEN_UPDATE
+	TOKEN_REMOVE
+	TOKEN_ENABLE
+	TOKEN_DISABLE
+)
+
+const (
+	SessionName      = "GOSESSION"
+	AuthName         = "_PANEL_AUTH"
+	LoginUrl         = "/login"
+	LoginSuccessUrl  = "/"
+	LogoutUrl        = "/logout"
+	LogoutSuccessUrl = "/login"
+)
+
+var (
+	userFormat        = regexp.MustCompile("^\\w+$")
+	tokenFormat       = regexp.MustCompile("^[\\w!@#$%^&*()]+$")
+	commentFormat     = regexp.MustCompile("[\\n\\t\\r]")
+	portsFormatSingle = regexp.MustCompile("^\\s*\\d{1,5}\\s*$")
+	portsFormatRange  = regexp.MustCompile("^\\s*\\d{1,5}\\s*-\\s*\\d{1,5}\\s*$")
+	domainFormat      = regexp.MustCompile("^([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\\.)+[a-zA-Z]{2,}$")
+	subdomainFormat   = regexp.MustCompile("^[a-zA-z0-9-]{1,20}$")
+	trimAllSpace      = regexp.MustCompile("[\\n\\t\\r\\s]")
+)
+
+type Response struct {
+	Msg string `json:"msg"`
+}
+
+type HTTPError struct {
+	Code int
+	Err  error
+}
+
+type Common struct {
+	Common CommonInfo
+}
+
+type CommonInfo struct {
+	PluginAddr    string `toml:"plugin_addr"`
+	PluginPort    int    `toml:"plugin_port"`
+	AdminUser     string `toml:"admin_user"`
+	AdminPwd      string `toml:"admin_pwd"`
+	AdminKeepTime int    `toml:"admin_keep_time"`
+	TlsMode       bool   `toml:"tls_mode"`
+	TlsCertFile   string `toml:"tls_cert_file"`
+	TlsKeyFile    string `toml:"tls_key_file"`
+	DashboardAddr string `toml:"dashboard_addr"`
+	DashboardPort int    `toml:"dashboard_port"`
+	DashboardUser string `toml:"dashboard_user"`
+	DashboardPwd  string `toml:"dashboard_pwd"`
+	DashboardTls  bool
+}
+
+type Tokens struct {
+	Tokens map[string]TokenInfo `toml:"tokens"`
+}
+
+type TokenInfo struct {
+	User       string   `toml:"user" json:"user" form:"user"`
+	Token      string   `toml:"token" json:"token" form:"token"`
+	Comment    string   `toml:"comment" json:"comment" form:"comment"`
+	Ports      []any    `toml:"ports" json:"ports" from:"ports"`
+	Domains    []string `toml:"domains" json:"domains" from:"domains"`
+	Subdomains []string `toml:"subdomains" json:"subdomains" from:"subdomains"`
+	Enable     bool     `toml:"enable" json:"enable" form:"enable"`
+}
+
+type TokenResponse struct {
+	Code  int         `json:"code"`
+	Msg   string      `json:"msg"`
+	Count int         `json:"count"`
+	Data  []TokenInfo `json:"data"`
+}
+
+type OperationResponse struct {
+	Success bool   `json:"success"`
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type ProxyResponse struct {
+	OperationResponse
+	Data string `json:"data"`
+}
+
+type TokenSearch struct {
+	TokenInfo
+	Page  int `form:"page"`
+	Limit int `form:"limit"`
+}
+
+type TokenUpdate struct {
+	Before TokenInfo `json:"before"`
+	After  TokenInfo `json:"after"`
+}
+
+type TokenRemove struct {
+	Users []TokenInfo `json:"users"`
+}
+
+type TokenDisable struct {
+	TokenRemove
+}
+
+type TokenEnable struct {
+	TokenDisable
+}
+
+func (e *HTTPError) Error() string {
+	return e.Err.Error()
+}

pkg/server/server.go

@@ -5,8 +5,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"frps-multiuser/pkg/server/controller"
+	"frps-panel/pkg/server/controller"
 	ginI18n "github.com/gin-contrib/i18n"
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-contrib/sessions/cookie"
 	"github.com/gin-gonic/gin"
 	"golang.org/x/text/language"
 	"log"
@@ -22,16 +24,26 @@ import (
 type Server struct {
 	cfg     controller.HandleController
 	s       *http.Server
+	tls     TLS
 	done    chan struct{}
 	rootDir string
 }
 
-func New(rootDir string, cfg controller.HandleController) (*Server, error) {
+type TLS struct {
+	Enable   bool
+	Cert     string
+	Key      string
+	Protocol string
+}
+
+func New(rootDir string, cfg controller.HandleController, tls TLS) (*Server, error) {
 	s := &Server{
 		cfg:     cfg,
 		done:    make(chan struct{}),
 		rootDir: rootDir,
+		tls:     tls,
 	}
+
 	if err := s.init(); err != nil {
 		return nil, err
 	}
@@ -44,10 +56,32 @@ func (s *Server) Run() error {
 	if err != nil {
 		return err
 	}
-	log.Printf("HTTP server listen on %s", l.Addr().String())
+	log.Printf("%s server listen on %s", s.tls.Protocol, l.Addr().String())
 	go func() {
-		if err = s.s.Serve(l); !errors.Is(http.ErrServerClosed, err) {
-			log.Printf("error shutdown HTTP server: %v", err)
+		if s.tls.Enable {
+			configDir := filepath.Dir(s.cfg.ConfigFile)
+
+			cert := filepath.Join(configDir, s.tls.Cert)
+			_, err := os.Stat(cert)
+			if err != nil && !os.IsExist(err) {
+				cert = s.tls.Cert
+			}
+
+			key := filepath.Join(configDir, s.tls.Key)
+			_, err = os.Stat(key)
+			if err != nil && !os.IsExist(err) {
+				key = s.tls.Key
+			}
+
+			if err = s.s.ServeTLS(l, cert, key); !errors.Is(http.ErrServerClosed, err) {
+				log.Printf("error shutdown %s server: %v", s.tls.Protocol, err)
+				_ = s.Stop()
+			}
+		} else {
+			if err = s.s.Serve(l); !errors.Is(http.ErrServerClosed, err) {
+				log.Printf("error shutdown %s server: %v", s.tls.Protocol, err)
+				_ = s.Stop()
+			}
 		}
 	}()
 	<-s.done
@@ -58,16 +92,17 @@ func (s *Server) Stop() error {
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 	if err := s.s.Shutdown(ctx); err != nil {
-		log.Fatalf("shutdown HTTP server error: %v", err)
+		log.Fatalf("shutdown %s server error: %v", s.tls.Protocol, err)
 	}
-	log.Printf("HTTP server exited")
+	log.Printf("%s server exited", s.tls.Protocol)
+
 	close(s.done)
 	return nil
 }
 
 func (s *Server) init() error {
 	if err := s.initHTTPServer(); err != nil {
-		log.Printf("init HTTP server error: %v", err)
+		log.Printf("init %s server error: %v", s.tls.Protocol, err)
 		return err
 	}
 	return nil
@@ -138,6 +173,15 @@ func GinI18nLocalize(rootDir string) gin.HandlerFunc {
 func (s *Server) initHTTPServer() error {
 	gin.SetMode(gin.ReleaseMode)
 	engine := gin.New()
+	authStore := cookie.NewStore([]byte("frps-panel"))
+	authStore.Options(sessions.Options{
+		Secure:   true,
+		HttpOnly: false,
+		SameSite: 4,
+		Path:     "/",
+		MaxAge:   s.cfg.CommonInfo.AdminKeepTime,
+	})
+	engine.Use(sessions.Sessions(controller.SessionName, authStore))
 	engine.Use(GinI18nLocalize(s.rootDir))
 	s.s = &http.Server{
 		Handler: engine,