Merge branch 'master' of chenweida/esb into master

Hos-Framework/Hos-Framework.iml

@@ -111,6 +111,16 @@
    <orderEntry type="library" name="Maven: ansj.lucene:lucene-analyzers:4.10.4" level="project" />
    <orderEntry type="library" name="Maven: ansj.lucene:nlpcn-lang:1.0" level="project" />
    <orderEntry type="library" name="Maven: basic.java:ktool:1.0" level="project" />
    <orderEntry type="module-library">
      <library>
        <CLASSES>
          <root url="file://$MAVEN_REPOSITORY$/org/yihu/common/common/1.0.0-SNAPSHOT" />
        </CLASSES>
        <JAVADOC />
        <SOURCES />
        <jarDirectory url="file://$MAVEN_REPOSITORY$/org/yihu/common/common/1.0.0-SNAPSHOT" recursive="false" />
      </library>
    </orderEntry>
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
@@ -310,19 +320,9 @@
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-redishelper:1.0.0" level="project" />
    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.6.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.ehr.commons:commons-db:0.0.1-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:core-rpc:2.2.0" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.5" level="project" />
    <orderEntry type="module-library">
      <library>
        <CLASSES>
          <root url="file://$MAVEN_REPOSITORY$/org/yihu/common/common/1.0.0-SNAPSHOT" />
        </CLASSES>
        <JAVADOC />
        <SOURCES />
        <jarDirectory url="file://$MAVEN_REPOSITORY$/org/yihu/common/common/1.0.0-SNAPSHOT" recursive="false" />
      </library>
    </orderEntry>
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.7" level="project" />
    <orderEntry type="library" name="Maven: commons-net:commons-net:3.3" level="project" />
  </component>
  <component name="org.twodividedbyzero.idea.findbugs">
    <option name="_basePreferences">

Hos-Framework/pom.xml

@@ -647,16 +647,6 @@
            <artifactId>spring-data-redis</artifactId>
            <version>1.6.2.RELEASE</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr.commons</groupId>
            <artifactId>commons-db</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr.commons</groupId>
            <artifactId>commons-db</artifactId>
            <version>0.0.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>core-rpc</artifactId>
@@ -667,26 +657,11 @@
            <artifactId>ehr-dbhelper</artifactId>
            <version>1.1.7</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>ehr-dbhelper</artifactId>
            <version>1.1.7</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>ehr-dbhelper</artifactId>
            <version>1.1.7</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>ehr-dbhelper</artifactId>
            <version>1.1.7</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>ehr-dbhelper</artifactId>
            <version>1.1.5</version>
            <groupId>commons-net</groupId>
            <artifactId>commons-net</artifactId>
            <version>3.3</version>
        </dependency>
    </dependencies>
</project>