From ebf9baac27a235f473c14907bc4a9ab84d06301f Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Wed, 8 Aug 2018 21:33:01 +0800
Subject: [PATCH] =?UTF-8?q?#534=20=E9=92=88=E5=AF=B9=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E5=8F=91=E9=80=81=E6=A8=A1=E7=89=88=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=B0=8F=E7=A8=8B=E5=BA=8Fpath=E5=92=8Cpagep?=
 =?UTF-8?q?ath=E9=97=AE=E9=A2=98=E5=A2=9E=E5=8A=A0=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=83=B3=E8=AE=A9?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E4=BD=BF=E7=94=A8path=E4=BD=9C=E4=B8=BA?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=EF=BC=8C=E8=AE=BE=E7=BD=AEusePath?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=B8=BAtrue=E5=8D=B3=E5=8F=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=90=A6=E5=88=99=E4=BC=9A=E4=BD=BF=E7=94=A8pagepath=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mp/bean/subscribe/WxMpSubscribeMessage.java   | 11 ++++++++---
 .../mp/bean/template/WxMpTemplateMessage.java     |  6 ++++++
 .../json/WxMpSubscribeMessageGsonAdapter.java     | 15 ++++++++++-----
 .../util/json/WxMpTemplateMessageGsonAdapter.java | 14 +++++++++++---
 .../bean/subscribe/WxMpSubscribeMessageTest.java  |  2 +-
 .../mp/bean/template/WxMpTemplateMessageTest.java |  2 +-
 6 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/subscribe/WxMpSubscribeMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/subscribe/WxMpSubscribeMessage.java
index 8c784c665..b6f1eef5a 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/subscribe/WxMpSubscribeMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/subscribe/WxMpSubscribeMessage.java
@@ -1,14 +1,13 @@
 package me.chanjar.weixin.mp.bean.subscribe;
 
+import java.io.Serializable;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
-import java.io.Serializable;
-
 /**
  * @author Mklaus
  * @date 2018-01-22 下午12:18
@@ -78,5 +77,11 @@ public class WxMpSubscribeMessage {
 
     private String appid;
     private String pagePath;
+
+    /**
+     * 是否使用path，否则使用pagepath.
+     * 加入此字段是基于微信官方接口变化多端的考虑
+     */
+    private boolean usePath = false;
   }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessage.java
index a66dbc07a..cb70893a9 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessage.java
@@ -77,6 +77,12 @@ public class WxMpTemplateMessage implements Serializable {
 
     private String appid;
     private String pagePath;
+
+    /**
+     * 是否使用path，否则使用pagepath.
+     * 加入此字段是基于微信官方接口变化多端的考虑
+     */
+    private boolean usePath = true;
   }
 
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpSubscribeMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpSubscribeMessageGsonAdapter.java
index 367416db0..6f32195a7 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpSubscribeMessageGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpSubscribeMessageGsonAdapter.java
@@ -1,13 +1,13 @@
 package me.chanjar.weixin.mp.util.json;
 
+import java.lang.reflect.Type;
+
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import me.chanjar.weixin.mp.bean.subscribe.WxMpSubscribeMessage;
 
-import java.lang.reflect.Type;
-
 /**
  * @author Mklaus
  * @date 2018-01-22 下午12:31
@@ -24,10 +24,15 @@ public class WxMpSubscribeMessageGsonAdapter implements JsonSerializer<WxMpSubsc
       messageJson.addProperty("url", message.getUrl());
     }
 
-    if (message.getMiniProgram() != null) {
+    final WxMpSubscribeMessage.MiniProgram miniProgram = message.getMiniProgram();
+    if (miniProgram != null) {
       JsonObject miniProgramJson = new JsonObject();
-      miniProgramJson.addProperty("appid", message.getMiniProgram().getAppid());
-      miniProgramJson.addProperty("pagepath", message.getMiniProgram().getPagePath());
+      miniProgramJson.addProperty("appid", miniProgram.getAppid());
+      if (miniProgram.isUsePath()) {
+        miniProgramJson.addProperty("path", miniProgram.getPagePath());
+      } else {
+        miniProgramJson.addProperty("pagepath", miniProgram.getPagePath());
+      }
       messageJson.add("miniprogram", miniProgramJson);
     }
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java
index 6bb5d2c5f..73f8c4e3a 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java
@@ -9,6 +9,9 @@ import com.google.gson.JsonSerializer;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
 
+/**
+ * @author chanjarster
+ */
 public class WxMpTemplateMessageGsonAdapter implements JsonSerializer<WxMpTemplateMessage> {
 
   @Override
@@ -20,10 +23,15 @@ public class WxMpTemplateMessageGsonAdapter implements JsonSerializer<WxMpTempla
       messageJson.addProperty("url", message.getUrl());
     }
 
-    if (message.getMiniProgram() != null) {
+    final WxMpTemplateMessage.MiniProgram miniProgram = message.getMiniProgram();
+    if (miniProgram != null) {
       JsonObject miniProgramJson = new JsonObject();
-      miniProgramJson.addProperty("appid", message.getMiniProgram().getAppid());
-      miniProgramJson.addProperty("pagepath", message.getMiniProgram().getPagePath());
+      miniProgramJson.addProperty("appid", miniProgram.getAppid());
+      if (miniProgram.isUsePath()) {
+        miniProgramJson.addProperty("path", miniProgram.getPagePath());
+      } else {
+        miniProgramJson.addProperty("pagepath", miniProgram.getPagePath());
+      }
       messageJson.add("miniprogram", miniProgramJson);
     }
 
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/subscribe/WxMpSubscribeMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/subscribe/WxMpSubscribeMessageTest.java
index c6ae47798..61d3d6fa6 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/subscribe/WxMpSubscribeMessageTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/subscribe/WxMpSubscribeMessageTest.java
@@ -33,7 +33,7 @@ public class WxMpSubscribeMessageTest {
       .toUser("OPENID")
       .templateId("TEMPLATE_ID")
       .url("URL")
-      .miniProgram(new WxMpSubscribeMessage.MiniProgram("xiaochengxuappid12345", "index?foo=bar"))
+      .miniProgram(new WxMpSubscribeMessage.MiniProgram("xiaochengxuappid12345", "index?foo=bar",false))
       .scene("SCENE")
       .title("TITLE")
       .contentValue("VALUE")
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessageTest.java
index dd0f10105..5a3f67fb1 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessageTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessageTest.java
@@ -17,7 +17,7 @@ public class WxMpTemplateMessageTest {
     WxMpTemplateMessage tm = WxMpTemplateMessage.builder()
       .toUser("OPENID")
       .templateId("ngqIpbwh8bUfcSsECmogfXcV14J0tQlEpBO27izEYtY")
-      .miniProgram(new WxMpTemplateMessage.MiniProgram("xiaochengxuappid12345", "index?foo=bar"))
+      .miniProgram(new WxMpTemplateMessage.MiniProgram("xiaochengxuappid12345", "index?foo=bar",true))
       .url("http://weixin.qq.com/download")
       .build();