Merge branch 'develop'

# Conflicts:
#	README.md

Author: binarywang

.gitignore

@@ -1,28 +1,49 @@
-*.class
-test-output
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-target
-bin
-.project
-.classpath
-.settings
-
-sw-pom.xml
-*.iml
-test-config.xml
-.idea
-/.gradle/
-/gradle/
-*.bat
-/gradlew
+*.class
+test-output
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+target
+bin
+.project
+.classpath
+.settings
+
+sw-pom.xml
+*.iml
+test-config.xml
+.idea
+/.gradle/
+/gradle/
+*.bat
+/gradlew
+
+# OSX
+# Icon must end with two \r
+Icon
+
+
+._*
+.DS_Store
+.AppleDouble
+.LSOverride
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

README.md

@@ -6,7 +6,7 @@
 1. ***本项目Fork自chanjarster/weixin-java-tools，但由于原项目已停止维护，故单独维护和发布，且发布到maven上的groupId也会不同，详细信息见下文。***
 1. ***自2.0.0版本以来，公众号的接口调整比较大，主要是为了解决主接口类过于庞大不方便管理的问题，将接口实现代码按模块进行拆分。***
 1. 本SDK要求的最低JDK版本是7，为满足少量还在使用JDK6的用户的需求，特意抽出独立的代码分支项目，请参考 https://github.com/binarywang/weixin-java-tools-for-jdk6 ，其他更早的JDK版本则需要自己改造实现；
-1. 最新更新：2016-09-30 发布2.2.0正式版！
+1. 最新更新：2016-10-31 发布2.3.0正式版！
 
 ===========
 
@@ -36,12 +36,12 @@ maven：
 <dependency>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-mp</artifactId>
-  <version>2.2.0</version>
+  <version>2.3.0</version>
 </dependency>
 ```
 gradle：
 ```groovy
-compile 'com.github.binarywang:weixin-java-mp:2.2.0'
+compile 'com.github.binarywang:weixin-java-mp:2.3.0'
 ```
 
 * 企业号：
@@ -51,12 +51,12 @@ maven：
 <dependency>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-cp</artifactId>
-  <version>2.2.0</version>
+  <version>2.3.0</version>
 </dependency>
 ```
 gradle：
 ```groovy
-compile 'com.github.binarywang:weixin-java-cp:2.2.0'
+compile 'com.github.binarywang:weixin-java-cp:2.3.0'
 ```
 
 ===========

build.gradle

