version upgrade to 1.7.1

weixin4j-base/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.7.0</version>
+		<version>1.7.1</version>
 	</parent>
 	<artifactId>weixin4j-base</artifactId>
 	<name>weixin4j-base</name>

weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/qr/QRParameter.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.foxinmy.weixin4j.model.card.CardQR;
 import com.foxinmy.weixin4j.type.QRType;
+import com.foxinmy.weixin4j.util.Consts;
 
 /**
  * 二维码参数对象
@@ -22,7 +23,7 @@ import com.foxinmy.weixin4j.type.QRType;
 public class QRParameter implements Serializable {
 
 	private static final long serialVersionUID = 6611187606558274253L;
-	
+
 	/**
 	 * 二维码的类型
 	 * 
@@ -35,6 +36,11 @@ public class QRParameter implements Serializable {
 	 */
 	@JSONField(name = "expire_seconds")
 	private Integer expireSeconds;
+	/**
+	 * 二维码的场景值
+	 */
+	@JSONField(serialize = false)
+	private String sceneValue;
 	/**
 	 * 二维码的内容
 	 */
@@ -42,9 +48,10 @@ public class QRParameter implements Serializable {
 	private JSONObject sceneContent;
 
 	private QRParameter(QRType qrType, Integer expireSeconds,
-			JSONObject sceneContent) {
+			String sceneValue, JSONObject sceneContent) {
 		this.qrType = qrType;
 		this.expireSeconds = expireSeconds;
+		this.sceneValue = sceneValue;
 		this.sceneContent = sceneContent;
 	}
 
@@ -56,6 +63,10 @@ public class QRParameter implements Serializable {
 		return qrType;
 	}
 
+	public String getSceneValue() {
+		return sceneValue;
+	}
+
 	public JSONObject getSceneContent() {
 		return sceneContent;
 	}
@@ -75,7 +86,8 @@ public class QRParameter implements Serializable {
 		JSONObject scene = new JSONObject();
 		scene.put("scene_id", sceneValue);
 		sceneContent.put("scene", scene);
-		return new QRParameter(QRType.QR_SCENE, expireSeconds, sceneContent);
+		return new QRParameter(QRType.QR_SCENE, expireSeconds,
+				Long.toString(sceneValue), sceneContent);
 	}
 
 	/**
@@ -89,7 +101,8 @@ public class QRParameter implements Serializable {
 		JSONObject scene = new JSONObject();
 		scene.put("scene_id", sceneValue);
 		sceneContent.put("scene", scene);
-		return new QRParameter(QRType.QR_LIMIT_SCENE, null, sceneContent);
+		return new QRParameter(QRType.QR_LIMIT_SCENE, null,
+				Integer.toString(sceneValue), sceneContent);
 	}
 
 	/**
@@ -103,7 +116,8 @@ public class QRParameter implements Serializable {
 		JSONObject scene = new JSONObject();
 		scene.put("scene_str", sceneValue);
 		sceneContent.put("scene", scene);
-		return new QRParameter(QRType.QR_LIMIT_STR_SCENE, null, sceneContent);
+		return new QRParameter(QRType.QR_LIMIT_STR_SCENE, null, sceneValue,
+				sceneContent);
 	}
 
 	/**
@@ -118,15 +132,22 @@ public class QRParameter implements Serializable {
 			CardQR... cardQRs) {
 		QRType qrType = QRType.QR_CARD;
 		JSONObject sceneContent = new JSONObject();
+		StringBuilder sceneValue = new StringBuilder();
+		sceneValue.append(cardQRs[0].getSceneValue());
 		if (cardQRs.length > 1) {
 			qrType = QRType.QR_MULTIPLE_CARD;
 			JSONObject multipleCard = new JSONObject();
 			multipleCard.put("card_list", cardQRs);
 			sceneContent.put("multiple_card", multipleCard);
+			for (int i = 1; i < cardQRs.length; i++) {
+				sceneValue.append(Consts.SEPARATOR).append(
+						cardQRs[i].getSceneValue());
+			}
 		} else {
 			sceneContent.put("card", cardQRs[0]);
 		}
-		return new QRParameter(qrType, expireSeconds, sceneContent);
+		return new QRParameter(qrType, expireSeconds, sceneValue.toString(),
+				sceneContent);
 	}
 
 	@Override

weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java

@@ -951,5 +951,5 @@ public class WeixinPayProxy {
 		return customsApi.queryCustomsOrder(idQuery, customsCity);
 	}
 
-	public final static String VERSION = "1.7.0";
+	public final static String VERSION = "1.7.1";
 }

weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Consts.java

@@ -28,4 +28,5 @@ public final class Consts {
 	public static final String SHA1 = "SHA-1";
 	public static final String PROTOCOL_FILE = "file";
 	public static final String PROTOCOL_JAR = "jar";
+	public static final String SEPARATOR = ",";
 }