feature(Util): remove 'content-type' judgment

tronprotocol · Sep 14, 2023 · 54884dc · 54884dc
1 parent a241aa3
commit 54884dc
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/framework/src/main/java/org/tron/core/services/http/Util.java b/framework/src/main/java/org/tron/core/services/http/Util.java
@@ -524,7 +524,6 @@ public static byte[] getAddress(HttpServletRequest request) throws Exception {
 
   private static String checkGetParam(HttpServletRequest request, String key) throws Exception {
     String method = request.getMethod();
-    String value = null;
 
     if (HttpMethod.GET.toString().toUpperCase().equalsIgnoreCase(method)) {
       return request.getParameter(key);
@@ -534,8 +533,10 @@ private static String checkGetParam(HttpServletRequest request, String key) thro
       if (StringUtils.isBlank(contentType)) {
         return null;
       }
-      if (contentType.contains(MimeTypes.Type.APPLICATION_JSON.asString())) {
-        value = getRequestValue(request);
+      if (contentType.contains(MimeTypes.Type.FORM_ENCODED.asString())) {
+        return request.getParameter(key);
+      } else {
+        String value = getRequestValue(request);
         if (StringUtils.isBlank(value)) {
           return null;
         }
@@ -544,13 +545,10 @@ private static String checkGetParam(HttpServletRequest request, String key) thro
         if (jsonObject != null) {
           return jsonObject.getString(key);
         }
-      } else if (contentType.contains(MimeTypes.Type.FORM_ENCODED.asString())) {
-        return request.getParameter(key);
-      } else {
         return null;
       }
     }
-    return value;
+    return null;
   }
 
   public static String getRequestValue(HttpServletRequest request) throws IOException {