Merge branch 'master' of github.com:wxpusher/wxpusher-sdk-java

Author: zjiecode

demo/src/main/java/com/zjiecode/wxpusher/demo/controller/SendController.java

@@ -63,7 +63,7 @@ public Result sendMarkdown(@PathVariable("uid") String uid) {
         message.setUid(uid);
         message.setAppToken(appToken);
         message.setContent("WxPusher演示消息，这是一个Markdown消息\n# 目录\n- 什么是Wxpusher\n- Wxpusher可好用了\n## 发送状态：_成功_"
-                + "<br /><br /><br />" + sign);
+                + "\n\n<br /><br /><br />" + sign);
         return WxPusher.send(message);
     }
 

sdk/src/main/java/com/zjiecode/wxpusher/client/HttpUtils.java

@@ -11,6 +11,8 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.Set;
 
@@ -21,6 +23,7 @@
  */
 public final class HttpUtils {
     private static final String BASE_URL = "http://wxpusher.zjiecode.com";
+    private static final String CHARSET_NAME ="UTF-8";
 
     private HttpUtils() {
     }
@@ -47,11 +50,11 @@ public static Result post(Object data, String path) {
             urlConnection.setRequestMethod("POST");
             //设置请求属性
             urlConnection.setRequestProperty("Content-Type", "application/json");
-            urlConnection.setRequestProperty("Charset", "UTF-8");
+            urlConnection.setRequestProperty("Charset", CHARSET_NAME);
             urlConnection.setDoOutput(true);
             urlConnection.connect();
             OutputStream outputStream = urlConnection.getOutputStream();
-            outputStream.write(dataStr.getBytes());
+            outputStream.write(dataStr.getBytes(Charset.forName(CHARSET_NAME)));
             outputStream.flush();
             return dealConnect(urlConnection);
         } catch (MalformedURLException e) {
@@ -84,7 +87,7 @@ public static Result get(Map<String, Object> data, String path) {
             urlConnection.setUseCaches(false);
             urlConnection.setRequestMethod("GET");
             //设置请求属性
-            urlConnection.setRequestProperty("Charset", "UTF-8");
+            urlConnection.setRequestProperty("Charset", CHARSET_NAME);
             urlConnection.setDoOutput(true);
             urlConnection.connect();
             return dealConnect(urlConnection);
@@ -175,7 +178,7 @@ private static String inputStream2String(InputStream inputStream) {
             while ((len = inputStream.read(bytes)) != -1) {
                 outputStream.write(bytes, 0, len);
             }
-            return new String(outputStream.toByteArray());
+            return new String(outputStream.toByteArray(),CHARSET_NAME);
         } catch (IOException e) {
             e.printStackTrace();
         }