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

# Conflicts:
#	hos-arbiter/src/main/java/com/yihu/hos/arbiter/routers/EndpointEventRouter.java
#	hos-broker/src/main/resources/application.yml

hos-admin/pom.xml

@@ -56,6 +56,12 @@
            <version>1.1.1-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-orm</artifactId>
            <version>${spring.version}</version>
        </dependency>
        <!--=============tilesJSP布局框架 start =============-->
        <dependency>
            <groupId>org.apache.tiles</groupId>

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

@@ -14,6 +14,30 @@ spring:
    view:
      prefix: /WEB-INF/ehr/jsp/
      suffix: .jsp
---
spring:
  profiles: dev
  data:
    mongodb:
      host: 172.19.103.86
      port: 27017
      username: esb
      password: esb
      authenticationDatabase: admin
      database: configuration
  application:
    name: ESB
  activemq:
    broker-url: tcp://172.19.103.86:61616?wireFormat.maxInactivityDuration=0
    user: admin
    password: admin
    pooled: false
---
spring:
  profiles: test
  data:
    mongodb:
      host: 172.19.103.86

hos-admin/src/main/resources/config/dbhelper.properties

@@ -4,5 +4,5 @@ defaultUser = hos
defaultPassword = hos
mongodbUri=mongodb://admin:admin@192.168.1.220:27017/?authSource=admin
mongodbUri=mongodb://esb:esb@172.19.103.86:27017/?authSource=admin
mongodbName=hos

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

@@ -1,10 +1,10 @@
server:
  contextPath:
  port: 0
  port: 8099
  sessionTimeout:  300
local:
  server:
    port: 0
    port: 8099
  application:
    name: HosBrokerServer
security:
@@ -24,9 +24,9 @@ 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
    url: jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    username: hos
    password: hos
    test-on-borrow: true
    validation-query: SELECT 1
    test-while-idle: true
@@ -52,8 +52,8 @@ spring:
    port: 8066
hos:
  arbiter:
    enable: true
    url: http://192.168.131.38:10135
    enable: false
    url: http://localhost:10135
  timer:
      period: 10000
@@ -61,12 +61,40 @@ hos:
---
spring:
  profiles: test
datasource:
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.19.103.71:3306/esb?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    username: hos
    password: hos
    test-on-borrow: true
    validation-query: SELECT 1
    test-while-idle: true
    max-active: 30
    default-auto-commit: true
    max-idle: 30
    min-idle: 10
    initial-size: 10
  activemq:
      broker-url: tcp://172.19.103.86:61616
      user: admin
      password: admin
  data:
    mongodb:
      host: 172.19.103.86
      port: 27017
      username: esb
      password: esb
      authenticationDatabase: admin
      database: log
  gateway:
    ip: localhost
    port: 8066
hos:
  arbiter:
    enable: false
    url: http://192.168.131.38:10135
    url: http://172.19.103.89:10135
  timer:
    period: 10000
      period: 10000
---
application:
  message: ESB Broker

hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/CrawlerFlowManager.java

@@ -24,9 +24,11 @@ import com.yihu.hos.rest.services.standard.adapter.AdapterSchemeVersionService;
import com.yihu.hos.web.framework.model.DictItem;
import com.yihu.hos.web.framework.model.Result;
import com.yihu.hos.web.framework.util.springutil.SpringBeanUtil;
import org.springframework.stereotype.Service;
import java.util.*;
@Service("CrawlerFlowManager")
public class CrawlerFlowManager {
    private static Logger logger = LoggerFactory.getLogger(CrawlerFlowManager.class);

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

@@ -7,6 +7,10 @@ local:
    port: 8088
  application:
    name: HosRestServer
---
spring:
  profiles: dev
qlc:
  rpc:
    ip: 172.18.20.21
@@ -15,11 +19,29 @@ qlc:
    port: 2181
crawler:
  upload:
    ip: 192.168.131.96
    ip: 172.19.103.89
    port: 8088
    api: crawler/patient
  storage:
    ip: 192.168.131.96
    ip: 172.19.103.89
    port: 8088
    api: crawler/datapush
---
spring:
  profiles: test
qlc:
  rpc:
    ip: 172.18.20.21
    appId: EsbCloud
    channelId: 100123
    port: 2181
crawler:
  upload:
    ip: 172.19.103.89
    port: 8088
    api: crawler/patient
  storage:
    ip: 172.19.103.89
    port: 8088
    api: crawler/datapush

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

@@ -105,7 +105,7 @@
        <property name="dataSource" ref="dataSource"/>
    </bean>
    <!--Hibernate模版配置 -->
    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate4.HibernateTemplate">
    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate5.HibernateTemplate">
        <property name="sessionFactory" ref="sessionFactory"></property>
    </bean>
    <!--<bean id="quartzScheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean" scope="singleton">-->