From ad9dc965d69c7ed31e6f2d342360b0ff5a603095 Mon Sep 17 00:00:00 2001
From: linxiaozhi <linxiaozhi@linxiaozhi.com>
Date: Mon, 18 Feb 2019 14:41:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=99=A8ui?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jobs/job.go            | 8 ++++----
 views/server/add.html  | 6 +++---
 views/server/copy.html | 6 +++---
 views/server/edit.html | 6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

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 @@
         <div class="layui-form-item">
             <label class="layui-form-label mw200">验证登录类型</label>
             <div class="layui-input-inline mw400">
-                <input type="radio" name="type" lay-verify="type" value="0" title="密码" checked>
-                <input type="radio" name="type" lay-verify="type" value="1" title="密钥" >
+                <input type="radio" name="type" lay-verify="type" lay-filter="type" value="0" title="密码" checked>
+                <input type="radio" name="type" lay-verify="type" lay-filter="type" value="1" title="密钥" >
             </div>
             <div class="layui-form-mid layui-word-aux"></div>
         </div>
@@ -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 @@
         <div class="layui-form-item">
             <label class="layui-form-label mw200">验证登录类型</label>
             <div class="layui-input-inline mw400">
-                <input type="radio" name="type" lay-verify="type" value="0" title="密码" {{if eq .server.type 0}}checked{{end}}>
-                <input type="radio" name="type" lay-verify="type" value="1" title="密钥" {{if eq .server.type 1}}checked{{end}}>
+                <input type="radio" name="type" lay-verify="type" lay-filter="type" value="0" title="密码" {{if eq .server.type 0}}checked{{end}}>
+                <input type="radio" name="type" lay-verify="type" lay-filter="type" value="1" title="密钥" {{if eq .server.type 1}}checked{{end}}>
             </div>
             <div class="layui-form-mid layui-word-aux"></div>
         </div>
@@ -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 @@
         <div class="layui-form-item">
             <label class="layui-form-label mw200">验证登录类型</label>
             <div class="layui-input-inline mw400">
-                <input type="radio" name="type" lay-verify="type" value="0" title="密码" {{if eq .server.type 0}}checked{{end}}>
-                <input type="radio" name="type" lay-verify="type" value="1" title="密钥" {{if eq .server.type 1}}checked{{end}}>
+                <input type="radio" name="type" lay-verify="type" lay-filter="type" value="0" title="密码" {{if eq .server.type 0}}checked{{end}}>
+                <input type="radio" name="type" lay-verify="type" lay-filter="type" value="1" title="密钥" {{if eq .server.type 1}}checked{{end}}>
             </div>
             <div class="layui-form-mid layui-word-aux"></div>
         </div>
@@ -132,7 +132,7 @@
             })
             return;
         }
-        form.on('radio', function(data){
+        form.on('radio(type)', function(data){
             if(data.value==1){
                 $(".key").show();
                 $(".password").hide();