diff --git a/basic-properties/src/main/java/ink/wgink/properties/wechat/miniapp/MiniappProperties.java b/basic-properties/src/main/java/ink/wgink/properties/wechat/miniapp/MiniappProperties.java index 8750fe5e..940284f6 100644 --- a/basic-properties/src/main/java/ink/wgink/properties/wechat/miniapp/MiniappProperties.java +++ b/basic-properties/src/main/java/ink/wgink/properties/wechat/miniapp/MiniappProperties.java @@ -18,6 +18,7 @@ import org.springframework.context.annotation.Configuration; public class MiniappProperties { private Boolean active; + private String apiUrl; private String authorizeUrl; private String grantType; private String appKey; @@ -31,6 +32,14 @@ public class MiniappProperties { this.active = active; } + public String getApiUrl() { + return apiUrl == null ? "" : apiUrl.trim(); + } + + public void setApiUrl(String apiUrl) { + this.apiUrl = apiUrl; + } + public String getAuthorizeUrl() { return authorizeUrl == null ? "" : authorizeUrl; } diff --git a/basic-properties/src/main/java/ink/wgink/properties/wechat/official/account/OfficialAccountProperties.java b/basic-properties/src/main/java/ink/wgink/properties/wechat/official/account/OfficialAccountProperties.java index c6607015..4ec1f358 100644 --- a/basic-properties/src/main/java/ink/wgink/properties/wechat/official/account/OfficialAccountProperties.java +++ b/basic-properties/src/main/java/ink/wgink/properties/wechat/official/account/OfficialAccountProperties.java @@ -19,6 +19,7 @@ public class OfficialAccountProperties { private Boolean apiCrossOrigin; private Boolean activate; + private String apiUrl; private OfficialAccountAuthorizeProperties authorize; private String accessTokenUrl; private String appId; @@ -42,6 +43,14 @@ public class OfficialAccountProperties { this.activate = activate; } + public String getApiUrl() { + return apiUrl == null ? "" : apiUrl.trim(); + } + + public void setApiUrl(String apiUrl) { + this.apiUrl = apiUrl; + } + public OfficialAccountAuthorizeProperties getAuthorize() { return authorize; } diff --git a/common/src/main/java/ink/wgink/common/rpc/rest/handler/RestRemoteHandler.java b/common/src/main/java/ink/wgink/common/rpc/rest/handler/RestRemoteHandler.java index af121ffb..9ec1b7e6 100644 --- a/common/src/main/java/ink/wgink/common/rpc/rest/handler/RestRemoteHandler.java +++ b/common/src/main/java/ink/wgink/common/rpc/rest/handler/RestRemoteHandler.java @@ -81,7 +81,7 @@ public class RestRemoteHandler implements InvocationHandler { RemotePostMethod postMethod = method.getAnnotation(RemotePostMethod.class); uri = postMethod.value(); formVariableParams = getFormVariableParams(method.getParameters(), args); - if (formVariableParams == null) { + if (formVariableParams.isEmpty()) { requestBody = getRequestBody(method.getParameters(), args); } } else if (method.isAnnotationPresent(RemotePutMethod.class)) { diff --git a/common/src/main/java/ink/wgink/common/rpc/rest/request/RestRemoteRequest.java b/common/src/main/java/ink/wgink/common/rpc/rest/request/RestRemoteRequest.java index 5eba806f..1a8218de 100644 --- a/common/src/main/java/ink/wgink/common/rpc/rest/request/RestRemoteRequest.java +++ b/common/src/main/java/ink/wgink/common/rpc/rest/request/RestRemoteRequest.java @@ -49,7 +49,7 @@ public class RestRemoteRequest { result = delete(remoteUri, headers); } else if (RequestMethod.POST.equals(requestMethod)) { // form表单优先 - if (formVariableParams != null) { + if (!formVariableParams.isEmpty()) { result = post(remoteUri, headers, formVariableParams); } else { result = post(remoteUri, headers, jsonBody);