请求url中host可自定义

Author: Hyq0719

marketing-api-common/src/main/java/com/hyq0719/mktapi/common/ApiClient.java

@@ -8,6 +8,7 @@
 import com.hyq0719.mktapi.common.token.cache.ITokenLocalCache;
 import com.hyq0719.mktapi.common.util.JSON;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.threeten.bp.format.DateTimeFormatter;
 
 import java.lang.reflect.Type;
@@ -70,6 +71,10 @@ public <T> ApiResponse<T> execute(RequestParam param, Type returnType) throws Ap
   }
 
   public String getToken(String accountId) {
+    //账号id判空
+    if (StringUtils.isEmpty(accountId)) {
+      return "";
+    }
     IToken iToken = iTokenLocalCache.get(accountId);
     if (iToken != null) {
       return iToken.getToken();

marketing-api-common/src/main/java/com/hyq0719/mktapi/common/ApiRequest.java

@@ -43,7 +43,7 @@ public R execute(T t, ApiRequestAdvice apiRequestAdvice, String token) throws Ap
     if (Objects.nonNull(apiRequestAdvice)) {
       apiRequestAdvice.before();
     }
-    ApiResponse<R> resp = businessWithHttpInfo(t, token);
+    ApiResponse<R> resp = executeWithHttp(t, token);
     if (Objects.nonNull(apiRequestAdvice)) {
       apiRequestAdvice.after();
     }
@@ -81,7 +81,8 @@ public RequestParam constructParameters(T t, String token) {
     final String localVarToken = StringUtils.isEmpty(token) ? getStringToken(getAccountId(t)) : token;
 
     return RequestParam.builder()
-            .baseUrl(getBaseUrl())
+            .scheme(getBaseUrl().getScheme())
+            .host(getHost())
             .path(getLocalVarPath())
             .version(getVersion())
             .method(getMethod())
@@ -181,7 +182,7 @@ public List<Pair> parameterToPairs(String collectionFormat, String name, Collect
 
   protected abstract void updateParamsForAuth(RequestParam param);
 
-  protected ApiResponse<R> businessWithHttpInfo(T t, String token) throws ApiException {
+  protected ApiResponse<R> executeWithHttp(T t, String token) throws ApiException {
     RequestParam param = constructParameters(t, token);
     paramValidate(t);
     updateParamsForAuth(param);

marketing-api-common/src/main/java/com/hyq0719/mktapi/common/annotation/ApiRequestMapping.java

@@ -13,6 +13,8 @@
 
   String version() default "";
 
+  String host() default "";
+
   String method();
 
   boolean usePostBody() default true;

marketing-api-common/src/main/java/com/hyq0719/mktapi/common/executor/http/BaseHttpHandler.java

@@ -1,6 +1,5 @@
 package com.hyq0719.mktapi.common.executor.http;
 
-import com.hyq0719.mktapi.common.executor.parameter.BaseUrl;
 import com.hyq0719.mktapi.common.executor.parameter.Pair;
 import com.hyq0719.mktapi.common.executor.parameter.RequestParam;
 import com.hyq0719.mktapi.common.util.JSON;
@@ -36,14 +35,13 @@ public String parameterToString(Object param) {
   @Override
   public String buildUrl(RequestParam requestParam) {
     StringBuilder url = new StringBuilder();
-    final BaseUrl baseUrl = requestParam.getBaseUrl();
 
-    url.append(baseUrl.getScheme()).append("://")
-            .append(baseUrl.getHost()).append("/")
+    url.append(requestParam.getScheme()).append("://")
+            .append(requestParam.getHost()).append("/")
             .append(requestParam.getVersion())
             .append(requestParam.getPath());
 
-    appendQueryParams(url, requestParam, baseUrl);
+    appendQueryParams(url, requestParam);
 
     appendCollectionQueryParams(url, requestParam);
 
@@ -74,11 +72,11 @@ public boolean isJsonMime(String mime) {
     return mime != null && (mime.matches(jsonMime) || "*/*".equals(mime));
   }
 
-  private void appendQueryParams(StringBuilder url, RequestParam requestParam, BaseUrl baseUrl) {
+  private void appendQueryParams(StringBuilder url, RequestParam requestParam) {
     List<Pair> queryParams = requestParam.getQueryParams();
     if (queryParams != null && !queryParams.isEmpty()) {
       // support (constant) query string in `path`, e.g. "/posts?draft=1"
-      String prefix = baseUrl.toString().contains("?") ? "&" : "?";
+      String prefix = "?";
       for (Pair param : queryParams) {
         if (param.getValue() != null) {
           if (prefix != null) {

marketing-api-common/src/main/java/com/hyq0719/mktapi/common/executor/parameter/ParamHandler.java

@@ -14,6 +14,8 @@ public interface ParamHandler<T> {
 
   String getVersion();
 
+  String getHost();
+
   String getStringToken(String accountId);
 
   String getAccountId(T t);

marketing-api-common/src/main/java/com/hyq0719/mktapi/common/executor/parameter/RequestParam.java

@@ -15,6 +15,8 @@
 @AllArgsConstructor
 public class RequestParam {
   private String path;
+  private String scheme;
+  private String host;
   private String version;
   private BaseUrl baseUrl;
   private String method;