bug修复

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

@@ -11,7 +11,7 @@ import org.apache.camel.builder.RouteBuilder;
public class ArbiterServerRouter  extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("direct:arbiterServer")
                .to("bean:arbiterServerService?method=serverServiceFlow");
//        from("direct:arbiterServer")
//                .to("bean:arbiterServerService?method=serverServiceFlow");
    }
}

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

@@ -1,7 +1,6 @@
package com.yihu.hos.arbiter.routers;
import org.apache.camel.builder.RouteBuilder;
import org.springframework.stereotype.Component;
/**
 * @created Airhead 2016/8/1.
@@ -10,7 +9,7 @@ import org.springframework.stereotype.Component;
public class SerivceHealthRouter extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("timer:healthCheck?period={{arbiter.timer.period}}")
                .to("bean:endpointService?method=check");
//        from("timer:healthCheck?period={{arbiter.timer.period}}")
//                .to("bean:endpointService?method=check");
    }
}

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

@@ -79,6 +79,46 @@ hos:
  arbiter:
    enable: true
    url: http://172.19.103.67:10135
  rest:
    url: http://172.19.103.67:8088
  timer:
      period: 10000
  tenant:
    name: jkzl
  mycat:
    path: /opt/mycat/   ##mycat的安装目录
  #jcraft shell操作
  jcraft:
    host: 172.19.103.70
    port: 22
    user: root
    password: ceshi
---
spring:
  profiles: prod
  activemq:
      broker-url: tcp://activemq:61616
      user: admin
      password: admin
  data:
    mongodb:
      host: mongodb
      port: 27017
      username: esb
      password: esb
      authenticationDatabase: admin
      database: log
      gridFsDatabase: dfs
  camel.gateway:
    ip: localhost
    port: 8066
hos:
  esb:
    rest-url: http://172.17.110.202:8080/esb
  arbiter:
    enable: true
    url: http://arbiter:10135
  rest:
    url: http://rest:8088
  timer:
@@ -89,7 +129,7 @@ hos:
    path: /opt/mycat/   ##mycat的安装目录
  #jcraft shell操作
  jcraft:
    host: 172.19.103.67
    host: 172.17.110.202
    port: 22
    user: root
    password: ceshi

hos-camel/src/main/java/api7/processor/ApiProcessor.java

@@ -8,6 +8,7 @@ import org.apache.camel.Processor;
public class ApiProcessor implements Processor {
    public void process(Exchange exchange) throws Exception {
        Message outMessage = exchange.getOut();
        System.out.println("测试，helloWorld 打印camel接口");
        outMessage.setBody("hello,api7");
    }
}

hos-camel/src/main/java/api7/route/ApiRouteBulider.java

@@ -7,7 +7,7 @@ import org.apache.camel.builder.RouteBuilder;
public class ApiRouteBulider extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("jetty:http://localhost:9097/api/v1").routeId("api7")
        from("jetty:http://0.0.0.0:9097/api/v1").routeId("api7")
                .process(new ApiProcessor()).log("servers: 0,code: ,order: 0").log("servers: 0,code: ,order: 0");
    }
}

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

@@ -169,6 +169,7 @@ public class ClassFileUtil {
            return new FileOutputStream(classPath);
        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }

hos-core/src/main/java/com/yihu/hos/core/http/DefaultClientImpl.java

@@ -78,7 +78,6 @@ class DefaultClientImpl implements HTTPClient {
                    .url(url)
                    .post(requestBody)
                    .build();
            httpClient.newBuilder().connectTimeout(60, TimeUnit.SECONDS);
            Response response = httpClient.newCall(request).execute();
            return new HTTPResponse(response.code(), response.body().string());

src/main/java/com/yihu/hos/common/CommonPageController.java

@@ -285,8 +285,8 @@ public class CommonPageController extends BaseController {
            HTTPResponse response = HttpClientKit.post(portalUrl + "/oauth/validToken", params);
            if (response.getStatusCode() != 200) {
                System.out.println("获取 token 请求失败！");
                return null;
                System.out.println("验证 token 请求失败！");
                return failed("验证 token 请求失败！");
            }
            Map map = objectMapper.readValue(response.getBody(), Map.class);

src/main/java/com/yihu/hos/services/ServiceFlowEventService.java

@@ -81,15 +81,16 @@ public class ServiceFlowEventService {
        try {
            String msg = objectMapper.writeValueAsString(serviceFlow);
            String tenant = LocalContext.getContext().getAttachment(ContextAttributes.TENANT_NAME);
            Producer producer = new Producer(zbusBroker, ServiceFlowConstant.ZBUS_MQ + "@" + tenant);
            producer.createMQ();    //确定为创建消息队列需要显示调用
            Message message = new Message();
            message.setHead("event", event);
            message.setHead("tenant", tenant);
            message.setMethod("POST");
            message.setBody(msg);
            producer.sendSync(message);
            if (tenant!=null) {
                Producer producer = new Producer(zbusBroker, ServiceFlowConstant.ZBUS_MQ + "@" + tenant);
                producer.createMQ();    //确定为创建消息队列需要显示调用
                Message message = new Message();
                message.setHead("event", event);
                message.setHead("tenant", tenant);
                message.setMethod("POST");
                message.setBody(msg);
                producer.sendSync(message);
            }
        } catch (IOException | InterruptedException e) {
            logger.error(e.getMessage());
            e.printStackTrace();

src/main/resources/application.yml

@@ -60,8 +60,8 @@ hos:
  mysql:
    filePath: e://learn.sql   #租户基础表 sql文件位置
service-gateway:
  portalUrl: http://localhost:10280/api/v1.0/portal
  adminUrl: http://localhost:10000/api/v1.0/admin
  portalUrl: http://192.168.1.221:10280/api/v1.0/portal
  adminUrl: http://192.168.1.221:10000/api/v1.0/admin
  url: http://localhost:9999/api
---
spring:
@@ -90,7 +90,7 @@ spring:
    show-sql: false
  data:
    mongodb:
      host: mongodb
      host: 172.17.110.202
      port: 27017
      username: esb
      password: esb
@@ -98,7 +98,7 @@ spring:
      gridFsDatabase: dfs
      database: runtime
  activemq:
    broker-url: tcp://activemq:61616?wireFormat.maxInactivityDuration=0
    broker-url: tcp://172.17.110.202:61616?wireFormat.maxInactivityDuration=0
    user: admin
    password: admin
    pooled: false
@@ -114,4 +114,4 @@ hos:
service-gateway:
  portalUrl: http://192.168.1.221:10280/api/v1.0/portal
  adminUrl: http://192.168.1.221:10000/api/v1.0/admin
  url: http://192.168.131.109:9999/api
  url: http://172.17.110.202:9999/api