Merge branch 'dev_2.0.1' into test_2.0.1

@@ -16,7 +16,7 @@
 	</properties>
 
 	<build>
-		<finalName>yohomars-search-service</finalName>
+		<finalName>yohomars-search</finalName>
 		<plugins>
 			<plugin>
 				<groupId>com.yoho.tools</groupId>
@@ -59,7 +59,7 @@
 						<phase>package</phase>
 						<configuration>
 							<tasks>
-								<unzip src="target/yohomars-search-service.zip" dest="target" />
+								<unzip src="target/yohomars-search.zip" dest="target" />
 							</tasks>
 						</configuration>
 						<goals>

@@ -2,7 +2,7 @@
 
 <config>
     <group>
-		<property name="yohomars.search.service.env.webapphome" defaultValue="/home/test/yohomars-search-service/deploy" description="应用根目录"/>
+		<property name="yohomars.search.service.env.webapphome" defaultValue="/home/test/yohomars-search/deploy" description="应用根目录"/>
         <property name="yohomars.search.service.env.serverport" defaultValue="7" description="应用端口"/>
         <property name="yohomars.search.service.env.namespace" defaultValue="yohomars-search" description="应用命名空间"/>
 		<property name="yoho.env.javahome" defaultValue="/usr/local/java" description="" />

@@ -21,7 +21,7 @@
 	</modules>
 
 	<properties>
-		<project-name>yohomars-search-parent</project-name>
+		<project-name>yohomars-search</project-name>
 	</properties>
 
 	<dependencies>