Merge branch 'develop' of github.com:Wechat-Group/weixin-java-tools into develop

* 'develop' of github.com:Wechat-Group/weixin-java-tools:
  binarywang#376 增加摇一摇周边的部分相关接口
  发布临时测试版本2.8.8.BETA
  fix error code
  使用lombok的@DaTa注解简化cp模块的所有bean类
  格式化开放平台模块代码
  使用lombok的@DaTa注解简化common模块的所有bean类
  使用lombok的@DaTa注解简化miniapp模块的所有bean类
  发布临时测试版本2.8.7.BETA
  binarywang#370 WxMpServiceOkHttpImpl改用httpProxy
  binarywang#370 WxMpServiceOkHttpImpl改用httpProxy
  # 368 增加 微信第三方平台 模块
  统一使用WxErrorException

Author: comeonc

pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.8.6.BETA</version>
+  <version>2.8.8.BETA</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
@@ -80,6 +80,11 @@
       <email>[email protected]</email>
       <url>https://github.com/crskyp</url>
     </developer>
+    <developer>
+      <name>007</name>
+      <email>[email protected]</email>
+      <url>https://github.com/007gzs</url>
+    </developer>
   </developers>
 
   <scm>
@@ -94,6 +99,7 @@
     <module>weixin-java-mp</module>
     <module>weixin-java-pay</module>
     <module>weixin-java-miniapp</module>
+    <module>weixin-java-open</module>
     <!--module>weixin-java-osgi</module-->
   </modules>
 

weixin-java-common/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.8.6.BETA</version>
+    <version>2.8.8.BETA</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java

@@ -1,9 +1,11 @@
 package me.chanjar.weixin.common.bean;
 
+import lombok.Data;
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 
 import java.io.Serializable;
 
