Merge branch 'master' of luofaqiang/esb into master

hos-admin/src/main/java/com/yihu/hos/service/ArchiveUploadJob.java

@@ -1,4 +1,4 @@
package com.yihu.hos.service;
package com.yihu.hos.services;
import com.yihu.hos.common.Services;
import com.yihu.hos.core.datatype.DateUtil;

hos-admin/src/main/java/com/yihu/hos/service/CrawlerFlowUploadJob.java

@@ -1,4 +1,4 @@
package com.yihu.hos.service;
package com.yihu.hos.services;
import com.yihu.hos.common.Services;
import com.yihu.hos.core.datatype.DateUtil;

hos-admin/src/main/java/com/yihu/hos/service/DatacollectJob.java

@@ -1,4 +1,4 @@
package com.yihu.hos.service;
package com.yihu.hos.services;
import com.yihu.hos.common.Services;
import com.yihu.hos.datacollect.service.intf.IDatacollectService;

hos-admin/src/main/java/com/yihu/hos/service/IBaseJob.java

@@ -1,4 +1,4 @@
package com.yihu.hos.service;
package com.yihu.hos.services;
/**
 * 任务类接口类

hos-admin/src/main/java/com/yihu/hos/service/TestJob.java

@@ -1,4 +1,4 @@
package com.yihu.hos.service;
package com.yihu.hos.services;
import com.yihu.hos.common.Services;
import com.yihu.hos.datacollect.service.intf.IDatacollectService;

hos-arbiter/pom.xml

@@ -26,76 +26,6 @@
        <!--<spring-data-releasetrain.version>Fowler-SR2</spring-data-releasetrain.version>-->
    </properties>
    <!--<repositories>-->
    <!--<repository>-->
    <!--<id>my-repo</id>-->
    <!--<name>my repository</name>-->
    <!--<url>http://localhost:8080/artifactory/my-repo/</url>-->
    <!--<releases>-->
    <!--<enabled>true</enabled>-->
    <!--</releases>-->
    <!--<snapshots>-->
    <!--<enabled>true</enabled>-->
    <!--</snapshots>-->
    <!--</repository>-->
    <!--</repositories>-->
    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-mongodb</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-mongodb</artifactId>
            <version>1.9.2.RELEASE</version>
        </dependency>
        <dependency>
            <groupId>org.mongodb</groupId>
            <artifactId>mongo-java-driver</artifactId>
            <version>3.2.2</version>
        </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-jms</artifactId>
            <version>2.17.1</version> <!-- use the same version as your Camel core 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>
        <!-- https://mvnrepository.com/artifact/org.apache.activemq/activemq-camel -->
        <dependency>
            <groupId>org.apache.activemq</groupId>
            <artifactId>activemq-camel</artifactId>
            <version>5.13.2</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>
            <scope>test</scope>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>

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

@@ -25,6 +25,15 @@ import java.util.Map;
public class ApplicationStartListener implements ApplicationListener<ContextRefreshedEvent> {
    private static Logger logger = LogManager.getLogger(ApplicationStartListener.class);
    @Override
    public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) {
        try {
            camelRouteStart(contextRefreshedEvent);
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    /**
     * 这是一个固定的存储class文件的根路径
     * 正式系统中，这个值可来自于系统的配置文件
@@ -87,7 +96,7 @@ public class ApplicationStartListener implements ApplicationListener<ContextRefr
                    SystemClassMapping.getSystemClassNameMapping().put(code + Constant.ROUTE, code + Constant.DOT + packageName + Constant.DOT + className);
                    ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
                    Class<RouteBuilder> routeBuilderClass = (Class<RouteBuilder>) currentClassLoader.loadClass(SystemClassMapping.getSystemClassNameMapping().get(code + Constant.ROUTE));
                    if(routeBuilderClass != null) {
                    if (routeBuilderClass != null) {
                        RouteBuilder routeBuilder = routeBuilderClass.newInstance();
                        alreadyRouteBuilders.add(routeBuilder);
                    }
@@ -104,7 +113,7 @@ public class ApplicationStartListener implements ApplicationListener<ContextRefr
            URLs.add(systemClassFlowPath.toURI().toURL());
        }
        ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
        ClassLoader camelESBClassLoader = new URLClassLoader(URLs.toArray(new URL[]{}) , currentClassLoader);
        ClassLoader camelESBClassLoader = new URLClassLoader(URLs.toArray(new URL[]{}), currentClassLoader);
        Thread.currentThread().setContextClassLoader(camelESBClassLoader);
        SystemCamelContext.getDefaultCamelContext().setApplicationContextClassLoader(camelESBClassLoader);
        // 然后就可以进行RouteBuilder的加载
@@ -112,18 +121,9 @@ public class ApplicationStartListener implements ApplicationListener<ContextRefr
        for (RouteBuilder routeBuilder : alreadyRouteBuilders) {
            try {
                SystemCamelContext.getDefaultCamelContext().addRoutes(routeBuilder);
            } catch(Exception e) {
                logger.warn(e.getMessage() , e);
            } catch (Exception e) {
                logger.warn(e.getMessage(), e);
            }
        }
    }
    @Override
    public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) {
        try {
            camelRouteStart(contextRefreshedEvent);
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
}

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

@@ -17,7 +17,6 @@ import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.net.InetAddress;
@@ -69,9 +68,6 @@ public class BrokerServerService implements DisposableBean {
     */
    public void brokerServerOffline() {
        try {
            String hostName = InetAddressUtil.getLocalHostName();
            String hostAddress = InetAddress.getLocalHost().getHostAddress();
            int port = applicationConfiguration.getPort();
            ObjectMapper objectMapper = new ObjectMapper();
            ObjectNode objectNode = objectMapper.createObjectNode();
            objectNode.put("hostName", hostName);

hos-core-dependencies/pom.xml

@@ -22,12 +22,9 @@
    </build>
    <properties>
        <!--<jackson.version>2.4.6</jackson.version>-->
        <version.log4j>1.2.17</version.log4j>
        <version.log4j-over-slf4j>1.7.21</version.log4j-over-slf4j>
        <version.log4j2>2.4.1</version.log4j2>
        <version.jcl-over-slf4j>1.7.19</version.jcl-over-slf4j>
        <version.jul-over-slf4j>1.7.21</version.jul-over-slf4j>
        <version.slf4j>1.7.21</version.slf4j>
        <log4j.version>1.2.14</log4j.version>
        <log4j2.version>2.4.1</log4j2.version>
        <slf4j.version>1.7.21</slf4j.version>
    </properties>
    <pluginRepositories>
@@ -168,31 +165,31 @@
        <dependency>
            <groupId>log4j</groupId>
            <artifactId>log4j</artifactId>
            <version>${version.log4j}</version>
            <version>${log4j.version}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.logging.log4j</groupId>
            <artifactId>log4j-api</artifactId>
            <version>${version.log4j2}</version>
            <version>${log4j2.version}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.logging.log4j</groupId>
            <artifactId>log4j-core</artifactId>
            <version>${version.log4j2}</version>
            <version>${log4j2.version}</version>
        </dependency>
        <!--SLF4J api-->
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
            <version>${version.slf4j}</version>
            <version>${slf4j.version}</version>
        </dependency>
        <!--Log framework to SLF4J bridge: x-over-slf4j-->
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>jcl-over-slf4j</artifactId>
            <version>${version.jcl-over-slf4j}</version>
            <version>${slf4j.version}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
@@ -203,7 +200,7 @@
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>jul-to-slf4j</artifactId>
            <version>${version.jul-over-slf4j}</version>
            <version>${slf4j.version}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
@@ -214,19 +211,9 @@
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>log4j-over-slf4j</artifactId>
            <version>${version.log4j-over-slf4j}</version>
            <version>${slf4j.version}</version>
        </dependency>
        <!-- Log framework end-->
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>ehr-dbhelper</artifactId>
            <version>1.1.9</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>html2image</artifactId>
            <version>0.9</version>
        </dependency>
    </dependencies>
</project>

hos-core/pom.xml

@@ -7,13 +7,6 @@
    <groupId>com.yihu.hos</groupId>
    <artifactId>hos-core</artifactId>
    <version>1.1.1-SNAPSHOT</version>
    <dependencies>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
            <version>1.7.13</version>
        </dependency>
    </dependencies>
    <parent>
        <groupId>com.yihu.hos</groupId>
        <artifactId>hos-core-dependencies</artifactId>

hos-rest/src/main/java/com/yihu/hos/HosRestApplication.java

@@ -1,4 +1,4 @@
package com.yihu.hos;
package com.yihu.hos.rest;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

hos-rest/src/test/java/com/yihu/hos/HosRestApplicationTests.java

@@ -1,4 +1,4 @@
package com.yihu.hos;
package com.yihu.hos.rest;
import org.junit.Test;
import org.junit.runner.RunWith;

hos-web-framework-dependencies/pom.xml

@@ -173,7 +173,12 @@
        <dependency>
            <groupId>org.apache.activemq</groupId>
            <artifactId>activemq-all</artifactId>
            <artifactId>activemq-core</artifactId>
            <version>5.7.0</version>
        </dependency>
        <dependency>
            <groupId>org.apache.activemq</groupId>
            <artifactId>activemq-pool</artifactId>
            <version>5.13.0</version>
        </dependency>
        <dependency>
@@ -194,6 +199,17 @@
            <artifactId>javax.transaction-api</artifactId>
            <version>1.2</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>ehr-dbhelper</artifactId>
            <version>1.1.9</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>html2image</artifactId>
            <version>0.9</version>
        </dependency>
    </dependencies>
    <build>