diff --git a/.gitignore b/.gitignore index 56a043c7..5a4810c0 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,8 @@ _testmain.go bin/ packages/ test/bin/ - +src/cmd/.DS_Store +src/cmd/frps/frps +src/cmd/frps/frps.log # Cache *.swp diff --git a/src/cmd/frps/frps.ini b/src/cmd/frps/frps.ini new file mode 100644 index 00000000..4a6d47f8 --- /dev/null +++ b/src/cmd/frps/frps.ini @@ -0,0 +1,45 @@ +# [common] is integral section +[common] +# A literal address or host name for IPv6 must be enclosed +# in square brackets, as in "[::1]:80", "[ipv6-host]:http" or "[ipv6-host%zone]:80" +bind_addr = 0.0.0.0 +bind_port = 7000 +# if you want to support virtual host, you must set the http port for listening (optional) +vhost_http_port = 80 +vhost_https_port = 443 +# if you want to configure or reload frps by dashboard, dashboard_port must be set +dashboard_port = 7500 +# dashboard assets directory(only for debug mode) +# assets_dir = ./static +# console or real logFile path like ./frps.log +log_file = ./frps.log +# debug, info, warn, error +log_level = info +log_max_days = 3 +# if you enable privilege mode, frpc can create a proxy without pre-configure in frps when privilege_token is correct +privilege_mode = true +privilege_token = 12345678 +# only allow frpc to bind ports you list, if you set nothing, there won't be any limit +privilege_allow_ports = 2000-3000,3001,3003,4000-50000 +# pool_count in each proxy will change to max_pool_count if they exceed the maximum value +max_pool_count = 100 + +# ssh is the proxy name, client will use this name and auth_token to connect to server +[ssh] +type = tcp +auth_token = 123 +bind_addr = 0.0.0.0 +listen_port = 6000 + +[web01] +# if type equals http, vhost_http_port must be set +type = http +auth_token = 123 +# if proxy type equals http, custom_domains must be set separated by commas +custom_domains = web01.yourdomain.com,web01.yourdomain2.com + +[web02] +# if type equals https, vhost_https_port must be set +type = https +auth_token = 123 +custom_domains = web02.yourdomain.com diff --git a/src/cmd/frps/main.go b/src/cmd/frps/main.go index 1200a570..7820e7d9 100644 --- a/src/cmd/frps/main.go +++ b/src/cmd/frps/main.go @@ -60,7 +60,9 @@ func main() { if args["-c"] != nil { server.ConfigFile = args["-c"].(string) } + err = server.LoadConf(server.ConfigFile) + if err != nil { fmt.Println(err) os.Exit(-1) diff --git a/src/model/user.go b/src/model/user.go new file mode 100644 index 00000000..d6a425b3 --- /dev/null +++ b/src/model/user.go @@ -0,0 +1,14 @@ +package model + +import ( + "time" +) + +type User struct { + Id int `xorm:"not null pk autoincr INT(11)"` + Username string `xorm:"not null default '' VARCHAR(128)"` + Password string `xorm:"not null default '' VARCHAR(128)"` + Serssion string `xorm:"VARCHAR(128)"` + CreateTime time.Time `xorm:"DATETIME"` + Status int `xorm:"INT(11)"` +}