From b2b2db4b02cda352f1e4aa8226431c3e147824b0 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Wed, 16 Feb 2022 11:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8F=82=E6=95=B02=E6=AC=A1U?=
 =?UTF-8?q?RLEncoding=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rpc/rest/handler/RestRemoteHandler.java       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

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 991d6f8c..9603ef1d 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
@@ -19,7 +19,6 @@ import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -49,7 +48,7 @@ public class RestRemoteHandler implements InvocationHandler {
      * @param args
      * @return
      */
-    public Object handle(Method method, Object[] args) throws UnsupportedEncodingException {
+    public Object handle(Method method, Object[] args) {
         if (method.getParameters().length == 0) {
             throw new ParamsException("方法没有参数");
         }
@@ -124,7 +123,7 @@ public class RestRemoteHandler implements InvocationHandler {
      * @param parameters
      * @return
      */
-    private Map<String, String> getPathVariableParams(Parameter[] parameters, Object[] args) throws UnsupportedEncodingException {
+    private Map<String, String> getPathVariableParams(Parameter[] parameters, Object[] args) {
         Map<String, String> pathVariableParamsMap = new HashMap<>();
         for (int i = 0; i < parameters.length; i++) {
             Parameter parameter = parameters[i];
@@ -140,7 +139,7 @@ public class RestRemoteHandler implements InvocationHandler {
             if (arg == null) {
                 throw new SystemException("路径参数不能为空: " + variableName);
             }
-            pathVariableParamsMap.put(variableName, URLEncoder.encode(String.valueOf(arg), "UTF-8"));
+            pathVariableParamsMap.put(variableName, String.valueOf(arg));
         }
         return pathVariableParamsMap;
     }
@@ -152,7 +151,7 @@ public class RestRemoteHandler implements InvocationHandler {
      * @param args
      * @return
      */
-    private Map<String, String> getQueryVariableParams(Parameter[] parameters, Object[] args) throws UnsupportedEncodingException {
+    private Map<String, String> getQueryVariableParams(Parameter[] parameters, Object[] args) {
         Map<String, String> queryVariableParamsMap = new HashMap<>();
         for (int i = 0; i < parameters.length; i++) {
             Parameter parameter = parameters[i];
@@ -168,7 +167,7 @@ public class RestRemoteHandler implements InvocationHandler {
             if (arg == null) {
                 continue;
             }
-            queryVariableParamsMap.put(variableName, URLEncoder.encode(String.valueOf(arg), "UTF-8"));
+            queryVariableParamsMap.put(variableName, String.valueOf(arg));
         }
         return queryVariableParamsMap;
     }
@@ -259,7 +258,7 @@ public class RestRemoteHandler implements InvocationHandler {
      * @return
      * @throws UnsupportedEncodingException
      */
-    private Map<String, String> getQueryMapParams(Parameter[] parameters, Object[] args) throws UnsupportedEncodingException {
+    private Map<String, String> getQueryMapParams(Parameter[] parameters, Object[] args) {
         for (int i = 0; i < parameters.length; i++) {
             Parameter parameter = parameters[i];
             if (!parameter.isAnnotationPresent(RemoteQueryParamsMap.class)) {
@@ -274,7 +273,7 @@ public class RestRemoteHandler implements InvocationHandler {
             Map<String, Object> argMap = (Map<String, Object>) args[i];
             Map<String, String> queryMap = new HashMap<>();
             for (Map.Entry<String, Object> kv : argMap.entrySet()) {
-                queryMap.put(kv.getKey(), URLEncoder.encode(String.valueOf(kv.getValue()), "UTF-8"));
+                queryMap.put(kv.getKey(), String.valueOf(kv.getValue()));
             }
             return queryMap;
         }