Authored by DengXinFei

Merge branch 'master' of git.dev.yoho.cn:yoho30/yohobuy-union

... ... @@ -10,37 +10,10 @@
<dependent-module archiveName="yoho-unions-server-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/yoho-unions-server/yoho-unions-server">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="union-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/union-service-model/union-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="yoho-unions-common-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/yoho-unions-common/yoho-unions-common">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="error-code-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/error-code/error-code">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="sns-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/sns-service-model/sns-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="resource-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/resource-service-model/resource-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="promotion-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/promotion-service-model/promotion-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="users-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/users-service-model/users-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="product-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/product-service-model/product-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="order-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/order-service-model/order-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="message-service-model-1.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/message-service-model/message-service-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/yoho-unions-web/target/classes"/>
<property name="context-root" value="unions"/>
<property name="context-root" value="yoho-unions-web"/>
</wb-module>
</project-modules>
... ...
#memcached
cache.servers.memcached.address=${cache.servers.gateway.level1.address}
cache.servers.memcached.address=${cache.servers.union.address}
#MQ
rabbit.mq.host=${rabbit.mq.host}
... ...
... ... @@ -134,7 +134,7 @@
<maxHistory>${yoho.logs.maxHistory}</maxHistory>
</rollingPolicy>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger:%line - %msg%n</pattern>
<pattern>%msg%n</pattern>
</encoder>
</appender>
... ...