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

# Conflicts:
#	hos-camel/src/main/java/gateway/processor/GatewayProcessor.java

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

@@ -2,7 +2,6 @@ package gateway.processor;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.core.datatype.DateUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.core.http.HTTPResponse;
import com.yihu.hos.core.http.HttpClientKit;
@@ -10,8 +9,6 @@ import org.apache.camel.Body;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import java.io.IOException;
import java.sql.Date;
import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -135,9 +132,9 @@ public class GatewayProcessor implements Processor {
                .collect(Collectors.toMap(entry -> entry[0], entry -> entry[1]));
    }
    private String genEndpoint(Map<String, String> params, String[] requestBody) {
        String api = params.get("api");                     // API接口名称
        String param = params.get("param");
    private String genEndpoint(Map<String, Object> params, String[] requestBody) {
        String api = params.get("api").toString();                     // API接口名称
        String param = params.get("param").toString();
        ApiInfo apiInfo = getApiInfo(api);
        ObjectMapper objectMapper = new ObjectMapper();