diff --git a/src/main/java/com/eactive/eai/adapter/http/client/HttpClientAdapterServiceKey.java b/src/main/java/com/eactive/eai/adapter/http/client/HttpClientAdapterServiceKey.java index 6e6bad5..4de44f4 100644 --- a/src/main/java/com/eactive/eai/adapter/http/client/HttpClientAdapterServiceKey.java +++ b/src/main/java/com/eactive/eai/adapter/http/client/HttpClientAdapterServiceKey.java @@ -69,6 +69,7 @@ public interface HttpClientAdapterServiceKey { public static final String INBOUND_METHOD = "INBOUND_METHOD"; public static final String INBOUND_URI = "INBOUND_URI"; public static final String INBOUND_EXTURI = "INBOUND_EXTURI"; + public static final String INBOUND_EXTPARAMS = "INBOUND_EXTPARAMS"; public static final String INBOUND_HEADER = "INBOUND_HEADER"; public static final String HTTP_VERSION = "HTTP_VERSION"; diff --git a/src/main/java/com/eactive/eai/adapter/http/dynamic/HttpAdapterServiceKey.java b/src/main/java/com/eactive/eai/adapter/http/dynamic/HttpAdapterServiceKey.java index c617084..b662e26 100644 --- a/src/main/java/com/eactive/eai/adapter/http/dynamic/HttpAdapterServiceKey.java +++ b/src/main/java/com/eactive/eai/adapter/http/dynamic/HttpAdapterServiceKey.java @@ -43,6 +43,7 @@ public interface HttpAdapterServiceKey { static final String INBOUND_METHOD = "INBOUND_METHOD"; static final String INBOUND_URI = "INBOUND_URI"; static final String INBOUND_EXTURI = "INBOUND_EXTURI"; + static final String INBOUND_EXTPARAMS = "INBOUND_EXTPARAMS"; static final String INBOUND_HEADER = "INBOUND_HEADER"; static final String INBOUND_QUERY_STRING = "INBOUND_QUERY_STRING"; static final String INBOUND_REWRITE_PATH = "INBOUND_REWRITE_PATH"; diff --git a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceBypass.java b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceBypass.java index 0d47483..94ef194 100644 --- a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceBypass.java +++ b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceBypass.java @@ -131,6 +131,7 @@ public class HttpAdapterServiceBypass extends HttpAdapterServiceSupport { prop.put(INBOUND_URI, request.getRequestURI()); prop.put(INBOUND_QUERY_STRING, StringUtils.defaultString(request.getQueryString())); prop.put(INBOUND_HEADER, getHeaders(request)); + prop.put(INBOUND_EXTPARAMS, request.getQueryString()); if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST) || StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) { // /api/v1/public/getUserInfo.svc diff --git a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceRest.java b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceRest.java index 13089e7..070d99b 100644 --- a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceRest.java +++ b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceRest.java @@ -275,6 +275,7 @@ public class HttpAdapterServiceRest extends HttpAdapterServiceSupport { prop = new Properties(); prop.put(INBOUND_METHOD, request.getMethod()); prop.put(INBOUND_URI, request.getRequestURI()); + prop.put(INBOUND_EXTPARAMS, request.getQueryString()); prop.put(INBOUND_HEADER, getHeaders(request)); if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST) || StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) { diff --git a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java index 17103ab..b78408f 100644 --- a/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java +++ b/src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java @@ -172,6 +172,7 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport prop.put(INBOUND_METHOD, request.getMethod()); prop.put(INBOUND_URI, request.getRequestURI()); prop.put(INBOUND_HEADER, getHeaders(request)); + prop.put(INBOUND_EXTPARAMS, request.getQueryString()); if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST) || StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) { // /api/v1/public/getUserInfo.svc diff --git a/src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java b/src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java index db60802..25d4c1d 100644 --- a/src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java +++ b/src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java @@ -426,7 +426,7 @@ public class RequestProcessor extends RequestProcessorSupport { prop.getProperty(HttpClientAdapterServiceKey.ADAPTER_GROUP_NAME), prop.getProperty(HttpClientAdapterServiceKey.ADAPTER_NAME), (Properties) prop.get(HttpClientAdapterServiceKey.INBOUND_HEADER), - prop.getProperty(HttpClientAdapterServiceKey.INBOUND_EXTURI), + prop.getProperty(HttpClientAdapterServiceKey.INBOUND_EXTURI)+"?"+prop.getProperty(HttpClientAdapterServiceKey.INBOUND_EXTPARAMS), prop.getProperty(HttpClientAdapterServiceKey.INBOUND_METHOD)); }