首页 发现 帮助
注册 登录
huangzhiyong
/
eip_manage
关注 1
点赞 0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

代码冲突

lingfeng 8 年之前
父节点
de68c4b706
当前提交
df8ac3833d
共有 13 个文件被更改，包括 334 次插入 和 227 次删除
分列视图 显示文件统计
  1. 88 53
      hos-admin/hos-admin.iml
  2. 78 61
      hos-arbiter/hos-arbiter.iml
  3. 8 75
      hos-broker/pom.xml
  4. 2 2
      hos-broker/src/main/java/com/yihu/hos/common/camelrouter/BrokerServerRouter.java
  5. 2 2
      hos-broker/src/main/java/com/yihu/hos/common/listener/ApplicationStartListener.java
  6. 1 1
      hos-broker/src/main/java/com/yihu/hos/controllers/ESBCamelController.java
  7. 1 1
      hos-broker/src/main/java/com/yihu/hos/services/BrokerServerService.java
  8. 4 4
      hos-broker/src/main/java/com/yihu/hos/services/ESBCamelService.java
  9. 0 25
      hos-broker/src/main/resources/application.properties
  10. 49 0
      hos-broker/src/main/resources/application.yml
  11. 98 0
      hos-core/src/main/java/com/yihu/hos/core/datatype/ClassFileUtil.java
  12. 2 2
      hos-web-framework/src/main/java/com/yihu/hos/web/framework/dao/SQLGeneralDAO.java
  13. 1 1
      hos-web-framework/src/main/java/com/yihu/hos/web/framework/util/springutil/SpringBeanUtil.java

+ 88 - 53
hos-admin/hos-admin.iml
查看文件 

@ -45,27 +45,28 @@
 
    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.0.1" level="project" />
 
    <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" />
 
    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.38" level="project" />
 
    <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.3.0" 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-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-core:3.0.5" 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:1.0.6" 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-api: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.slf4j:slf4j-api:1.7.21" 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-request-api:1.0.6" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.16" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.0.33" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.0.33" level="project" />
 
@ -76,17 +77,10 @@
 
    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.1.0" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.6" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.6" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.6" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
 
@ -94,79 +88,120 @@
 
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.0.33" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.0.33" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.3.11.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.9.4.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.4.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver: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.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-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-http4:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-core: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.4" level="project" />
 
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" 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.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.5.RELEASE" 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.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.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.activemq:activemq-camel:5.13.2" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-spring:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.xbean:xbean-spring:3.18" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-broker:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-client:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.fusesource.hawtbuf:hawtbuf:1.11" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-openwire-legacy:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-pool:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-jms-pool:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:1.0.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" 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: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
 
    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
 
    <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.3.0" 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.1.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.0.0" 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-transports-http:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.4.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.4.1" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.6" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.6" 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: 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: 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.0" 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-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:1.0.6" 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" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.3.5.RELEASE" 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.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-core:1.3" 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.springframework:spring-test:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
 
  </component>
 
</module>

+ 78 - 61
hos-arbiter/hos-arbiter.iml
查看文件 

@ -17,6 +17,27 @@
 
    <orderEntry type="inheritedJdk" />
 
    <orderEntry type="sourceFolder" forTests="false" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.16" level="project" />
 
    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver: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.springframework:spring-tx:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.4.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.0.33" level="project" />
 
@ -26,64 +47,47 @@
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:1.3.5.RELEASE" 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.1.0" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.6" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.6" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.6" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.5.RELEASE" 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.springframework:spring-tx:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.4.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" 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-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-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-jms:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-core:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-jms:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.2.5.RELEASE" 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.4" level="project" />
 
    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-camel:5.13.2" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-spring:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.xbean:xbean-spring:3.18" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-broker:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-openwire-legacy:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:1.0.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-pool:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-jms-pool:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-client:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.fusesource.hawtbuf:hawtbuf:1.11" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-openwire-legacy:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-pool:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-jms-pool:5.12.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:1.0.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.3.5.RELEASE" 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.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-core:1.3" 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.springframework:spring-test:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.16" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.3.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
 