@@ -2,7 +2,7 @@ allprojects  {
   apply plugin: 'maven'
 
   group = 'com.github.binarywang'
-  version = '2.2.0'
+  version = '2.3.0'
 }
 
 subprojects {
@@ -20,12 +20,9 @@ subprojects {
 
   dependencies {
     compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.10'
-    compile group: 'org.apache.httpcomponents', name: 'fluent-hc', version:'4.5'
     compile group: 'org.apache.httpcomponents', name: 'httpmime', version:'4.5'
-    compile group: 'org.jodd', name: 'jodd-http', version:'3.6.7'
     compile group: 'com.google.code.gson', name: 'gson', version:'2.7'
     compile group: 'com.google.guava', name: 'guava', version:'19.0'
-    compile group: 'org.jooq', name: 'joor', version:'0.9.6'
     compile group: 'commons-codec', name: 'commons-codec', version:'1.10'
     compile group: 'commons-io', name: 'commons-io', version:'2.5'
     compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.4'

pom.xml

@@ -5,11 +5,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.2.0</version>
+  <version>2.3.0</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
-  <url>https://github.com/binarywang/weixin-java-tools</url>
+  <url>https://github.com/wechat-group/weixin-java-tools</url>
 
   <licenses>
     <license>
@@ -22,23 +22,51 @@
     <developer>
       <name>Daniel Qian</name>
       <email>chanjarster@gmail.com</email>
+      <url>https://github.com/chanjarster</url>
     </developer>
     <developer>
       <name>Binary Wang</name>
       <email>binarywang@gmail.com</email>
+      <url>https://github.com/binarywang</url>
+    </developer>
+    <developer>
+      <name>gaigeshen</name>
+      <email>gaigeshen@qq.com</email>
+      <url>https://github.com/gaigeshen</url>
+    </developer>
+    <developer>
+      <name>Liu Mingbo</name>
+      <email>liumingbo2008@gmail.com</email>
+      <url>https://github.com/FirenzesEagle</url>
+    </developer>
+    <developer>
+      <name>kakotor</name>
+      <email>kakotor@gmail.com</email>
+      <url>https://github.com/kakotor</url>
+    </developer>
+    <developer>
+      <name>xiong</name>
+      <email>zhaoxiong.tan@gmail.com</email>
+      <url>https://github.com/ZhaoxiongTan</url>
+    </developer>
+    <developer>
+      <name>LiuJunGuang</name>
+      <email>aimilin@yeah.net</email>
+      <url>https://github.com/aimilin6688</url>
     </developer>
   </developers>
 
   <scm>
-    <connection>scm:git:https://github.com/binarywang/weixin-java-tools.git</connection>
-    <developerConnection>scm:git:git@github.com:binarywang/weixin-java-tools.git</developerConnection>
-    <url>https://github.com/binarywang/weixin-java-tools</url>
+    <connection>scm:git:https://github.com/wechat-group/weixin-java-tools.git</connection>
+    <developerConnection>scm:git:git@github.com:wechat-group/weixin-java-tools.git</developerConnection>
+    <url>https://github.com/wechat-group/weixin-java-tools</url>
   </scm>
 
   <modules>
     <module>weixin-java-common</module>
     <module>weixin-java-cp</module>
     <module>weixin-java-mp</module>
+    <module>weixin-java-osgi</module>
   </modules>
 
   <properties>
@@ -48,16 +76,13 @@
     <httpclient.version>4.5</httpclient.version>
     <slf4j.version>1.7.10</slf4j.version>
     <logback.version>1.1.2</logback.version>
-    <jodd-http.version>3.6.7</jodd-http.version>
     <jedis.version>2.9.0</jedis.version>
     <gson.version>2.7</gson.version>
     <guava.version>19.0</guava.version>
-    <joor.version>0.9.6</joor.version>
-    <commons-lang3.version>3.4</commons-lang3.version>
+    <commons-lang3.version>3.5</commons-lang3.version>
     <commons-io.version>2.5</commons-io.version>
     <commons-codec.version>1.10</commons-codec.version>
-    <jetty.version>9.3.0.M0</jetty.version>
-    <jetty-new.version>9.3.10.v20160621</jetty-new.version>
+    <jetty.version>9.3.0.RC0</jetty.version>
   </properties>
 
   <dependencies>
@@ -72,21 +97,11 @@
       <version>${logback.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>fluent-hc</artifactId>
-      <version>${httpclient.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
       <version>${httpclient.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.jodd</groupId>
-      <artifactId>jodd-http</artifactId>
-      <version>${jodd-http.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
@@ -111,16 +126,12 @@
       <groupId>redis.clients</groupId>
       <artifactId>jedis</artifactId>
       <version>${jedis.version}</version>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jooq</groupId>
-      <artifactId>joor</artifactId>
-    </dependency>
   </dependencies>
 
   <dependencyManagement>
@@ -166,11 +177,6 @@
         <artifactId>guava</artifactId>
         <version>${guava.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.jooq</groupId>
-        <artifactId>joor</artifactId>
-        <version>${joor.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -300,5 +306,4 @@
     </plugins>
   </build>
 
-
 </project>

weixin-java-common/pom.xml

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

weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java

@@ -23,14 +23,15 @@ public class WxConsts {
   ///////////////////////
   // 主动发送消息(即客服消息)的消息类型
   ///////////////////////
-  public static final String CUSTOM_MSG_TEXT = "text";
-  public static final String CUSTOM_MSG_IMAGE = "image";
-  public static final String CUSTOM_MSG_VOICE = "voice";
-  public static final String CUSTOM_MSG_VIDEO = "video";
-  public static final String CUSTOM_MSG_MUSIC = "music";
-  public static final String CUSTOM_MSG_NEWS = "news";
-  public static final String CUSTOM_MSG_FILE = "file";
-  public static final String CUSTOM_MSG_WXCARD = "wxcard";
+  public static final String CUSTOM_MSG_TEXT = "text";//文本消息
+  public static final String CUSTOM_MSG_IMAGE = "image";//图片消息
+  public static final String CUSTOM_MSG_VOICE = "voice";//语音消息
+  public static final String CUSTOM_MSG_VIDEO = "video";//视频消息
+  public static final String CUSTOM_MSG_MUSIC = "music";//音乐消息
+  public static final String CUSTOM_MSG_NEWS = "news";//图文消息（点击跳转到外链）
+  public static final String CUSTOM_MSG_MPNEWS = "mpnews";//图文消息（点击跳转到图文消息页面）
+  public static final String CUSTOM_MSG_FILE = "file";//发送文件（CP专用）
+  public static final String CUSTOM_MSG_WXCARD = "wxcard";//卡券消息
   public static final String CUSTOM_MSG_TRANSFER_CUSTOMER_SERVICE = "transfer_customer_service";
   public static final String CUSTOM_MSG_SAFE_NO = "0";
   public static final String CUSTOM_MSG_SAFE_YES = "1";
@@ -63,6 +64,7 @@ public class WxConsts {
    * 群发反馈消息代码所对应的文字描述
    */
   public static final Map<String, String> MASS_ST_2_DESC = new HashMap<>();
+
   ///////////////////////
   // 微信端推送过来的事件类型
   ///////////////////////
@@ -94,6 +96,31 @@ public class WxConsts {
   public static final String EVT_KF_CLOSE_SESSION = "kf_close_session"; // 客服关闭会话
   public static final String EVT_KF_SWITCH_SESSION = "kf_switch_session"; // 客服转接会话
   public static final String EVT_POI_CHECK_NOTIFY = "poi_check_notify"; //门店审核事件推送
+  //以下为微信认证事件
+  /**
+   * 资质认证成功
+   */
+  public static final String EVT_QUALIFICATION_VERIFY_SUCCESS = "qualification_verify_success";
+  /**
+   * 资质认证失败
+   */
+  public static final String EVT_QUALIFICATION_VERIFY_FAIL = "qualification_verify_fail";
+  /**
+   * 名称认证成功
+   */
+  public static final String EVT_NAMING_VERIFY_SUCCESS = "naming_verify_success";
+  /**
+   * 名称认证失败
+   */
+  public static final String EVT_NAMING_VERIFY_FAIL = "naming_verify_fail";
+  /**
+   * 年审通知
+   */
+  public static final String EVT_ANNUAL_RENEW = "annual_renew";
+  /**
+   * 认证过期失效通知
+   */
+  public static final String EVT_VERIFY_EXPIRED = "verify_expired";
 
   ///////////////////////
   // 上传多媒体文件的类型
@@ -167,7 +194,7 @@ public class WxConsts {
    * 弹出授权页面，可通过openid拿到昵称、性别、所在地。并且，即使在未关注的情况下，只要用户授权，也能获取其信息
    */
   public static final String OAUTH2_SCOPE_USER_INFO = "snsapi_userinfo";
-  
+
   /**
    * 网页应用登录授权作用域 snsapi_login
    */

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

@@ -1,7 +1,6 @@
 package me.chanjar.weixin.common.bean;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import me.chanjar.weixin.common.util.ToStringUtils;
 
 import java.io.Serializable;
 
@@ -35,7 +34,7 @@ public class WxCardApiSignature implements Serializable {
 
   @Override
   public String toString() {
-    return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
+    return ToStringUtils.toSimpleString(this);
   }
 
   public String getAppId() {