From e8bdc1ace52b2876e7077729feb276b66e465dfb Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Thu, 30 Sep 2021 11:55:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86post=E7=9A=84json=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E4=B8=BB=E4=BD=93=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../properties/wechat/miniapp/MiniappProperties.java     | 9 +++++++++
 .../official/account/OfficialAccountProperties.java      | 9 +++++++++
 .../wgink/common/rpc/rest/handler/RestRemoteHandler.java | 2 +-
 .../wgink/common/rpc/rest/request/RestRemoteRequest.java | 2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)

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);