From cb45fe9548cb1fc64722df3c454c40294e12334a Mon Sep 17 00:00:00 2001 From: panjing <599194993@qq.com> Date: Tue, 14 Mar 2017 17:16:44 +0800 Subject: [PATCH] =?UTF-8?q?body=E8=AF=B7=E6=B1=82=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E4=B8=AD=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wezoz-nat-client/pom.xml | 10 ++++++---- .../src/main/java/cn/wenat/CallListener.java | 2 +- .../src/main/java/cn/wenat/LocalServer.java | 8 ++++---- wezoz-nat-client/src/main/java/cn/wenat/Response.java | 2 +- .../src/main/java/cn/wenat/SocketListener.java | 2 +- .../src/main/java/cn/wenat/form/BaseForm.java | 2 +- .../src/main/java/cn/wenat/form/MainForm.java | 8 ++++---- .../src/main/java/cn/wenat/utils/HttpClientUtils.java | 9 ++++++--- .../src/main/java/cn/wenat/utils/SSLHttpClient.java | 2 +- 9 files changed, 25 insertions(+), 20 deletions(-) diff --git a/wezoz-nat-client/pom.xml b/wezoz-nat-client/pom.xml index f2616aa..f07ab5a 100644 --- a/wezoz-nat-client/pom.xml +++ b/wezoz-nat-client/pom.xml @@ -2,14 +2,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.wezoz.nat - wezoz-nat-client + com.wenat + wenat-client 0.0.1-SNAPSHOT jar - wezoz-nat-client + wenat-client https://www.wezoz.com - + + wenat.cn 这个域名没备案，.com的域名将就用吧～ + UTF-8 1.7 diff --git a/wezoz-nat-client/src/main/java/cn/wenat/CallListener.java b/wezoz-nat-client/src/main/java/cn/wenat/CallListener.java index 9c623a9..5b024ab 100644 --- a/wezoz-nat-client/src/main/java/cn/wenat/CallListener.java +++ b/wezoz-nat-client/src/main/java/cn/wenat/CallListener.java @@ -1,4 +1,4 @@ -package com.wezoz.nat; +package cn.wenat; public interface CallListener { diff --git a/wezoz-nat-client/src/main/java/cn/wenat/LocalServer.java b/wezoz-nat-client/src/main/java/cn/wenat/LocalServer.java index 594871c..8ed3116 100644 --- a/wezoz-nat-client/src/main/java/cn/wenat/LocalServer.java +++ b/wezoz-nat-client/src/main/java/cn/wenat/LocalServer.java @@ -1,4 +1,4 @@ -package com.wezoz.nat; +package cn.wenat; import java.sql.Time; import java.util.HashMap; @@ -14,9 +14,9 @@ import org.json.JSONException; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.wezoz.nat.form.MainForm; -import com.wezoz.nat.utils.HttpClientUtils; +import cn.wenat.form.MainForm; +import cn.wenat.utils.HttpClientUtils; import io.socket.client.IO; import io.socket.client.IO.Options; import io.socket.client.Socket; @@ -239,7 +239,7 @@ public class LocalServer { response = HttpClientUtils.post(post, params); }else { //其他的全部postBody - response = HttpClientUtils.postBody(post, request.getString("params"), encoding); + response = HttpClientUtils.postBody(post, request.getString("body"), encoding); } } catch (Exception e) { response = new Response(); diff --git a/wezoz-nat-client/src/main/java/cn/wenat/Response.java b/wezoz-nat-client/src/main/java/cn/wenat/Response.java index ab9d1be..a20832f 100644 --- a/wezoz-nat-client/src/main/java/cn/wenat/Response.java +++ b/wezoz-nat-client/src/main/java/cn/wenat/Response.java @@ -1,4 +1,4 @@ -package com.wezoz.nat; +package cn.wenat; import java.io.Serializable; import java.util.Map; diff --git a/wezoz-nat-client/src/main/java/cn/wenat/SocketListener.java b/wezoz-nat-client/src/main/java/cn/wenat/SocketListener.java index 8d56c84..e93f521 100644 --- a/wezoz-nat-client/src/main/java/cn/wenat/SocketListener.java +++ b/wezoz-nat-client/src/main/java/cn/wenat/SocketListener.java @@ -1,4 +1,4 @@ -package com.wezoz.nat; +package cn.wenat; import io.socket.emitter.Emitter.Listener; diff --git a/wezoz-nat-client/src/main/java/cn/wenat/form/BaseForm.java b/wezoz-nat-client/src/main/java/cn/wenat/form/BaseForm.java index 0b229e3..0591706 100644 --- a/wezoz-nat-client/src/main/java/cn/wenat/form/BaseForm.java +++ b/wezoz-nat-client/src/main/java/cn/wenat/form/BaseForm.java @@ -1,4 +1,4 @@ -package com.wezoz.nat.form; +package cn.wenat.form; import java.awt.Color; import java.awt.event.WindowAdapter; diff --git a/wezoz-nat-client/src/main/java/cn/wenat/form/MainForm.java b/wezoz-nat-client/src/main/java/cn/wenat/form/MainForm.java index 86b3847..188ccbb 100644 --- a/wezoz-nat-client/src/main/java/cn/wenat/form/MainForm.java +++ b/wezoz-nat-client/src/main/java/cn/wenat/form/MainForm.java @@ -1,4 +1,4 @@ -package com.wezoz.nat.form; +package cn.wenat.form; import java.awt.Color; import java.awt.event.ActionEvent; @@ -18,8 +18,8 @@ import javax.swing.JTextField; import javax.swing.border.EtchedBorder; import javax.swing.border.TitledBorder; -import com.wezoz.nat.CallListener; -import com.wezoz.nat.LocalServer; +import cn.wenat.CallListener; +import cn.wenat.LocalServer; public class MainForm extends BaseForm { @@ -73,7 +73,7 @@ public class MainForm extends BaseForm { try { String host = txtHost.getText(); server = new LocalServer(); - server.setServer("http://wezoz.com:3001"); + server.setServer("http://127.0.0.1:3001"); server.setForward(host); server.setDomain(txtDomain.getText()); server.setCallListener(new CallListener() { diff --git a/wezoz-nat-client/src/main/java/cn/wenat/utils/HttpClientUtils.java b/wezoz-nat-client/src/main/java/cn/wenat/utils/HttpClientUtils.java index 497d4bf..f04ea66 100644 --- a/wezoz-nat-client/src/main/java/cn/wenat/utils/HttpClientUtils.java +++ b/wezoz-nat-client/src/main/java/cn/wenat/utils/HttpClientUtils.java @@ -1,4 +1,4 @@ -package com.wezoz.nat.utils; +package cn.wenat.utils; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; @@ -48,7 +48,8 @@ import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; import com.alibaba.fastjson.JSON; -import com.wezoz.nat.Response; + +import cn.wenat.Response; /** * http请求工具 httpclient4.5 @@ -205,7 +206,9 @@ public class HttpClientUtils { public static Response postBody(HttpPost httpPost, String body,String encoding) { Response res = null; try { - httpPost.setEntity(new StringEntity(body, encoding)); + StringEntity entity=new StringEntity(body,encoding); +// entity.setContentType(httpPost.getFirstHeader("content-type")); + httpPost.setEntity(entity); CloseableHttpResponse response = getClient().execute(httpPost); res = getContent(response); } catch (Exception e) { diff --git a/wezoz-nat-client/src/main/java/cn/wenat/utils/SSLHttpClient.java b/wezoz-nat-client/src/main/java/cn/wenat/utils/SSLHttpClient.java index 3c48463..4be8b11 100644 --- a/wezoz-nat-client/src/main/java/cn/wenat/utils/SSLHttpClient.java +++ b/wezoz-nat-client/src/main/java/cn/wenat/utils/SSLHttpClient.java @@ -1,4 +1,4 @@ -package com.wezoz.nat.utils; +package cn.wenat.utils; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException;