From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/util/HttpUtils.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/util/HttpUtils.java b/src/main/java/com/highdatas/mdm/util/HttpUtils.java
index c4359d5..072574e 100644
--- a/src/main/java/com/highdatas/mdm/util/HttpUtils.java
+++ b/src/main/java/com/highdatas/mdm/util/HttpUtils.java
@@ -53,14 +53,13 @@
if (mediaType == null){
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
MultiValueMap<String, String> vals = new LinkedMultiValueMap();
- if (formParams != null) {
- Set<String> keySet = formParams.keySet();
- for (String key : keySet) {
- String s = formParams.get(key);
- List<String> strings = new ArrayList<>();
- strings.add(s);
- vals.put(key,strings);
- }
+
+ Set<String> keySet = formParams.keySet();
+ for (String key : keySet) {
+ String s = formParams.get(key);
+ List<String> strings = new ArrayList<>();
+ strings.add(s);
+ vals.put(key,strings);
}
requestEntity = new HttpEntity<MultiValueMap<String, String>>(vals, headers);
@@ -120,7 +119,7 @@
}
String s = sb.toString();
if (s.endsWith("&")) {
- s = org.apache.commons.lang3.StringUtils.substringBeforeLast(s, "&");
+ s = org.apache.commons.lang.StringUtils.substringBeforeLast(s, "&");
}
return s;
}
--
Gitblit v1.8.0