adjust color

add title bar;

Makefile

@@ -1,8 +1,12 @@
 export GO111MODULE=on
+export CGO_ENABLED=0
+export GOOS=linux
+export GOARCH=amd64
 
 build: frps-multiuser
 	cp ./config/frps-multiuser.ini ./bin/frps-multiuser.ini
 	cp -r ./assets/ ./bin/assets/
 
 frps-multiuser:
+	rm -rf ./bin
 	go build -o ./bin/frps-multiuser ./cmd/frps-multiuser

README.md

@@ -1,5 +1,7 @@
 # frps-multiuser
 
+[README](README.md) | [中文文档](README_zh.md)
+
 frp server plugin to support multiple users for [frp](https://github.com/fatedier/frp).
 
 frps-multiuser will run as one single process and accept HTTP requests from frps.
@@ -9,7 +11,7 @@ frps-multiuser will run as one single process and accept HTTP requests from frps
 ![支持英文](screenshots/i18n.png)
 ![自动深色模式](screenshots/dark%20mode.png)
 
-## update notes
+## Update Notes
 
 + **the default tokens file is frps-multiuser.ini now,ini file support comment**
 + **remove `-l`,it configure in `frps-multiuser.ini` now**
@@ -21,9 +23,8 @@ frps-multiuser will run as one single process and accept HTTP requests from frps
 + **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`***
 
-[README](README.md) | [中文文档](README_zh.md)
+***the limit of `ports`、`domains`、`subdomains` only effective at `NewProxy`***
 
 ### Features
 
@@ -130,8 +131,36 @@ local_port = 22
 remote_port = 6000
 ```
 
+## Run as service
+
+this example is for `ubuntu` and with `root` user
+
++ 1.unzip `frps-multiuser.zip` to dir `/root/frps-multiuser`
++ 2.touch a file with command `touch frps-multiuser.service` in dir `/root/frps-multiuser`.the file content is:
+```ini
+[Unit]
+Description = frp multiuser service
+After = network.target syslog.target
+Wants = network.target
+
+[Service]
+Type = simple
+# config of frps-multiuser.ini,you should change the file path
+Environment=FRPS_MULTIUSER_OPTS="-c /root/frps-multiuser/frps-multiuser.ini"
+# command of run frps-multiuser,you should change the file path
+ExecStart = /root/frps-multiuser/frps-multiuser $FRPS_MULTIUSER_OPTS
+
+[Install]
+WantedBy = multi-user.target
+```
++ 3.copy `frps-multiuser.service` to `/etc/systemd/system/` with command `cp /root/frps-multiuser.service /etc/systemd/system/`
++ 4.reload service with command `systemctl daemon-reload`
++ 5.start service with command `service frps-multiuser 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.
 
 ## Credits

README_zh.md

@@ -23,6 +23,7 @@ frps-multiuser 会以一个单独的进程运行，并接收 frps 发送过来
 + **新增对用户的`端口`、`域名`、`二级域名`进行限制**
 
 ***用户被`删除`或`禁用`后，不会马上生效，需要等一段时间***
+
 ***用户`端口`、`域名`、`二级域名`限制仅在建立新连接(`NewProxy`)时生效***
 
 ### 功能
@@ -130,8 +131,36 @@ local_port = 22
 remote_port = 6000
 ```
 
+## 以服务的形式运行
+
+本实例是在 `ubuntu` 下， 以 `root` 用户执操作
+
++ 1、解压 `frps-multiuser.zip` 到目录 `/root/frps-multiuser`
++ 2、在目录 `/root/frps-multiuser` 下 用命令创建文件：`touch frps-multiuser.service`。创建后修改文件内容：
+```ini
+[Unit]
+Description = frp multiuser service
+After = network.target syslog.target
+Wants = network.target
+
+[Service]
+Type = simple
+# 启动frps-multiuser的配置文件路径，需修改为您的frps-multiuser.ini的路径
+Environment=FRPS_MULTIUSER_OPTS="-c /root/frps-multiuser/frps-multiuser.ini"
+# 启动frps-multiuser的命令，需修改为您的frps-multiuser的安装路径
+ExecStart = /root/frps-multiuser/frps-multiuser $FRPS_MULTIUSER_OPTS
+
+[Install]
+WantedBy = multi-user.target
+```
++ 3、复制服务文件： `cp /root/frps-multiuser.service /etc/systemd/system/`
++ 4、重载服务： `systemctl daemon-reload`
++ 5、启动服务： `service frps-multiuser start`
+
 ## 使用
 
+___如果要从外网访问管理界面, 需要把配置中的 `plugin_addr` 改为 `0.0.0.0`___
+
 如果使用中有问题或者有其他想法，在[issues](https://github.com/yhl452493373/frps-multiuser/issues)上提出来。 如果我能搞定的话，我尽量搞。
 
 ## 致谢

assets/lang/en.json

@@ -1,5 +1,6 @@
 {
   "User Manage": "User Manage",
+  "frps multiuser": "frps multiuser",
   "User": "User",
   "Token": "Token",
   "Notes": "Notes",

assets/lang/zh.json

@@ -1,5 +1,6 @@
 {
   "User Manage": "用户管理",
+  "frps multiuser": "frps用户管理",
   "User": "用户名(user)",
   "Token": "凭证(meta_token)",
   "Notes": "备注",
@@ -39,7 +40,7 @@
   "Allowed domains": "允许域名",
   "Please input allowed domains": "请输入允许使用的域名,如:web01.domain.com,web02.domain.com",
   "Allowed subdomains": "允许子域名",
-  "Please input allowed subdomains": "请输入允许使用的端口,如:web01,web02",
+  "Please input allowed subdomains": "请输入允许使用的子域名,如:web01,web02",
   "Ports is invalid": "端口不正确",
   "Domains is invalid": "域名不正确",
   "Subdomains is invalid": "子域名不正确",

assets/static/css/index-color.css

@@ -0,0 +1,128 @@
+header {
+    background-color: #58b7ff;
+    color: #fff;
+}
+
+.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-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;
+}
+
+@media (prefers-color-scheme: dark) {
+    header {
+        background-color: #395c74;
+    }
+
+    .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-checkbox[lay-skin=primary]:hover > i {
+        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;
+    }
+}

assets/static/css/index.css

@@ -1,8 +1,18 @@
-body {
+html, body {
-    padding: 15px;
+    padding: 0;
     word-break: break-all;
 }
 
+header .title {
+    padding: 10px 15px;
+    line-height: 40px;
+    font-size: 25px;
+}
+
+section {
+    padding: 15px 15px 0 15px;
+}
+
 #searchForm input {
     height: 30px;
     line-height: 28px;
@@ -44,10 +54,14 @@ 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;
+}

assets/templates/index.html

@@ -5,6 +5,7 @@
     <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">
+    <link rel="stylesheet" href="./static/css/index-color.css">
     <script src="./static/layui/layui.js"></script>
     <script src="./static/js/index.js"></script>
     <style>
@@ -18,7 +19,11 @@
     </style>
 </head>
 <body>
-<form class="layui-form layui-row layui-col-space16" id="searchForm" lay-filter="searchForm">
+<header>
+    <div class="title">${ .FrpsMultiuser }</div>
+</header>
+<section>
+    <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">
@@ -52,8 +57,10 @@
                 <button class="layui-btn layui-btn-sm layui-btn-primary" type="reset" id="resetBtn">${ .Reset }</button>
             </div>
         </div>
-</form>
+    </form>
-<table id="tokenTable" lay-filter="tokenTable"></table>
+    <table id="tokenTable" lay-filter="tokenTable"></table>
+</section>
+
 <script type="text/html" id="toolbarTemplate">
     <div class="layui-btn-container">
         <button class="layui-btn layui-btn-sm" lay-event="add">${ .NewUser }</button>

cmd/frps-multiuser/cmd.go

@@ -9,6 +9,7 @@ import (
 	"io/fs"
 	"log"
 	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 )
@@ -33,12 +34,21 @@ var rootCmd = &cobra.Command{
 			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 nil
+			return err
 		}
-		s, err := server.New(controller.HandleController{
+		s, err := server.New(
+			rootDir,
+			controller.HandleController{
 				CommonInfo: common,
 				Tokens:     tokens,
 				Ports:      ports,

pkg/server/controller/controller.go

@@ -23,7 +23,7 @@ const (
 	TokenFormatError = 5
 )
 
-var UserFormatReg = regexp.MustCompile("^\\w$")
+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]")
@@ -164,6 +164,7 @@ func (c *HandleController) MakeManagerFunc() func(context *gin.Context) {
 	return func(context *gin.Context) {
 		context.HTML(http.StatusOK, "index.html", gin.H{
 			"UserManage":                   ginI18n.MustGetMessage(context, "User Manage"),
+			"FrpsMultiuser":                ginI18n.MustGetMessage(context, "frps multiuser"),
 			"User":                         ginI18n.MustGetMessage(context, "User"),
 			"Token":                        ginI18n.MustGetMessage(context, "Token"),
 			"Notes":                        ginI18n.MustGetMessage(context, "Notes"),

pkg/server/controller/op.go

@@ -6,6 +6,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"gopkg.in/ini.v1"
 	"log"
+	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 )
@@ -24,9 +26,15 @@ func NewHandleController(config *HandleController) *HandleController {
 	return config
 }
 
-func (c *HandleController) Register(engine *gin.Engine) {
+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("./assets/templates/*")
+	engine.LoadHTMLGlob(filepath.Join(assets, "templates/*"))
 	engine.POST("/handler", c.MakeHandlerFunc())
 
 	var group *gin.RouterGroup
@@ -37,7 +45,7 @@ func (c *HandleController) Register(engine *gin.Engine) {
 	} else {
 		group = engine.Group("/")
 	}
-	group.Static("/static", "./assets/static")
+	group.Static("/static", filepath.Join(assets, "static"))
 	group.GET("/", c.MakeManagerFunc())
 	group.GET("/lang", c.MakeLangFunc())
 	group.GET("/tokens", c.MakeQueryTokensFunc())

pkg/server/server.go

@@ -13,6 +13,7 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
@@ -22,12 +23,14 @@ type Server struct {
 	cfg     controller.HandleController
 	s       *http.Server
 	done    chan struct{}
+	rootDir string
 }
 
-func New(cfg controller.HandleController) (*Server, error) {
+func New(rootDir string, cfg controller.HandleController) (*Server, error) {
 	s := &Server{
 		cfg:     cfg,
 		done:    make(chan struct{}),
+		rootDir: rootDir,
 	}
 	if err := s.init(); err != nil {
 		return nil, err
@@ -74,14 +77,10 @@ func LoadSupportLanguage(dir string) ([]language.Tag, error) {
 	var tags []language.Tag
 
 	files, err := os.Open(dir)
-	if err != nil {
-		log.Printf("error opening directory: %v", err)
-		return tags, err
-	}
 
 	fileList, err := files.Readdir(-1)
 	if err != nil {
-		log.Printf("error reading directory: %v", err)
+		log.Printf("error read lang directory: %v", err)
 		return tags, err
 	}
 
@@ -103,15 +102,21 @@ func LoadSupportLanguage(dir string) ([]language.Tag, error) {
 	return tags, nil
 }
 
-func GinI18nLocalize() gin.HandlerFunc {
+func GinI18nLocalize(rootDir string) gin.HandlerFunc {
-	dir := "./assets/lang"
+	assets := filepath.Join(rootDir, "assets")
-	tags, err := LoadSupportLanguage(dir)
+	_, err := os.Stat(assets)
+	if err != nil && !os.IsExist(err) {
+		assets = "./assets"
+	}
+	lang := filepath.Join(assets, "lang")
+	tags, err := LoadSupportLanguage(lang)
 	if err != nil {
 		log.Panicf("language file is not found: %v", err)
 	}
+
 	return ginI18n.Localize(
 		ginI18n.WithBundle(&ginI18n.BundleCfg{
-			RootPath:         dir,
+			RootPath:         lang,
 			AcceptLanguage:   tags,
 			DefaultLanguage:  language.Chinese,
 			FormatBundleFile: "json",
@@ -133,10 +138,10 @@ func GinI18nLocalize() gin.HandlerFunc {
 func (s *Server) initHTTPServer() error {
 	gin.SetMode(gin.ReleaseMode)
 	engine := gin.New()
-	engine.Use(GinI18nLocalize())
+	engine.Use(GinI18nLocalize(s.rootDir))
 	s.s = &http.Server{
 		Handler: engine,
 	}
-	controller.NewHandleController(&s.cfg).Register(engine)
+	controller.NewHandleController(&s.cfg).Register(s.rootDir, engine)
 	return nil
 }