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

hos-agent/pom.xml

@@ -96,7 +96,20 @@
            <version>${camel.version}</version>
            <!-- use the same version as your Camel core version -->
        </dependency>
    </dependencies>
		<dependency>
			<groupId>org.apache.camel</groupId>
			<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-http</artifactId>
			<version>${camel.version}</version> <!-- use the same version as your Camel core version -->
		</dependency>
	</dependencies>
	<build>
		<plugins>

hos-agent/src/main/java/com/yihu/hos/agent/camelrouter/AdminProxyRouter.java

@@ -11,7 +11,9 @@ import org.springframework.stereotype.Component;
public class AdminProxyRouter extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("jetty:http://0.0.0.0:{{agent.proxy.port}}/esb?matchOnUriPrefix=true")
                .to("jetty:http://127.0.0.57:8080/esb?bridgeEndpoint=true&throwExceptionOnFailure=false");
        this.getContext().setTracing(true);
        from("jetty:http://0.0.0.0:9000")
                .process(new GatewayProcessor())
                .routingSlip(method(GatewayProcessor.class, "route"));
    }
}

hos-agent/src/main/java/com/yihu/hos/agent/camelrouter/GatewayProcessor.java

@@ -0,0 +1,34 @@
package com.yihu.hos.agent.camelrouter;
import org.apache.camel.Exchange;
import org.apache.camel.Header;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import java.util.HashMap;
import java.util.Map;
public class GatewayProcessor implements Processor {
    public void process(Exchange exchange) throws Exception {
        Message in = exchange.getIn();
        String query = (String) in.getHeader(Exchange.HTTP_QUERY);
        if (query != null) {
            String[] values = query.split("=");
            if (values.length == 2 && values[0].equals("api")) {
                in.setHeader("api", values[1]);
            }
        }
    }
    public String route(@Header("api") String api) {
        if (api == null) {
            return null;
        }
        Map<String, String> apiRoute = new HashMap<>();
        apiRoute.put("swagger", "jetty:http://192.168.1.221:10000/swagger-ui.html?bridgeEndpoint=true&throwExceptionOnFailure=false");
        return apiRoute.get(api);
    }
}

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

