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

hos-camel2/pom.xml

@@ -7,7 +7,8 @@
        <groupId>com.yihu.hos</groupId>
        <artifactId>hos-parent</artifactId>
        <version>1.3.0</version>
        <relativePath>../hos-parent</relativePath><!-- lookup parent from repository -->
        <relativePath>../hos-parent</relativePath>
        <!-- lookup parent from repository -->
    </parent>
    <artifactId>hos-camel2</artifactId>
@@ -80,7 +81,10 @@
            <groupId>net.sf.json-lib</groupId>
            <artifactId>json-lib</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-eureka</artifactId>
        </dependency>
    </dependencies>
</project>

hos-camel2/src/main/java/camel/HosCamelApplication.java

@@ -2,11 +2,13 @@ package camel;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
/**
 * Basic Spring Boot application.
 */
@SpringBootApplication
@EnableEurekaClient
public class HosCamelApplication {
    public static void main(String[] args) {

hos-camel2/src/main/java/camel/crawler/processor/DefaultHttpProcessor.java

@@ -25,7 +25,7 @@ public class DefaultHttpProcessor implements Processor {
            String value = (String) jsonObject.get(name);
            queryStr += name + "=" + value + "&&";
        }
        queryStr = StringUtil.substring(queryStr, 0, queryStr.length()-2);
        queryStr = StringUtil.substring(queryStr, 0, queryStr.length() - 2);
        outMessage.setHeader(Exchange.HTTP_QUERY, queryStr);
    }
}

hos-camel2/src/main/java/camel/crawler/processor/HttpProcessor.java

