Browse Source

Merge branch 'master' of http://192.168.1.220:10080/esb/esb

Airhead 8 years ago
parent
commit
06faecce5a
100 changed files with 49 additions and 767 deletions
  1. 0 1
      hos-admin/.mvn/wrapper/maven-wrapper.properties
  2. 0 215
      hos-admin/hos-admin.iml
  3. 0 233
      hos-admin/mvnw
  4. 0 145
      hos-admin/mvnw.cmd
  5. 0 100
      hos-admin/pom.xml
  6. 1 1
      hos-broker/src/main/java/com/yihu/hos/common/appender/JMSAppender.java
  7. 9 4
      hos-broker/src/main/java/com/yihu/hos/common/listener/ApplicationStartListener.java
  8. 13 13
      hos-broker/src/main/resources/application.yml
  9. 4 4
      hos-rest/src/main/resources/config/dbhelper.properties
  10. 2 26
      hos-rest/src/main/resources/spring/applicationContext.xml
  11. 7 21
      hos-web-framework-dependencies/pom.xml
  12. 10 1
      hos-web-framework/pom.xml
  13. 2 2
      hos-admin/src/main/java/com/yihu/hos/HosAdminApplication.java
  14. 1 1
      hos-admin/src/main/java/com/yihu/hos/ServletInitializer.java
  15. 0 0
      src/main/java/com/yihu/hos/common/ActiveMqUtil.java
  16. 0 0
      src/main/java/com/yihu/hos/common/ApplicationStart.java
  17. 0 0
      src/main/java/com/yihu/hos/common/CheckLoginFilter.java
  18. 0 0
      src/main/java/com/yihu/hos/common/CommonPageController.java
  19. 0 0
      src/main/java/com/yihu/hos/common/JXLUtil.java
  20. 0 0
      src/main/java/com/yihu/hos/common/ObjectVersion.java
  21. 0 0
      src/main/java/com/yihu/hos/common/ReflectUtil.java
  22. 0 0
      src/main/java/com/yihu/hos/common/Services.java
  23. 0 0
      src/main/java/com/yihu/hos/common/SessionOutTimeFilter.java
  24. 0 0
      src/main/java/com/yihu/hos/common/activeMq/ActiveMqConstants.java
  25. 0 0
      src/main/java/com/yihu/hos/common/activeMq/ActivemqConfiguration.java
  26. 0 0
      src/main/java/com/yihu/hos/common/constants/Constants.java
  27. 0 0
      src/main/java/com/yihu/hos/common/mongo/IMongoDBAdminer.java
  28. 0 0
      src/main/java/com/yihu/hos/common/mongo/IMongoDBRunner.java
  29. 0 0
      src/main/java/com/yihu/hos/common/mongo/MongoDB.java
  30. 0 0
      src/main/java/com/yihu/hos/common/mongo/MongoDBConfig.java
  31. 0 0
      src/main/java/com/yihu/hos/common/mongo/MongoDBKit.java
  32. 0 0
      src/main/java/com/yihu/hos/common/mongo/MongoDBOperator.java
  33. 0 0
      src/main/java/com/yihu/hos/common/mongo/MongoDBPro.java
  34. 0 0
      src/main/java/com/yihu/hos/config/BeanConfig.java
  35. 0 0
      src/main/java/com/yihu/hos/config/WebConfig.java
  36. 0 0
      src/main/java/com/yihu/hos/config/WebMvcConfig.java
  37. 0 0
      src/main/java/com/yihu/hos/crawler/controller/CrawlerController.java
  38. 0 0
      src/main/java/com/yihu/hos/crawler/dao/CrawlerDatasetDao.java
  39. 0 0
      src/main/java/com/yihu/hos/crawler/dao/CrawlerFlowDao.java
  40. 0 0
      src/main/java/com/yihu/hos/crawler/dao/CrawlerFlowHeadDao.java
  41. 0 0
      src/main/java/com/yihu/hos/crawler/format/AdapterBase.java
  42. 0 0
      src/main/java/com/yihu/hos/crawler/format/AdapterScheme.java
  43. 0 0
      src/main/java/com/yihu/hos/crawler/format/DataSetTransformer.java
  44. 0 0
      src/main/java/com/yihu/hos/crawler/format/DocumentTransformer.java
  45. 0 0
      src/main/java/com/yihu/hos/crawler/format/IDataTransformer.java
  46. 0 0
      src/main/java/com/yihu/hos/crawler/model/adapter/AdapterDataSet.java
  47. 0 0
      src/main/java/com/yihu/hos/crawler/model/adapter/AdapterDict.java
  48. 0 0
      src/main/java/com/yihu/hos/crawler/model/adapter/AdapterDictEntry.java
  49. 0 0
      src/main/java/com/yihu/hos/crawler/model/adapter/AdapterMetaData.java
  50. 0 0
      src/main/java/com/yihu/hos/crawler/model/config/SysConfig.java
  51. 0 0
      src/main/java/com/yihu/hos/crawler/model/flow/CrawlerDataSetModel.java
  52. 0 0
      src/main/java/com/yihu/hos/crawler/model/flow/CrawlerFlowHeadModel.java
  53. 0 0
      src/main/java/com/yihu/hos/crawler/model/flow/CrawlerFlowModel.java
  54. 0 0
      src/main/java/com/yihu/hos/crawler/model/flow/resultModel/CrawlerDatasetResultDetailModel.java
  55. 0 0
      src/main/java/com/yihu/hos/crawler/model/flow/resultModel/CrawlerDatasetResultModel.java
  56. 0 0
      src/main/java/com/yihu/hos/crawler/model/flow/resultModel/FlowEntrance.java
  57. 0 0
      src/main/java/com/yihu/hos/crawler/model/flow/resultModel/FlowLines.java
  58. 0 0
      src/main/java/com/yihu/hos/crawler/model/flow/resultModel/FlowMapping.java
  59. 0 0
      src/main/java/com/yihu/hos/crawler/model/flow/resultModel/MappingDataset.java
  60. 0 0
      src/main/java/com/yihu/hos/crawler/model/flow/resultModel/MappingMetadata.java
  61. 0 0
      src/main/java/com/yihu/hos/crawler/model/patient/Patient.java
  62. 0 0
      src/main/java/com/yihu/hos/crawler/model/patient/PatientIdentity.java
  63. 0 0
      src/main/java/com/yihu/hos/crawler/model/patient/PatientIndex.java
  64. 0 0
      src/main/java/com/yihu/hos/crawler/model/standard/StdDict.java
  65. 0 0
      src/main/java/com/yihu/hos/crawler/model/standard/StdMetaData.java
  66. 0 0
      src/main/java/com/yihu/hos/crawler/model/transform/DictDataType.java
  67. 0 0
      src/main/java/com/yihu/hos/crawler/model/transform/EhrCondition.java
  68. 0 0
      src/main/java/com/yihu/hos/crawler/model/transform/IVerifier.java
  69. 0 0
      src/main/java/com/yihu/hos/crawler/model/transform/LogicValues.java
  70. 0 0
      src/main/java/com/yihu/hos/crawler/model/transform/MetaDataType.java
  71. 0 0
      src/main/java/com/yihu/hos/crawler/model/transform/MetaDataVerify.java
  72. 0 0
      src/main/java/com/yihu/hos/crawler/model/transform/TransformType.java
  73. 0 0
      src/main/java/com/yihu/hos/crawler/origin/FileSystemOrigin.java
  74. 0 0
      src/main/java/com/yihu/hos/crawler/origin/IDataOrigin.java
  75. 0 0
      src/main/java/com/yihu/hos/crawler/service/CrawlerFlowManager.java
  76. 0 0
      src/main/java/com/yihu/hos/crawler/service/CrawlerManager.java
  77. 0 0
      src/main/java/com/yihu/hos/crawler/service/CrawlerService.java
  78. 0 0
      src/main/java/com/yihu/hos/crawler/service/DataCollectDispatcher.java
  79. 0 0
      src/main/java/com/yihu/hos/crawler/service/EsbHttp.java
  80. 0 0
      src/main/java/com/yihu/hos/crawler/service/OldPatientCDAUpload.java
  81. 0 0
      src/main/java/com/yihu/hos/crawler/service/PatientCDAIndex.java
  82. 0 0
      src/main/java/com/yihu/hos/crawler/service/PatientCDAUpload.java
  83. 0 0
      src/main/java/com/yihu/hos/crawler/storage/DataSetStorage.java
  84. 0 0
      src/main/java/com/yihu/hos/crawler/storage/DocumentStorage.java
  85. 0 0
      src/main/java/com/yihu/hos/crawler/storage/IDataStorage.java
  86. 0 0
      src/main/java/com/yihu/hos/crawler/storage/MongodbStorage.java
  87. 0 0
      src/main/java/com/yihu/hos/datacollect/controller/DataCollectController.java
  88. 0 0
      src/main/java/com/yihu/hos/datacollect/controller/DataPushController.java
  89. 0 0
      src/main/java/com/yihu/hos/datacollect/dao/DatacollectDao.java
  90. 0 0
      src/main/java/com/yihu/hos/datacollect/dao/DatacollectLogDao.java
  91. 0 0
      src/main/java/com/yihu/hos/datacollect/dao/intf/IDatacollectDao.java
  92. 0 0
      src/main/java/com/yihu/hos/datacollect/dao/intf/IDatacollectLogDao.java
  93. 0 0
      src/main/java/com/yihu/hos/datacollect/model/DtoDatasetCol.java
  94. 0 0
      src/main/java/com/yihu/hos/datacollect/model/DtoDictCol.java
  95. 0 0
      src/main/java/com/yihu/hos/datacollect/model/DtoJobConfig.java
  96. 0 0
      src/main/java/com/yihu/hos/datacollect/model/DtoJobDataset.java
  97. 0 0
      src/main/java/com/yihu/hos/datacollect/model/DtoJobLog.java
  98. 0 0
      src/main/java/com/yihu/hos/datacollect/model/RsDatapushLog.java
  99. 0 0
      src/main/java/com/yihu/hos/datacollect/model/RsJobConfig.java
  100. 0 0
      hos-admin/src/main/java/com/yihu/hos/datacollect/model/RsJobDataset.java

