Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
huangzhiyong
/
eip_manage
Obserwuj 1
Polub 0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

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

# Conflicts:
#	src/main/java/com/yihu/hos/system/service/FlowManager.java
Airhead 8 lat temu
rodzic
74cde411b5 abeaacd653
commit
48de6775c1
9 zmienionych plików z 258 dodań i 154 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 1 0
      esb.iml
  2. 117 69
      hos-arbiter/hos-arbiter.iml
  3. 70 42
      hos-camel/hos-camel.iml
  4. 56 28
      hos-rest/hos-rest.iml
  5. 4 2
      src/main/java/com/yihu/hos/datacollect/service/DatacollectManager.java
  6. 0 1
      src/main/java/com/yihu/hos/interceptor/JdbcTemplateAdvice.java
  7. 8 8
      src/main/java/com/yihu/hos/system/service/FlowManager.java
  8. 1 3
      src/main/java/com/yihu/hos/system/service/intf/IFlowManage.java
  9. 1 1
      src/main/resources/spring/applicationContext.xml

+ 1 - 0
esb.iml
Wyświetl plik 

@ -208,6 +208,7 @@
 
    <orderEntry type="library" name="Maven: org.fusesource.hawtbuf:hawtbuf:1.9" 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.jasypt:jasypt:1.9.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.1.RELEASE" level="project" />

+ 117 - 69
hos-arbiter/hos-arbiter.iml
Wyświetl plik 

@ -80,108 +80,90 @@
 
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.2.8.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.3.8.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.2.8.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-core:5.7.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" 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:kahadb:5.7.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq.protobuf:activemq-protobuf:1.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.fusesource.mqtt-client:mqtt-client:1.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.fusesource.hawtdispatch:hawtdispatch-transport:1.11" level="project" />
 
    <orderEntry type="library" name="Maven: org.fusesource.hawtdispatch:hawtdispatch:1.11" level="project" />
 
    <orderEntry type="library" name="Maven: org.fusesource.hawtbuf:hawtbuf:1.9" 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.springframework:spring-context:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.jasypt:jasypt:1.9.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.json:json:20140107" 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.springframework:spring-tx:4.3.3.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.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.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.3.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.1.5" 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: org.apache.camel:camel-jetty:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty9:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlets:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-jmx:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty-common:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
 
    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" 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: org.springframework.boot:spring-boot-starter-web:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-core:5.7.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" 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:kahadb:5.7.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.activemq.protobuf:activemq-protobuf:1.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.fusesource.mqtt-client:mqtt-client:1.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.fusesource.hawtdispatch:hawtdispatch-transport:1.11" level="project" />
 
    <orderEntry type="library" name="Maven: org.fusesource.hawtdispatch:hawtdispatch:1.11" level="project" />
 
    <orderEntry type="library" name="Maven: org.fusesource.hawtbuf:hawtbuf:1.9" 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.springframework:spring-context:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.jasypt:jasypt:1.9.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
 
    <orderEntry type="module" module-name="hos-web-framework" />
 
    <orderEntry type="library" name="Maven: eu.medsea.mimeutil:mime-util:2.1.3" level="project" />
 
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.1.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-aop:1.4.1.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.1.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.0.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.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.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.10.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.12.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.5" 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.3" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
 
@ -193,7 +175,6 @@
 
    <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.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.12.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.2.2" 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" />
 
@ -203,12 +184,16 @@
 
    <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-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-codec:commons-codec:1.10" level="project" />
 
    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.4.1" level="project" />
 
    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.9.0" level="project" />
 
    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
 
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" 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: 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: org.apache.httpcomponents:httpmime:4.5.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" />
 
@ -222,6 +207,72 @@
 
    <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: 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.camel:camel-core:2.18.0" 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.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-spring:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-http4:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-http-common:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jms:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-jms:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-cxf:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-cxf-transport:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.1.7" 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.7" 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.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxrs:3.1.7" 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.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.7" 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.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.1.7" 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.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-rs-client:3.1.7" 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.18.0" 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.18.0" 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.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" 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.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty9:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlets:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-jmx:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty-common:2.18.0" 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" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.1.RELEASE" level="project" />
 
@ -236,8 +287,5 @@
 
    <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.springframework:spring-test:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" 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" />
 
  </component>
 
</module>

+ 70 - 42
hos-camel/hos-camel.iml
Wyświetl plik 

@ -10,6 +10,34 @@
 
    </content>
 
    <orderEntry type="inheritedJdk" />
 
    <orderEntry type="sourceFolder" forTests="false" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-core:2.17.1" 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: org.apache.camel:camel-jms:2.17.1" 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-frontend-jaxrs: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.apache.cxf:cxf-rt-transports-http:3.1.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.5" 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.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: org.apache.cxf:cxf-rt-bindings-soap:3.1.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.1.5" 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.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: org.apache.camel:camel-xmljson:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-stream:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty9:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty-common:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib: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" />
 
