修复readir的类型错误

fssc/internal/handler/nfhandler.go

@@ -20,7 +20,7 @@ type Response struct {
 // 文件输出的结构
 type FileJson struct {
 	Fname   string `json:"fname"`
-	Dirflag int    `json:dirflag`
+	Dirflag bool   `json:"dirflag"`
 }
 
 type FilesListJson struct {
@@ -69,12 +69,14 @@ func NfTest(w http.ResponseWriter, r *http.Request) {
 		// data.Files = files
 
 		for _, v := range files {
-			flist.Flist = append(flist.Flist, FileJson{Fname: v.Name(), Dirflag: 1})
+
+			// drflag:= v.IsDir()?"1":"0"
+			flist.Flist = append(flist.Flist, FileJson{Fname: v.Name(), Dirflag: v.IsDir()})
 		}
 
 	} else {
-		//data.FileName = filepath.Base(realFilePath)
+		data.FileName = filepath.Base(realFilePath)
-		flist.Flist = append(flist.Flist, FileJson{Fname: filepath.Base(realFilePath), Dirflag: 0})
+		// flist.Flist = append(flist.Flist, FileJson{Fname: filepath.Base(realFilePath), Dirflag: "1"})
 	}
 
 	// respone file list

fssc/web/wbconsole.tmpl

@@ -21,6 +21,11 @@
 			overflow:scroll;
 		}
 
+		.flist{
+			height:360px;
+			overflow:auto;
+		}
+
 		.icon {
 			display: inline-block;
 			width: 24px;
@@ -57,21 +62,13 @@
 	<div class="container">
 		<div class="col-md-12 no-padding">
 			<div class="form-group col-md-10">
-				<div class="input-group">
-					<input type="hidden" class="form-control" name="bpath" value="" />
-				</div>
-
-				<div class="input-group">
-					<input type="hidden" class="form-control" name="bfile" value="" />
-				</div>
-
 				<div class="input-group">
 					<div class="input-group-addon">服务器ip</div>
-					<input type="text" class="form-control" name="sip" placeholder="eg:192.168.66.99">
+					<input type="text" class="form-control" name="sip" id="scip" placeholder="eg:192.168.66.99">
 				</div>
 			</div>
 			<div class="form-group col-md-2">
-				<button type="submit" class="btn btn-primary">Transfer</button>
+				<button type="button" id="entsip" class="btn btn-primary">Transfer</button>
 			</div>
 		</div>
 	</div>
@@ -149,9 +146,7 @@
 			<div class="panel">
 				<div class="panel-heading">运行状态</div>
 				<div class="panel-body" >
-					<ul class="list-group">
+					<ul class="list-group flist" id="rstatus"></ul>
-						<li class="list-group-item">aa 复制完成</li>
-					</ul>
 				</div>
 			</div>
 		</div>
@@ -159,7 +154,15 @@
 
 	<script type="text/javascript">
 		$(function(){
+			// 获取ip
+			$("#entsip").on("click",function(){
+				//
+				var sip = $("#scip").val();
+				var html = "<li class=\"list-group-item\">输入目标服务器"+sip+"</li>";
 				//
+				$("#rstatus").append(html)
+			})
+
 		});
 	</script>
 </body>

fsv2/handler/serverinfo.go

@@ -20,7 +20,7 @@ type Response struct {
 // 文件输出的结构
 type FileJson struct {
 	Fname   string `json:"fname"`
-	Dirflag string `json:"dirflag"`
+	Dirflag bool   `json:"dirflag"`
 }
 
 type FilesListJson struct {
@@ -69,12 +69,11 @@ func SerInfo(w http.ResponseWriter, r *http.Request) {
 		// data.Files = files
 
 		for _, v := range files {
-			flist.Flist = append(flist.Flist, FileJson{Fname: v.Name(), Dirflag: 1})
+			flist.Flist = append(flist.Flist, FileJson{Fname: v.Name(), Dirflag: v.IsDir()})
 		}
 
 	} else {
-		//data.FileName = filepath.Base(realFilePath)
+		data.FileName = filepath.Base(realFilePath)
-		flist.Flist = append(flist.Flist, FileJson{Fname: filepath.Base(realFilePath), Dirflag: 0})
 	}
 
 	// respone file list