From 6ce9f75ee7cbf4736d34d63538d057bdf816fd80 Mon Sep 17 00:00:00 2001
From: lily <lily>
Date: Tue, 13 Sep 2016 10:08:15 +0800
Subject: [PATCH] add md5 and getfoldersize

---
 src/com/dao/mapper/data-detaisl-mapper.xml    |   3 +-
 src/com/platform/glusterfs/CheckoutMD5.java   | 106 +++++++++++++++
 src/com/platform/glusterfs/ClusterInfo.java   |   4 +-
 src/com/platform/glusterfs/GetTreeData.java   |  14 +-
 src/com/platform/glusterfs/SetCluster.java    |  56 +++++++-
 src/com/platform/glusterfs/ShowData.java      | 121 +++++++++++-------
 src/com/platform/glusterfs/VolumeInfo.java    |  16 ++-
 src/com/platform/service/DataInfoService.java |   1 +
 src/com/platform/utils/Constant.java          |  28 ++--
 src/com/platform/utils/FileOperateHelper.java |  14 +-
 src/com/platform/utils/GanymedSSH.java        |  38 +++---
 src/com/platform/utils/Support.java           |  31 +++++
 src/com/platform/utils/TestSupport.java       |  14 --
 13 files changed, 338 insertions(+), 108 deletions(-)
 create mode 100644 src/com/platform/glusterfs/CheckoutMD5.java
 create mode 100644 src/com/platform/utils/Support.java
 delete mode 100644 src/com/platform/utils/TestSupport.java

diff --git a/src/com/dao/mapper/data-detaisl-mapper.xml b/src/com/dao/mapper/data-detaisl-mapper.xml
index 52b98767..d0f8d7c7 100644
--- a/src/com/dao/mapper/data-detaisl-mapper.xml
+++ b/src/com/dao/mapper/data-detaisl-mapper.xml
@@ -62,7 +62,8 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 	</sql>
 
 	<!-- 获取数据符合筛选条件的全部记录信息 -->
-	<select id="getLimitedDataInfoEntities" parameterType="PagerOptions"
+	<select id="3
+	" parameterType="PagerOptions"
 		resultMap="getEntityByText">
 		SELECT
 		id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,data_year
