diff --git a/src/main/java/luckyclient/tool/mail/HtmlMail.java b/src/main/java/luckyclient/tool/mail/HtmlMail.java index 304fca0..7f046d4 100644 --- a/src/main/java/luckyclient/tool/mail/HtmlMail.java +++ b/src/main/java/luckyclient/tool/mail/HtmlMail.java @@ -7,7 +7,7 @@ import java.util.Properties; import luckyclient.remote.entity.ProjectProtocolTemplate; import luckyclient.utils.LogUtil; import luckyclient.utils.SysConfig; -import luckyclient.utils.httputils.HttpClientHelper; +import luckyclient.utils.httputils.HttpClientTools; /** * ================================================================= @@ -55,7 +55,7 @@ public class HtmlMail { ProjectProtocolTemplate ppt=new ProjectProtocolTemplate(); ppt.setEncoding("utf-8"); ppt.setTimeout(60); - HttpClientHelper.httpClientPostJson(pushurl, pushparameters, headmsg,ppt); + HttpClientTools.httpClientPostJson(pushurl, pushparameters, headmsg,ppt); } } catch (Exception e) { LogUtil.APP.error("向第三方平台推送任务执行情况出现异常,请检查!", e); diff --git a/src/main/java/luckyclient/utils/InvokeMethod.java b/src/main/java/luckyclient/utils/InvokeMethod.java index 8195894..840b9d6 100644 --- a/src/main/java/luckyclient/utils/InvokeMethod.java +++ b/src/main/java/luckyclient/utils/InvokeMethod.java @@ -16,7 +16,7 @@ import luckyclient.execution.dispose.ParamsManageForSteps; import luckyclient.remote.api.GetServerApi; import luckyclient.remote.entity.ProjectProtocolTemplate; import luckyclient.remote.entity.ProjectTemplateParams; -import luckyclient.utils.httputils.HttpClientHelper; +import luckyclient.utils.httputils.HttpClientTools; /** * ================================================================= @@ -215,32 +215,32 @@ public class InvokeMethod { } if (functionname.toLowerCase().equals("httpurlpost")) { - result = HttpClientHelper.sendHttpURLPost(packagename, params,headmsg,ppt); + result = HttpClientTools.sendHttpURLPost(packagename, params,headmsg,ppt); } else if (functionname.toLowerCase().equals("urlpost")) { - result = HttpClientHelper.sendURLPost(packagename, params, headmsg,ppt); + result = HttpClientTools.sendURLPost(packagename, params, headmsg,ppt); } else if (functionname.toLowerCase().equals("getandsavefile")) { String fileSavePath = System.getProperty("user.dir") + "\\HTTPSaveFile\\"; - result = HttpClientHelper.sendGetAndSaveFile(packagename, params, fileSavePath, headmsg,ppt); + result = HttpClientTools.sendGetAndSaveFile(packagename, params, fileSavePath, headmsg,ppt); } else if (functionname.toLowerCase().equals("httpurlget")) { - result = HttpClientHelper.sendHttpURLGet(packagename, params, headmsg,ppt); + result = HttpClientTools.sendHttpURLGet(packagename, params, headmsg,ppt); } else if (functionname.toLowerCase().equals("urlget")) { - result = HttpClientHelper.sendURLGet(packagename, params, headmsg,ppt); + result = HttpClientTools.sendURLGet(packagename, params, headmsg,ppt); } else if (functionname.toLowerCase().equals("httpclientpost")) { - result = HttpClientHelper.httpClientPost(packagename, params, headmsg , ppt); + result = HttpClientTools.httpClientPost(packagename, params, headmsg , ppt); } else if (functionname.toLowerCase().equals("httpclientuploadfile")) { - result = HttpClientHelper.httpClientUploadFile(packagename, params, headmsg , ppt); + result = HttpClientTools.httpClientUploadFile(packagename, params, headmsg , ppt); } else if (functionname.toLowerCase().equals("httpclientpostjson")) { - result = HttpClientHelper.httpClientPostJson(packagename, params, headmsg , ppt); + result = HttpClientTools.httpClientPostJson(packagename, params, headmsg , ppt); } else if (functionname.toLowerCase().equals("httpurldelete")) { - result = HttpClientHelper.sendHttpURLDel(packagename, params, headmsg,ppt); + result = HttpClientTools.sendHttpURLDel(packagename, params, headmsg,ppt); } else if (functionname.toLowerCase().equals("httpclientputjson")) { - result = HttpClientHelper.httpClientPutJson(packagename, params, headmsg , ppt); + result = HttpClientTools.httpClientPutJson(packagename, params, headmsg , ppt); } else if (functionname.toLowerCase().equals("httpclientput")) { - result = HttpClientHelper.httpClientPut(packagename, params, headmsg , ppt); + result = HttpClientTools.httpClientPut(packagename, params, headmsg , ppt); } else if (functionname.toLowerCase().equals("httpclientget")) { - result = HttpClientHelper.httpClientGet(packagename, params, headmsg, ppt); + result = HttpClientTools.httpClientGet(packagename, params, headmsg, ppt); } else if (functionname.toLowerCase().equals("httpclientpostxml")) { - result = HttpClientHelper.httpClientPostXml(packagename, params, headmsg, ppt); + result = HttpClientTools.httpClientPostXml(packagename, params, headmsg, ppt); } else { LogUtil.APP.warn("您的HTTP操作方法异常,检测到的操作方法是:{}",functionname); result = "调用异常,请查看错误日志!"; @@ -376,9 +376,9 @@ public class InvokeMethod { if (functionname.toLowerCase().equals("socketpost")) { - result = HttpClientHelper.sendSocketPost(packagename, params, ppt.getEncoding().toLowerCase(), headmsg); + result = HttpClientTools.sendSocketPost(packagename, params, ppt.getEncoding().toLowerCase(), headmsg); } else if (functionname.toLowerCase().equals("socketget")) { - result = HttpClientHelper.sendSocketGet(packagename, params, ppt.getEncoding().toLowerCase(), headmsg); + result = HttpClientTools.sendSocketGet(packagename, params, ppt.getEncoding().toLowerCase(), headmsg); } else { LogUtil.APP.warn("您的SOCKET操作方法异常,检测到的操作方法是:{}",functionname); result = "调用异常,请查看错误日志!"; diff --git a/src/main/java/luckyclient/utils/httputils/HttpClientHelper.java b/src/main/java/luckyclient/utils/httputils/HttpClientTools.java similarity index 97% rename from src/main/java/luckyclient/utils/httputils/HttpClientHelper.java rename to src/main/java/luckyclient/utils/httputils/HttpClientTools.java index df6e5b8..44b226d 100644 --- a/src/main/java/luckyclient/utils/httputils/HttpClientHelper.java +++ b/src/main/java/luckyclient/utils/httputils/HttpClientTools.java @@ -73,7 +73,7 @@ import luckyclient.utils.LogUtil; * @date 2017年12月1日 上午9:29:40 * */ -public class HttpClientHelper { +public class HttpClientTools { /** * 使用HttpURLConnection发送post请求 * @param urlParam