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

Conflicts:
	build/classes/com/platform/controller/DataModelController.class
	build/classes/com/platform/controller/DefaultController.class
	build/classes/com/platform/entities/FolderNode.class
	build/classes/com/platform/service/OracleExtractService.class
	build/classes/com/platform/test/TestController.class
	build/classes/com/platform/test/TestEncodeInfoDao.class
	build/classes/com/platform/test/TestEncodeService.class
	build/classes/com/platform/utils/Configs.class
	build/classes/com/platform/utils/ConfigsLoader.class
	src/com/platform/controller/DataModelController.java

.classpath

@@ -9,6 +9,6 @@
 	</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.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/com.sun.java.jdk7.win32.x86_64_1.7.0.u45"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

.gitignore

@@ -1 +1 @@
-*.class
+build/

WebContent/WEB-INF/config/config.properties

@@ -4,7 +4,7 @@
 # 驱动程序
 jdbc.mysql.driver=com.mysql.jdbc.Driver
 # 连接url
-jdbc.mysql.url=jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
 # 用户名
 jdbc.mysql.username=root
 # 密码

WebContent/WEB-INF/config/mybatis-applicationConfig.xml

@@ -7,8 +7,10 @@
 		<typeAlias alias="EncodedInfoEntity" type="com.platform.entities.EncodedInfoEntity" />
 		<typeAlias alias="DataInfoEntity" type="com.platform.entities.DataInfoEntity" />
 		<typeAlias alias="PagerOptions" type="com.platform.entities.PagerOptions"/>
+		<typeAlias alias="GatherOracleInfo" type="com.platform.entities.GatherOracleInfo"/>
 	</typeAliases>
 	<mappers>
-		<mapper resource="com/dao/mapper/data-detaisl-mapper.xml" />		
+		<mapper resource="com/dao/mapper/data-details-mapper.xml" />
+		<mapper resource="com/dao/mapper/config-details-mapper.xml"/>		
 	</mappers>
 </configuration>    

WebContent/WEB-INF/web.xml

@@ -59,7 +59,7 @@
 	</listener>
 
 	<!-- 防止Spring内存溢出监听器 -->
-	<listener>
+	<!-- <listener>
 		<listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class>
-	</listener>
+	</listener> -->
 </web-app>

build/classes/.gitignore

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