+ 0 - 1
hos-admin/.mvn/wrapper/maven-wrapper.properties

@ -1 +0,0 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip

+ 0 - 215
hos-admin/hos-admin.iml

@ -1,215 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="web" name="Web">
      <configuration>
        <webroots>
          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
        </webroots>
        <sourceRoots>
          <root url="file://$MODULE_DIR$/src/main/java" />
          <root url="file://$MODULE_DIR$/src/main/resources" />
        </sourceRoots>
      </configuration>
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
    <output url="file://$MODULE_DIR$/target/classes" />
    <output-test url="file://$MODULE_DIR$/target/test-classes" />
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
      <excludeFolder url="file://$MODULE_DIR$/target" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-jasper:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.eclipse.jdt.core.compiler:ecj:4.5.1" level="project" />
    <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.10" level="project" />
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
    <orderEntry type="module" module-name="hos-web-framework" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.1" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.1" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.4" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.0.9.Final" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.0.Final" level="project" />
    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:5.0.9.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.10.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.12.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.mongodb:bson:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.9.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-core:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.11" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-spring-boot:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-spring:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-http4:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-http-common:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jms:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-jms:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.2.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-cxf:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-cxf-transport:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.1.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.1.5" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.1.5" level="project" />
    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.1.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxrs:3.1.5" level="project" />
    <orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.0.1" level="project" />
    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.5" level="project" />
    <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.1.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.1.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.1.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.1.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-rs-security-oauth:3.1.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-rs-client:3.1.5" level="project" />
    <orderEntry type="library" name="Maven: net.oauth.core:oauth-provider:20100527" level="project" />
    <orderEntry type="library" name="Maven: net.oauth.core:oauth:20100527" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-quartz:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:1.8.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-quartz2:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.5.2" level="project" />
    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.11" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-xmljson:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.camel:camel-stream:2.17.1" level="project" />
    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.0" level="project" />
    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.37" level="project" />
    <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.3.0" level="project" />
    <orderEntry type="module" module-name="hos-core" />
    <orderEntry type="library" name="Maven: net.lingala.zip4j:zip4j:1.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.0" level="project" />
    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
    <orderEntry type="library" name="Maven: commons-net:commons-net:3.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.6.2" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.6" level="project" />
    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.6" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.4.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-all:5.13.3" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.9" level="project" />
    <orderEntry type="library" name="Maven: com.yihu.core:html2image:0.9" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-extras:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-core:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-api:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-api:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-servlet-wildcard:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-servlet:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-mustache:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: com.github.spullara.mustache.java:compiler:0.8.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-jsp:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-servlet:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-template:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-autotag-core-runtime:1.1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-jsp:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-freemarker:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-freemarker:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-velocity:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-velocity:1.0.6" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-el:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-mvel:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.mvel:mvel2:2.0.11" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-ognl:3.0.5" level="project" />
    <orderEntry type="library" name="Maven: ognl:ognl:2.7.3" level="project" />
    <orderEntry type="library" name="Maven: jboss:javassist:3.7.ga" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-compat:3.0.5" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.0.RELEASE" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" 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" scope="TEST" name="Maven: org.assertj:assertj-core:2.5.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.3.0" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.json:json:20140107" level="project" />
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.2.RELEASE" level="project" />
  </component>
