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

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

@@ -49,7 +49,7 @@ public class ApplicationStartListener implements ApplicationListener<ContextRefr
        for (SystemServiceFlowClass systemServiceFlowClass : systemServiceFlowClassList) {
            Integer flowId = systemServiceFlowClass.getFlowId();
            String type = systemServiceFlowClass.getType();
            if (systemServiceFlowClassGroupMap.containsKey(flowId)) {
            if (systemServiceFlowClassGroupMap.containsKey(type + flowId.toString())) {
                List<SystemServiceFlowClass> classList = systemServiceFlowClassGroupMap.get(type + flowId);
                classList.add(systemServiceFlowClass);
                systemServiceFlowClassGroupMap.put(type + flowId.toString(), classList);

hos-broker/src/main/java/com/yihu/hos/models/BusinessLog.java

@@ -23,8 +23,10 @@ public class BusinessLog {
    private String breadcrumbId;
    private String camelContextId;
    private String body;
    private String bodyLength;
    private Integer bodyLength;
    private String fireTimeSource;
    //@Indexed(name = "fireTime_1", expireAfterSeconds = 30)
    @Indexed
    private Date fireTime;  //后期建议转成TTL
@@ -100,11 +102,11 @@ public class BusinessLog {
        this.fireTime = fireTime;
    }
    public String getBodyLength() {
    public Integer getBodyLength() {
        return bodyLength;
    }
    public void setBodyLength(String bodyLength) {
    public void setBodyLength(Integer bodyLength) {
        this.bodyLength = bodyLength;
    }

hos-broker/src/main/java/com/yihu/hos/services/BusinessLogService.java

@@ -26,6 +26,7 @@ public class BusinessLogService {
            BusinessLog businessLog = objectMapper.readValue(msg, BusinessLog.class);
            String fireTimeSource = businessLog.getFireTimeSource();
            businessLog.setFireTime(DateUtil.toTimestamp(fireTimeSource));
            businessLog.setBodyLength(businessLog.getBody().length());
            mongoOperations.save(businessLog);
        } catch (IOException e) {
            e.printStackTrace();

hos-camel/src/main/java/com/yihu/hos/camel/crawler/processor/Processor0.java

@@ -1,4 +1,4 @@
package com.yihu.hos.camel.crawler.processor;
package crawler.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;

hos-camel/src/main/java/com/yihu/hos/camel/crawler/route/CrawlerRouteBulider.java

@@ -1,6 +1,6 @@
package com.yihu.hos.camel.crawler.route;
package crawler.route;
import com.yihu.hos.camel.crawler.processor.Processor0;
import crawler.processor.Processor0;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;

hos-camel/src/main/java/com/yihu/hos/camel/qlc/processor/Processor0.java

@@ -1,4 +1,4 @@
package com.yihu.hos.camel.qlc.processor;
package qlc.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;

hos-camel/src/main/java/com/yihu/hos/camel/qlc/processor/Processor1.java

@@ -1,4 +1,4 @@
package com.yihu.hos.camel.qlc.processor;
package qlc.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;

hos-camel/src/main/java/com/yihu/hos/camel/qlc/processor/Processor2.java

@@ -1,4 +1,4 @@
package com.yihu.hos.camel.qlc.processor;
package qlc.processor;
import net.sf.json.JSONObject;
import org.apache.camel.Exchange;

hos-camel/src/main/java/com/yihu/hos/camel/qlc/route/QlcRouteBulider.java

@@ -1,9 +1,9 @@
package com.yihu.hos.camel.qlc.route;
package qlc.route;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import com.yihu.hos.camel.qlc.processor.Processor1;
import com.yihu.hos.camel.qlc.processor.Processor2;
import qlc.processor.Processor1;
import qlc.processor.Processor2;
/**
 * Created by lingfeng on 2016/7/25.
@@ -12,12 +12,12 @@ public class QlcRouteBulider extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("jetty:http://192.168.131.96:8066/qlc").routeId("qlc")
        from("jetty:http4://192.168.131.101:8066/qlc").routeId("qlc")
                .process(new Processor1()).setHeader(Exchange.HTTP_METHOD, constant("POST"))
                .to("http://192.168.131.96:8088/api/v1.0/qlc/queryUserInfo")
                .to("http4://192.168.131.101:8088/api/v1.0/qlc/queryUserInfo")
                .process(new Processor2()).setHeader(Exchange.HTTP_METHOD, constant("POST"))
                .to("http://192.168.131.96:8088/api/v1.0/qlc/patientInformation")
                .to("http4://192.168.131.101:8088/api/v1.0/qlc/patientInformation")
                .process(new Processor2()).setHeader(Exchange.HTTP_METHOD, constant("POST"))
                .to("http://192.168.131.96:8088/crawler/patient").to("stream:out"); // 2. 为路由配置组件或终端节点.
                .to("http4://192.168.131.101:8088/crawler/patient").to("stream:out"); // 2. 为路由配置组件或终端节点.
    }
}

hos-core/src/main/java/com/yihu/hos/core/constants/ExceptionConstant.java

@@ -4,25 +4,25 @@ package com.yihu.hos.core.constants;
 */
public class ExceptionConstant {
    //===========================系统异常 3开头=============================
    //===========================系统异常 3开头=============================
    public static String EHREXCEPTION_SYSTEMEXCEPTION = "30000";
    public static String EHREXCEPTION_SYSTEMEXCEPTION_MESSAGE = "系统异常,请联系管理员";
    public static String EHREXCEPTION_SYSTEMEXCEPTION_MESSAGE = "绯荤粺寮傚父,璇疯仈绯荤�鐞嗗憳";
    public static String EHREXCEPTION_SYSTEM_TRANSFER = "30100";
    public static String EHREXCEPTION_SYSTEM_TRANSFER_MESSAGE = "目标服务异常,请稍后再试";
    public static String EHREXCEPTION_SYSTEM_TRANSFER_MESSAGE = "目标服务异常,请稍后再试";
    //=============================业务异常 2开头=============================
    //=============================业务异常 2开头=============================
    public static String EHREXCEPTION_BUSINESS_EXCEPTION = "20000";
    public static String EHREXCEPTION_BUSINESS_PARAMS_EXCEPTION = "20100";//请求的参数格式有错
    public static String EHREXCEPTION_BUSINESS_PARAMS_EXCEPTION_MESSAGE = "请求的参数格式错误";
    public static String EHREXCEPTION_BUSINESS_PARAMS_EXCEPTION = "20100";//请求的参数格式有错
    public static String EHREXCEPTION_BUSINESS_PARAMS_EXCEPTION_MESSAGE = "请求的参数格式错误";
    public static String EHREXCEPTION_BUSINESS_REOURCE_TYPE_EXCEPTION = "20200";//数据库的参数格式有错
    public static String EHREXCEPTION_BUSINESS_REOURCE_TYPE_EXCEPTION_MESSAGE = "业务资源类型格式错误";
    public static String EHREXCEPTION_BUSINESS_REOURCE_TYPE_EXCEPTION = "20200";//鏁版嵁搴撶殑鍙傛暟鏍煎紡鏈夐敊
    public static String EHREXCEPTION_BUSINESS_REOURCE_TYPE_EXCEPTION_MESSAGE = "涓氬姟璧勬簮绫诲瀷鏍煎紡閿欒�";
    //=============================返回成功 10000=============================
    //=============================杩斿洖鎴愬姛 10000=============================
    public static String EHREXCEPTION_SUCCESS = "10000";
    public static String EHREXCEPTION_SUCCESS_MESSAGE = "成功";
    public static String EHREXCEPTION_SUCCESS_MESSAGE = "鎴愬姛";
}

hos-rest/pom.xml

@@ -55,6 +55,17 @@
			<groupId>com.yihu.hos</groupId>
			<artifactId>hos-web-framework</artifactId>
			<version>1.1.1-SNAPSHOT</version>
			<exclusions>
				<exclusion>
					<groupId>org.springframework.boot</groupId>
					<artifactId>spring-boot-starter-data-jpa</artifactId>
				</exclusion>
			</exclusions>
		</dependency>
		<dependency>
			<groupId>org.springframework</groupId>
			<artifactId>spring-orm</artifactId>
			<version>${spring.version}</version>
		</dependency>
		<dependency>
			<groupId>com.yihu.core</groupId>

hos-rest/src/main/resources/application.yml

@@ -19,11 +19,11 @@ qlc:
    port: 2181
crawler:
  upload:
    ip: 172.19.103.89
    ip: localhost
    port: 8088
    api: crawler/patient
  storage:
    ip: 172.19.103.89
    ip: localhost
    port: 8088
    api: crawler/datapush

hos-rest/src/main/resources/spring/applicationContext.xml

@@ -65,7 +65,6 @@
        <property name="sessionFactory" ref="sessionFactory"/>
    </bean>
    <tx:annotation-driven transaction-manager="txManager" proxy-target-class="true"/>
    <aop:aspectj-autoproxy/>
    <!--文件上传支持-->
    <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"/>

hos-web-framework-dependencies/pom.xml

@@ -115,6 +115,16 @@
            <artifactId>camel-http4</artifactId>
            <version>${camel.version}</version> <!-- use the same version as your Camel core version -->
        </dependency>
        <dependency>
            <groupId>org.apache.camel</groupId>
            <artifactId>camel-jetty</artifactId>
            <version>${camel.version}</version> <!-- use the same version as your Camel core version -->
        </dependency>
        <dependency>
            <groupId>org.apache.camel</groupId>
            <artifactId>camel-jms</artifactId>
            <version>${camel.version}</version> <!-- use the same version as your Camel core version -->
        </dependency>
        <dependency>
            <groupId>org.apache.camel</groupId>
            <artifactId>camel-jms</artifactId>

src/main/resources/application.yml

@@ -1,3 +1,5 @@
application:
  message: ESB
server:
  context-path: /
  port: 8080
@@ -26,9 +28,6 @@ spring:
      password: esb
      authenticationDatabase: admin
      database: configuration
  application:
    name: ESB
  activemq:
    broker-url: tcp://172.19.103.86:61616?wireFormat.maxInactivityDuration=0
    user: admin
@@ -46,9 +45,6 @@ spring:
      password: esb
      authenticationDatabase: admin
      database: configuration
  application:
    name: ESB
  activemq:
    broker-url: tcp://172.19.103.86:61616?wireFormat.maxInactivityDuration=0
    user: admin
@@ -65,5 +61,19 @@ spring:
#      database: configuration
---
application:
  message: ESB
spring:
  profiles: lfq
  data:
    mongodb:
      host: 172.19.103.86
      port: 27017
      username: esb
      password: esb
      authenticationDatabase: admin
      database: configuration
  activemq:
    broker-url: tcp://172.19.103.86:61616?wireFormat.maxInactivityDuration=0
    user: admin
    password: admin
    pooled: false