Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore

# Conflicts: # common/yohoufo-fore-common.iml # order/yohoufo-fore-order.iml # payment/yohoufo-fore-payment.iml

Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
# Conflicts: # common/yohoufo-fore-common.iml # order/yohoufo-fore-order.iml # payment/yohoufo-fore-payment.iml
tanling
Commit d6770006b9a75deeb741ec35ef4296fefd1bc588 2 parents 64ebbea4 e463b2e0
Showing 7 changed files with 203 additions and 108 deletions
.gitignore
common/yohoufo-fore-common.iml
dal/yohoufo-fore-dal.iml
order/.gitignore
order/yohoufo-fore-order.iml
payment/yohoufo-fore-payment.iml
product/yohoufo-fore-product.iml
--- a/.gitignore
View file @d677000
+++ b/.gitignore
View file @d677000
@@ -7,7 +7,4 @@
 */target/
 */.classpath
 */bin/
- MANIFEST.MF
- deploy/.gitignore
- order/.gitignore
- product/.gitignore
+ MANIFEST.MF
\ No newline at end of file
--- a/common/yohoufo-fore-common.iml
View file @d677000
+++ b/common/yohoufo-fore-common.iml
View file @d677000
@@ -16,7 +16,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
- <<<<<<< HEAD
     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.4-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.4-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.4-SNAPSHOT" level="project" />
@@ -30,9 +29,15 @@
     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.4-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.4-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.4-SNAPSHOT" level="project" />
- =======
- >>>>>>> 1f89a7ae07f35940011ae205122cddcb4f458e17
     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-trace" />
     <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" />
     <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" />
@@ -47,33 +52,31 @@
     <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-config" />
     <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
     <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" />
- <<<<<<< HEAD
     <orderEntry type="module" module-name="error-code" />
- =======
     <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" />
- >>>>>>> 1f89a7ae07f35940011ae205122cddcb4f458e17
     <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" />
+     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-common" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
     <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-redis-cluster" />
+     <orderEntry type="module" module-name="yoho-core-config-client" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" />
@@ -91,9 +94,9 @@
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-rest-client-simple" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-rest-common" />
     <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
     <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" />
@@ -103,13 +106,13 @@
     <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-alarm" />
+     <orderEntry type="module" module-name="yoho-core-rest-governance" />
+     <orderEntry type="module" module-name="yoho-core-rest-governance-model" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-cache" />
     <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" />
@@ -139,7 +142,6 @@
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" />
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" />
@@ -157,27 +159,24 @@
     <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
     <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
- <<<<<<< HEAD
     <orderEntry type="module" module-name="uic-service-model" />
- =======
     <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" />
- >>>>>>> 1f89a7ae07f35940011ae205122cddcb4f458e17
+     <orderEntry type="module" module-name="uic-service-model" />
     <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.5-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" />
     <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
     <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
- <<<<<<< HEAD
     <orderEntry type="module" module-name="resource-service-model" />
     <orderEntry type="module" module-name="users-service-model" />
     <orderEntry type="module" module-name="shops-service-model" />
- =======
     <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" />
- >>>>>>> 1f89a7ae07f35940011ae205122cddcb4f458e17
+     <orderEntry type="module" module-name="resource-service-model" />
+     <orderEntry type="module" module-name="users-service-model" />
+     <orderEntry type="module" module-name="shops-service-model" />
   </component>
 </module>
\ No newline at end of file
--- a/dal/yohoufo-fore-dal.iml
View file @d677000
+++ b/dal/yohoufo-fore-dal.iml
View file @d677000
@@ -10,6 +10,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+     <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
@@ -20,14 +26,13 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" />
     <orderEntry type="module" module-name="yohoufo-fore-common" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-trace" />
     <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" />
     <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:1.5.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:4.3.8.RELEASE" level="project" />
-     <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.kafka:spring-kafka:1.1.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:0.10.1.1" level="project" />
@@ -35,36 +40,23 @@
     <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" />
-     <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
-     <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
-     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-     <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
-     <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" />
-     <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" />
+     <orderEntry type="module" module-name="error-code" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" />
-     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
-     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-common" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
     <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-redis-cluster" />
+     <orderEntry type="module" module-name="yoho-core-config-client" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.8.RELEASE" level="project" />
-     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.5.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.5.5" level="project" />
@@ -77,9 +69,9 @@
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-rest-client-simple" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-rest-common" />
     <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
     <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" />
@@ -89,13 +81,13 @@
     <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-alarm" />
+     <orderEntry type="module" module-name="yoho-core-rest-governance" />
+     <orderEntry type="module" module-name="yoho-core-rest-governance-model" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-cache" />
     <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" />
@@ -138,16 +130,45 @@
     <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
     <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="uic-service-model" />
     <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.5-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
     <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="resource-service-model" />
+     <orderEntry type="module" module-name="users-service-model" />
+     <orderEntry type="module" module-name="shops-service-model" />
+     <orderEntry type="module" module-name="yoho-core-dal" />
+     <orderEntry type="module" module-name="yoho-core-config" />
+     <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
+     <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
+     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+     <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" />
+     <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" />
+     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" />
+     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.8.RELEASE" level="project" />
+     <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.8.RELEASE" level="project" />
+     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" />
+     <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:1.4.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.4.1" level="project" />
+     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" />
   </component>
 </module>