@ -92,67 +96,80 @@
 
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.0.33" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.3.11.Final" level="project" />
 
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
 
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" level="project" />
 
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.3.11.Final" level="project" />
 
    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.jboss:jandex:1.1.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.0.b2" level="project" />
 
    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.5.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.18.1-GA" level="project" />
 
    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.jboss:jandex:1.1.0.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.9.4.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.2.5.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.2.5.RELEASE" 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.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="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: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
 
    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.0.1" level="project" />
 
    <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" />
 
    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
 
    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
 
    <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.3.0" 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.1.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.0.0" 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-transports-http:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.0.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.4.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.4.1" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.6" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.6" 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: 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: 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: javax.transaction:javax.transaction-api:1.2" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-all:5.13.0" level="project" />
 
  </component>
 
</module>

+ 8 - 75
hos-broker/pom.xml
查看文件 

@ -5,17 +5,17 @@
 
	<groupId>com.yihu.hos</groupId>
 
	<artifactId>hos-broker</artifactId>
 
	<version>0.0.1-SNAPSHOT</version>
 
	<version>1.1.1-SNAPSHOT</version>
 
	<packaging>jar</packaging>
 
	<name>hos-broker</name>
 
	<description>ESB服务运行模块</description>
 
	<parent>
 
		<groupId>org.springframework.boot</groupId>
 
		<artifactId>spring-boot-starter-parent</artifactId>
 
		<version>1.4.0.RELEASE</version>
 
		<relativePath/> <!-- lookup parent from repository -->
 
		<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>
 
@ -52,77 +52,10 @@
 
	<dependencies>
 
		<dependency>
 
			<groupId>org.springframework.boot</groupId>
 
			<artifactId>spring-boot-starter-web</artifactId>
 
			<groupId>com.yihu.hos</groupId>
 
			<artifactId>hos-web-framework</artifactId>
 
			<version>1.1.1-SNAPSHOT</version>
 
		</dependency>
 
		<dependency>
 
			<groupId>org.springframework.boot</groupId>
 
			<artifactId>spring-boot-starter-data-mongodb</artifactId>
 
		</dependency>
 
		<dependency>
 
			<groupId>org.apache.camel</groupId>
 
			<artifactId>camel-spring-boot</artifactId>
 
			<version>2.17.1</version> <!-- use the same version as your Camel core version -->
 
		</dependency>
 
		<dependency>
 
			<groupId>org.apache.camel</groupId>
 
			<artifactId>camel-http</artifactId>
 
			<version>2.17.1</version>
 
		</dependency>
 
		<dependency>
 
			<groupId>org.apache.camel</groupId>
 
			<artifactId>camel-cxf</artifactId>
 
			<version>2.17.1</version>
 
		</dependency>
 
		<dependency>
 
			<groupId>org.apache.camel</groupId>
 
			<artifactId>camel-quartz</artifactId>
 
			<version>2.17.1</version>
 
		</dependency>
 
		<dependency>
 
			<groupId>org.apache.camel</groupId>
 
			<artifactId>camel-quartz2</artifactId>
 
			<version>2.17.1</version>
 
		</dependency>
 
		<dependency>
 
			<groupId>org.apache.camel</groupId>
 
			<artifactId>camel-xmljson</artifactId>
 
			<version>2.17.1</version>
 
			<!-- Use the same version as camel-core, but remember that this component is only available from 2.10 onwards -->
 
		</dependency>
 
		<dependency>
 
			<groupId>xom</groupId>
 
			<artifactId>xom</artifactId>
 
			<version>1.2.5</version>
 
		</dependency>
 
		<dependency>
 
			<groupId>org.apache.camel</groupId>
 
			<artifactId>camel-stream</artifactId>
 
			<version>2.17.1</version>
 
		</dependency>
 
		<dependency>
 
			<groupId>org.apache.camel</groupId>
 
			<artifactId>camel-http4</artifactId>
 
			<version>2.17.1</version> <!-- use the same version as your Camel core version -->
 
		</dependency>
 
		<dependency>
 
			<groupId>org.apache.activemq</groupId>
 
			<artifactId>activemq-camel</artifactId>
 
			<version>5.13.2</version>
 
		</dependency>
 
		<!-- test -->
 
		<dependency>
 
			<groupId>org.springframework.boot</groupId>
 
			<artifactId>spring-boot-starter-test</artifactId>
 
			<scope>test</scope>
 
		</dependency>
 
		<dependency>
 
			<groupId>com.yihu.hos.resource</groupId>
 
			<artifactId>Hos-Framework</artifactId>
 
			<version>1.0.7</version>
 
		</dependency>
 
	</dependencies>
 
	<build>

