Merge pull request #138 from Wechat-Group/develop

merge Develop branch

Author: binarywang

.gitignore

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

.travis.yml

@@ -1,12 +1,26 @@
 language: java
-jdk:
-  - oraclejdk7
-
-script: "mvn clean package -Dmaven.test.skip=true"
+sudo: false
+install: true
+addons:
+  sonarqube:
+    token:
+      secure: "834110c7191f97ecb226970c46dcaff8e681da5a"
 
+jdk:
+  - oraclejdk8
+#script: "mvn clean package -Dmaven.test.skip=true"
+    
+script:
+  - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar
+  
 branches:
   only:
     - develop
+  
+cache:
+  directories:
+    - '$HOME/.m2/repository'
+    - '$HOME/.sonar/cache'
 
 notifications:
   email:

build.gradle

@@ -2,7 +2,7 @@ allprojects  {
   apply plugin: 'maven'
 
   group = 'com.github.binarywang'
-  version = '2.4.0'
+  version = '2.5.0-SNAPSHOT'
 }
 
 subprojects {

pom.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.4.0</version>
+  <version>2.5.0</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
@@ -69,6 +69,11 @@
       <email>dongfuqiang1988@163.com</email>
       <url>https://github.com/johnnytung</url>
     </developer>
+    <developer>
+      <name>Jonk</name>
+      <email>aimilin@yeah.net</email>
+      <url>https://github.com/aimilin6688</url>
+    </developer>
   </developers>
 
   <scm>
@@ -94,7 +99,6 @@
     <httpclient.version>4.5</httpclient.version>
     <slf4j.version>1.7.10</slf4j.version>
     <logback.version>1.1.2</logback.version>
-    <jedis.version>2.9.0</jedis.version>
     <gson.version>2.7</gson.version>
     <guava.version>19.0</guava.version>
     <commons-lang3.version>3.5</commons-lang3.version>
@@ -145,12 +149,6 @@
       <artifactId>commons-lang3</artifactId>
       <version>${commons-lang3.version}</version>
     </dependency>
-    <dependency>
-      <groupId>redis.clients</groupId>
-      <artifactId>jedis</artifactId>
-      <version>${jedis.version}</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -302,7 +300,7 @@
         <configuration>
           <serverId>ossrh</serverId>
           <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-          <autoReleaseAfterClose>false</autoReleaseAfterClose>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
         </configuration>
       </plugin>
       <plugin>

weixin-java-common/pom.xml

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

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

@@ -8,9 +8,9 @@
 public class WxJsapiSignature implements Serializable {
   private static final long serialVersionUID = -1116808193154384804L;
 
-  private String appid;
+  private String appId;
 
-  private String noncestr;
+  private String nonceStr;
 
   private long timestamp;
 
@@ -26,12 +26,12 @@ public void setSignature(String signature) {
     this.signature = signature;
   }
 
-  public String getNoncestr() {
-    return this.noncestr;
+  public String getNonceStr() {
+    return nonceStr;
   }
 
-  public void setNoncestr(String noncestr) {
-    this.noncestr = noncestr;
+  public void setNonceStr(String nonceStr) {
+    this.nonceStr = nonceStr;
   }
 
   public long getTimestamp() {
@@ -50,12 +50,11 @@ public void setUrl(String url) {
     this.url = url;
   }
 
-  public String getAppid() {
-    return this.appid;
+  public String getAppId() {
+    return appId;
   }
 
-  public void setAppid(String appid) {
-    this.appid = appid;
+  public void setAppId(String appId) {
+    this.appId = appId;
   }
-
 }

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

@@ -2,10 +2,12 @@
 
 import me.chanjar.weixin.common.util.ToStringUtils;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-public class WxMenuButton {
+public class WxMenuButton implements Serializable {
+  private static final long serialVersionUID = -1070939403109776555L;
 
   private String type;
   private String name;

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

@@ -2,7 +2,11 @@
 
 import me.chanjar.weixin.common.util.ToStringUtils;
 
-public class WxMenuRule {
+import java.io.Serializable;
+
+public class WxMenuRule implements Serializable {
+  private static final long serialVersionUID = -4587181819499286670L;
+
   private String tagId;
   private String sex;
   private String country;

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java

@@ -20,8 +20,7 @@ public class WxError implements Serializable {
   private String json;
 
   public static WxError fromJson(String json) {
-    WxError error = WxGsonBuilder.create().fromJson(json, WxError.class);
-    return error;
+    return WxGsonBuilder.create().fromJson(json, WxError.class);
   }
 
   public static Builder newBuilder() {