代码合并

hos-broker/pom.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
	<modelVersion>4.0.0</modelVersion>
	<groupId>com.yihu.hos</groupId>
@@ -103,7 +103,11 @@
			<artifactId>camel-http4</artifactId>
			<version>2.17.1</version> <!-- use the same version as your Camel core version -->
		</dependency>
		<dependency>
			<groupId>org.apache.activemq</groupId>
			<artifactId>activemq-camel</artifactId>
			<version>5.13.2</version>
		</dependency>
		<!-- test -->
		<dependency>
			<groupId>org.springframework.boot</groupId>

hos-broker/src/main/java/com/yihu/hos/camelrouter/BrokerServerRouter.java

@@ -1,4 +1,4 @@
package com.yihu.hos.camelrouter;
package com.yihu.hos.common.camelrouter;
import org.apache.camel.builder.RouteBuilder;
import org.springframework.stereotype.Component;

hos-broker/src/main/java/com/yihu/hos/camelrouter/BusinessLogRouter.java

@@ -1,6 +1,6 @@
package com.yihu.hos.camelrouter;
package com.yihu.hos.common.camelrouter;
import com.yihu.hos.configuration.ActivemqConfiguration;
import com.yihu.hos.common.configuration.ActivemqConfiguration;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
@@ -10,6 +10,7 @@ import org.springframework.stereotype.Component;
import javax.jms.ConnectionFactory;
/**
 * @created Airhead 2016/8/8.
 */

hos-broker/src/main/java/com/yihu/hos/configuration/ActivemqConfiguration.java

@@ -1,4 +1,4 @@
package com.yihu.hos.configuration;
package com.yihu.hos.common.configuration;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;