Merge pull request #718 from fatedier/cmd

more cmds
This commit is contained in:
fatedier
2018-04-23 03:07:14 +08:00
committed by GitHub
217 changed files with 21834 additions and 10364 deletions

View File

@ -18,6 +18,7 @@ import (
"encoding/json"
"net/http"
"github.com/fatedier/frp/g"
"github.com/fatedier/frp/models/config"
"github.com/fatedier/frp/models/consts"
"github.com/fatedier/frp/utils/log"
@ -60,7 +61,7 @@ func apiServerInfo(w http.ResponseWriter, r *http.Request, _ httprouter.Params)
}()
log.Info("Http request: [/api/serverinfo]")
cfg := config.ServerCommonCfg
cfg := &g.GlbServerCfg.ServerCommonConf
serverStats := StatsGetServer()
res = ServerInfoResp{
Version: version.Full(),