Merge branch 'Manager_Backend' of https://git.trustie.net/fhx569287825/aggregation-platform into Manager_Backend

Conflicts:
	.classpath
	.project
	build/classes/com/platform/controller/DefaultController.class
	src/com/platform/controller/DefaultController.java
	src/com/platform/glusterfs/CopyData.java
	src/com/platform/glusterfs/GetTreeData.java

.gitignore

@@ -0,0 +1,2 @@
+/target/
+/build

.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,5 @@
 eclipse.preferences.version=1
 encoding//WebContent/WEB-INF/config/config.properties=UTF-8
+encoding//src/com/platform/utils/GanymedSSH.java=UTF-8
+encoding/<project>=UTF-8
+separateDerivedEncodings=true

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

@@ -1,7 +1,101 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.7

.settings/org.eclipse.jpt.core.prefs

@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+org.eclipse.jpt.core.platform=generic2_1
+org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=false

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

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

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

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

@@ -0,0 +1,7 @@
+<root>
+  <facet id="jpt.jpa">
+    <node name="libprov">
+      <attribute name="provider-id" value="jpa-no-op-library-provider"/>
+    </node>
+  </facet>
+</root>

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

@@ -7,4 +7,5 @@
   <installed facet="java" version="1.7"/>
   <installed facet="jst.web" version="3.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="jpt.jpa" version="2.1"/>
 </faceted-project>

build/classes/.gitignore

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