+ 2 - 2
hos-broker/src/main/java/com/yihu/hos/common/camelrouter/BrokerServerRouter.java
查看文件 

@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
 
public class BrokerServerRouter extends RouteBuilder {
 
    @Override
 
    public void configure() throws Exception {
 
//        from("timer:brokerServerOnline?period={{timer.period}}")
 
//                .to("bean:brokerServerService?method=brokerServerOnline");
 
        from("timer:brokerServerOnline?period={{timer.period}}")
 
                .to("bean:brokerServerService?method=brokerServerOnline");
 
    }
 
}

+ 2 - 2
hos-broker/src/main/java/com/yihu/hos/common/listener/ApplicationStartListener.java
查看文件 

@ -1,9 +1,9 @@
 
package com.yihu.hos.common.listener;
 
import com.yihu.ehr.framework.util.operator.ClassFileUtil;
 
import com.yihu.ehr.framework.util.operator.CollectionUtil;
 
import com.yihu.hos.common.constants.Constant;
 
import com.yihu.hos.common.dao.BrokerDao;
 
import com.yihu.hos.core.datatype.ClassFileUtil;
 
import com.yihu.hos.core.datatype.CollectionUtil;
 
import com.yihu.hos.models.SystemCamelContext;
 
import com.yihu.hos.models.SystemClassMapping;
 
import com.yihu.hos.models.SystemServiceFlow;

+ 1 - 1
hos-broker/src/main/java/com/yihu/hos/controllers/ESBCamelController.java
查看文件 

@ -1,7 +1,7 @@
 
package com.yihu.hos.controllers;
 
import com.yihu.ehr.framework.model.Result;
 
import com.yihu.hos.services.ESBCamelService;
 
import com.yihu.hos.web.framework.model.Result;
 
import io.swagger.annotations.ApiOperation;
 
import io.swagger.annotations.ApiParam;
 
import org.springframework.stereotype.Controller;

+ 1 - 1
hos-broker/src/main/java/com/yihu/hos/services/BrokerServerService.java
查看文件 

@ -97,6 +97,6 @@ public class BrokerServerService implements DisposableBean {
 
    @Override
 
    public void destroy() throws Exception {
 
        this.brokerServerOffline();
 
//        this.brokerServerOffline();
 
    }
 
}

+ 4 - 4
hos-broker/src/main/java/com/yihu/hos/services/ESBCamelService.java
查看文件 

@ -1,12 +1,12 @@
 
package com.yihu.hos.services;
 
import com.yihu.ehr.framework.model.Result;
 
import com.yihu.ehr.framework.util.operator.ClassFileUtil;
 
import com.yihu.ehr.framework.util.operator.StringUtil;
 
import com.yihu.hos.common.classLoader.DynamicClassLoader;
 
import com.yihu.hos.common.constants.Constant;
 
import com.yihu.hos.core.datatype.ClassFileUtil;
 