@@ -20,10 +20,7 @@ import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * @created Airhead 2016/7/27.
@@ -54,7 +51,8 @@ public class BrokerServerService {
        update.set("hostName", brokerServer.getHostName());
        update.set("hostAddress", brokerServer.getHostAddress());
        update.set("port", brokerServer.getPort());
        update.set("updateTime", brokerServer.getUpdateTime());
        Date updateTime = brokerServer.getUpdateTime() == null ? new Date(): brokerServer.getUpdateTime();
        update.set("updateTime", updateTime);
        update.set("enable", brokerServer.isEnable());
        if (brokerServer.getServiceFlows()!=null) {
            for (BrokerServer.ServiceFlow serviceFlow : brokerServer.getServiceFlows()) {

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

@@ -83,14 +83,14 @@ spring:
  profiles: lfq
  data:
    mongodb:
      host: 172.19.103.58
      host: 172.19.103.57
      port: 27017
      username: esb
      password: esb
      authenticationDatabase: admin
      database: runtime
  activemq:
    broker-url: tcp://172.19.103.58:61616
    broker-url: tcp://172.19.103.57:61616
    user: admin
    password: admin
arbiter:
@@ -98,8 +98,6 @@ arbiter:
      period: 10000
  central:
    url: 192.168.131.38:15555
  terminal:
    url: 192.168.131.38:15555
  tenant:
    name: jkzl
  mycat:

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

@@ -122,26 +122,13 @@ hos:
---
spring:
  profiles: lfq
#  datasource:
#      driverClassName: com.mysql.jdbc.Driver
#      url: jdbc:mysql://172.19.103.57:3306/db1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
#      username: esb
#      password: esb
#      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.58:61616
      broker-url: tcp://172.19.103.57:61616
      user: admin
      password: admin
  data:
    mongodb:
      host: 172.19.103.58
      host: 172.19.103.57
      port: 27017
      username: esb
      password: esb
@@ -152,15 +139,15 @@ spring:
    ip: localhost
    port: 8066
server:
  port: 9999
  port: 8099
hos:
  esb:
    rest-url: http://192.168.131.119:8080/esb
    rest-url: http://192.168.131.38:8080/esb
  arbiter:
    enable: true
    url: http://192.168.131.38:10135
  rest:
    url: http://localhost:8088
    url: http://192.168.131.38:8088
  timer:
      period: 10000
  tenant:

hos-broker/src/main/resources/log4j.properties

@@ -31,7 +31,7 @@ log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
log4j.appender.jms=com.yihu.hos.broker.common.log.JMSAppender
log4j.appender.jms.InitialContextFactoryName=org.apache.activemq.jndi.ActiveMQInitialContextFactory
log4j.appender.jms.ProviderURL=tcp://172.19.103.58:61616
log4j.appender.jms.ProviderURL=tcp://172.19.103.57:61616
log4j.appender.jms.TopicBindingName=logTopic
log4j.appender.jms.TopicConnectionFactoryBindingName=ConnectionFactory
log4j.appender.jms.userName=admin

hos-camel/src/main/java/proxy/route/ProxyRouteBuilder.java

@@ -0,0 +1,16 @@
package proxy.route;
import org.apache.camel.builder.RouteBuilder;
/**
 * @author Airhead
 * @since 2017/3/10.
 */
public class ProxyRouteBuilder extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("jetty:http://0.0.0.0:9999?matchOnUriPrefix=true").routeId("proxy")
                .noStreamCaching()
                .to("jetty:http://192.168.1.221:10000?bridgeEndpoint=true&throwExceptionOnFailure=false");
    }
}

hos-docker/esb/central-docker-compose/docker-compose.yml

@@ -5,6 +5,7 @@ services:
        container_name: admin
        ports:
            - "8080:8080"
            - "15555:15555"
        volumes:
            - /usr/local/esb/hos-admin/jar:/hos-admin/jar
        depends_on:
@@ -15,7 +16,7 @@ services:
        build: /usr/local/esb/hos-broker
        container_name: broker
        ports:
            - "8099:8099"
            - "8099-10000:8099-10000"
        volumes:
            - /usr/local/esb/hos-broker/jar:/hos-broker/jar
        environment:

hos-docker/esb/hos-broker/Dockerfile

@@ -9,4 +9,4 @@ WORKDIR /apache-tomcat-8.5.11/bin/
VOLUME ["/var/log/hos-broker/"]
CMD tail -f /apache-tomcat-8.5.11/logs/catalina.out
WORKDIR /apache-tomcat-8.5.11/bin/
EXPOSE 8099
EXPOSE 8099-10000

src/main/java/com/yihu/hos/ESBApplication.java

@@ -10,8 +10,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.data.mongodb.gridfs.GridFsOperations;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.zbus.mq.server.MqServer;
import org.zbus.mq.server.MqServerConfig;
@SpringBootApplication
public class ESBApplication extends WebMvcConfigurerAdapter  implements CommandLineRunner {
@@ -39,11 +37,11 @@ public class ESBApplication extends WebMvcConfigurerAdapter  implements CommandL
    @Override
    public void run(String... strings) throws Exception {
        MqServerConfig config = new MqServerConfig();
        config.serverPort = configuration.getZbusPort();
        config.storePath = configuration.getZbusStore();
        final MqServer server = new MqServer(config);
        server.start();
        System.out.println("zbus 启动成功！");
//        MqServerConfig config = new MqServerConfig();
//        config.serverPort = configuration.getZbusPort();
//        config.storePath = configuration.getZbusStore();
//        final MqServer server = new MqServer(config);
//        server.start();
//        System.out.println("zbus 启动成功！");
    }
}

src/main/java/com/yihu/hos/config/BeanConfig.java

@@ -19,6 +19,8 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
import org.springframework.web.servlet.i18n.CookieLocaleResolver;
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
import org.zbus.broker.ZbusBroker;
import org.zbus.mq.server.MqServer;
import org.zbus.mq.server.MqServerConfig;
import javax.sql.DataSource;
import java.io.IOException;
@@ -50,9 +52,16 @@ public class BeanConfig {
    @Bean
    public ZbusBroker getZbusBroker() {
        try {
            MqServerConfig config = new MqServerConfig();
            config.serverPort = this.getZbusPort();
            config.storePath = this.getZbusStore();
            final MqServer server = new MqServer(config);
            server.start();
            System.out.println("zbus 启动成功！");
            zbusBroker = new ZbusBroker("127.0.0.1:" + zbusPort);
            return zbusBroker;
        } catch (IOException e) {
        } catch (Exception e) {
            e.printStackTrace();
        }
        return null;