diff --git a/jobs/job.go b/jobs/job.go index 5b91c89..9539c43 100644 --- a/jobs/job.go +++ b/jobs/job.go @@ -272,20 +272,20 @@ func RemoteCommandJobByTelnetPassword(id int, name string, command string, serve commandArr := strings.Split(command, "\n") - out := "" + out, n := "", 0 for _, c := range commandArr { _, err = conn.Write([]byte(c + "\r\n")) if err != nil { return "", "", err, false } - _, err = conn.Read(buf) + n, err = conn.Read(buf) - out = out + gbkAsUtf8(string(buf[:])) + out = out + gbkAsUtf8(string(buf[0:n])) if err != nil || strings.Contains(out, "'"+c+"' is not recognized as an internal or external command") || strings.Contains(out, "'"+c+"' 不是内部或外部命令,也不是可运行的程序") { - return "", "", fmt.Errorf(gbkAsUtf8(string(buf[:]))), false + return out, "", fmt.Errorf(gbkAsUtf8(string(buf[0:n]))), false } } diff --git a/views/server/add.html b/views/server/add.html index be07f4e..c81b228 100644 --- a/views/server/add.html +++ b/views/server/add.html @@ -71,8 +71,8 @@
- - + +
@@ -133,7 +133,7 @@ }) return; } - form.on('radio', function(data){ + form.on('radio(type)', function(data){ if(data.value==1){ $(".key").show(); $(".password").hide(); diff --git a/views/server/copy.html b/views/server/copy.html index 7261a16..a804399 100644 --- a/views/server/copy.html +++ b/views/server/copy.html @@ -71,8 +71,8 @@
- - + +
@@ -131,7 +131,7 @@ }) return; } - form.on('radio', function(data){ + form.on('radio(type)', function(data){ if(data.value==1){ $(".key").show(); $(".password").hide(); diff --git a/views/server/edit.html b/views/server/edit.html index 02155a1..3e09f8c 100644 --- a/views/server/edit.html +++ b/views/server/edit.html @@ -71,8 +71,8 @@
- - + +
@@ -132,7 +132,7 @@ }) return; } - form.on('radio', function(data){ + form.on('radio(type)', function(data){ if(data.value==1){ $(".key").show(); $(".password").hide();