Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-web/src/main/resources/dubbo-project.properties

-dubbo.registry.file=haoban-manage-web
\ No newline at end of file
+dubbo.registry.file=haoban-manage3-web
\ No newline at end of file

haoban-manage3-wx/pom.xml

@@ -218,7 +218,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>haoban-manage-web</finalName>
+		<finalName>haoban-manage3-wx</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -11,9 +11,9 @@
 
     <context:component-scan base-package="com.gic.haoban" />
 	<!-- 应用名称 -->
-    <dubbo:application name="haoban-apps-web"/>
+    <dubbo:application name="haoban-manage3-wx"/>
 
-    <dubbo:protocol name="dubbo" port="30009"/>
+    <dubbo:protocol name="dubbo" port="30010"/>
     <!-- 使用zookeeper注册中心暴露服务地址 -->
 <!--      <dubbo:registry address="zookeeper://192.168.1.118:2181" protocol="dubbo" id="localAdd"/> -->
     <!--<dubbo:registry address="zookeeper://115.159.182.172:2199" protocol="dubbo" id="remoteAdd"/>-->