From 85e0271265f39193ded310a3226bc9880cd33fab Mon Sep 17 00:00:00 2001
From: kamhung <22250530@qq.com>
Date: Thu, 3 Dec 2015 13:29:05 +0800
Subject: [PATCH]

---
 .../wentch/redkale/service/weixin/WeiXinMPService.java   | 9 +++------
 .../wentch/redkale/service/weixin/WeiXinPayService.java  | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src-plugin/com/wentch/redkale/service/weixin/WeiXinMPService.java b/src-plugin/com/wentch/redkale/service/weixin/WeiXinMPService.java
index 1d119a024..adac3db83 100644
--- a/src-plugin/com/wentch/redkale/service/weixin/WeiXinMPService.java
+++ b/src-plugin/com/wentch/redkale/service/weixin/WeiXinMPService.java
@@ -6,11 +6,11 @@
 package com.wentch.redkale.service.weixin;
 
 import com.wentch.redkale.convert.json.*;
+import static com.wentch.redkale.convert.json.JsonConvert.TYPE_MAP_STRING_STRING;
 import com.wentch.redkale.service.*;
 import com.wentch.redkale.util.*;
 import static com.wentch.redkale.util.Utility.getHttpContent;
 import java.io.*;
-import java.lang.reflect.*;
 import java.security.*;
 import java.util.*;
 import java.util.logging.*;
@@ -23,9 +23,6 @@ import javax.annotation.*;
  */
 public class WeiXinMPService implements Service {
 
-    protected static final Type MAPTYPE = new TypeToken<Map<String, String>>() {
-    }.getType();
-
     protected final Logger logger = Logger.getLogger(this.getClass().getSimpleName());
 
     private final boolean finest = logger.isLoggable(Level.FINEST);
@@ -67,7 +64,7 @@ public class WeiXinMPService implements Service {
         String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + appid + "&secret=" + mpsecrets.get(appid) + "&code=" + code + "&grant_type=authorization_code";
         String json = getHttpContent(url);
         if (finest) logger.finest(url + "--->" + json);
-        Map<String, String> jsonmap = convert.convertFrom(MAPTYPE, json);
+        Map<String, String> jsonmap = convert.convertFrom(TYPE_MAP_STRING_STRING, json);
         return getMPUserTokenByOpenid(jsonmap.get("access_token"), jsonmap.get("openid"));
     }
 
@@ -75,7 +72,7 @@ public class WeiXinMPService implements Service {
         String url = "https://api.weixin.qq.com/sns/userinfo?access_token=" + access_token + "&openid=" + openid;
         String json = getHttpContent(url);
         if (finest) logger.finest(url + "--->" + json);
-        Map<String, String> jsonmap = convert.convertFrom(MAPTYPE, json.replaceFirst("\\[.*\\]", "null"));
+        Map<String, String> jsonmap = convert.convertFrom(TYPE_MAP_STRING_STRING, json.replaceFirst("\\[.*\\]", "null"));
         return jsonmap;
     }
 
diff --git a/src-plugin/com/wentch/redkale/service/weixin/WeiXinPayService.java b/src-plugin/com/wentch/redkale/service/weixin/WeiXinPayService.java
index 0fdf8f5e9..9d9146d89 100644
--- a/src-plugin/com/wentch/redkale/service/weixin/WeiXinPayService.java
+++ b/src-plugin/com/wentch/redkale/service/weixin/WeiXinPayService.java
@@ -89,7 +89,7 @@ public class WeiXinPayService implements Service {
             map.put("appid", wxpayappid);
             map.put("mch_id", wxpaymchid);
             map.put("nonce_str", Long.toHexString(System.currentTimeMillis()) + Long.toHexString(System.nanoTime()));
-            map.put("body", "三万英尺服务套餐");
+            map.putIfAbsent("body", "服务");
             map.put("attach", "" + payid);
             map.put("out_trade_no", "" + orderpayid);
             map.put("total_fee", "" + paymoney);