From 0d84da91d47b88fa32bdd41d3ecfccf7baf96297 Mon Sep 17 00:00:00 2001 From: fatedier Date: Mon, 10 May 2021 23:04:26 +0800 Subject: [PATCH] change default value of dashboard_user and dashboard_pwd to empty string (#2383) --- README.md | 6 +++--- pkg/config/client.go | 4 ++-- pkg/config/server.go | 10 +++++----- pkg/config/server_test.go | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 78399a6..5e5f623 100644 --- a/README.md +++ b/README.md @@ -421,12 +421,12 @@ Configure a port for dashboard to enable this feature: ```ini [common] dashboard_port = 7500 -# dashboard's username and password are both optional，if not set, default is admin. +# dashboard's username and password are both optional dashboard_user = admin dashboard_pwd = admin ``` -Then visit `http://[server_addr]:7500` to see the dashboard, with username and password both being `admin` by default. +Then visit `http://[server_addr]:7500` to see the dashboard, with username and password both being `admin`. ![dashboard](/doc/pic/dashboard.png) @@ -444,7 +444,7 @@ admin_user = admin admin_pwd = admin ``` -Then visit `http://127.0.0.1:7400` to see admin UI, with username and password both being `admin` by default. +Then visit `http://127.0.0.1:7400` to see admin UI, with username and password both being `admin`. ### Monitor diff --git a/pkg/config/client.go b/pkg/config/client.go index ecc1a45..bf53959 100644 --- a/pkg/config/client.go +++ b/pkg/config/client.go @@ -68,10 +68,10 @@ type ClientCommonConf struct { // is 0. AdminPort int `ini:"admin_port" json:"admin_port"` // AdminUser specifies the username that the admin server will use for - // login. By default, this value is "admin". + // login. AdminUser string `ini:"admin_user" json:"admin_user"` // AdminPwd specifies the password that the admin server will use for - // login. By default, this value is "admin". + // login. AdminPwd string `ini:"admin_pwd" json:"admin_pwd"` // AssetsDir specifies the local directory that the admin server will load // resources from. If this value is "", assets will be loaded from the diff --git a/pkg/config/server.go b/pkg/config/server.go index 3603bf3..92ca7ba 100644 --- a/pkg/config/server.go +++ b/pkg/config/server.go @@ -72,10 +72,10 @@ type ServerCommonConf struct { // 0. DashboardPort int `ini:"dashboard_port" json:"dashboard_port"` // DashboardUser specifies the username that the dashboard will use for - // login. By default, this value is "admin". + // login. DashboardUser string `ini:"dashboard_user" json:"dashboard_user"` - // DashboardUser specifies the password that the dashboard will use for - // login. By default, this value is "admin". + // DashboardPwd specifies the password that the dashboard will use for + // login. DashboardPwd string `ini:"dashboard_pwd" json:"dashboard_pwd"` // EnablePrometheus will export prometheus metrics on {dashboard_addr}:{dashboard_port} // in /metrics api. @@ -181,8 +181,8 @@ func GetDefaultServerConf() ServerCommonConf { VhostHTTPTimeout: 60, DashboardAddr: "0.0.0.0", DashboardPort: 0, - DashboardUser: "admin", - DashboardPwd: "admin", + DashboardUser: "", + DashboardPwd: "", EnablePrometheus: false, AssetsDir: "", LogFile: "console", diff --git a/pkg/config/server_test.go b/pkg/config/server_test.go index 1f03898..18f6d7a 100644 --- a/pkg/config/server_test.go +++ b/pkg/config/server_test.go @@ -180,8 +180,8 @@ func Test_LoadServerCommonConf(t *testing.T) { ProxyBindAddr: "0.0.0.9", VhostHTTPTimeout: 60, DashboardAddr: "0.0.0.0", - DashboardUser: "admin", - DashboardPwd: "admin", + DashboardUser: "", + DashboardPwd: "", EnablePrometheus: false, LogFile: "console", LogWay: "console",