</module>

+ 0 - 233
hos-admin/mvnw

@ -1,233 +0,0 @@
#!/bin/sh
# ----------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements.  See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership.  The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License.  You may obtain a copy of the License at
#
#    http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied.  See the License for the
# specific language governing permissions and limitations
# under the License.
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# Maven2 Start Up Batch script
#
# Required ENV vars:
# ------------------
#   JAVA_HOME - location of a JDK home dir
#
# Optional ENV vars
# -----------------
#   M2_HOME - location of maven2's installed home dir
#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
#     e.g. to debug Maven itself, use
#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
# ----------------------------------------------------------------------------
if [ -z "$MAVEN_SKIP_RC" ] ; then
  if [ -f /etc/mavenrc ] ; then
    . /etc/mavenrc
  fi
  if [ -f "$HOME/.mavenrc" ] ; then
    . "$HOME/.mavenrc"
  fi
fi
# OS specific support.  $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
mingw=false
case "`uname`" in
  CYGWIN*) cygwin=true ;;
  MINGW*) mingw=true;;
  Darwin*) darwin=true
           #
           # Look for the Apple JDKs first to preserve the existing behaviour, and then look
           # for the new JDKs provided by Oracle.
           #
           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
             #
             # Apple JDKs
             #
             export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
           fi
           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
             #
             # Apple JDKs
             #
             export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
           fi
           if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
             #
             # Oracle JDKs
             #
             export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
           fi
           if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
             #
             # Apple JDKs
             #
             export JAVA_HOME=`/usr/libexec/java_home`
           fi
           ;;
esac
if [ -z "$JAVA_HOME" ] ; then
  if [ -r /etc/gentoo-release ] ; then
    JAVA_HOME=`java-config --jre-home`
  fi
fi
if [ -z "$M2_HOME" ] ; then
  ## resolve links - $0 may be a link to maven's home
  PRG="$0"
  # need this for relative symlinks
  while [ -h "$PRG" ] ; do
    ls=`ls -ld "$PRG"`
    link=`expr "$ls" : '.*-> \(.*\)$'`
    if expr "$link" : '/.*' > /dev/null; then
      PRG="$link"
    else
      PRG="`dirname "$PRG"`/$link"
    fi
  done
  saveddir=`pwd`
  M2_HOME=`dirname "$PRG"`/..
  # make it fully qualified
  M2_HOME=`cd "$M2_HOME" && pwd`
  cd "$saveddir"
  # echo Using m2 at $M2_HOME
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
  [ -n "$M2_HOME" ] &&
    M2_HOME=`cygpath --unix "$M2_HOME"`
  [ -n "$JAVA_HOME" ] &&
    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
  [ -n "$CLASSPATH" ] &&
    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
# For Migwn, ensure paths are in UNIX format before anything is touched
if $mingw ; then
  [ -n "$M2_HOME" ] &&
    M2_HOME="`(cd "$M2_HOME"; pwd)`"
  [ -n "$JAVA_HOME" ] &&
    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
  # TODO classpath?
fi
if [ -z "$JAVA_HOME" ]; then
  javaExecutable="`which javac`"
  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
    # readlink(1) is not available as standard on Solaris 10.
    readLink=`which readlink`
    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
      if $darwin ; then
        javaHome="`dirname \"$javaExecutable\"`"
        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
      else
        javaExecutable="`readlink -f \"$javaExecutable\"`"
      fi
      javaHome="`dirname \"$javaExecutable\"`"
      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
      JAVA_HOME="$javaHome"
      export JAVA_HOME
    fi
  fi