@@ -10,6 +10,7 @@ public class HttpProcessor implements Processor {
    public HttpProcessor(String paramName) {
        this.paramName = paramName;
    }
    public void process(Exchange exchange) throws Exception {
        Message outMessage = exchange.getOut();
        Message inMessage = exchange.getIn();

hos-camel2/src/main/java/camel/gateway/processor/ErrorHandle.java

@@ -8,19 +8,19 @@ import org.springframework.stereotype.Component;
 */
@Component("errorHandle")
public class ErrorHandle {
    public String paramError(){
    public String paramError() {
        return "paramError";
    }
    public String outdataError(){
    public String outdataError() {
        return "outdataError";
    }
    public String signValidError(){
    public String signValidError() {
        return "signValidError";
    }
    public String unauthorizedError(){
    public String unauthorizedError() {
        return "unauthorizedError";
    }
}

hos-camel2/src/main/java/camel/gateway/processor/GatewayProcessor.java

@@ -7,20 +7,31 @@ import com.yihu.hos.core.http.HTTPResponse;
import com.yihu.hos.core.http.HttpClientKit;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Component
public class GatewayProcessor implements Processor {
    static Map<String, AppApi> apiMap = new HashMap<>();
    static final String agUrl = "http://192.168.1.221:10000";
    @Autowired
    ParamVerifyBean paramSign;
    @Autowired
    private DiscoveryClient discoveryClient;
    public void process(Exchange exchange) throws Exception {
        Map<String, Object> headers = exchange.getIn().getHeaders();
@@ -37,7 +48,7 @@ public class GatewayProcessor implements Processor {
    public String route(Exchange exchange) throws IOException, ParseException {
//        body = URLDecoder.decode(body, "UTF-8");
        Map<String, Object> params = exchange.getIn().getHeaders();
        if (params.get("appKey")==null) {
        if (params.get("appKey") == null) {
            return "jetty:http://0.0.0.0:9999/error/paramError";    //TODO:
        }
        String appKey = params.get("appKey").toString();
@@ -108,7 +119,6 @@ public class GatewayProcessor implements Processor {
        try {
            String sign = params.get("sign").toString();                     // 簽名
            ParamVerifyBean paramSign = new ParamVerifyBean();
            paramSign.addParam(params);
//            paramSign.genParam();
            //TODO 获取app secret传入验证
@@ -172,7 +182,11 @@ public class GatewayProcessor implements Processor {
            methodMap.put("3", "put");
            JsonNode jsonNode = objectMapper.readValue(param, JsonNode.class);
            String url = appApi.getMicroServiceUri().split(",")[0];
            String url = serviceUrl(appApi.getMicroServiceName());
            if (StringUtil.isEmpty(url)) {
                return "";
            }
            final String[] endPoint = {"restlet:" + url + appApi.getMsMethodName() + "?socketTimeout=60000&connectionTimeout=60000&restletMethod=" + methodMap.get(appApi.getMethod())};
            final String[] body = {""};
            appApi.getParameters().forEach(p -> {
@@ -186,7 +200,7 @@ public class GatewayProcessor implements Processor {
                    endPoint[0] = endPoint[0].replaceAll("\\{[^}]*\\}", value);
                } else if (p.getType().equals("2")) { //head param
                    exchange.getOut().setHeader(p.getName(), value);
                }else {
                } else {
                    body[0] += ("&" + p.getName() + "=" + value);
                }
@@ -254,4 +268,20 @@ public class GatewayProcessor implements Processor {
        }
    }
    /**
     * 通过服务名获取微服务地址
     *
     * @param serviceName 微服务名
     * @return
     */
    public String serviceUrl(String serviceName) {
        List<ServiceInstance> instances = discoveryClient.getInstances(serviceName);
        if (instances != null && !instances.isEmpty()) {
            ServiceInstance serviceInstance = instances.get(0);
            return serviceInstance.getUri().toString();
        } else {
            return null;
        }
    }
}

hos-camel2/src/main/java/camel/gateway/processor/ParamVerifyBean.java

@@ -1,11 +1,8 @@
package camel.gateway.processor;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.core.encrypt.MD5;
import org.springframework.stereotype.Component;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
@@ -15,36 +12,12 @@ import java.util.TreeMap;
 * @vsrsion 1.0
 * Created at 2017/3/15.
 */
@Component
public class ParamVerifyBean {
    private final String version = "1.0";
    private TreeMap<String, String> paramMap = new TreeMap<>();
    private String timestamp;
    //TODO 配置文件中配置
    private String gatewayUrl = "seb-gatewayUrl";
    private String api;
    private String appKey = "esb-key";
    private String token;
//    public static void main(String[] args) throws Exception {
//        ParamVerifyBean paramSignUtil = new ParamVerifyBean();
//        paramSignUtil.setApi("camel.collect");
//        paramSignUtil.addParam("patientId", "11111", true);
//        paramSignUtil.addParam("eventNo", "2222222", true);
//        paramSignUtil.genParam();
//        String s = paramSignUtil.signParam("secret");
//        System.out.println(s);
//
//    }
    public void setApi(String api) {
        this.api = api;
    }
    public void setGatewayUrl(String gatewayUrl) {
        this.gatewayUrl = gatewayUrl;
    }
    public void addParam(Map<String, Object> params) throws Exception {
        if (params != null) {
@@ -86,68 +59,4 @@ public class ParamVerifyBean {
        return null;
    }
    /**
     * http请求 参数拼接
     *
     * @return
     * @throws Exception
     */
    public String genParam() throws Exception {
        Iterator<Map.Entry<String, String>> iterator = paramMap.entrySet().iterator();
        StringBuilder builder = new StringBuilder();
        while (iterator.hasNext()) {
            Map.Entry<String, String> next = iterator.next();
            String key = next.getKey();
            String value = next.getValue();
            if (value == null) {
                throw new Exception("参数错误:参数" + key + "值为空.");
            }
            if (builder.length() == 0) {
                builder.append("?");
            } else {
                builder.append("&");
            }
            builder.append(key);
            builder.append("=");
            builder.append(URLEncoder.encode(value, "UTF-8"));
        }
        return builder.toString();
    }
    //TODO 获取应用token
    public String getToken() {
        return null;
    }
    public void setToken(String token) {
        this.token = token;
    }
    private void addParam(String paramName, String paramValue, boolean bMust) throws Exception {
        if (StringUtil.isEmpty(paramValue)) {
            if (bMust) {
                throw new Exception(paramName + "参数不能为空.");
            } else {
                return;
            }
        }
        String encodeValue = URLEncoder.encode(paramValue, "UTF-8");
        paramMap.put(paramName, encodeValue);
    }
    /**
     * 获取 ISO 8601格式的时间戳
     *
     * @return
     */
    private String getTimestamp() {
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss:SSZ");
        timestamp = format.format(new Date());
        return timestamp;
    }
}

hos-camel2/src/main/java/camel/gateway/processor/SignProcessor.java

@@ -21,22 +21,22 @@ public class SignProcessor implements Processor {
        Message outMessage = exchange.getOut();
        Message inMessage = exchange.getIn();
        String camelHttpMethod = inMessage.getHeader("CamelHttpMethod").toString();
        if (!"POST".equals(camelHttpMethod)){
        if (!"POST".equals(camelHttpMethod)) {
            outMessage.setBody("请求类型必须为POST");
            return;
        }
        if (inMessage.getHeaders().get("appKey")==null){
        if (inMessage.getHeaders().get("appKey") == null) {
            outMessage.setBody("appKey不能为空");
            return;
        }
        String appKey = inMessage.getHeaders().get("appKey").toString();
        String secret = getSecret(appKey);
        if (StringUtil.isEmpty(secret)){
        if (StringUtil.isEmpty(secret)) {
            outMessage.setBody("获取secret失败，APPKey不存在对应的应用");
        }else {
        } else {
            Map<String, Object> params = inMessage.getHeaders();
            String sign = getSign(params, secret);
            outMessage.setBody("sign,"+sign);
            outMessage.setBody("sign," + sign);
        }
    }

hos-camel2/src/main/java/camel/gateway/route/GatewayRouterBuilder.java

@@ -44,7 +44,7 @@ public class GatewayRouterBuilder extends RouteBuilder {
                .process(new GatewayProcessor())
                .routingSlip(method(GatewayProcessor.class, "route"));
        from("jetty:http://0.0.0.0:9999/error")
        from("jetty:http://0.0.0.0:9999/error/{error}")
                .choice()
                .when(header(Exchange.HTTP_URI).contains("paramError")).bean(new ErrorHandle(), "paramError")
                .when(header(Exchange.HTTP_URI).contains("outdataError")).bean(new ErrorHandle(), "outdataError")

hos-camel2/src/main/java/camel/log/JmsAppender.java

@@ -1,6 +1,5 @@
package camel.log;
import ch.qos.logback.classic.net.JMSQueueAppender;
import ch.qos.logback.classic.net.JMSTopicAppender;
import ch.qos.logback.classic.spi.ILoggingEvent;
@@ -13,8 +12,7 @@ public class JmsAppender extends JMSTopicAppender {
    @Override
    public void append(ILoggingEvent event) {
        Map<String, String> mdcPropertyMap = event.getMDCPropertyMap();
        if (mdcPropertyMap.size() == 0)
        {
        if (mdcPropertyMap.size() == 0) {
            return;
        }
        System.out.println(mdcPropertyMap);

hos-camel2/src/main/java/camel/qlc/processor/Processor0.java

@@ -12,7 +12,7 @@ public class Processor0 implements Processor {
    public void process(Exchange exchange) throws Exception {
        Message outMessage = exchange.getOut();
        HttpMessage inMessage = (HttpMessage) exchange.getIn();
        String queryString = "api=camel.qlc&param="+inMessage.getRequest().getParameterValues("data")[0];
        String queryString = "api=camel.qlc&param=" + inMessage.getRequest().getParameterValues("data")[0];
        outMessage.setHeader(Exchange.HTTP_QUERY, queryString);
    }

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

@@ -7,4 +7,8 @@ server:
---
spring:
  profiles: dev
  profiles: dev
eureka:
  client:
    serviceUrl:
      defaultZone: http://192.168.1.221:8761/eureka/

hos-camel2/src/test/java/camel/SpringbootApplicationTests.java

@@ -12,8 +12,8 @@ import org.springframework.test.context.junit4.SpringRunner;
@SpringBootTest
public class SpringbootApplicationTests {
	@Test
	public void contextLoads() {
	}
    @Test
    public void contextLoads() {
    }
}