build/classes/com/dao/mapper/data-detaisl-mapper.xml

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>    
-<!DOCTYPE mapper    
-PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"    
-"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
-
-<mapper namespace="com.platform.dao.DataInfoDao">
-	<resultMap id="getEntityByText" type="DataInfoEntity">
-		<id property="id" column="id" javaType="int" jdbcType="INTEGER" />
-		<result property="regionalismCode" column="regionalism_code"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="cityName" column="city_name" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="districtName" column="district_name"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="systemCode" column="system_code" javaType="int"
-			jdbcType="INTEGER" />
-		<result property="systemName" column="system_name" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="dataType" column="data_type" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="dataVersion" column="data_version" javaType="int"
-			jdbcType="INTEGER" />
-		<result property="submittedBatch" column="submitted_batch"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="dataPath" column="data_path" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="charset" column="data_charset" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="collectingTime" column="collection_time"
-			javaType="string" jdbcType="DATE" />
-		<result property="collectorContacts" column="collector_contacts"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="collectorName" column="collector_name"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="year" column="data_year" javaType="string"
-			jdbcType="VARCHAR" />
-	</resultMap>
-	<sql id="conditionsFilters">
-		<if test="PagerOptions.dataType!=null">
-			and data_details.data_type=#{PagerOptions.dataType}
-		</if>
-		<if test="PagerOptions.submittedBatch!=null">
-			and
-			data_details.submitted_batch=#{PagerOptions.submittedBatch}
-		</if>
-		<if test="PagerOptions.cityName!=null">
-			and data_details.city_name=#{PagerOptions.cityName}
-		</if>
-		<if test="PagerOptions.districtName!=null">
-			and
-			data_details.district_name=#{PagerOptions.districtName}
-		</if>
-		<if test="PagerOptions.dataVersion !=null">
-			and data_details.data_version=#{PagerOptions.dataVersion}
-		</if>
-		<if test="PagerOptions.systemName !=null">
-			and data_details=#{PagerOptions.systemName}
-		</if>
-		<if test="PagerOptions.dataYear !=null">
-			and data_details.data_year=#{PagerOptions.dataYear}
-		</if>
-	</sql>
-
-	<!-- 获取数据符合筛选条件的全部记录信息 -->
-	<select id="getLimitedDataInfoEntities" 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
-		FROM data_details
-		<if test="PagerOptions!=null">
-			<where>
-				<include refid="conditionsFilters" />
-				<choose>
-					<when test="PagerOptions.offset > 0">
-						and data_details.id>= #{PagerOptions.offset}
-					</when>
-					<otherwise>
-						and data_details.id>=0
-					</otherwise>
-				</choose>
-			</where>
-			ORDER BY data_details.id
-			<if test="PagerOptions.limit > 0">
-				LIMIT #{PagerOptions.limit}
-			</if>
-		</if>
-	</select>
-
-	<!-- 获取数据符合筛选条件的总记录条数 -->
-	<select id="getLimitedDataCount" resultType="java.lang.Integer"
-		parameterType="PagerOptions">
-		SELECT COUNT(id) FROM data_details
-		<if test="PagerOptions!=null">
-			<where>
-				<include refid="conditionsFilters" />
-			</where>
-		</if>
-
-	</select>
-
-	<!-- 获取数据查询的起始di -->
-	<select id="getLimitedBeginId" resultType="java.lang.Integer"
-		parameterType="PagerOptions">
-		SELECT MAX(idx) FROM (SELECT id idx FROM data_details
-		ORDER BY id LIMIT 0,#{PagerOptions.totalLimit}) AS TEMP
-	</select>
-
-</mapper>  

build/classes/spring-applicationContext-test.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-       http://www.springframework.org/schema/beans/spring-beans-3.0.xsd 
-       http://www.springframework.org/schema/tx 
-       http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
-       http://www.springframework.org/schema/aop 
-       http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
-       http://www.springframework.org/schema/context
-       http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-	<!-- 读取db.properties中的属性值 -->
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location" value="/WebContent/WEB-INF/config/config.properties"></property>
-	</bean>
-
-	<!-- 连接MySQL数据库 -->
-	<bean id="mySQLDataSource"
-		class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-		<property name="driverClassName" value="${jdbc.mysql.driver}" />
-		<property name="url" value="${jdbc.mysql.url}" />
-		<property name="username" value="${jdbc.mysql.username}" />
-		<property name="password" value="${jdbc.mysql.password}" />
-	</bean>
-	<bean id="mySQLSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-	    <property name="configLocation" value="/WebContent/WEB-INF/config/mybatis-applicationConfig.xml" />  
-		<property name="dataSource" ref="mySQLDataSource" />
-	</bean>
-	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="com.platform.dao" />
-	</bean>
-
-	<!-- 配置声明式事物 -->
-	<bean id="mySQLTxManager"
-		class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<property name="dataSource" ref="mySQLDataSource" />
-	</bean>
-	<tx:advice id="txAdvice" transaction-manager="mySQLTxManager">
-		<tx:attributes>
-			<tx:method name="delete*" propagation="REQUIRED" />
-			<tx:method name="insert*" propagation="REQUIRED" />
-			<tx:method name="update*" propagation="REQUIRED" />
-			<tx:method name="get*" read-only="true" />
-			<tx:method name="select*" read-only="true" />
-		</tx:attributes>
-	</tx:advice>
-	<aop:config>
-		<aop:pointcut expression="execution(* com.platform.service.*.*(..))"
-			id="pointcut" />
-		<aop:advisor advice-ref="txAdvice" pointcut-ref="pointcut" />
-	</aop:config>
-	<bean id="user" class="com.platform.test.User">
-		<property name="name" value="伍名" />
-		<property name="id" value="1" />
-		<property name="sex" value="男" />
-	</bean>
-	<context:component-scan base-package="com.platform.*">
-		<context:exclude-filter type="annotation"
-			expression="org.springframework.stereotype.Controller" />
-	</context:component-scan>
-</beans>      

pom.xml

@@ -0,0 +1,37 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>extendGlusterfs</groupId>
+  <artifactId>extendGlusterfs</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>extendGlusterfs</name>
+  <url>http://maven.apache.org</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+  <dependency>
+    	<groupId>log4j</groupId>
+    	<artifactId>log4j</artifactId>
+    	<version>1.2.17</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    
+     <!-- https://mvnrepository.com/artifact/ch.ethz.ganymed/ganymed-ssh2 -->
+<dependency>
+    <groupId>ch.ethz.ganymed</groupId>
+    <artifactId>ganymed-ssh2</artifactId>
+    <version>build209</version>
+</dependency>
+  </dependencies>
+</project>

src/META-INF/persistence.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+	<persistence-unit name="aggregation-platform">
+	</persistence-unit>
+</persistence>

src/com/platform/controller/DefaultController.java

@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -17,13 +18,13 @@ public class DefaultController {
 		//处理不匹配的请求		
 		System.out.println("index");		
 		return new ModelAndView("index");
-		
 	}
 	
 	@RequestMapping("/test")
-	public void test(HttpServletRequest req, HttpServletResponse res){
+	public ModelMap test(HttpServletRequest req, HttpServletResponse res){
 		//System.out.println(Class.class.getClass().getResource("/").getPath());
 		System.out.println(Configs.EXTRACT_LOG_LOCALTION);
+		return new ModelMap();
 	}
 	
 }

src/com/platform/controller/FolderController.java

@@ -35,7 +35,6 @@ public class FolderController extends BaseController {
 		if (null != path && !"".equals(path)) {
 			System.out.println(path);
 			result = gfsService.getFolder(path);
-			throw new CustomException("3211", null);
 		}
 		return result;
 	}

src/com/platform/glusterfs/CopyData.java

@@ -1,5 +1,7 @@
 package com.platform.glusterfs;
 
+import java.util.List;
+
 import java.util.Map;
 
 import org.apache.log4j.Logger;
@@ -9,7 +11,6 @@ import org.junit.Test;
 import com.platform.utils.Constant;
 
 
-
 /**
  * <一句话功能简述> 复制数据
  * <功能详细描述>
@@ -18,6 +19,7 @@ import com.platform.utils.Constant;
  * @see       [相关类/方法]
  * @since     [产品/模块版本]
  */
+
 public class CopyData {
 	public static Logger log = Logger.getLogger(CopyData.class);
 

src/com/platform/glusterfs/GetTreeData.java

@@ -75,4 +75,3 @@ public class GetTreeData {
 //	}
 //}
 
-