fi
if [ -z "$JAVACMD" ] ; then
  if [ -n "$JAVA_HOME"  ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
      # IBM's JDK on AIX uses strange locations for the executables
      JAVACMD="$JAVA_HOME/jre/sh/java"
    else
      JAVACMD="$JAVA_HOME/bin/java"
    fi
  else
    JAVACMD="`which java`"
  fi
fi
if [ ! -x "$JAVACMD" ] ; then
  echo "Error: JAVA_HOME is not defined correctly." >&2
  echo "  We cannot execute $JAVACMD" >&2
  exit 1
fi
if [ -z "$JAVA_HOME" ] ; then
  echo "Warning: JAVA_HOME environment variable is not set."
fi
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
  [ -n "$M2_HOME" ] &&
    M2_HOME=`cygpath --path --windows "$M2_HOME"`
  [ -n "$JAVA_HOME" ] &&
    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
  [ -n "$CLASSPATH" ] &&
    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
# traverses directory structure from process work directory to filesystem root
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
  local basedir=$(pwd)
  local wdir=$(pwd)
  while [ "$wdir" != '/' ] ; do
    if [ -d "$wdir"/.mvn ] ; then
      basedir=$wdir
      break
    fi
    wdir=$(cd "$wdir/.."; pwd)
  done
  echo "${basedir}"
}
# concatenates all lines of a file
concat_lines() {
  if [ -f "$1" ]; then
    echo "$(tr -s '\n' ' ' < "$1")"
  fi
}
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
# Provide a "standardized" way to retrieve the CLI args that will
# work with both Windows and non-Windows executions.
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
export MAVEN_CMD_LINE_ARGS
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
exec "$JAVACMD" \
  $MAVEN_OPTS \
  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
  ${WRAPPER_LAUNCHER} "$@"

+ 0 - 145
hos-admin/mvnw.cmd

@ -1,145 +0,0 @@
@REM ----------------------------------------------------------------------------
@REM Licensed to the Apache Software Foundation (ASF) under one
@REM or more contributor license agreements.  See the NOTICE file
@REM distributed with this work for additional information
@REM regarding copyright ownership.  The ASF licenses this file
@REM to you under the Apache License, Version 2.0 (the
@REM "License"); you may not use this file except in compliance
@REM with the License.  You may obtain a copy of the License at
@REM
@REM    http://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@REM KIND, either express or implied.  See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
@REM ----------------------------------------------------------------------------
@REM ----------------------------------------------------------------------------
@REM Maven2 Start Up Batch script
@REM
@REM Required ENV vars:
@REM JAVA_HOME - location of a JDK home dir
@REM
@REM Optional ENV vars
@REM M2_HOME - location of maven2's installed home dir
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@REM     e.g. to debug Maven itself, use
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
@REM ----------------------------------------------------------------------------
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@echo off
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
@REM set %HOME% to equivalent of $HOME
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
:skipRcPre
@setlocal
set ERROR_CODE=0
@REM To isolate internal variables from possible post scripts, we use another setlocal
@setlocal
@REM ==== START VALIDATION ====
if not "%JAVA_HOME%" == "" goto OkJHome
echo.
echo Error: JAVA_HOME not found in your environment. >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
echo.
goto error
:OkJHome
if exist "%JAVA_HOME%\bin\java.exe" goto init
echo.
echo Error: JAVA_HOME is set to an invalid directory. >&2
echo JAVA_HOME = "%JAVA_HOME%" >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
echo.
goto error
@REM ==== END VALIDATION ====
:init
set MAVEN_CMD_LINE_ARGS=%*
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
@REM Fallback to current working directory if not found.
set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
set EXEC_DIR=%CD%
set WDIR=%EXEC_DIR%
:findBaseDir
IF EXIST "%WDIR%"\.mvn goto baseDirFound
cd ..
IF "%WDIR%"=="%CD%" goto baseDirNotFound
set WDIR=%CD%
goto findBaseDir
:baseDirFound
set MAVEN_PROJECTBASEDIR=%WDIR%
cd "%EXEC_DIR%"
goto endDetectBaseDir
:baseDirNotFound
set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
cd "%EXEC_DIR%"
:endDetectBaseDir
IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
@setlocal EnableExtensions EnableDelayedExpansion
for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
:endReadAdditionalConfig
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end
:error
set ERROR_CODE=1
:end
@endlocal & set ERROR_CODE=%ERROR_CODE%
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
@REM check for post script, once with legacy .bat ending and once with .cmd ending
if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
:skipRcPost
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
if "%MAVEN_BATCH_PAUSE%" == "on" pause
if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
exit /B %ERROR_CODE%

+ 0 - 100
hos-admin/pom.xml