@ -18,72 +46,74 @@
 
    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" 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.apache.camel:camel-core:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-core:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" 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-spring-boot:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-spring:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.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: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-http4:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-http-common:2.18.0" 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.camel:camel-jms:2.17.1" 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.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-jms:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.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-frontend-jaxrs: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.apache.camel:camel-cxf:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-cxf-transport:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.1.7" 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.7" 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.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxrs:3.1.7" 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.1.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" 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-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.cxf:cxf-rt-bindings-xml:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.1.7" 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: org.apache.cxf:cxf-rt-rs-security-oauth:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-rs-client:3.1.7" 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.springframework:spring-core:4.3.3.RELEASE" 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-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.apache.cxf:cxf-rt-databinding-jaxb:3.1.5" 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-quartz:2.18.0" 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: org.apache.camel:camel-quartz2:2.18.0" 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: org.apache.camel:camel-xmljson:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-stream:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty9:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-stream:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty9:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlets:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-jmx:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty-common:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty-common:2.18.0" 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" />
 
@ -102,6 +132,7 @@
 
    <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.3" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:1.4.1.RELEASE" level="project" />
 
@ -120,27 +151,24 @@
 
    <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: commons-codec:commons-codec:1.10" level="project" />
 
    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.4.1" level="project" />
 
    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.9.0" level="project" />
 
    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
 
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
 
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" 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: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" 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" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.1.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.4.1.RELEASE" level="project" />
 
@ -149,10 +177,10 @@
 
    <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-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.skyscreamer:jsonassert:1.3.0" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.json:json:20140107" level="project" />

+ 56 - 28
hos-rest/hos-rest.iml
Wyświetl plik 

@ -82,6 +82,34 @@
 
    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.8.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.3.8.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.2.8.RELEASE" 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-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: org.apache.camel:camel-jms:2.17.1" 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.apache.cxf:cxf-rt-wsdl:3.1.5" 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: org.apache.cxf:cxf-rt-transports-http:3.1.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.5" 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.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: 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: org.apache.camel:camel-xmljson:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-stream:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty9:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty-common:2.17.1" level="project" />
 
    <orderEntry type="module" module-name="hos-web-framework" />
 
    <orderEntry type="library" name="Maven: eu.medsea.mimeutil:mime-util:2.1.3" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
 
@ -168,56 +196,56 @@
 
    <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:1.1.0.Final" 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-core:2.18.0" 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: org.apache.camel:camel-spring-boot:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-spring:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-http4:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-http-common:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" 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-jms:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-jms:4.3.3.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.3.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.apache.camel:camel-cxf:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-cxf-transport:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.1.7" 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: org.apache.cxf:cxf-rt-wsdl:3.1.7" 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: org.apache.cxf:cxf-rt-databinding-jaxb:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxrs:3.1.7" 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.1.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.7" 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.cxf:cxf-rt-bindings-xml:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.1.7" 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: org.apache.cxf:cxf-rt-rs-security-oauth:3.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-rs-client:3.1.7" 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-quartz:2.18.0" 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: org.apache.camel:camel-quartz2:2.18.0" 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: org.apache.camel:camel-xmljson:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" 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: org.apache.camel:camel-jetty:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty9:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-stream:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty9:2.18.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.3.11.v20160721" level="project" />
 
@ -228,7 +256,7 @@
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-jmx:9.3.11.v20160721" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty-common:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-jetty-common:2.18.0" 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" />

+ 4 - 2
src/main/java/com/yihu/hos/datacollect/service/DatacollectManager.java
Wyświetl plik 

