From f4129379e5d7c4581f25871301f6e1c3d70dc0cb Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Mon, 17 Apr 2023 16:02:20 +0800
Subject: [PATCH] http工具类post调用问题/一级菜单修改问题修复
---
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java | 2 +-
huaheng-wms-core/src/main/java/org/jeecg/utils/OkHttpUtils.java | 54 ++----------------------------------------------------
2 files changed, 3 insertions(+), 53 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
index 7d8226d..d3352df 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
@@ -185,7 +185,7 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
// ----------------------------------------------------------------------
// Step1.判断是否是一级菜单，是的话清空父菜单ID
if (CommonConstant.MENU_TYPE_0.equals(sysPermission.getMenuType())) {
- sysPermission.setParentId(0);
+ sysPermission.setParentId(null);
}
// Step2.判断菜单下级是否有菜单，无则设置为叶子节点
int count = this.count(new QueryWrapper<SysPermission>().lambda().eq(SysPermission::getParentId, sysPermission.getId()));
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/OkHttpUtils.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/OkHttpUtils.java
index efb5e35..6cd76ca 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/utils/OkHttpUtils.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/utils/OkHttpUtils.java
@@ -85,7 +85,7 @@ public class OkHttpUtils {
* @throws Exception
*/
public static String sendGet(String url, String param) {
- Map<String, String> headers = new HashMap<String, String>();
+ Map<String, String> headers = new HashMap<>();
return sendGet(url, headers, param);
}
@@ -126,58 +126,8 @@ public class OkHttpUtils {
return result;
}
- /**
- * 向指定 URL 发送POST方法的请求
- * @param url 发送请求的 URL
- * @param param 请求参数，请求参数是 name1=value1&name2=value2 的形式
- * @return 远程资源的响应结果
- * @throws IOException
- */
- public static String sendPost(String url, String param) throws IOException {
- Map<String, String> headers = new HashMap<String, String>();
- return sendPost(url, headers, param);
- }
-
- /**
- * 向指定 URL 发送POST方法的请求
- * @param url 发送请求的 URL
- * @param param 请求参数，请求参数是 name1=value1&name2=value2 的形式
- * @param headers 请求头
- * @return 远程资源的响应结果
- * @throws IOException
- */
- public static String sendPost(String url, Map<String, String> headers, String param) {
- ApiLog apiLog = new ApiLog();
- Request.Builder builder = new Request.Builder();
- buildHeader(builder, headers);
- FormBody body = new FormBody.Builder().build();
- Request request = builder.url(url + "?" + param).post(body).build();
- Response response = null;
- String result = null;
- try {
- ApiLoggerAspect.initApiLog(apiLog, request, param);
- response = HTTP_CLIENT.newCall(request).execute();
- result = response.body().string();
- } catch (Exception e) {
- String errorString =
- StrUtil.format("执行POST请求异常，url:{}，header:{}，param:{}，errorMessage:{}", url, JSON.toJSONString(headers), param, e.getMessage());
- ApiLoggerAspect.setApiLogException(apiLog, e);
- throw new RuntimeException(errorString, e);
- } finally {
- ApiLoggerAspect.finishApiLog(apiLog, response, result);
- }
- if (response.isSuccessful() && Objects.nonNull(response.body())) {// 调用成功
- log.info("执行POST请求成功，url:{}，header:{}，param:{}，result:{}", url, JSON.toJSONString(headers), param, result);
- } else {
- String errorString = StrUtil.format("执行POST请求失败，url:{}，header:{}，param:{}，responseCode:{}，responseMessage:{}", url,
- JSON.toJSONString(headers), param, response.code(), response.message());
- throw new RuntimeException(errorString);
- }
- return result;
- }
-
public static String sendPostByJsonStr(String url, String jsonString) {
- Map<String, String> headers = new HashMap<String, String>();
+ Map<String, String> headers = new HashMap<>();
return sendPostByJsonStr(url, headers, jsonString);
}
--
libgit2 0.22.2