Browse Source

Merged master

webui
Ruben Cid 5 years ago
parent
commit
6aae3b582a
  1. 2
      README.md
  2. 2
      README_cn.md
  3. 2
      configure/liveconfig.go
  4. 5
      webui/src/views/SignIn/SignIn.jsx

2
README.md

@ -53,7 +53,7 @@ all options: @@ -53,7 +53,7 @@ all options:
Usage of ./livego:
--api_addr string HTTP manage interface server listen address (default ":8090")
--config_file string configure filename (default "livego.yaml")
--dashboard Enable dashboard
--dashboard Enable dashboard on http://{api_addr}/dashboard
--flv_dir string output flv file at flvDir/APP/KEY_TIME.flv (default "tmp")
--gop_num int gop num (default 1)
--hls_addr string HLS server listen address (default ":7002")

2
README_cn.md

@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
Usage of ./livego:
--api_addr string HTTP manage interface server listen address (default ":8090")
--config_file string configure filename (default "livego.yaml")
--dashboard Enable dashboard
--dashboard Enable dashboard on http://{api_addr}/dashboard
--flv_dir string output flv file at flvDir/APP/KEY_TIME.flv (default "tmp")
--gop_num int gop num (default 1)
--hls_addr string HLS server listen address (default ":7002")

2
configure/liveconfig.go

@ -103,7 +103,7 @@ func init() { @@ -103,7 +103,7 @@ func init() {
pflag.Int("read_timeout", 10, "read time out")
pflag.Int("write_timeout", 10, "write time out")
pflag.Int("gop_num", 1, "gop num")
pflag.Bool("dashboard", false, "Enable dashboard")
pflag.Bool("dashboard", false, "Enable dashboard on http://{api_addr}/dashboard")
pflag.Parse()
Config.BindPFlags(pflag.CommandLine)

5
webui/src/views/SignIn/SignIn.jsx

@ -84,8 +84,7 @@ const SignIn = (props) => { @@ -84,8 +84,7 @@ const SignIn = (props) => {
};
const checkToken = (token) => {
axios.get(`http://localhost:8090/stat/livestat?jwt=${token}`).then(res => {
console.log(res)
axios.get(`/stat/livestat?jwt=${token}`).then(res => {
onSuccess();
}, err => {
if (!token) return;
@ -101,7 +100,7 @@ const SignIn = (props) => { @@ -101,7 +100,7 @@ const SignIn = (props) => {
setError(JSON.stringify(err));
}
});
}
};
// Check if have not the jwt enabled
checkToken();

Loading…
Cancel
Save