upgrade version to 1.6.6 & 1.1.5

2015-12-31 13:12:37 +08:00
parent 7a3f47fd2a
commit c8cb22b69a
17 changed files with 108 additions and 45 deletions
@@ -95,4 +95,18 @@
  
 * 2015-12-19

-  + 删除PayUtil类,接口转移到PayApi类
+  + 删除PayUtil类,接口转移到PayApi类
+  
+* 2015-12-25
+  
+  + WeixinPayProxy类新增获取支付信息#getWeixinAccount方法
+  
+  + 新增JSSDK的config生成类
+  
+  + JSSDKHelper 重命名为 JSSDKConfigurator
+  
+  + 重构了token类
+  
+* 2015-12-26
+  
+  + MchPayRequest抽象化
@@ -110,8 +110,8 @@ public class JSSDKConfigurator {
 		signMap.put("noncestr", noncestr);
 		signMap.put("jsapi_ticket", this.ticketTokenHolder.getAccessToken());
 		signMap.put("url", url);
-		String sign = DigestUtil.SHA1(MapUtil
-				.toJoinString(signMap, false, false));
+		String sign = DigestUtil.SHA1(MapUtil.toJoinString(signMap, false,
+				false));
 		if (StringUtil.isBlank(config.getString("appId"))) {
 			config.put("appId", Weixin4jConfigUtil.getWeixinAccount().getId());
 		}
@@ -127,15 +127,4 @@ public class JSSDKConfigurator {
 		config.put("jsApiList", apis.toArray());
 		return config.toJSONString();
 	}
-	
-	public static void main(String[] args){
-		Map<String, String> signMap = new HashMap<String, String>();
-		signMap.put("timestamp", "1451291129");
-		signMap.put("noncestr", "FXlt1mmwNrU30AIGGNrdLcdO");
-		signMap.put("jsapi_ticket", "kgt8ON7yVITDhtdwci0qeQdDHdx7JYipird9HNRuaHAIXFpvYh0mz9vuWOjdZb8a3ftvHZKfqcLzrx_pTFOZ3Q");
-		signMap.put("url", "http://wx.jdxg.doubimeizhi.com/apprise/share");
-		String sign = DigestUtil.SHA1(MapUtil
-				.toJoinString(signMap, false, false));
-		System.err.println(sign);
-	}
 }
@@ -807,5 +807,5 @@ public class WeixinPayProxy {
 		return pay3Api.authCode2openId(authCode);
 	}

-	public final static String VERSION = "1.6.5";
+	public final static String VERSION = "1.6.6";
 }