Commit 6370e59c authored by Eric's avatar Eric

[update] interactive choose systemuser

parent 42b78fa9
...@@ -162,18 +162,19 @@ func (h *interactiveHandler) chooseSystemUser(systemUsers []model.SystemUser) mo ...@@ -162,18 +162,19 @@ func (h *interactiveHandler) chooseSystemUser(systemUsers []model.SystemUser) mo
highestPriority := systemUsers[length-1].Priority highestPriority := systemUsers[length-1].Priority
displaySystemUsers = append(displaySystemUsers, systemUsers[length-1]) displaySystemUsers = append(displaySystemUsers, systemUsers[length-1])
for i := length - 2; i <= 0; i-- { for i := length - 2; i >= 0; i-- {
if highestPriority == systemUsers[i].Priority { if highestPriority == systemUsers[i].Priority {
displaySystemUsers = append(displaySystemUsers, systemUsers[length-1]) displaySystemUsers = append(displaySystemUsers, systemUsers[i])
} }
} }
if len(displaySystemUsers) == 1 { if len(displaySystemUsers) == 1 {
return displaySystemUsers[0] return displaySystemUsers[0]
} }
table := tablewriter.NewWriter(h.term) table := tablewriter.NewWriter(h.term)
table.SetHeader([]string{"ID", "Username"}) table.SetHeader([]string{"ID", "Username"})
for i := 0; i < len(displaySystemUsers); i++ { for i := 0; i < len(displaySystemUsers); i++ {
table.Append([]string{strconv.Itoa(i + 1), systemUsers[i].Username}) table.Append([]string{strconv.Itoa(i + 1), displaySystemUsers[i].Username})
} }
table.SetBorder(false) table.SetBorder(false)
count := 0 count := 0
...@@ -185,8 +186,8 @@ func (h *interactiveHandler) chooseSystemUser(systemUsers []model.SystemUser) mo ...@@ -185,8 +186,8 @@ func (h *interactiveHandler) chooseSystemUser(systemUsers []model.SystemUser) mo
continue continue
} }
if num, err := strconv.Atoi(line); err == nil { if num, err := strconv.Atoi(line); err == nil {
if num > 0 && num <= len(systemUsers) { if num > 0 && num <= len(displaySystemUsers) {
return systemUsers[num-1] return displaySystemUsers[num-1]
} }
} }
count++ count++
...@@ -197,7 +198,6 @@ func (h *interactiveHandler) chooseSystemUser(systemUsers []model.SystemUser) mo ...@@ -197,7 +198,6 @@ func (h *interactiveHandler) chooseSystemUser(systemUsers []model.SystemUser) mo
// 当资产的数量为1的时候,就进行代理转化 // 当资产的数量为1的时候,就进行代理转化
func (h *interactiveHandler) displayAssetsOrProxy(assets []model.Asset) { func (h *interactiveHandler) displayAssetsOrProxy(assets []model.Asset) {
if len(assets) == 1 { if len(assets) == 1 {
logger.Debug(assets[0].SystemUsers)
systemUser := h.chooseSystemUser(assets[0].SystemUsers) systemUser := h.chooseSystemUser(assets[0].SystemUsers)
h.assetSelect = &assets[0] h.assetSelect = &assets[0]
h.systemUserSelect = &systemUser h.systemUserSelect = &systemUser
......
...@@ -158,7 +158,6 @@ func (sc *ServerSSHConnection) invokeShell(h, w int, term string) (err error) { ...@@ -158,7 +158,6 @@ func (sc *ServerSSHConnection) invokeShell(h, w int, term string) (err error) {
func (sc *ServerSSHConnection) Connect(h, w int, term string) (err error) { func (sc *ServerSSHConnection) Connect(h, w int, term string) (err error) {
_, err = sc.connect() _, err = sc.connect()
fmt.Println("error")
if err != nil { if err != nil {
return return
} }
......
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