@ -1,100 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.yihu.hos</groupId>
    <artifactId>hos-admin</artifactId>
    <version>1.1.1-SNAPSHOT</version>
    <packaging>war</packaging>
    <name>hos-admin</name>
    <description>ESB管理平台</description>
    <parent>
        <groupId>com.yihu.hos</groupId>
        <artifactId>hos-web-framework-dependencies</artifactId>
        <version>1.1.1-SNAPSHOT</version>
        <relativePath>../hos-web-framework-dependencies</relativePath> <!-- lookup parent from repository -->
    </parent>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
        <org.apache.tiles-version>3.0.5</org.apache.tiles-version>
        <!--<main.basedir>${basedir}/../..</main.basedir>-->
        <!--<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>-->
    </properties>
    <dependencies>
        <!--<dependency>-->
            <!--<groupId>org.springframework.boot</groupId>-->
            <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
            <!--<scope>compile</scope>-->
        <!--</dependency>-->
        <dependency>
        <groupId>org.apache.tomcat.embed</groupId>
        <artifactId>tomcat-embed-jasper</artifactId>
        <scope>compile</scope>
    </dependency>
        <!--jxl导出工具-->
        <dependency>
            <groupId>net.sourceforge.jexcelapi</groupId>
            <artifactId>jxl</artifactId>
            <version>2.6.10</version>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>jstl</artifactId>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.hos</groupId>
            <artifactId>hos-web-framework</artifactId>
            <version>1.1.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-orm</artifactId>
            <version>${spring.version}</version>
        </dependency>
        <!--=============tilesJSP布局框架 start =============-->
        <dependency>
            <groupId>org.apache.tiles</groupId>
            <artifactId>tiles-extras</artifactId>
            <version>3.0.5</version>
            <exclusions>
                <exclusion>
                    <groupId>com.google.guava</groupId>
                    <artifactId>guava</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.apache.tiles</groupId>
            <artifactId>tiles-jsp</artifactId>
            <version>${org.apache.tiles-version}</version>
        </dependency>
        <!--=============tiles end =============-->
        <!--========== hibernate start=======-->
        <!--========== hibernate end=========-->
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
        </plugins>
    </build>
</project>

+ 1 - 1
hos-broker/src/main/java/com/yihu/hos/common/appender/JMSAppender.java

@ -326,7 +326,7 @@ public class JMSAppender extends AppenderSkeleton {
      map.put("breadcrumbId",StringUtil.toString(event.getMDC("camel.breadcrumbId")));
      map.put("camelContextId", StringUtil.toString(event.getMDC("camel.contextId")));
      map.put("body", body);
      map.put("fireTimeSource", DateUtil.toStringFormatGMTTime(DateUtil.toGMTTime(event.getTimeStamp()), DateUtil.DEFAULT_YMDHMSDATE_FORMAT));
      map.put("fireTimeSource", DateUtil.toStringFormatGMTTime(DateUtil.toGMTTime(event.getTimeStamp()), DateUtil.DEFAULT_TIMESTAMP_FORMAT));
      msg.setObject(JSONObject.fromObject(map).toString());
      topicPublisher.publish(msg);

+ 9 - 4
hos-broker/src/main/java/com/yihu/hos/common/listener/ApplicationStartListener.java

@ -96,10 +96,15 @@ public class ApplicationStartListener implements ApplicationListener<ContextRefr
                    // 记录到工具类中,以便其它线程需要时进行取用
                    SystemClassMapping.getSystemClassNameMapping().put(code + BrokerConstant.ROUTE, code + CoreConstant.DOT + packageName + CoreConstant.DOT + className);
                    ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
                    Class<RouteBuilder> routeBuilderClass = (Class<RouteBuilder>) currentClassLoader.loadClass(SystemClassMapping.getSystemClassNameMapping().get(code + BrokerConstant.ROUTE));
                    if (routeBuilderClass != null) {
                        RouteBuilder routeBuilder = routeBuilderClass.newInstance();
                        alreadyRouteBuilders.add(routeBuilder);
                    try {
                        Class<RouteBuilder> routeBuilderClass = (Class<RouteBuilder>) currentClassLoader.loadClass(SystemClassMapping.getSystemClassNameMapping().get(code + BrokerConstant.ROUTE));
                        if (routeBuilderClass != null) {
                            RouteBuilder routeBuilder = routeBuilderClass.newInstance();
                            alreadyRouteBuilders.add(routeBuilder);
                        }
                    } catch (Exception e) {
                        logger.info("缺少class文件:" + code);
                        continue;
                    }
                }
            }

+ 13 - 13
hos-broker/src/main/resources/application.yml

@ -61,19 +61,19 @@ hos:
---
spring:
  profiles: test
datasource:
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    username: hos
    password: hos
    test-on-borrow: true
    validation-query: SELECT 1
    test-while-idle: true
    max-active: 30
    default-auto-commit: true
    max-idle: 30
    min-idle: 10
    initial-size: 10
  datasource:
      driverClassName: com.mysql.jdbc.Driver
      url: jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
      username: hos
      password: hos
      test-on-borrow: true
      validation-query: SELECT 1
      test-while-idle: true
      max-active: 30
      default-auto-commit: true
      max-idle: 30
      min-idle: 10
      initial-size: 10
  activemq:
      broker-url: tcp://172.19.103.86:61616
      user: admin

+ 4 - 4
hos-rest/src/main/resources/config/dbhelper.properties

@ -1,7 +1,7 @@
defaultName = hos-mysql
defaultUri = jdbc:mysql://192.168.1.220:3306/hos2?useUnicode=true&characterEncoding=UTF-8
defaultUser = hos2
defaultPassword = hos2
defaultUri = jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=UTF-8
defaultUser = hos
defaultPassword = hos
mongodbUri=mongodb://admin:admin@192.168.131.96/?authSource=admin
mongodbUri=mongodb://esb:esb@172.19.103.86:27017/?authSource=admin
mongodbName=hos

+ 2 - 26
hos-rest/src/main/resources/spring/applicationContext.xml

@ -19,20 +19,7 @@
    <!--业务Beans, 使用注解方式配置-->
    <context:component-scan base-package="com.yihu.hos">
    </context:component-scan>
    <!--====================返回为null的时候转“”==========================-->
    <mvc:annotation-driven>
        <mvc:message-converters register-defaults="true">
            <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
                <property name="objectMapper">
                    <bean class="com.fasterxml.jackson.databind.ObjectMapper">
                        <property name="serializationInclusion">
                            <value type="com.fasterxml.jackson.annotation.JsonInclude.Include">NON_NULL</value>
                        </property>
                    </bean>
                </property>
            </bean>
        </mvc:message-converters>
    </mvc:annotation-driven>
    <!--Hibernate 数据库配置-->
    <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
