Merge pull request binarywang#87 from wechat-group/develop

准备发布新版本2.4.0
henryking14 · Nov 30, 2016 · 668eaaa · 668eaaa
2 parents 2a63e12 + 6ca78bb
commit 668eaaa
Show file tree

Hide file tree

Showing 50 changed files with 2,487 additions and 798 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ test-config.xml
 /gradle/
 *.bat
 /gradlew
+**/build/
 
 # OSX
 # Icon must end with two \r

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ allprojects  {
   apply plugin: 'maven'
 
   group = 'com.github.binarywang'
-  version = '2.3.0'
+  version = '2.4.0-SNAPSHOT'
 }
 
 subprojects {
@@ -21,6 +21,7 @@ subprojects {
   dependencies {
     compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.10'
     compile group: 'org.apache.httpcomponents', name: 'httpmime', version:'4.5'
+    compile group: 'org.apache.httpcomponents', name: 'httpclient', version:'4.5'
     compile group: 'com.google.code.gson', name: 'gson', version:'2.7'
     compile group: 'com.google.guava', name: 'guava', version:'19.0'
     compile group: 'commons-codec', name: 'commons-codec', version:'1.10'

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.3.0</version>
+  <version>2.4.0</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
@@ -54,6 +54,21 @@
       <email>[email protected]</email>
       <url>https://github.com/aimilin6688</url>
     </developer>
+    <developer>
+      <name>Eric.Tsai</name>
+      <email>[email protected]</email>
+      <url>https://github.com/iwareserictsai</url>
+    </developer>
+    <developer>
+      <name>withinthefog</name>
+      <email>[email protected]</email>
+      <url>https://github.com/withinthefog</url>
+    </developer>
+    <developer>
+      <name>Keung</name>
+      <email>[email protected]</email>
+      <url>https://github.com/johnnytung</url>
+    </developer>
   </developers>
 
   <scm>
@@ -70,6 +85,9 @@
   </modules>
 
   <properties>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <downloadJavadocs>true</downloadJavadocs>
     <downloadSources>true</downloadSources>
@@ -97,6 +115,11 @@
       <version>${logback.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>${httpclient.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
@@ -296,10 +319,8 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.6.0</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>

diff --git a/weixin-java-common/build.gradle b/weixin-java-common/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testCompile group: 'org.testng', name: 'testng', version:'6.8.7'
     testCompile group: 'org.mockito', name: 'mockito-all', version:'1.9.5'
     testCompile group: 'com.google.inject', name: 'guice', version:'3.0'
-    testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version:'9.3.0.M0'
-    testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version:'9.3.0.M0'
+    testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version:'9.3.0.RC0'
+    testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version:'9.3.0.RC0'
 }
 test.useTestNG()
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
@@ -18,8 +18,13 @@ public class WxConsts {
   public static final String XML_MSG_LOCATION = "location";
   public static final String XML_MSG_LINK = "link";
   public static final String XML_MSG_EVENT = "event";
+  public static final String XML_MSG_DEVICE_TEXT = "device_text";
+  public static final String XML_MSG_DEVICE_EVENT = "device_event";
+  public static final String XML_MSG_DEVICE_STATUS = "device_status";
+  public static final String XML_MSG_HARDWARE = "hardware";
   public static final String XML_TRANSFER_CUSTOMER_SERVICE = "transfer_customer_service";
 
+
   ///////////////////////
   // 主动发送消息(即客服消息)的消息类型
   ///////////////////////

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenu.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenu.java
@@ -1,17 +1,17 @@
 package me.chanjar.weixin.common.bean.menu;
 
+import me.chanjar.weixin.common.util.ToStringUtils;
+import me.chanjar.weixin.common.util.json.WxGsonBuilder;
+
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
-import me.chanjar.weixin.common.bean.menu.WxMenuButton;
-import me.chanjar.weixin.common.util.json.WxGsonBuilder;
-
 /**
- * 企业号菜单
+ * 菜单（公众号和企业号共用的）
  *
  * @author Daniel Qian
  */
@@ -61,9 +61,7 @@ public String toJson() {
 
   @Override
   public String toString() {
-    return "WxMenu{" +
-            "buttons=" + this.buttons +
-            '}';
+    return ToStringUtils.toSimpleString(this);
   }
 
 }
diff --git a/weixin-java-cp/build.gradle b/weixin-java-cp/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     testCompile group: 'org.testng', name: 'testng', version:'6.8.7'
     testCompile group: 'org.mockito', name: 'mockito-all', version:'1.9.5'
     testCompile group: 'com.google.inject', name: 'guice', version:'3.0'
-    testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version:'9.3.0.M0'
-    testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version:'9.3.0.M0'
+    testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version:'9.3.0.RC0'
+    testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version:'9.3.0.RC0'
 }
 test.useTestNG()
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.binarywang</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>2.3.0</version>
+        <version>2.4.0</version>
     </parent>
 
     <artifactId>weixin-java-cp</artifactId>

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpConfigStorage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpConfigStorage.java
@@ -45,7 +45,7 @@ public interface WxCpConfigStorage {
 
   String getCorpSecret();
 
-  String getAgentId();
+  Integer getAgentId();
 
   String getToken();
 

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpInMemoryConfigStorage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpInMemoryConfigStorage.java
@@ -19,7 +19,7 @@ public class WxCpInMemoryConfigStorage implements WxCpConfigStorage {
   protected volatile String token;
   protected volatile String accessToken;
   protected volatile String aesKey;
-  protected volatile String agentId;
+  protected volatile Integer agentId;
   protected volatile long expiresTime;
 
   protected volatile String oauth2redirectUri;
@@ -146,11 +146,11 @@ public void setAesKey(String aesKey) {
   }
 
   @Override
-  public String getAgentId() {
+  public Integer getAgentId() {
     return this.agentId;
   }
 
-  public void setAgentId(String agentId) {
+  public void setAgentId(Integer agentId) {
     this.agentId = agentId;
   }