Merge pull request #11 from Wechat-Group/develop

合并

Author: aimilin6688

.gitignore

@@ -48,3 +48,5 @@ Icon
 Network Trash Folder
 Temporary Items
 .apdisk
+/.sonar/
+sonar-project.properties

README.md

@@ -26,7 +26,7 @@ Weixin Java Tools 微信公众号/企业号开发Java SDK
 
 ## 版本说明
 1. 本项目定为每两个月发布一次正式版，版本号格式为X.X.0（如2.1.0，2.2.0等），月底发布新版本，遇到重大问题需修复会及时提交新版本，欢迎大家随时提交Pull Request；
-1. BUG修复和新特性一般会先发布成小版本作为临时版本（如2.0.1，2.0.2等，即尾号不为0，以区别于正式版）；
+1. BUG修复和新特性一般会先发布成小版本作为临时测试版本（如2.0.1-beta，2.0.2-beta等，即尾号不为0，并添加beta字样，以区别于正式版）；
 1. 目前最新版本号为 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.binarywang/weixin-java-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.binarywang/weixin-java-parent) ，也可以通过访问链接 [【公众号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-mp%22) 、[【企业号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-cp%22)
 分别查看所有最新的版本。 
 

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.5.0-SNAPSHOT</version>
+  <version>2.4.4-beta</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
@@ -69,6 +69,11 @@
       <email>[email protected]</email>
       <url>https://github.com/johnnytung</url>
     </developer>
+    <developer>
+      <name>Jonk</name>
+      <email>[email protected]</email>
+      <url>https://github.com/aimilin6688</url>
+    </developer>
   </developers>
 
   <scm>

weixin-java-common/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.4.4-beta</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

weixin-java-cp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.binarywang</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>2.4.4-beta</version>
     </parent>
 
     <artifactId>weixin-java-cp</artifactId>

weixin-java-mp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.binarywang</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>2.4.4-beta</version>
     </parent>
     <artifactId>weixin-java-mp</artifactId>
     <name>WeiXin Java Tools - MP</name>

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java

@@ -422,8 +422,7 @@ protected synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor,
       }
 
       if (error.getErrorCode() != 0) {
-        this.log.error("\n[URL]:  {}\n[PARAMS]: {}\n[RESPONSE]: {}", uri, data,
-            error);
+        this.log.error("\n[URL]:  {}\n[PARAMS]: {}\n[RESPONSE]: {}", uri, data, error);
         throw new WxErrorException(error);
       }
       return null;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassOpenIdsMessage.java

@@ -1,28 +1,29 @@
 package me.chanjar.weixin.mp.bean;
 
+import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
-
 /**
  * openid列表群发的消息
- * 
+ *
  * @author chanjarster
  */
 public class WxMpMassOpenIdsMessage implements Serializable {
   private static final long serialVersionUID = -8022910911104788999L;
-  
+
   private List<String> toUsers = new ArrayList<>();
   private String msgType;
   private String content;
   private String mediaId;
+  private boolean sendIgnoreReprint = false;
 
   public WxMpMassOpenIdsMessage() {
     super();
   }
-  
+
   public String getMsgType() {
     return this.msgType;
   }
@@ -86,4 +87,15 @@ public void setToUsers(List<String> toUsers) {
     this.toUsers = toUsers;
   }
 
+  public boolean isSendIgnoreReprint() {
+    return sendIgnoreReprint;
+  }
+
+  /**
+   *
+   * @param sendIgnoreReprint 文章被判定为转载时，是否继续进行群发操作。
+   */
+  public void setSendIgnoreReprint(boolean sendIgnoreReprint) {
+    this.sendIgnoreReprint = sendIgnoreReprint;
+  }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassTagMessage.java

@@ -1,28 +1,29 @@
 package me.chanjar.weixin.mp.bean;
 
-import java.io.Serializable;
-
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
+
 /**
  * 按标签群发的消息
- * 
+ *
  * @author chanjarster
  */
 public class WxMpMassTagMessage implements Serializable {
-  
+
   private static final long serialVersionUID = -6625914040986749286L;
   private Long tagId;
-  private String msgtype;
+  private String msgType;
   private String content;
   private String mediaId;
+  private boolean sendIgnoreReprint = false;
 
   public WxMpMassTagMessage() {
     super();
   }
-  
-  public String getMsgtype() {
-    return this.msgtype;
+
+  public String getMsgType() {
+    return this.msgType;
   }
 
   /**
@@ -35,10 +36,11 @@ public String getMsgtype() {
    * {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_VOICE}
    * 如果msgtype和media_id不匹配的话，会返回系统繁忙的错误
    * </pre>
-   * @param msgtype
+   *
+   * @param msgType 消息类型
    */
-  public void setMsgtype(String msgtype) {
-    this.msgtype = msgtype;
+  public void setMsgType(String msgType) {
+    this.msgType = msgType;
   }
 
   public String getContent() {
@@ -67,10 +69,23 @@ public Long getTagId() {
 
   /**
    * 如果不设置则就意味着发给所有用户
-   * @param tagId
+   *
+   * @param tagId 标签id
    */
   public void setTagId(Long tagId) {
     this.tagId = tagId;
   }
 
+  public boolean isSendIgnoreReprint() {
+    return sendIgnoreReprint;
+  }
+
+  /**
+   *
+   * @param sendIgnoreReprint 文章被判定为转载时，是否继续进行群发操作。
+   */
+  public void setSendIgnoreReprint(boolean sendIgnoreReprint) {
+    this.sendIgnoreReprint = sendIgnoreReprint;
+  }
+
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassSendResult.java

@@ -1,25 +1,22 @@
 package me.chanjar.weixin.mp.bean.result;
 
+import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 import java.io.Serializable;
 
 /**
  * <pre>
  * 群发消息一发送就返回的结果
- * 
+ *
  * 真正的群发消息是否发送成功要看
  * http://mp.weixin.qq.com/wiki/index.php?title=高级群发接口#.E4.BA.8B.E4.BB.B6.E6.8E.A8.E9.80.81.E7.BE.A4.E5.8F.91.E7.BB.93.E6.9E.9C
- * 
+ *
  * </pre>
  * @author chanjarster
  *
  */
 public class WxMpMassSendResult implements Serializable {
-
-  /**
-   * 
-   */
   private static final long serialVersionUID = -4816336807575562818L;
   private String errorCode;
   private String errorMsg;
@@ -64,7 +61,7 @@ public static WxMpMassSendResult fromJson(String json) {
 
   @Override
   public String toString() {
-    return "WxMassSendResult [errcode=" + this.errorCode + ", errmsg=" + this.errorMsg + ", msg_id=" + this.msgId + "]";
+    return ToStringUtils.toSimpleString(this);
   }
-  
+
 }