@ -221,14 +221,16 @@ public class DatacollectManager implements IDatacollectManager {
 
    @Override
 
    @Transactional
 
    public ActionResult addJob(RsJobConfig obj, String cron, String jobDataset) throws Exception {
 
        Integer flowId = flowManage.genCamelFile(obj.getFlowTempId(),cron);
 
        datacollectDao.saveEntity(obj);//保存任务
 
        Integer flowId = flowManage.genCamelFile(obj.getId(),obj.getFlowTempId(),cron);
 
        if (flowId!=null){
 
            obj.setFlowId(flowId);
 
            datacollectDao.saveEntity(obj);
 
            datacollectDao.updateEntity(obj);
 
            saveJobDataset(obj.getId(), jobDataset);
 
            return new ActionResult(true, "新增任务成功！");
 
        }else {
 
            datacollectDao.deleteEntity(obj);
 
            return new ActionResult(false, "新增任务失败-关联流程环节失败！");
 
        }

+ 0 - 1
src/main/java/com/yihu/hos/interceptor/JdbcTemplateAdvice.java
Wyświetl plik 

@ -32,7 +32,6 @@ public class JdbcTemplateAdvice {
 
        }
 
        //用改变后的参数执行目标方法
 
        Object returnValue = point.proceed(args);
 
        System.out.println("@Around：被织入的目标对象为：" + point.getTarget());
 
        return returnValue;
 
    }

+ 8 - 8
src/main/java/com/yihu/hos/system/service/FlowManager.java
Wyświetl plik 

@ -451,11 +451,11 @@ public class FlowManager implements IFlowManage {
 
     * @param newCron
 
     * @throws Exception
 
     */
 
    public Integer genCamelFile(Integer flowTempId, String newCron) throws Exception {
 
    public Integer genCamelFile(String jobId,Integer flowTempId, String newCron) throws Exception {
 
        Long timestamp = System.currentTimeMillis();
 
        //发送生成processor文件的消息
 
        Integer newFlowId = sendAddProcessor(flowTempId, timestamp);
 
        if (newFlowId != null) {
 
        Integer newFlowId = sendAddProcessor(jobId,flowTempId, timestamp);
 
        if (newFlowId != null){
 
            //发送生成route文件的消息
 
            newFlowId = sendAddRoute(flowTempId, newFlowId, newCron);
 
            if (newFlowId != null) {
 
@ -565,9 +565,9 @@ public class FlowManager implements IFlowManage {
 
        return null;
 
    }
 
    public Integer sendAddProcessor(Integer flowId, Long timestamp) throws Exception {
 
        List<SystemServiceFlowTemp> flowTempRouters = flowTempDao.getFlowTemps(flowId, ServiceFlowConstant.FLOW_TYPE_ROUTE);
 
        List<SystemServiceFlowTemp> flowTempProces = flowTempDao.getFlowTemps(flowId, ServiceFlowConstant.FLOW_TYPE_PROCESSOR);
 
    public Integer sendAddProcessor(String jobId,Integer flowId, Long timestamp) throws Exception {
 
        List<SystemServiceFlowTemp> flowTempRouters = flowTempDao.getFlowTemps(flowId, Constants.FLOW_TYPE_ROUTE);
 
        List<SystemServiceFlowTemp> flowTempProces = flowTempDao.getFlowTemps(flowId, Constants.FLOW_TYPE_PROCESSOR);
 
        SystemServiceFlow oldFlow = getFlowById(flowId);
 
        //route模板文件记录是否存在。不存在就返回。
 
@ -606,8 +606,8 @@ public class FlowManager implements IFlowManage {
 
                processClass.setType(ServiceFlowConstant.FLOW_TYPE_PROCESSOR);
 
                processClass.setIsUpdate("1");
 
                //生成新的java文件
 
                String newFileName = genProcessorJavaFile(newFlow.getCode(), deName, processClass.getClassName());
 
                if (newFileName != null) {
 
                String newFileName = genProcessorJavaFile(jobId,newFlow.getCode(),deName,processClass.getClassName());
 
                if (newFileName!=null){
 
                    //发送消息
 
                    ServiceFlow serviceFlow = new ServiceFlow();
 
                    serviceFlow.setRouteCode(newFlow.getCode());

+ 1 - 3
src/main/java/com/yihu/hos/system/service/intf/IFlowManage.java
Wyświetl plik 

@ -4,10 +4,8 @@ import com.yihu.hos.system.model.SystemServiceFlow;
 
import com.yihu.hos.system.model.SystemServiceFlowClass;
 
import com.yihu.hos.system.model.SystemServiceFlowTemp;
 
import com.yihu.hos.web.framework.model.Result;
 
import org.springframework.web.multipart.MultipartFile;
 
import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
import java.io.File;
 
import java.io.OutputStream;
 
import java.util.List;
 
import java.util.Map;
 
@ -64,7 +62,7 @@ public interface IFlowManage {
 
     * @return
 
     * @throws Exception
 
     */
 
    Integer genCamelFile(Integer flowTempId, String newCron) throws Exception;
 
    Integer genCamelFile(String jobId,Integer flowTempId, String newCron) throws Exception;
 
    /**
 
     * 修改流程文件

+ 1 - 1
src/main/resources/spring/applicationContext.xml
Wyświetl plik 

@ -67,7 +67,7 @@
 
        <property name="hibernateProperties">
 
            <value>
 
                hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
 
                hibernate.show_sql=true
 
                hibernate.show_sql=false
 
                hibernate.format_sql=true
 
            </value>
 
        </property>