@ -55,7 +42,7 @@
        <property name="packagesToScan">
            <list>
                <!-- 可以加多个包 -->
                <value>com.yihu.hos.standard.model</value>
                <value>com.yihu.hos.rest.models</value>
            </list>
        </property>
        <property name="hibernateProperties">
@ -83,17 +70,6 @@
    <!--文件上传支持-->
    <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"/>
    <!--国际化配置-->
    <bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
        <description>Message Sources</description>
        <property name="basenames">
            <list>
                <value>text/message</value>
            </list>
        </property>
        <property name="defaultEncoding" value="UTF-8"/>
    </bean>
    <bean id="localeResolver" class="org.springframework.web.servlet.i18n.CookieLocaleResolver">
        <property name="cookieMaxAge" value="604800"/>
        <property name="defaultLocale" value="zh_CN"/>

+ 7 - 21
hos-web-framework-dependencies/pom.xml

@ -11,14 +11,14 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
        <version>1.4.0.RELEASE</version>
        <version>1.3.8.RELEASE</version>
        <relativePath/> <!-- lookup parent from repository -->
    </parent>
    <properties>
        <camel.version>2.17.1</camel.version>
        <spring.version>4.3.2.RELEASE</spring.version>
        <hibernate.version>5.0.9.Final</hibernate.version>
        <hibernate.version>5.2.3.Final</hibernate.version>
        <camel.osgi.export.pkg>org.apache.camel.dataformat.xmljson.*</camel.osgi.export.pkg>
        <camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=xmljson</camel.osgi.export.service>
        <!--<spring.security.version>4.0.2.RELEASE</spring.security.version>-->