import com.yihu.hos.core.datatype.StringUtil;
 
import com.yihu.hos.models.SystemCamelContext;
 
import com.yihu.hos.models.SystemClassMapping;
 
import com.yihu.hos.web.framework.model.Result;
 
import org.apache.camel.builder.RouteBuilder;
 
import org.apache.logging.log4j.LogManager;
 
import org.apache.logging.log4j.Logger;
 
@ -157,7 +157,7 @@ public class ESBCamelService {
 
        // 1、============
 
        File systemClassFlowPath = new File(ClassLoader.getSystemResource(Constant.EMPTY).getPath() + "/" + serviceFlow);
 
        // 记录到工具类中，以便其它线程需要时进行取用
 
        SystemClassMapping.getSystemClassNameMapping().put(serviceFlow + Constant.ROUTE, serviceFlow + Constant.DOT + packageName + Constant.DOT + className);
 
        SystemClassMapping.getSystemClassNameMapping().put(serviceFlow + type, serviceFlow + Constant.DOT + packageName + Constant.DOT + className);
 
        // 2、============开始写入class文件
 
        ClassFileUtil.createClassfile(systemClassFlowPath.toURI().toURL(), packageName, className, path);

+ 0 - 25
hos-broker/src/main/resources/application.properties
查看文件 

@ -1,25 +0,0 @@
 
server.port=8099
 
hos.arbiter=http://192.168.131.38:10135
 
spring.datasource.driverClassName=com.mysql.jdbc.Driver
 
spring.datasource.url=jdbc:mysql://192.168.1.220:3306/hos2_resource??useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
 
spring.datasource.username=hos2
 
spring.datasource.password=hos2
 
spring.datasource.test-on-borrow=true
 
spring.datasource.validation-query=SELECT 1
 
spring.datasource.test-while-idle=true
 
spring.datasource.max-active=30
 
spring.datasource.default-auto-commit=true
 
spring.datasource.max-idle=30
 
spring.datasource.min-idle=10
 
spring.datasource.initial-size=10
 
security.basic.enabled=false
 
# the name of Camel
 
camel.springboot.name = HosBrokerServer
 
# how often to trigger the timer, must less than 30s
 
timer.period = 10000
 
spring.activemq.broker-url=tcp://172.19.103.86:61616
 
spring.activemq.user=admin
 
spring.activemq.password=admin

+ 49 - 0
hos-broker/src/main/resources/application.yml
查看文件 

@ -0,0 +1,49 @@
 
server:
 
  contextPath:
 
  port: 8099
 
  sessionTimeout:  300
 
hos:
 
  arbiter: http://192.168.131.38:10135
 
local:
 
  server:
 
    port: 8099
 
  application:
 
    name: HosBrokerServer
 
---
 
spring:
 
  profiles: dev
 
  datasource:
 
    driverClassName: com.mysql.jdbc.Driver
 
    url: jdbc:mysql://192.168.1.220:3306/hos2_resource?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
 
    username: hos2
 
    password: hos2
 
    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
 
      password: admin
 
security:
 
  basic:
 
    enabled: false
 
# the name of Camel
 
camel:
 
  springboot:
 
    name: HosBrokerServer
 
# how often to trigger the timer, must less than 30s
 
timer:
 
  period: 10000
 
---
 
spring:
 
  profiles: test
 
---
 
application:
 
  message: EHR Browser

+ 98 - 0
hos-core/src/main/java/com/yihu/hos/core/datatype/ClassFileUtil.java
查看文件 

@ -0,0 +1,98 @@
 
package com.yihu.hos.core.datatype;
 
import org.apache.logging.log4j.LogManager;
 
import org.apache.logging.log4j.Logger;
 
import java.io.File;
 
import java.io.FileInputStream;
 
import java.io.FileOutputStream;
 
import java.net.URL;
 
public class ClassFileUtil {
 
    /**
 
     * 工具类不允许进行实例化
 
     */
 
    private ClassFileUtil() {
 
    }
 
    private static Logger logger = LogManager.getLogger();
 
    /**
 
     * 通过这个工具方法，可以进行class文件的创建
 
     * @param systemFlowURL 本次进行系统创建的system业务系统存储class文件的根目录
 
     * @param packageName class文件的包信息
 
     * @param className class文件的类名信息
 
     * @param path class文件的路径
 
     */
 
    public static void createClassfile(URL systemFlowURL, String packageName, String className, String path) {
 
        // 开始输出文件内容
 
        try {
 
            FileInputStream in = new FileInputStream(new File(path));
 
            File systemFlowFile = new File(systemFlowURL.getPath());
 
            if (!systemFlowFile.exists()) {
 
                systemFlowFile.mkdirs();
 
            }
 
            File packageFile = new File(systemFlowURL.getPath() + "/" + packageName);
 
            if (!packageFile.exists()) {
 
                packageFile.mkdirs();
 
            }
 
            String classPath = packageFile + "/" + className + ".class";
 
            File file = new File(classPath);
 
            if (file.isFile() && file.exists()) {
 
                return;
 
            } else {
 
                file.createNewFile();
 
            }
 
            FileOutputStream out = new FileOutputStream(classPath);
 
            int n = 0;// 每次读取的字节长度
 
            byte[] bb = new byte[1024];// 存储每次读取的内容
 
            while ((n = in.read(bb)) != -1) {
 
                out.write(bb, 0, n);// 将读取的内容，写入到输出流当中
 
            }
 
            out.close();
 
            in.close();
 
        } catch (Exception e) {
 
            logger.error(e.getMessage() , e);
 
            return;
 
        }
 
    }
 
    public static void updateClassfile(String classPath, String path) {
 
        // 开始输出文件内容
 
        try {
 
            FileInputStream in = new FileInputStream(new File(path));
 
            File file = new File(classPath);
 
            if (file.isFile() && file.exists()) {
 
                file.delete();
 
            } else {
 
                file.createNewFile();
 
            }
 
            FileOutputStream out = new FileOutputStream(classPath);
 
            int n = 0;// 每次读取的字节长度
 
            byte[] bb = new byte[1024];// 存储每次读取的内容
 
            while ((n = in.read(bb)) != -1) {
 
                out.write(bb, 0, n);// 将读取的内容，写入到输出流当中
 
            }
 
            out.close();
 
            in.close();
 
        } catch (Exception e) {
 
            logger.error(e.getMessage() , e);
 
            return;
 
        }
 
    }
 
    public static void deleteClassfile(String classPath) {
 
        // 开始输出文件内容
 
        try {
 
            File file = new File(classPath);
 
            if (file.isFile() && file.exists()) {
 
                file.delete();
 
            }
 
        } catch (Exception e) {
 
            logger.error(e.getMessage() , e);
 
            return;
 
        }
 
    }
 
}

+ 2 - 2
hos-web-framework/src/main/java/com/yihu/hos/web/framework/dao/SQLGeneralDAO.java
查看文件 

@ -46,8 +46,8 @@ import java.util.Map;
 
 * @vsrsion 1.0
 
 * Created at 2016/8/8.
 
 */
 
@Transactional
 
@Repository("sqlGeneralDAO")
 
//@Transactional
 
//@Repository("sqlGeneralDAO")
 
public class SQLGeneralDAO implements XSQLGeneralDAO {
 
    static private final Logger logger = LoggerFactory.getLogger(SQLGeneralDAO.class);

+ 1 - 1
hos-web-framework/src/main/java/com/yihu/hos/web/framework/util/springutil/SpringBeanUtil.java
查看文件 

@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 
 * @version 1.0
 
 * @created 12-05-2015 17:47:55
 
 */
 
@Component
 
public class SpringBeanUtil implements ApplicationContextAware {
 
    private static ApplicationContext springContext = null;