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

hos-arbiter/src/main/java/com/yihu/hos/arbiter/routers/EndpointEventRouter.java

@@ -23,8 +23,8 @@ public class EndpointEventRouter extends RouteBuilder {
        ConnectionFactory connectionFactory = new ActiveMQConnectionFactory(
                activemqConfiguration.getUser(), activemqConfiguration.getPassword(),activemqConfiguration.getBrokerURL());
        // Note we can explicit name the component
        context.addComponent("endpoint-event", JmsComponent.jmsComponentAutoAcknowledge(connectionFactory));
        from("service-event:queue:configuration.endpoint")
        context.addComponent("endpoint.event", JmsComponent.jmsComponentAutoAcknowledge(connectionFactory));
        from("endpoint.event:queue:configuration.endpoint")
                .to("bean:endpointService?method=trigger"); //TODO:这边可以做Message Filter，减化trigger逻辑
    }
}

hos-arbiter/src/main/java/com/yihu/hos/arbiter/routers/ServiceFlowEventRouter.java

@@ -23,8 +23,8 @@ public class ServiceFlowEventRouter extends RouteBuilder {
        ConnectionFactory connectionFactory = new ActiveMQConnectionFactory(
                activemqConfiguration.getUser(), activemqConfiguration.getPassword(),activemqConfiguration.getBrokerURL());
        // Note we can explicit name the component
        context.addComponent("service-event", JmsComponent.jmsComponentAutoAcknowledge(connectionFactory));
        from("service-event:queue:configuration.service.flow")
        context.addComponent("service.flow.event", JmsComponent.jmsComponentAutoAcknowledge(connectionFactory));
        from("service.flow.event:queue:configuration.service.flow")
                .to("bean:serviceFlowService?method=trigger"); //TODO:这边可以做Message Filter，减化trigger逻辑
    }
}

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

@@ -31,6 +31,7 @@ public class BrokerServerService {
        update.set("hostAddress", brokerServer.getHostAddress());
        update.set("port", brokerServer.getPort());
        update.set("updateTime", brokerServer.getUpdateTime());
        update.set("enable", brokerServer.isEnable());
        mongoOperations.upsert(query, update, BrokerServer.class);
    }

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

