调整资源文件

.gitignore

-.DS_Store
-jvm/*
+/o2cloud/
\ No newline at end of file
-webserver/x_desktop_web/.idea/*
\ No newline at end of file

o2server/.gitignore

 .project
 /local/
-/logs/
+/logs/
\ No newline at end of file
+/x_build_and_scratch/
\ No newline at end of file

o2server/pom.xml

@@ -62,7 +62,6 @@
 		<module>x_report_assemble_control</module>
 		<module>x_strategydeploy_assemble_control</module>
 		<module>x_program_center</module>
-		<module>x_build_and_scratch</module>
 		<module>x_console</module>
 	</modules>
 	<properties>