@ -82,31 +82,17 @@
                </exclusion>
            </exclusions>
        </dependency>
        <!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-core -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
                    <artifactId>jcl-over-slf4j</artifactId>
                </exclusion>
            </exclusions>
            <groupId>org.hibernate</groupId>
            <artifactId>hibernate-core</artifactId>
            <version>${hibernate.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-mongodb</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-mongodb</artifactId>
            <version>1.9.2.RELEASE</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
                    <artifactId>jcl-over-slf4j</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.mongodb</groupId>
            <artifactId>mongo-java-driver</artifactId>

+ 10 - 1
hos-web-framework/pom.xml

@ -14,7 +14,16 @@
        <relativePath>../hos-web-framework-dependencies</relativePath>
    </parent>
    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
                    <artifactId>jcl-over-slf4j</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
    </dependencies>
</project>

+ 2 - 2
hos-admin/src/main/java/com/yihu/hos/HosAdminApplication.java

@ -12,10 +12,10 @@ import javax.jms.Queue;
@SpringBootApplication(exclude = {MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
@EnableJms
public class HosAdminApplication {
public class ESBApplication {
    public static void main(String[] args) throws Exception {
        SpringApplication application = new SpringApplication(HosAdminApplication.class);
        SpringApplication application = new SpringApplication(ESBApplication.class);
        application.run(args);
    }

+ 1 - 1
hos-admin/src/main/java/com/yihu/hos/ServletInitializer.java

@ -7,7 +7,7 @@ public class ServletInitializer extends SpringBootServletInitializer {
	@Override
	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
		return application.sources(HosAdminApplication.class);
		return application.sources(ESBApplication.class);
	}
}

hos-admin/src/main/java/com/yihu/hos/common/ActiveMqUtil.java → src/main/java/com/yihu/hos/common/ActiveMqUtil.java


hos-admin/src/main/java/com/yihu/hos/common/ApplicationStart.java → src/main/java/com/yihu/hos/common/ApplicationStart.java


hos-admin/src/main/java/com/yihu/hos/common/CheckLoginFilter.java → src/main/java/com/yihu/hos/common/CheckLoginFilter.java


hos-admin/src/main/java/com/yihu/hos/common/CommonPageController.java → src/main/java/com/yihu/hos/common/CommonPageController.java


hos-admin/src/main/java/com/yihu/hos/common/JXLUtil.java → src/main/java/com/yihu/hos/common/JXLUtil.java


hos-admin/src/main/java/com/yihu/hos/common/ObjectVersion.java → src/main/java/com/yihu/hos/common/ObjectVersion.java


hos-admin/src/main/java/com/yihu/hos/common/ReflectUtil.java → src/main/java/com/yihu/hos/common/ReflectUtil.java


hos-admin/src/main/java/com/yihu/hos/common/Services.java → src/main/java/com/yihu/hos/common/Services.java


hos-admin/src/main/java/com/yihu/hos/common/SessionOutTimeFilter.java → src/main/java/com/yihu/hos/common/SessionOutTimeFilter.java


hos-admin/src/main/java/com/yihu/hos/common/activeMq/ActiveMqConstants.java → src/main/java/com/yihu/hos/common/activeMq/ActiveMqConstants.java


hos-admin/src/main/java/com/yihu/hos/common/activeMq/ActivemqConfiguration.java → src/main/java/com/yihu/hos/common/activeMq/ActivemqConfiguration.java


hos-admin/src/main/java/com/yihu/hos/common/constants/Constants.java → src/main/java/com/yihu/hos/common/constants/Constants.java


hos-admin/src/main/java/com/yihu/hos/common/mongo/IMongoDBAdminer.java → src/main/java/com/yihu/hos/common/mongo/IMongoDBAdminer.java


hos-admin/src/main/java/com/yihu/hos/common/mongo/IMongoDBRunner.java → src/main/java/com/yihu/hos/common/mongo/IMongoDBRunner.java


hos-admin/src/main/java/com/yihu/hos/common/mongo/MongoDB.java → src/main/java/com/yihu/hos/common/mongo/MongoDB.java


hos-admin/src/main/java/com/yihu/hos/common/mongo/MongoDBConfig.java → src/main/java/com/yihu/hos/common/mongo/MongoDBConfig.java


hos-admin/src/main/java/com/yihu/hos/common/mongo/MongoDBKit.java → src/main/java/com/yihu/hos/common/mongo/MongoDBKit.java


hos-admin/src/main/java/com/yihu/hos/common/mongo/MongoDBOperator.java → src/main/java/com/yihu/hos/common/mongo/MongoDBOperator.java


hos-admin/src/main/java/com/yihu/hos/common/mongo/MongoDBPro.java → src/main/java/com/yihu/hos/common/mongo/MongoDBPro.java


hos-admin/src/main/java/com/yihu/hos/config/BeanConfig.java → src/main/java/com/yihu/hos/config/BeanConfig.java


hos-admin/src/main/java/com/yihu/hos/config/WebConfig.java → src/main/java/com/yihu/hos/config/WebConfig.java


hos-admin/src/main/java/com/yihu/hos/config/WebMvcConfig.java → src/main/java/com/yihu/hos/config/WebMvcConfig.java


hos-admin/src/main/java/com/yihu/hos/crawler/controller/CrawlerController.java → src/main/java/com/yihu/hos/crawler/controller/CrawlerController.java


hos-admin/src/main/java/com/yihu/hos/crawler/dao/CrawlerDatasetDao.java → src/main/java/com/yihu/hos/crawler/dao/CrawlerDatasetDao.java


hos-admin/src/main/java/com/yihu/hos/crawler/dao/CrawlerFlowDao.java → src/main/java/com/yihu/hos/crawler/dao/CrawlerFlowDao.java


hos-admin/src/main/java/com/yihu/hos/crawler/dao/CrawlerFlowHeadDao.java → src/main/java/com/yihu/hos/crawler/dao/CrawlerFlowHeadDao.java


hos-admin/src/main/java/com/yihu/hos/crawler/format/AdapterBase.java → src/main/java/com/yihu/hos/crawler/format/AdapterBase.java


hos-admin/src/main/java/com/yihu/hos/crawler/format/AdapterScheme.java → src/main/java/com/yihu/hos/crawler/format/AdapterScheme.java


hos-admin/src/main/java/com/yihu/hos/crawler/format/DataSetTransformer.java → src/main/java/com/yihu/hos/crawler/format/DataSetTransformer.java


hos-admin/src/main/java/com/yihu/hos/crawler/format/DocumentTransformer.java → src/main/java/com/yihu/hos/crawler/format/DocumentTransformer.java


hos-admin/src/main/java/com/yihu/hos/crawler/format/IDataTransformer.java → src/main/java/com/yihu/hos/crawler/format/IDataTransformer.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/adapter/AdapterDataSet.java → src/main/java/com/yihu/hos/crawler/model/adapter/AdapterDataSet.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/adapter/AdapterDict.java → src/main/java/com/yihu/hos/crawler/model/adapter/AdapterDict.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/adapter/AdapterDictEntry.java → src/main/java/com/yihu/hos/crawler/model/adapter/AdapterDictEntry.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/adapter/AdapterMetaData.java → src/main/java/com/yihu/hos/crawler/model/adapter/AdapterMetaData.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/config/SysConfig.java → src/main/java/com/yihu/hos/crawler/model/config/SysConfig.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/CrawlerDataSetModel.java → src/main/java/com/yihu/hos/crawler/model/flow/CrawlerDataSetModel.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/CrawlerFlowHeadModel.java → src/main/java/com/yihu/hos/crawler/model/flow/CrawlerFlowHeadModel.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/CrawlerFlowModel.java → src/main/java/com/yihu/hos/crawler/model/flow/CrawlerFlowModel.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/resultModel/CrawlerDatasetResultDetailModel.java → src/main/java/com/yihu/hos/crawler/model/flow/resultModel/CrawlerDatasetResultDetailModel.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/resultModel/CrawlerDatasetResultModel.java → src/main/java/com/yihu/hos/crawler/model/flow/resultModel/CrawlerDatasetResultModel.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/resultModel/FlowEntrance.java → src/main/java/com/yihu/hos/crawler/model/flow/resultModel/FlowEntrance.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/resultModel/FlowLines.java → src/main/java/com/yihu/hos/crawler/model/flow/resultModel/FlowLines.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/resultModel/FlowMapping.java → src/main/java/com/yihu/hos/crawler/model/flow/resultModel/FlowMapping.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/resultModel/MappingDataset.java → src/main/java/com/yihu/hos/crawler/model/flow/resultModel/MappingDataset.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/flow/resultModel/MappingMetadata.java → src/main/java/com/yihu/hos/crawler/model/flow/resultModel/MappingMetadata.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/patient/Patient.java → src/main/java/com/yihu/hos/crawler/model/patient/Patient.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/patient/PatientIdentity.java → src/main/java/com/yihu/hos/crawler/model/patient/PatientIdentity.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/patient/PatientIndex.java → src/main/java/com/yihu/hos/crawler/model/patient/PatientIndex.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/standard/StdDict.java → src/main/java/com/yihu/hos/crawler/model/standard/StdDict.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/standard/StdMetaData.java → src/main/java/com/yihu/hos/crawler/model/standard/StdMetaData.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/transform/DictDataType.java → src/main/java/com/yihu/hos/crawler/model/transform/DictDataType.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/transform/EhrCondition.java → src/main/java/com/yihu/hos/crawler/model/transform/EhrCondition.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/transform/IVerifier.java → src/main/java/com/yihu/hos/crawler/model/transform/IVerifier.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/transform/LogicValues.java → src/main/java/com/yihu/hos/crawler/model/transform/LogicValues.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/transform/MetaDataType.java → src/main/java/com/yihu/hos/crawler/model/transform/MetaDataType.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/transform/MetaDataVerify.java → src/main/java/com/yihu/hos/crawler/model/transform/MetaDataVerify.java


hos-admin/src/main/java/com/yihu/hos/crawler/model/transform/TransformType.java → src/main/java/com/yihu/hos/crawler/model/transform/TransformType.java


hos-admin/src/main/java/com/yihu/hos/crawler/origin/FileSystemOrigin.java → src/main/java/com/yihu/hos/crawler/origin/FileSystemOrigin.java


hos-admin/src/main/java/com/yihu/hos/crawler/origin/IDataOrigin.java → src/main/java/com/yihu/hos/crawler/origin/IDataOrigin.java


hos-admin/src/main/java/com/yihu/hos/crawler/service/CrawlerFlowManager.java → src/main/java/com/yihu/hos/crawler/service/CrawlerFlowManager.java


hos-admin/src/main/java/com/yihu/hos/crawler/service/CrawlerManager.java → src/main/java/com/yihu/hos/crawler/service/CrawlerManager.java


hos-admin/src/main/java/com/yihu/hos/crawler/service/CrawlerService.java → src/main/java/com/yihu/hos/crawler/service/CrawlerService.java


hos-admin/src/main/java/com/yihu/hos/crawler/service/DataCollectDispatcher.java → src/main/java/com/yihu/hos/crawler/service/DataCollectDispatcher.java


hos-admin/src/main/java/com/yihu/hos/crawler/service/EsbHttp.java → src/main/java/com/yihu/hos/crawler/service/EsbHttp.java


hos-admin/src/main/java/com/yihu/hos/crawler/service/OldPatientCDAUpload.java → src/main/java/com/yihu/hos/crawler/service/OldPatientCDAUpload.java


hos-admin/src/main/java/com/yihu/hos/crawler/service/PatientCDAIndex.java → src/main/java/com/yihu/hos/crawler/service/PatientCDAIndex.java


hos-admin/src/main/java/com/yihu/hos/crawler/service/PatientCDAUpload.java → src/main/java/com/yihu/hos/crawler/service/PatientCDAUpload.java


hos-admin/src/main/java/com/yihu/hos/crawler/storage/DataSetStorage.java → src/main/java/com/yihu/hos/crawler/storage/DataSetStorage.java


hos-admin/src/main/java/com/yihu/hos/crawler/storage/DocumentStorage.java → src/main/java/com/yihu/hos/crawler/storage/DocumentStorage.java


hos-admin/src/main/java/com/yihu/hos/crawler/storage/IDataStorage.java → src/main/java/com/yihu/hos/crawler/storage/IDataStorage.java


hos-admin/src/main/java/com/yihu/hos/crawler/storage/MongodbStorage.java → src/main/java/com/yihu/hos/crawler/storage/MongodbStorage.java


hos-admin/src/main/java/com/yihu/hos/datacollect/controller/DataCollectController.java → src/main/java/com/yihu/hos/datacollect/controller/DataCollectController.java


hos-admin/src/main/java/com/yihu/hos/datacollect/controller/DataPushController.java → src/main/java/com/yihu/hos/datacollect/controller/DataPushController.java


hos-admin/src/main/java/com/yihu/hos/datacollect/dao/DatacollectDao.java → src/main/java/com/yihu/hos/datacollect/dao/DatacollectDao.java


hos-admin/src/main/java/com/yihu/hos/datacollect/dao/DatacollectLogDao.java → src/main/java/com/yihu/hos/datacollect/dao/DatacollectLogDao.java


hos-admin/src/main/java/com/yihu/hos/datacollect/dao/intf/IDatacollectDao.java → src/main/java/com/yihu/hos/datacollect/dao/intf/IDatacollectDao.java


hos-admin/src/main/java/com/yihu/hos/datacollect/dao/intf/IDatacollectLogDao.java → src/main/java/com/yihu/hos/datacollect/dao/intf/IDatacollectLogDao.java


hos-admin/src/main/java/com/yihu/hos/datacollect/model/DtoDatasetCol.java → src/main/java/com/yihu/hos/datacollect/model/DtoDatasetCol.java


hos-admin/src/main/java/com/yihu/hos/datacollect/model/DtoDictCol.java → src/main/java/com/yihu/hos/datacollect/model/DtoDictCol.java


hos-admin/src/main/java/com/yihu/hos/datacollect/model/DtoJobConfig.java → src/main/java/com/yihu/hos/datacollect/model/DtoJobConfig.java


hos-admin/src/main/java/com/yihu/hos/datacollect/model/DtoJobDataset.java → src/main/java/com/yihu/hos/datacollect/model/DtoJobDataset.java


hos-admin/src/main/java/com/yihu/hos/datacollect/model/DtoJobLog.java → src/main/java/com/yihu/hos/datacollect/model/DtoJobLog.java


hos-admin/src/main/java/com/yihu/hos/datacollect/model/RsDatapushLog.java → src/main/java/com/yihu/hos/datacollect/model/RsDatapushLog.java


hos-admin/src/main/java/com/yihu/hos/datacollect/model/RsJobConfig.java → src/main/java/com/yihu/hos/datacollect/model/RsJobConfig.java


+ 0 - 0
hos-admin/src/main/java/com/yihu/hos/datacollect/model/RsJobDataset.java


Some files were not shown because too many files changed in this diff