...

src/main/java/cn/com/qmth/examcloud/commons/util/OKHttpUtil.java

@@ -216,21 +216,24 @@ public class OKHttpUtil {
 		LOG.info("[okhttp3] headers: " + JsonUtil.toJson(headers));
 		LOG.info("[okhttp3] params: " + JsonUtil.toJson(params));
 
-		okhttp3.FormBody.Builder formBody = new FormBody.Builder();
-
-		if (null != params && 0 != params.size()) {
-			for (Entry<String, String> entry : params.entrySet()) {
-				formBody.add(entry.getKey(), entry.getValue());
-			}
-		}
-
 		Builder builder = null;
-		if (httpMethod.equals(HttpMethod.POST)) {
-			builder = new Request.Builder().url(url).post(formBody.build());
-		} else if (httpMethod.equals(HttpMethod.PUT)) {
-			builder = new Request.Builder().url(url).put(formBody.build());
-		} else if (httpMethod.equals(HttpMethod.DELETE)) {
-			builder = new Request.Builder().url(url).delete(formBody.build());
+		if (httpMethod.equals(HttpMethod.GET)) {
+			url = UrlUtil.joinParams(url, params);
+			builder = new Request.Builder().url(url).get();
+		} else {
+			okhttp3.FormBody.Builder formBody = new FormBody.Builder();
+			if (null != params && 0 != params.size()) {
+				for (Entry<String, String> entry : params.entrySet()) {
+					formBody.add(entry.getKey(), entry.getValue());
+				}
+			}
+			if (httpMethod.equals(HttpMethod.POST)) {
+				builder = new Request.Builder().url(url).post(formBody.build());
+			} else if (httpMethod.equals(HttpMethod.PUT)) {
+				builder = new Request.Builder().url(url).put(formBody.build());
+			} else if (httpMethod.equals(HttpMethod.DELETE)) {
+				builder = new Request.Builder().url(url).delete(formBody.build());
+			}
 		}
 
 		if (null != headers && 0 != headers.size()) {