Merge branch 'dev'

@@ -66,7 +66,7 @@
          APR (HTTP/AJP) Connector: /docs/apr.html
          Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
     -->
-    <Connector port="8087" protocol="HTTP/1.1"
+    <Connector port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
                redirectPort="8443" />
     <!-- A "Connector" using the shared thread pool-->

@@ -3,7 +3,7 @@
 <config>
     <group>
         <property name="yoho.search.service.env.namespace" defaultValue="yohosearch" description="namespace"/>
-        <property name="yoho.search.service.env.serverport" defaultValue="7" description="port"/>
+        <property name="yoho.search.service.env.serverport" defaultValue="0" description="port"/>
         <property name="yoho.search.service.env.webapphome" defaultValue="/home/dev/yoho-search-service/deploy" description="install path"/>
 
         <property name="search.es.cluster.name" defaultValue="yohosearch_test" description="" />