\ No newline at end of file
--- a/order/.gitignore 0 → 100644
View file @d677000
+++ b/order/.gitignore 0 → 100644
View file @d677000
+ .idea/
+ *.iml
+ *.ipr
+ *.iws
+ .settings/
+ .project
+ */target/
+ */.classpath
+ */bin/
+ MANIFEST.MF
+ 
--- a/order/yohoufo-fore-order.iml
View file @d677000
+++ b/order/yohoufo-fore-order.iml
View file @d677000
@@ -11,7 +11,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />	
+       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -34,6 +34,16 @@
     <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" />
     <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.ufo.model:order-ufo-model:1.0-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yohoufo-fore-common" />
+     <orderEntry type="module" module-name="yoho-core-trace" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:1.5.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:4.3.8.RELEASE" level="project" />
@@ -60,22 +70,22 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" />
+     <orderEntry type="module" module-name="yoho-core-config" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="error-code" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-common" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-redis-cluster" />
+     <orderEntry type="module" module-name="yoho-core-config-client" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.8.RELEASE" level="project" />
-     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.5.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.5.5" level="project" />
@@ -107,6 +117,7 @@
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" />
     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-cache" />
     <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" />
@@ -136,7 +147,6 @@
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" />
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" />
@@ -157,7 +167,6 @@
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" />
     <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
     <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
@@ -181,26 +190,39 @@
     <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" />
     <orderEntry type="module" module-name="yohoufo-fore-dal" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" />
+     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
     <orderEntry type="library" name="Maven: commons-pool:commons-pool:20030825.183949" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" />
- 
+     <orderEntry type="module" module-name="yoho-core-dal" />
+     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" />
+     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.8.RELEASE" level="project" />
+     <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:1.4.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.4.1" level="project" />
     <orderEntry type="module" module-name="order-ufo-model" />
     <orderEntry type="module" module-name="yohoufo-fore-product" />
     <orderEntry type="module" module-name="yoho-core-rest-client-simple" />
- 
-     <orderEntry type="library" name="Maven: com.yoho.ufo.model:order-ufo-model:1.0-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" />
- 
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-rest-common" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
@@ -211,9 +233,9 @@
     <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-alarm" />
+     <orderEntry type="module" module-name="yoho-core-rest-governance" />
+     <orderEntry type="module" module-name="yoho-core-rest-governance-model" />
     <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
     <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
--- a/payment/yohoufo-fore-payment.iml
View file @d677000
+++ b/payment/yohoufo-fore-payment.iml
View file @d677000
@@ -30,6 +30,16 @@
     <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.4-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.4-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.ufo.model:order-ufo-model:1.0-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yohoufo-fore-common" />
+     <orderEntry type="module" module-name="yoho-core-trace" />
     <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" />
     <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" />
@@ -44,7 +54,7 @@
     <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-config" />
     <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
     <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
@@ -54,20 +64,21 @@
     <orderEntry type="module" module-name="error-code" />
     <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" />
+     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-common" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
     <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-redis-cluster" />
+     <orderEntry type="module" module-name="yoho-core-config-client" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" />
@@ -85,9 +96,9 @@
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-rest-client-simple" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-rest-common" />
     <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
     <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" />
@@ -97,13 +108,13 @@
     <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-alarm" />
+     <orderEntry type="module" module-name="yoho-core-rest-governance" />
+     <orderEntry type="module" module-name="yoho-core-rest-governance-model" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-cache" />
     <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" />
@@ -133,7 +144,6 @@
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" />
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" />
@@ -154,7 +164,6 @@
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" />
     <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
     <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
@@ -176,10 +185,24 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" />
+     <orderEntry type="module" module-name="yoho-core-dal" />
+     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.8.RELEASE" level="project" />
+     <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:1.4.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.4.1" level="project" />
     <orderEntry type="module" module-name="order-ufo-model" />
     <orderEntry type="module" module-name="yohoufo-fore-product" />
-     <orderEntry type="library" name="Maven: com.yoho.ufo.model:order-ufo-model:1.0-SNAPSHOT" level="project" />
- 
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
--- a/product/yohoufo-fore-product.iml
View file @d677000
+++ b/product/yohoufo-fore-product.iml
View file @d677000
@@ -10,8 +10,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+     <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" />
     <orderEntry type="module" module-name="yohoufo-fore-common" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-trace" />
     <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" />
     <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" />
@@ -26,7 +33,7 @@
     <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-config" />
     <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
     <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
@@ -35,27 +42,26 @@
     <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="error-code" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-common" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
     <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-redis-cluster" />
+     <orderEntry type="module" module-name="yoho-core-config-client" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.8.RELEASE" level="project" />
-     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.5.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.5.5" level="project" />
@@ -68,9 +74,9 @@
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-rest-client-simple" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-rest-common" />
     <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
     <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" />
@@ -80,13 +86,13 @@
     <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-alarm" />
+     <orderEntry type="module" module-name="yoho-core-rest-governance" />
+     <orderEntry type="module" module-name="yoho-core-rest-governance-model" />
     <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="yoho-core-cache" />
     <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" />
@@ -116,7 +122,6 @@
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" />
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" />
@@ -131,25 +136,42 @@
     <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
     <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="uic-service-model" />
     <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.5-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" />
     <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
     <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" />
-     <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" />
+     <orderEntry type="module" module-name="resource-service-model" />
+     <orderEntry type="module" module-name="users-service-model" />
+     <orderEntry type="module" module-name="shops-service-model" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
     <orderEntry type="module" module-name="yohoufo-fore-dal" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" />
+     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
     <orderEntry type="library" name="Maven: commons-pool:commons-pool:20030825.183949" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" />
+     <orderEntry type="module" module-name="yoho-core-dal" />
+     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" />
+     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.8.RELEASE" level="project" />
+     <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:1.4.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:4.10.2" level="project" />
+     <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.4.1" level="project" />
   </component>
 </module>
\ No newline at end of file