@@ -57,7 +57,7 @@ public class ServiceFlowService {
        try {
            ServiceFlow serviceFlow = objectMapper.readValue(msg, ServiceFlow.class);
            List<NameValuePair> nameValuePairList = new ArrayList<>();
            nameValuePairList.add(new BasicNameValuePair("serviceName", serviceFlow.getServiceFlow()));
            nameValuePairList.add(new BasicNameValuePair("serviceFlow", serviceFlow.getServiceFlow()));
            nameValuePairList.add(new BasicNameValuePair("packageName", serviceFlow.getPackageName()));
            nameValuePairList.add(new BasicNameValuePair("className", serviceFlow.getClassName()));
            nameValuePairList.add(new BasicNameValuePair("path", serviceFlow.getPath()));
@@ -101,7 +101,7 @@ public class ServiceFlowService {
                                .setScheme("http")
                                .setHost(brokerServer.getHostAddress() + ":" + brokerServer.getPort())
                                .setPath("/route")
                                .setParameter("serviceName", serviceFlow.getServiceFlow())
                                .setParameter("serviceFlow", serviceFlow.getServiceFlow())
                                .setParameter("packageName", serviceFlow.getPackageName())
                                .setParameter("className", serviceFlow.getClassName())
                                .setParameter("path", serviceFlow.getPath())

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

@@ -49,6 +49,7 @@ public class BrokerServerService implements DisposableBean {
            objectNode.put("hostName", hostName);
            objectNode.put("hostAddress", hostAddress);
            objectNode.put("port", port);
            objectNode.put("enable", true);
            String brokerServer = objectMapper.writeValueAsString(objectNode);
            List<NameValuePair> nameValuePairList = new ArrayList<>();
@@ -75,6 +76,7 @@ public class BrokerServerService implements DisposableBean {
            objectNode.put("hostName", hostName);
            objectNode.put("hostAddress", hostAddress);
            objectNode.put("port", port);
            objectNode.put("enable", false);
            String brokerServer = objectMapper.writeValueAsString(objectNode);
            URI uri = new URIBuilder(arbiterConfiguration.getServer() + "/brokerServer")

hos-core/src/main/java/com/yihu/hos/core/datatype/ClassFileUtil.java

@@ -17,10 +17,11 @@ public class ClassFileUtil {
    /**
     * 通过这个工具方法，可以进行class文件的创建
     *
     * @param systemFlowURL 本次进行系统创建的system业务系统存储class文件的根目录
     * @param packageName class文件的包信息
     * @param className class文件的类名信息
     * @param path class文件的路径
     * @param packageName   class文件的包信息
     * @param className     class文件的类名信息
     * @param path          class文件的路径
     */
    public static void createClassfile(URL systemFlowURL, String packageName, String className, String path) {
        // 开始输出文件内容
@@ -37,10 +38,9 @@ public class ClassFileUtil {
            String classPath = packageFile + "/" + className + ".class";
            File file = new File(classPath);
            if (file.isFile() && file.exists()) {
                return;
            } else {
                file.createNewFile();
                file.delete();
            }
            file.createNewFile();
            FileOutputStream out = new FileOutputStream(classPath);
            int n = 0;// 每次读取的字节长度

hos-http/src/main/java/com/yihu/hos/http/HTTPClientDefaultImpl.java

@@ -30,11 +30,11 @@ import java.util.Map;
/**
 * @created Airhead 2016/8/24.
 */
public class HTTPClientDefaultImpl implements HTTPClient {
class HTTPClientDefaultImpl implements HTTPClient {
    private static final Log log = LogFactory.getLog(HTTPClientDefaultImpl.class);
    protected CloseableHttpClient httpClient;
    protected HttpClientContext httpClientContext;
    private CloseableHttpClient httpClient;
    private HttpClientContext httpClientContext;
    HTTPClientDefaultImpl(CloseableHttpClient httpClient, CredentialsProvider credentialsProvider) {
        this.httpClient = httpClient;

hos-http/src/main/java/com/yihu/hos/http/HTTPClientImpl.java

@@ -4,9 +4,11 @@ import org.apache.http.client.CredentialsProvider;
import org.apache.http.impl.client.HttpClients;
/**
 * 用于HTTP和受信证书的HTTPS访问
 *
 * @created Airhead 2016/8/24.
 */
public class HTTPClientImpl extends HTTPClientDefaultImpl {
class HTTPClientImpl extends HTTPClientDefaultImpl {
    HTTPClientImpl() {
        super(HttpClients.createDefault(), null);
    }

hos-http/src/main/java/com/yihu/hos/http/HTTPSClientImpl.java

@@ -5,9 +5,11 @@ import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.HttpClients;
/**
 * 用于非受信证书的HTTPS访问
 *
 * @created Airhead 2016/8/24.
 */
public class HTTPSClientImpl extends HTTPClientDefaultImpl {
class HTTPSClientImpl extends HTTPClientDefaultImpl {
    HTTPSClientImpl(SSLConnectionSocketFactory sslConnectionSocketFactory) {
        super(HttpClients.custom()
                .setSSLSocketFactory(sslConnectionSocketFactory)

hos-http/src/main/java/com/yihu/hos/http/HttpClientKit.java

@@ -40,6 +40,14 @@ public class HttpClientKit {
        return new HTTPClientImpl();
    }
    /**
     * 用于无认证和受信证书
     * @return HTTPClient
     */
    public static HTTPClient getHttpClient() {
        return new HTTPClientImpl();
    }
    private static HTTPClient getHttpClient(String host, Integer port) {
        String key = host + ":" + port;
        CredentialsProvider credentialsProvider = credentialsProviderMap.get(key);
@@ -54,7 +62,7 @@ public class HttpClientKit {
        String key = host + ":" + port;
        SSLConnectionSocketFactory sslConnectionSocketFactory = sslConnectionSocketFactoryMap.get(key);
        if (sslConnectionSocketFactory == null) {
            throw new IllegalArgumentException("must add trust store first.");
            throw new IllegalArgumentException("Custom SSL access must add trust store first.");
        }
        CredentialsProvider credentialsProvider = credentialsProviderMap.get(key);

hos-http/src/test/java/com/yihu/hos/http/HttpClientKitTest.java

@@ -9,7 +9,15 @@ public class HttpClientKitTest {
    @Test
    public void use() throws Exception {
        HTTPResponse httpResponse = HttpClientKit.use("http://www.baidu.com").get("http://www.baidu.com");
        if (httpResponse.statusCode==200){
            System.out.println(httpResponse.body);
        }
        HTTPResponse httpResponse2 = HttpClientKit.getHttpClient().get("https://www.baidu.com");
        if (httpResponse.statusCode==200){
            System.out.println(httpResponse.body);
        }
    }
    @Test