+@Data
 public class WxAccessToken implements Serializable {
   private static final long serialVersionUID = 8709719312922168909L;
 
@@ -15,20 +17,4 @@ public static WxAccessToken fromJson(String json) {
     return WxGsonBuilder.create().fromJson(json, WxAccessToken.class);
   }
 
-  public String getAccessToken() {
-    return this.accessToken;
-  }
-
-  public void setAccessToken(String accessToken) {
-    this.accessToken = accessToken;
-  }
-
-  public int getExpiresIn() {
-    return this.expiresIn;
-  }
-
-  public void setExpiresIn(int expiresIn) {
-    this.expiresIn = expiresIn;
-  }
-
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java

@@ -1,17 +1,18 @@
 package me.chanjar.weixin.common.bean;
 
+import lombok.Data;
 import me.chanjar.weixin.common.util.ToStringUtils;
 
 import java.io.Serializable;
 
 /**
- * 卡券Api签名
+ * 卡券Api签名.
  *
  * @author YuJian
  * @version 15/11/8
  */
+@Data
 public class WxCardApiSignature implements Serializable {
-
   private static final long serialVersionUID = 158176707226975979L;
 
   private String appId;
@@ -37,75 +38,4 @@ public String toString() {
     return ToStringUtils.toSimpleString(this);
   }
 
-  public String getAppId() {
-    return this.appId;
-  }
-
-  public void setAppId(String appId) {
-    this.appId = appId;
-  }
-
-  public String getCardId() {
-    return this.cardId;
-  }
-
-  public void setCardId(String cardId) {
-    this.cardId = cardId;
-  }
-
-  public String getCardType() {
-    return this.cardType;
-  }
-
-  public void setCardType(String cardType) {
-    this.cardType = cardType;
-  }
-
-  public String getLocationId() {
-    return this.locationId;
-  }
-
-  public void setLocationId(String locationId) {
-    this.locationId = locationId;
-  }
-
-  public String getCode() {
-    return this.code;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public String getOpenId() {
-    return this.openId;
-  }
-
-  public void setOpenId(String openId) {
-    this.openId = openId;
-  }
-
-  public Long getTimestamp() {
-    return this.timestamp;
-  }
-
-  public void setTimestamp(Long timestamp) {
-    this.timestamp = timestamp;
-  }
-
-  public String getNonceStr() {
-    return this.nonceStr;
-  }
-
-  public void setNonceStr(String nonceStr) {
-    this.nonceStr = nonceStr;
-  }
-
-  public String getSignature() {
-    return this.signature;
-  }
-
-  public void setSignature(String signature) {
-    this.signature = signature;
-  }
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java

@@ -1,10 +1,13 @@
 package me.chanjar.weixin.common.bean;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
- * jspai signature
+ * jspai signature.
  */
+@Data
 public class WxJsapiSignature implements Serializable {
   private static final long serialVersionUID = -1116808193154384804L;
 
@@ -18,43 +21,4 @@ public class WxJsapiSignature implements Serializable {
 
   private String signature;
 
-  public String getSignature() {
-    return this.signature;
-  }
-
-  public void setSignature(String signature) {
-    this.signature = signature;
-  }
-
-  public String getNonceStr() {
-    return nonceStr;
-  }
-
-  public void setNonceStr(String nonceStr) {
-    this.nonceStr = nonceStr;
-  }
-
-  public long getTimestamp() {
-    return this.timestamp;
-  }
-
-  public void setTimestamp(long timestamp) {
-    this.timestamp = timestamp;
-  }
-
-  public String getUrl() {
-    return this.url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public String getAppId() {
-    return appId;
-  }
-
-  public void setAppId(String appId) {
-    this.appId = appId;
-  }
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenu.java

@@ -1,5 +1,6 @@
 package me.chanjar.weixin.common.bean.menu;
 
+import lombok.Data;
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 
@@ -15,8 +16,8 @@
  *
  * @author Daniel Qian
  */
+@Data
 public class WxMenu implements Serializable {
-
   private static final long serialVersionUID = -7083914585539687746L;
 
   private List<WxMenuButton> buttons = new ArrayList<>();
@@ -40,22 +41,6 @@ public static WxMenu fromJson(InputStream is) {
       .fromJson(new InputStreamReader(is, StandardCharsets.UTF_8), WxMenu.class);
   }
 
-  public List<WxMenuButton> getButtons() {
-    return this.buttons;
-  }
-
-  public void setButtons(List<WxMenuButton> buttons) {
-    this.buttons = buttons;
-  }
-
-  public WxMenuRule getMatchRule() {
-    return this.matchRule;
-  }
-
-  public void setMatchRule(WxMenuRule matchRule) {
-    this.matchRule = matchRule;
-  }
-
   public String toJson() {
     return WxGsonBuilder.create().toJson(this);
   }

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuButton.java

@@ -1,12 +1,14 @@
 package me.chanjar.weixin.common.bean.menu;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.Data;
 import me.chanjar.weixin.common.util.ToStringUtils;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+@Data
 public class WxMenuButton implements Serializable {
   private static final long serialVersionUID = -1070939403109776555L;
 
@@ -77,67 +79,4 @@ public String toString() {
     return ToStringUtils.toSimpleString(this);
   }
 
-  public String getType() {
-    return this.type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public String getName() {
-    return this.name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getKey() {
-    return this.key;
-  }
-
-  public void setKey(String key) {
-    this.key = key;
-  }
-
-  public String getUrl() {
-    return this.url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public List<WxMenuButton> getSubButtons() {
-    return this.subButtons;
-  }
-
-  public void setSubButtons(List<WxMenuButton> subButtons) {
-    this.subButtons = subButtons;
-  }
-
-  public String getMediaId() {
-    return this.mediaId;
-  }
-
-  public void setMediaId(String mediaId) {
-    this.mediaId = mediaId;
-  }
-
-  public String getAppId() {
-    return appId;
-  }
-
-  public void setAppId(String appId) {
-    this.appId = appId;
-  }
-
-  public String getPagePath() {
-    return pagePath;
-  }
-
-  public void setPagePath(String pagePath) {
-    this.pagePath = pagePath;
-  }
 }