diff --git a/src/com/platform/glusterfs/CheckoutMD5.java b/src/com/platform/glusterfs/CheckoutMD5.java
new file mode 100644
index 00000000..d0be3dad
--- /dev/null
+++ b/src/com/platform/glusterfs/CheckoutMD5.java
@@ -0,0 +1,106 @@
+package com.platform.glusterfs;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.aspectj.weaver.ast.And;
+
+import com.mysql.jdbc.log.Log;
+import com.platform.utils.Constant;
+
+public class CheckoutMD5 {
+	public static Logger log = Logger.getLogger(CheckoutMD5.class);
+	String sourcePath;
+	String destPath;
+	String dataName;
+	// String cmd_crateSourceMD5File="find "+sourcePath+dataName+"/app/ -type f
+	// -print0 | xargs -0 md5sum | sort >"+deskPath+dataName+"_md5.txt";
+	String cmd_getSourceMD5File;
+	// String cmd_crateDestMD5File="find "+destPath+dataName+"/app/ -type f
+	// -print0 | xargs -0 md5sum | sort >"+deskPath+dataName+"_md5.txt";
+	String cmd_getDestMD5File;
+	Map<String, String> source_md5 = new HashMap<String, String>();
+	Map<String, String> dest_md5 = new HashMap<String, String>();
+
+	public CheckoutMD5() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public CheckoutMD5(String sourcePath, String destPath, String dataName) {
+		// TODO Auto-generated constructor stub
+		this.sourcePath = sourcePath;
+		this.destPath = destPath;
+		this.dataName = dataName;
+		cmd_getSourceMD5File = "find " + sourcePath + dataName + "/app/ -type f -print0 | xargs -0 md5sum | sort ";
+		cmd_getDestMD5File = "find " + destPath + dataName + "/app/ -type f -print0 | xargs -0 md5sum | sort ";
+	}
+
+	/**
+	 * 文件夹校验 校验sourcePath和destPath是否完全相同，如果相同，返回1；
+	 * 如果不相同，返回0，如果获取文件MD5出错，返回-1；如何源文件不存在返回-2；目标文件不存在，返回-3；
+	 * 
+	 * @param sourcePath
+	 * @param destPath
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public int checkoutMD5Folder(String sourcePath, String destPath) {
+		log.info("start checkout md5 "+sourcePath+" and "+ destPath);
+		List<String> wrong_files = new ArrayList<String>();
+		String source_cmd = "find " + sourcePath + " -type f -print0 | xargs -0 md5sum";
+		String dest_cmd = "find " + destPath + " -type f -print0 | xargs -0 md5sum";
+		List<String> sourceReStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(source_cmd);
+		if (sourceReStrings == null || sourceReStrings.size() == 0) {
+			log.error("get " + sourcePath + " MD5 error!");
+			return -1;
+		}
+		if(sourceReStrings.get(0).contains(Constant.noSuchFile)){
+			log.error(sourcePath+" is not exist!");
+			return -2;
+		}
+		List<String> destReStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(dest_cmd);
+		if (destReStrings == null || destReStrings.size() == 0) {
+			log.error("get " + destReStrings + " MD5 error!");
+			return -1;
+		}
+		if(destReStrings.get(0).contains(Constant.noSuchFile)){
+			log.error(destPath+" is not exist!");
+			return -3;
+		}
+		Map<String, String> source_md5 = new HashMap<String, String>();
+		Map<String, String> dest_md5 = new HashMap<String, String>();
+		for (String line : sourceReStrings) {
+			String[] lines = line.split("  ");
+			String key = lines[1].replace(sourcePath, "").trim();
+			String value = lines[0].trim();
+			source_md5.put(key, value);
+		}
+		for (String line : destReStrings) {
+			String[] lines = line.split("  ");
+			String key = lines[1].replace(destPath, "").trim();
+			String value = lines[0].trim();
+			dest_md5.put(key, value);
+		}
+		for (Map.Entry<String, String> mapEntry : source_md5.entrySet()) {
+			if (!(dest_md5.containsKey(mapEntry.getKey())
+					&& dest_md5.get(mapEntry.getKey()).equals(mapEntry.getValue()))) {
+				
+				log.info(sourcePath + " and " + destPath + " is not same!");
+				return 0;
+				// System.out.println(mapEntry.getKey());
+			}
+
+		}
+
+		log.info(sourcePath + " and " + destPath + " is  same!");
+		return 1;
+	}
+
+	public static void main(String[] args) {
+		CheckoutMD5 checkoutMD5 = new CheckoutMD5();
+		System.out.println(checkoutMD5.checkoutMD5Folder("/home/v1_copy","/home/ubuntu"));
+	}
+}
diff --git a/src/com/platform/glusterfs/ClusterInfo.java b/src/com/platform/glusterfs/ClusterInfo.java
index fdf94b55..e02ce65b 100644
--- a/src/com/platform/glusterfs/ClusterInfo.java
+++ b/src/com/platform/glusterfs/ClusterInfo.java
@@ -31,7 +31,7 @@ public class ClusterInfo {
 		log.info("get cluster info");
 		Map<String, String> peerIps = new HashMap<String, String>();
 
-		List<String> reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser, Constant.rootPasswd, Constant.port, Constant.glusterPeerStatus);
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(Constant.glusterPeerStatus);
 		if (reStrings == null) {
 			log.error("1101 command get result is null");
 			return null;
@@ -104,7 +104,7 @@ public class ClusterInfo {
 	
 	
 	public static void main(String[] args) {
-		PropertyConfigurator.configure("log4j.properties");
+//		PropertyConfigurator.configure("log4j.properties");
 		System.out.println(new ClusterInfo().showClusterInfo());
 	}
 }
diff --git a/src/com/platform/glusterfs/GetTreeData.java b/src/com/platform/glusterfs/GetTreeData.java
index 2e391ff4..2c59f35f 100644
--- a/src/com/platform/glusterfs/GetTreeData.java
+++ b/src/com/platform/glusterfs/GetTreeData.java
@@ -68,16 +68,17 @@ public class GetTreeData {
 	 */
 	public FolderNode getDatasWithShell(String name) {
 		if(name.endsWith("/")){
-			name=name.substring(0, name.length());
+			name=name.substring(0, name.length()-1);
 		}
-		String names[]=name.split("/");
-		String only_name=names[names.length-1];
+//		String names[]=name.split("/");
+//		String only_name=names[names.length-1];
 		FolderNode fileNode = new FolderNode(name);
 		fileNode.setPath(name);
 		
-		String shellComment=new FileOperateHelper().fileReaderAndendline(Constant.fileGetTreeData);
+//		String shellComment= new FileOperateHelper().fileReaderAndendline(Constant.fileGetTreeData);
+		String shellComment= Constant.strGetTreeData;
 		String sh_path="/getTreedata.sh";
-		String cmd="echo -e "+shellComment+" > "+sh_path+" & chmod +x "+sh_path;
+		String cmd="echo -e \""+shellComment+"\" > "+sh_path+" & chmod +x "+sh_path;
 		Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
 //		Map<String, String> files = showData.showFolderData(name);
 		List<String> files=Constant.ganymedSSH.execCmdWaitAcquiescent(sh_path+" "+name);
@@ -97,7 +98,8 @@ public class GetTreeData {
 	public void test_getTreeData() {
 	
 		GetTreeData getTreeData=new GetTreeData();
-		FolderNode fileOrFolder=getTreeData.getDatas("/home");
+//		FolderNode fileOrFolder=getTreeData.getDatas("/home/gfs_ftp_point");
+		FolderNode fileOrFolder=getTreeData.getDatasWithShell("/home/gfs_ftp_point/");
 		System.out.println(fileOrFolder);
 	}
 }
diff --git a/src/com/platform/glusterfs/SetCluster.java b/src/com/platform/glusterfs/SetCluster.java
index f0d607db..e63ec41a 100644
--- a/src/com/platform/glusterfs/SetCluster.java
+++ b/src/com/platform/glusterfs/SetCluster.java
@@ -1,11 +1,65 @@
 package com.platform.glusterfs;
 
+import java.util.List;
+
 import org.apache.log4j.Logger;
+import org.hamcrest.core.Is;
+
+import com.platform.utils.Constant;
+import com.platform.utils.Support;
 
 public class SetCluster {
 	public static Logger log =   Logger.getLogger ( SetCluster.class); 
 	
-	public int addPeer(String peerip){
+	/**
+	 * 向集群中添加节点
+	 * 返回1表示添加成功；-1表示ip不合法，-2 表示出错，0表示添加失败
+	 * @param peerip
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public int probePeer(String peerip){
+		if(!Support.checkIP(peerip)){
+			log.error(peerip +"is illegal!" );
+			return -1;
+		}
+		String cmd="gluster peer probe "+peerip;
+		List<String> reStrings=Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		if(reStrings==null || reStrings.size()==0){
+			log.error("detach error! ");
+			return -2;
+		}
+		if(reStrings.contains(Constant.success)){
+			log.info("probe success!");
+			return 1;
+		}
+		log.info("probe failed!");
+		return 0;
+	}
+	
+	/**
+	 * 删除集群中节点
+	 * 返回1表示删除成功；-1表示ip不合法，-2 表示出错，0表示添加失败
+	 * @param peerip
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public int detachPeer(String peerip){
+		if(!Support.checkIP(peerip)){
+			log.error(peerip +"is illegal!" );
+			return -1;
+		}
+		String cmd="gluster peer detach "+peerip;
+		List<String> reStrings=Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		if(reStrings==null || reStrings.size()==0){
+			log.error("detach error! ");
+			return -2;
+		}
+		if(reStrings.contains(Constant.success)){
+			log.info("detach success!");
+			return 1;
+		}
+		log.info("detach failed!");
 		return 0;
 	}
 }
diff --git a/src/com/platform/glusterfs/ShowData.java b/src/com/platform/glusterfs/ShowData.java
index 5996467b..2f5fa3e0 100644
--- a/src/com/platform/glusterfs/ShowData.java
+++ b/src/com/platform/glusterfs/ShowData.java
@@ -7,99 +7,126 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 
-
 import org.apache.log4j.PropertyConfigurator;
 import org.junit.Test;
 
 import com.platform.utils.Constant;
 
-
 public class ShowData {
-	
-	public static Logger log =   Logger.getLogger ( ShowData.class); 
+
+	public static Logger log = Logger.getLogger(ShowData.class);
 
 	/**
-	 * get the data of volumeName Map<string s1,string s2> s1 is data name and s2 is type file or folder
-	 * <功能详细描述>
+	 * get the data of volumeName Map<string s1,string s2> s1 is data name and
+	 * s2 is type file or folder <功能详细描述>
+	 * 
 	 * @param volumeName
 	 * @return
 	 * @see [类、类#方法、类#成员]
 	 */
-	public Map<String,String> showVolumeFiles(String volumeName){
-		log.info("start show the data");		
-		Map<String,String> data_type=new HashMap<String, String>();
+	public Map<String, String> showVolumeFiles(String volumeName) {
+		log.info("start show the data");
+		Map<String, String> data_type = new HashMap<String, String>();
 		/**
 		 * get mount point of volumeName
 		 */
-		String folderName=volumeName;
-		
-		data_type=showFolderData(volumeName);
-		return data_type;
-}
-	/**
-	 * get the data of folder name
-	 * Map<String,String> is folder name and type 1 is file and others is folder
+		String folderName = volumeName;
 
+		data_type = showFolderData(volumeName);
+		return data_type;
+	}
 
+	/**
+	 * get the data of folder name Map<String,String> is folder name and type 1
+	 * is file and others is folder
+	 * 
+	 * 
 	 * @param FolderName
 	 * @return
 	 */
-	public Map<String,String> showFolderData(String folderName){
-		log.info(" start get "+folderName+" data");		
+	public Map<String, String> showFolderData(String folderName) {
+		log.info(" start get " + folderName + " data");
 
+		Map<String, String> data_type = new HashMap<String, String>();
+		String command = "ls -l " + folderName;
 
-		Map<String,String> data_type=new HashMap<String, String>();
-		String command="ls -l "+folderName;
-		
 		/*
-		RunCommand runCommand=new RunCommand();
-		List<String> reStrings=runCommand.runCommandWait(command);
-		*/
-		List<String> reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser, Constant.rootPasswd, Constant.port, command);
-		if(reStrings==null){
+		 * RunCommand runCommand=new RunCommand(); List<String>
+		 * reStrings=runCommand.runCommandWait(command);
+		 */
+		List<String> reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser,
+				Constant.rootPasswd, Constant.port, command);
+		if (reStrings == null) {
 			log.error("2101 command get result is null");
 			return null;
 		}
-		if(reStrings.size()==0){
+		if (reStrings.size() == 0) {
 			log.info("2102 the folder is empty");
 			return data_type;
 		}
-		if(reStrings.get(0).contains("No such file or directory")){
-			log.info("2103 the "+folderName+" is not exists");
+		if (reStrings.get(0).contains("No such file or directory")) {
+			log.info("2103 the " + folderName + " is not exists");
 			return null;
 		}
 		/**
 		 * remove first line total number
 		 */
 		reStrings.remove(0);
-		
-		for(Iterator it2 = reStrings.iterator();it2.hasNext();){
-			String line=(String)it2.next();
-			line=line.replaceAll(" +", " ");
-			String keyValue[]=line.split(" ");
-			if(keyValue.length<9){
-				log.error("2104 "+line+" length is short");
+
+		for (Iterator it2 = reStrings.iterator(); it2.hasNext();) {
+			String line = (String) it2.next();
+			line = line.replaceAll(" +", " ");
+			String keyValue[] = line.split(" ");
+			if (keyValue.length < 9) {
+				log.error("2104 " + line + " length is short");
 				continue;
 			}
-			
+
 			data_type.put(keyValue[8], keyValue[1]);
-						
+
 		}
-		log.info(" get "+folderName+" data successed");	
+		log.info(" get " + folderName + " data successed");
 		return data_type;
 	}
-	
-	
+
 	/**
-	 * 
-	 * <一句话功能简述>
-	 * <功能详细描述>
+	 * 返回folder的大小字节表示
+	 * -2表示获取大小出错，-1表示folder不存在，其他表示folder的大小
+	 * @param folderPath
+	 * @return
 	 * @see [类、类#方法、类#成员]
 	 */
-	@Test
-	public void testShowData(){
+	public long getFolderSize(String folderPath) {
+		log.info("get " + folderPath + " Size ");
+
+		String command = "du -k -d 0 "+folderPath+" | grep  " + folderPath + "|awk  \'{print $1}\'";
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
+		if(reStrings==null || reStrings.size()==0){
+			log.error("get " + folderPath + " Size error!");
+			return -2;
+		}
+		if (reStrings.get(0).contains(Constant.noSuchFile)) {
+			log.error(folderPath+" is not exists");
+			return -1;
+		} 
+		long size = Long.valueOf(reStrings.get(0));
 		
+
+		return size;
+	}
+
+	
+	//@Test
+	public void testShowData() {
+
 		System.out.println(showFolderData("/home"));
 
 	}
+	
+	@Test
+	public void test_getFolderSize() {
+
+		System.out.println(getFolderSize("/home/ubuntu"));
+
+	}
 }
\ No newline at end of file
diff --git a/src/com/platform/glusterfs/VolumeInfo.java b/src/com/platform/glusterfs/VolumeInfo.java
index 66205970..bd6ef7e3 100644
--- a/src/com/platform/glusterfs/VolumeInfo.java
+++ b/src/com/platform/glusterfs/VolumeInfo.java
@@ -210,7 +210,7 @@ public class VolumeInfo {
 
 	public List<String> getVolumeMountPoint(String volumeName) {
 		log.info("get volume MountPoint");
-		
+		List<String> mountPoints = new ArrayList<>();
 		List<String> reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser, Constant.rootPasswd,
 				Constant.port, Constant.df + "|grep " + volumeName + "|awk '{print $6}'");
 		// System.out.println(reStrings);
@@ -220,7 +220,7 @@ public class VolumeInfo {
 		}
 		if(reStrings.size()==0){
 			log.error("11002 "+volumeName+" is no mountpoint");
-			return null;
+			return mountPoints;
 		}
 		
 		char flag = reStrings.get(0).trim().toCharArray()[0];
@@ -228,7 +228,7 @@ public class VolumeInfo {
 			log.error("11003 get result string wrong");
 			return null;
 		}
-		List<String> mountPoints = new ArrayList<>();
+		
 		for(String mountPoint:reStrings){
 		mountPoint=mountPoint.replaceAll(" ", "");
 		mountPoints.add(mountPoint);
@@ -302,12 +302,12 @@ public class VolumeInfo {
 		return brick_size;
 	}
 
-	@Test
+	//@Test
 	public void test_getVolumebricksDataSize() {
 		System.out.println(getVolumebricksDataSize("gfs_ftp"));
 	}
 
-	@Test
+	//@Test
 	public void test_getVolumebricksAvailableSize() {
 		System.out.println(getVolumebricksAvailableSize("gfs_ftp"));
 	}
@@ -316,4 +316,10 @@ public class VolumeInfo {
 	public void test_getVolumeBricks() {
 		getVolumeBricks("gfs_ftp");
 	}
+	
+	 @Test
+		public void test_getVolumeMountPoint() {
+			System.out.println(getVolumeMountPoint("gfs_ftp"));
+			System.out.println(getVolumeMountPoint("v1"));
+		}
 }
diff --git a/src/com/platform/service/DataInfoService.java b/src/com/platform/service/DataInfoService.java
index be0ca7f7..f5102301 100644
--- a/src/com/platform/service/DataInfoService.java
+++ b/src/com/platform/service/DataInfoService.java
@@ -1,3 +1,4 @@
+
 package com.platform.service;
 
 import org.springframework.ui.ModelMap;
diff --git a/src/com/platform/utils/Constant.java b/src/com/platform/utils/Constant.java
index fdfee0d0..b0968c2d 100644
--- a/src/com/platform/utils/Constant.java
+++ b/src/com/platform/utils/Constant.java
@@ -6,17 +6,25 @@ public class Constant {
 	public static String rootUser = "root";
 	public static String rootPasswd = "root";
 	public static String hostIp = "192.168.0.116";
-//	public static String hostIp = "192.168.1.105";
+	// public static String hostIp = "192.168.1.105";
 	public static int port = 22;
-	public static String glusterPeerStatus = "gluster peer status";  
+	public static String glusterPeerStatus = "gluster peer status";
 	public static String glusterVolumeInfo = "gluster volume info ";
 	public static String df = "df -k ";
-	public static String peerincluster_connected="PeerinCluster(Connected)";
-	public static String peerincluster_disconnected="PeerinCluster(Disconnected)";
-	public static String distributed="distributed";
-	public static String replica="replica";
-	public static String stripe="stripe";
-	public static String noVolume="No volumes present";
-	public static GanymedSSH ganymedSSH=new GanymedSSH(hostIp, rootUser, rootPasswd, port);
-	public static String fileGetTreeData="./WEB-INF/config/getTreedata.sh";
+	public static String peerincluster_connected = "PeerinCluster(Connected)";
+	public static String peerincluster_disconnected = "PeerinCluster(Disconnected)";
+	public static String distributed = "distributed";
+	public static String replica = "replica";
+	public static String stripe = "stripe";
+	public static String noVolume = "No volumes present";
+	public static String success = "success";
+	public static String failed = "failed";
+	public static String noSuchFile = "No such file or directory";
+	public static GanymedSSH ganymedSSH = new GanymedSSH(hostIp, rootUser, rootPasswd, port);
+	public static String fileGetTreeData = "WebContent\\WEB-INF\\config\\getTreedata.sh";
+	public static String strGetTreeData = "function ergodic(){\n  "
+			+ "for file in \\`ls \\$1\\`\n  do\n    if [ \"\\$file\" != \"app\" -a -d \\$1\\\"/\\\"\\$file  ]\n    "
+			+ "then\n      ergodic \\$1\"/\"\\$file\n    else\n      local path=\\$1\"/\"\\$file\n      "
+			+ "echo \\$path \n    fi\n  done\n}\n\nIFS=\\$\\'\\n\\'                      "
+			+ "#这个必须要，否则会在文件名中有空格时出错\nINIT_PATH=\".\";\nergodic \\$1\n";
 }
diff --git a/src/com/platform/utils/FileOperateHelper.java b/src/com/platform/utils/FileOperateHelper.java
index d2eed1b5..8150ea3f 100644
--- a/src/com/platform/utils/FileOperateHelper.java
+++ b/src/com/platform/utils/FileOperateHelper.java
@@ -7,6 +7,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
+import org.junit.Test;
+
 /**
  * 文件读写操作帮助类
  * 
@@ -65,14 +67,14 @@ public class FileOperateHelper {
 	 * @param path
 	 * @return
 	 */
-	@SuppressWarnings("resource")
-	public static String fileReaderAndendline(String path) {
+	
+	public String fileReaderAndendline(String path) {
 		StringBuffer sb = new StringBuffer();
 		String tempString = "";
 		try {
 			File file = new File(path);
 			if (!file.exists())
-				return "";
+ 				return "";
 			FileInputStream fis = new FileInputStream(file);
 			BufferedReader br = new BufferedReader(new InputStreamReader(fis));
 			while ((tempString = br.readLine()) != null) {
@@ -83,4 +85,10 @@ public class FileOperateHelper {
 		}
 		return sb.toString();
 	}
+	
+	@Test
+	public void test_fileReaderAndendline(){
+		System.out.println(System.getProperty("user.dir"));
+		System.out.println(fileReaderAndendline(Constant.fileGetTreeData));
+	}
 }
diff --git a/src/com/platform/utils/GanymedSSH.java b/src/com/platform/utils/GanymedSSH.java
index 5db5d2a3..4a3f9b72 100644
--- a/src/com/platform/utils/GanymedSSH.java
+++ b/src/com/platform/utils/GanymedSSH.java
@@ -111,7 +111,7 @@ public class GanymedSSH {
 			BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(stdout));
 			BufferedReader stderrReader = new BufferedReader(new InputStreamReader(stderr));
 			while (true) {
-				String line = stdoutReader.readLine();
+				String line = stderrReader.readLine();
 
 				if (line != null) {
 //					System.out.println(line);
@@ -120,18 +120,19 @@ public class GanymedSSH {
 					break;
 				}
 			}
+			
 			if(reStrings.size()==0){		
-			while (true) {
-				String line = stderrReader.readLine();
+				while (true) {
+					String line = stdoutReader.readLine();
 
-				if (line != null) {
-//					System.out.println(line);
-					reStrings.add(line);
-				} else {
-					break;
+					if (line != null) {
+//						System.out.println(line);
+						reStrings.add(line);
+					} else {
+						break;
+					}
 				}
 			}
-			}
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -188,8 +189,7 @@ public class GanymedSSH {
 		return reStrings;
 	}
 
-	public  Map<String, String> execMD5cmd(String host, String username, String password, int port, String cmd,
-			String prefix) {
+	public  Map<String, String> execMD5cmd(String cmd) {
 		Map<String, String> md5 = new HashMap<String, String>();
 
 		
@@ -199,22 +199,22 @@ public class GanymedSSH {
 			sess = conn.openSession();
 			// 执锟斤拷cmd
 			sess.execCommand(cmd);
+			
 			InputStream stdout = new StreamGobbler(sess.getStdout());
-
-			@SuppressWarnings("resource")
-			BufferedReader br = new BufferedReader(new InputStreamReader(stdout));
+			InputStream stderr = new StreamGobbler(sess.getStderr());
+			BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(stdout));
+			BufferedReader stderrReader = new BufferedReader(new InputStreamReader(stderr));
 			while (true) {
-				String line = br.readLine();
+				String line = stdoutReader.readLine();
+
 				if (line != null) {
 					String[] lines = line.split("  ");
-					String key = lines[1].replace(prefix, "");
-					String value = lines[0];
+					String key = lines[1].trim();
+					String value = lines[0].trim();
 					md5.put(key, value);
-					// System.out.println(key+"\t"+value);
 				} else {
 					break;
 				}
-
 			}
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
diff --git a/src/com/platform/utils/Support.java b/src/com/platform/utils/Support.java
new file mode 100644
index 00000000..1b4cdc92
--- /dev/null
+++ b/src/com/platform/utils/Support.java
@@ -0,0 +1,31 @@
+
+/**
+ * 文件名   :   Support.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  liliy
+ * 版本       :   <版本>
+ * 修改时间：      2016年9月12日
+ * 修改内容：      <修改内容>
+ */
+package com.platform.utils;
+
+import java.util.regex.Pattern;
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    liliy
+ * @version   [版本号，2016年9月12日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+
+public class Support {
+	 public static boolean checkIP(String str) {
+	        Pattern pattern = Pattern
+	                .compile("^((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5]"
+	                        + "|[*])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5]|[*])$");
+	        return pattern.matcher(str).matches();
+	    }
+}
diff --git a/src/com/platform/utils/TestSupport.java b/src/com/platform/utils/TestSupport.java
deleted file mode 100644
index 74d938cb..00000000
--- a/src/com/platform/utils/TestSupport.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.platform.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestSupport {
-public  List<String> strToList(String str) {
-	List<String> reStrings=new ArrayList<String>();
-	for(String one:str.split("\n")){
-		reStrings.add(one);
-	}
-	return reStrings;
-}
-}