修bug

.classpath

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="D:/git_gfs/aggregation-platform/WebContent/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
 </classpath>

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7

.settings/org.eclipse.wst.common.component

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="jfinal-demo">
+        <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <property name="context-root" value="jfinal-demo"/>
+        <property name="java-output-path" value="/jfinal-demo/WebContent/WEB-INF/classes"/>
+    </wb-module>
+</project-modules>

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.7"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>

WebContent/WEB-INF/classes/.gitignore

@@ -0,0 +1 @@
+/com

WebContent/WEB-INF/web.xml

@@ -3,7 +3,7 @@
 	xmlns="http://java.sun.com/xml/ns/javaee"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
 	id="WebApp_ID" version="3.0">
-	<display-name>jfinal-demo</display-name>
+	<display-name>JFinal-demo</display-name>
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>
 		<welcome-file>index.htm</welcome-file>

src/com/platform/config/JfinalConfig.java

@@ -9,12 +9,16 @@ import com.jfinal.config.Routes;
 import com.jfinal.core.JFinal;
 import com.platform.controller.GfsController;
 import com.platform.controller.HelloController;
+import com.platform.utils.Constant;
+import com.platform.utils.GanymedSSH;
+import com.platform.utils.ThreadVolume;
 
 public class JfinalConfig extends JFinalConfig {
 
 	@Override
 	public void configConstant(Constants me) {
 		me.setDevMode(true);
+		Constant.ganymedSSH = new GanymedSSH(Constant.hostIp, Constant.rootUser, Constant.rootPasswd, Constant.port);
 	}
 
 	@Override
@@ -37,5 +41,7 @@ public class JfinalConfig extends JFinalConfig {
 	
 	public static void main(String[] args) {
 		JFinal.start("WebRoot", 80, "/", 5);
+//		new ThreadVolume().start();
+		
 	}
 }

src/com/platform/controller/GfsController.java

@@ -1,14 +1,18 @@
 package com.platform.controller;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import com.alibaba.druid.util.DaemonThreadFactory;
 import com.jfinal.core.Controller;
 import com.platform.entities.FolderNode;
 import com.platform.entities.VolumeEntity;
 import com.platform.utils.CacheTreeData;
+import com.platform.utils.ThreadVolume;
 import com.platform.utils.getTreeDataByPath;
 
 public class GfsController extends Controller {
@@ -24,7 +28,10 @@ public class GfsController extends Controller {
 	}
 	
 	public void getAllvolume(){
-
+		Date a = new Date();
+		//查询volume信息
+		new ThreadVolume().getVolumeMsg();
+		//获得volume信息
 		List<VolumeEntity> volumeList = CacheTreeData.getVolumeList();
 		if (null == volumeList) {
 			JSONObject jsondata = JSONObject.fromObject(new ArrayList<VolumeEntity>());
@@ -41,8 +48,11 @@ public class GfsController extends Controller {
 				volume.setFolder(list);
 			}
 		}
-		JSONObject jsondata = JSONObject.fromObject(volumeList);
-		renderJson(jsondata.toString());
+		 List<FolderNode> folList = CacheTreeData.getFolders();
+		JSONArray jsondata = JSONArray.fromObject(volumeList);
+		JSONArray jsonfold = JSONArray.fromObject(folList);
+		Date b = new Date();
+		renderJson(jsondata.toString()+" :"+jsonfold.toString()+ " :"+ (b.getTime()-a.getTime()));
 	}
 	
 	public FolderNode getFolder(String path) {

src/com/platform/glusterfs/ClusterInfo.java

@@ -16,6 +16,7 @@ import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
 import com.platform.utils.Constant;
+import com.platform.utils.ProcessMyUtil;
 
 import ch.ethz.ssh2.Connection;
 
@@ -27,6 +28,7 @@ import ch.ethz.ssh2.Connection;
  * @since     [产品/模块版本]
  */
 public class ClusterInfo {
+	ProcessMyUtil proMy = new ProcessMyUtil();
 	public static Logger log = Logger.getLogger(ClusterInfo.class);
 
 	/**
@@ -42,7 +44,7 @@ public class ClusterInfo {
 //		log.info("get cluster info");
 		Map<String, String> peerIps = new HashMap<String, String>();
 		peerIps.put(Constant.hostIp, Constant.peerincluster_connected);
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(Constant.glusterPeerStatus);
+		List<String> reStrings = proMy.execCmdWaitAcquiescent(Constant.glusterPeerStatus);
 		if (reStrings == null) {
 			log.error("1101 command get result is null");
 			return null;

src/com/platform/glusterfs/GetTreeData.java

@@ -1,15 +1,24 @@
 package com.platform.glusterfs;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import net.sf.json.JSONObject;
+
 import org.junit.Test;
+
 import com.platform.entities.FolderNode;
 import com.platform.utils.Constant;
 import com.platform.utils.FileOperateHelper;
 import com.platform.utils.GanymedSSH;
 
+import freemarker.core._RegexBuiltins.replace_reBI;
+
 /**
  * <一句话功能简述> 获得GFS某个目录下的子目录
  * <功能详细描述>
@@ -101,23 +110,6 @@ public class GetTreeData {
 		FolderNode fileOrFolder=getTreeData.getDatasWithShell("/home/gfs_ftp_point/");
 		System.out.println(fileOrFolder);
 	}
-}
-/*
-class FileOrFolder {
-	String name;
-	int isFolder; // 1 is file and other integer is folder show children number
-	List<FileOrFolder> children;
-
-	public FileOrFolder(String name) {
-		// TODO Auto-generated constructor stub
-		this.name = name;
-	}
 	
-	public FileOrFolder(String name, int isFolder) {
-		// TODO Auto-generated constructor stub
-		this.name = name;
-		this.isFolder = isFolder;
-	}
 }
 
-*/

src/com/platform/glusterfs/ShowData.java

@@ -12,10 +12,13 @@ import org.apache.log4j.PropertyConfigurator;
 import org.junit.Test;
 
 import com.platform.utils.Constant;
+import com.platform.utils.ProcessMyUtil;
 
 
 public class ShowData {
 	
+	ProcessMyUtil proMy = new ProcessMyUtil();
+	
 	public static Logger log =   Logger.getLogger ( ShowData.class); 
 
 	/**
@@ -55,7 +58,7 @@ public class ShowData {
 		 * RunCommand runCommand=new RunCommand(); List<String>
 		 * reStrings=runCommand.runCommandWait(command);
 		 */
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
+		List<String> reStrings = proMy.execCmdWaitAcquiescent(command);
 		if (reStrings == null) {
 			log.error("2101 command get result is null");
 			return null;
@@ -100,7 +103,7 @@ public class ShowData {
 //		log.info("get " + folderPath + " Size ");
 
 		String command = "du -k -d 0 "+folderPath+" | grep  " + folderPath + "|awk  \'{print $1}\'";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
+		List<String> reStrings = proMy.execCmdWaitAcquiescent(command);
 		if(reStrings==null || reStrings.size()==0){
 			log.error("get " + folderPath + " Size error!");
 			return -2;

src/com/platform/glusterfs/VolumeInfo.java

@@ -15,6 +15,7 @@ import org.omg.CosNaming.NamingContextExtPackage.StringNameHelper;
 
 import com.platform.utils.Constant;
 import com.platform.utils.GanymedSSH;
+import com.platform.utils.ProcessMyUtil;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
  * @since [产品/模块版本]
  */
 public class VolumeInfo {
+	ProcessMyUtil proMy = new ProcessMyUtil();
 	public static Logger log = Logger.getLogger(VolumeInfo.class);
 
 	/**
@@ -47,8 +49,7 @@ public class VolumeInfo {
 		 * runCommand.runCommandWait(command);
 		 */
 		
-		List<String> reStrings = Constant.ganymedSSH
-				.execCmdWaitAcquiescent(Constant.glusterVolumeInfo + "|grep ^Volume.Name");
+		List<String> reStrings = proMy.execCmdWaitAcquiescent(Constant.glusterVolumeInfo + "|grep ^Volume.Name");
 		// System.out.println(reStrings);
 		if (reStrings == null) {
 			log.error("1401 get result is null");
@@ -88,8 +89,7 @@ public class VolumeInfo {
 //		log.info("get volume type");
 		String volType = "";
 
-		List<String> reStrings = Constant.ganymedSSH
-				.execCmdWaitAcquiescent(Constant.glusterVolumeInfo + volumeName + "|grep ^Type");
+		List<String> reStrings = proMy.execCmdWaitAcquiescent(Constant.glusterVolumeInfo + volumeName + "|grep ^Type");
 		// System.out.println(reStrings);
 		if (reStrings == null) {
 			log.error("1501 get result is null");
@@ -127,7 +127,7 @@ public class VolumeInfo {
 //		log.info("get volume status");
 		String volStatus = "";
 		String cmd = Constant.glusterVolumeInfo + " " + volumeName + " |grep ^Status";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		List<String> reStrings = proMy.execCmdWaitAcquiescent(cmd);
 		// System.out.println(reStrings);
 		if (reStrings == null) {
 			log.error("1701 get result is null");
@@ -167,7 +167,7 @@ public class VolumeInfo {
 		Long allSize = 0L;
 
 		String cmd = Constant.df + " | grep " + volumeName + "|awk '{print $4}'";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		List<String> reStrings = proMy.execCmdWaitAcquiescent(cmd);
 		// System.out.println(reStrings);
 		if (reStrings == null) {
 			log.error("1802 get result is error");
@@ -203,7 +203,7 @@ public class VolumeInfo {
 		}
 
 		String cmd = "df | grep " + volumeName + "|awk '{print $3}'";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		List<String> reStrings = proMy.execCmdWaitAcquiescent(cmd);
 		// System.out.println(reStrings);
 		if (reStrings == null) {
 			log.error("1901 get result is null");
@@ -233,7 +233,7 @@ public class VolumeInfo {
 //		log.info("get volume bricks");
 
 		String cmd = "gluster volume info " + volumeName + " |grep ^Brick'[0-9]\\+' |awk '{print $2}'";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		List<String> reStrings = proMy.execCmdWaitAcquiescent(cmd);
 		// System.out.println(reStrings);
 		if (reStrings == null) {
 			log.error("1601 get volume bricks wrong");
@@ -257,7 +257,7 @@ public class VolumeInfo {
 //		log.info("get volume MountPoint");
 		List<String> mountPoints = new ArrayList<>();
 		String cmd=Constant.df + "|grep " + volumeName + "|awk '{print $6}'";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		List<String> reStrings = proMy.execCmdWaitAcquiescent(cmd);
 		// System.out.println(reStrings);
 		if (reStrings == null) {
 			log.error("11001 get result string wrong");

src/com/platform/service/VolumeService.java

@@ -28,92 +28,7 @@ public class VolumeService {
 	private GetTreeData gfsTree = new GetTreeData();
 	
 	public void getVolumeMsg() {
-		List<FolderNode> folderlist = new ArrayList<FolderNode>();
-		List<VolumeEntity> volumeList = new ArrayList<VolumeEntity>();
-		// brick状态 map集合
-		Map<String, String> brickStatusMap = cluster.showClusterInfo();
 		
-		// 查询 volume name
-		List<String> volumeNameList = volumeInfo.showAllVolumeName();
-		if (null != volumeNameList) {
-			for (String volumeName : volumeNameList) {
-				try {
-					VolumeEntity volume = new VolumeEntity();
-					volume.setName(volumeName);
-					List<String> path = volumeInfo
-							.getVolumeMountPoint(volumeName);
-					// 默认加载第一个路径
-					if (null != path) {
-						for (String one : path) {
-							if (!one.contains("df")) {
-								volume.setPath(one);
-							}
-						}
-					}
-					if (null == volume.getPath()) {
-						volume.setPath("");
-					}
-					volume.setAllSize(volumeInfo
-							.getVolumeAvailableSize(volumeName)
-							+ volumeInfo.getVolumeUseSize(volumeName));
-					// 状态Started,Stopped,Created
-					String status = volumeInfo.getVolumeStatus(volumeName);
-					if ("Started".equals(status)) {
-						volume.setStatus(true);
-					} else {
-						volume.setStatus(false);
-					}
-					volume.setUsedSize(volumeInfo.getVolumeUseSize(volumeName));
-					volume.setType(volumeInfo.getVolumeType(volumeName));
-					// TODO 查询brick--
-					// 返回 ip:path
-					List<String> brickStrs = volumeInfo
-							.getVolumeBricks(volumeName);
-					// brick已用大小：
-					Map<String, Double> usedSize = volumeInfo
-							.getVolumebricksDataSize(volumeName);
-					Map<String, Double> availableSize = volumeInfo
-							.getVolumebricksAvailableSize(volumeName);
-
-					List<Brick> brickList = new ArrayList<Brick>();
-					for (String brickIpPath : brickStrs) {
-						Brick b = new Brick();
-						String ipAndpath[] = brickIpPath.split(":");
-						String brickip = ipAndpath[0];
-						String brickpath = ipAndpath[1];
-						// iP , path ,
-						b.setIp(brickip);
-						if (brickStatusMap == null
-								|| brickStatusMap.size() == 0) {
-							b.setStatus(false);
-						} else if (brickStatusMap.containsKey(brickip)) {
-							b.setStatus(true);
-						} else {
-							b.setStatus(false);
-						}
-						b.setPath(brickpath);
-						b.setAvailableSize(availableSize.get(brickIpPath));
-						b.setUsedSize(usedSize.get(brickIpPath));
-						brickList.add(b);
-					}
-					volume.setBrick(brickList);
-
-					// 默认加载第一个路径
-					if (null != path && path.size() > 0) {
-						// 装入 folder：
-						// 查询 每个 volume 下的 folder
-						FolderNode foldertmp = gfsTree.getDatas(path.get(0));
-						folderlist.add(foldertmp);
-					}
-					volumeList.add(volume);
-				} catch (Exception e) {
-					log.error(e.getMessage(), e);
-				}
-			}
-		}
-		//  更新folder 目录
-		CacheTreeData.setFolders(folderlist);
-		CacheTreeData.setVolumeList(volumeList);
 	}
 
 }

src/com/platform/utils/Constant.java

@@ -7,7 +7,7 @@ public class Constant {
 	public static String rootUser = "root";
 	public static String rootPasswd = "root";
 //	public static String hostIp = "192.168.191.23";
-	public static String hostIp = "";
+	public static String hostIp = "192.168.0.110";
 	public static int port = 22;
 	public static String glusterPeerStatus = "gluster peer status";
 	public static String glusterVolumeInfo = "gluster volume info ";

src/com/platform/utils/ProcessMyUtil.java

@@ -0,0 +1,61 @@
+package com.platform.utils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import ch.ethz.ssh2.Session;
+import ch.ethz.ssh2.StreamGobbler;
+
+public class ProcessMyUtil {
+	
+
+	public  List<String> execCmdWaitAcquiescent(String cmd) {
+//		String host=Constant.hostIp;
+//		String username=Constant.rootUser;
+//		String password=Constant.rootPasswd;
+//		int port=Constant.port;
+		List<String> reStrings = new ArrayList<String>();
+		
+		try {
+			ProcessBuilder pb = null;
+			Process pro = null;
+			
+			if (cmd.contains("grep")) {
+				List<String> cmds = new ArrayList<String>(); 
+				cmds.add("sh"); 
+				cmds.add("-c"); 
+				cmds.add(cmd); 
+				new ProcessBuilder(cmds); 
+				pro = pb.start();
+				
+			}else {
+				pro = Runtime.getRuntime().exec(cmd);
+			}
+			if (null == pro) {
+				return reStrings;
+			}
+			BufferedReader br = new BufferedReader(new InputStreamReader(pro.getInputStream()));
+			StringBuffer sb = new StringBuffer();
+			String line;
+			while ((line = br.readLine()) != null) {
+				if (line != null) {
+//					System.out.println(line);
+					reStrings.add(line);
+				} else {
+					break;
+				}
+			}
+			if(reStrings.size()==0){		
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return reStrings;
+	}
+
+}

src/com/platform/utils/ThreadVolume.java

@@ -89,6 +89,7 @@ public class ThreadVolume extends Thread {
 						for (String one : path) {
 							if (!one.contains("df")) {
 								volume.setPath(one);
+								break;
 							}
 						}
 					}