Commit 149e966d authored by Eric's avatar Eric

[update] fix display bugs

parent 8098fb4e
......@@ -219,13 +219,15 @@ func (h *interactiveHandler) chooseSystemUser(systemUsers []model.SystemUser) mo
}
table := tablewriter.NewWriter(h.term)
table.SetHeader([]string{"ID", "Username"})
table.SetHeader([]string{"ID", "Name"})
for i := 0; i < len(displaySystemUsers); i++ {
table.Append([]string{strconv.Itoa(i + 1), displaySystemUsers[i].Username})
table.Append([]string{strconv.Itoa(i + 1), displaySystemUsers[i].Name})
}
table.SetBorder(false)
table.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
table.SetAlignment(tablewriter.ALIGN_LEFT)
h.term.SetPrompt("Select User: ")
h.term.SetPrompt("ID> ")
defer h.term.SetPrompt("Opt> ")
for count := 0; count < 3; count++ {
table.Render()
......
......@@ -29,7 +29,7 @@ func (p *ProxyServer) getSystemUserAuthOrManualSet() {
if p.SystemUser.LoginMode == model.LoginModeManual ||
(p.SystemUser.Password == "" && p.SystemUser.PrivateKey == "") {
term := utils.NewTerminal(p.UserConn, "password: ")
line, err := term.ReadPassword("password")
line, err := term.ReadPassword(fmt.Sprintf("%s's password: ", p.SystemUser.Username))
if err != nil {
logger.Errorf("Get password from user err %s", err.Error())
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment