Merge branch 'develop'

binarywang · Jun 26, 2017 · 491095f · 491095f
2 parents e2659b3 + 07e8ffa
commit 491095f
Show file tree

Hide file tree

Showing 364 changed files with 14,025 additions and 5,055 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <project
   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">
+  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.6.0</version>
+  <version>2.7.0</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
@@ -74,6 +75,11 @@
       <email>[email protected]</email>
       <url>https://github.com/aimilin6688</url>
     </developer>
+    <developer>
+      <name>ecoolper</name>
+      <email>[email protected]</email>
+      <url>https://github.com/crskyp</url>
+    </developer>
   </developers>
 
   <scm>
@@ -87,6 +93,7 @@
     <module>weixin-java-cp</module>
     <module>weixin-java-mp</module>
     <module>weixin-java-pay</module>
+    <module>weixin-java-miniapp</module>
     <!--module>weixin-java-osgi</module-->
   </modules>
 
@@ -98,73 +105,90 @@
     <downloadJavadocs>true</downloadJavadocs>
     <downloadSources>true</downloadSources>
     <httpclient.version>4.5</httpclient.version>
-    <slf4j.version>1.7.10</slf4j.version>
-    <logback.version>1.1.2</logback.version>
-    <gson.version>2.7</gson.version>
-    <guava.version>19.0</guava.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.RC0</jetty.version>
-    <jedis.version>2.9.0</jedis.version>
   </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <version>1.4.9</version>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <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>
-      <version>${httpclient.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>${gson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>${commons-codec.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>${commons-io.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>${commons-lang3.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
-    </dependency>
-  </dependencies>
-
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>com.github.binarywang</groupId>
+        <artifactId>qrcode-utils</artifactId>
+        <version>1.1</version>
+      </dependency>
+      <!-- 由于jodd-http较新的3.8版本需要jdk8，故而此处采用较低版本 -->
+      <dependency>
+        <groupId>org.jodd</groupId>
+        <artifactId>jodd-http</artifactId>
+        <version>3.7.1</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp</artifactId>
+        <version>3.7.0</version>
+        <scope>provided</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>
+        <version>${httpclient.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>1.10</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>3.5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.7.24</version>
+      </dependency>
+      <dependency>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <version>1.4.9</version>
+      </dependency>
+      <!-- 由于guava较新的21.0版本需要jdk8，故而此处采用较低版本 -->
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>20.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+        <version>2.8.0</version>
+      </dependency>
+
+      <!-- 测试所用依赖 -->
+      <dependency>
+        <groupId>joda-time</groupId>
+        <artifactId>joda-time</artifactId>
+        <version>2.9.7</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>1.1.11</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.inject</groupId>
         <artifactId>guice</artifactId>
@@ -174,7 +198,7 @@
       <dependency>
         <groupId>org.testng</groupId>
         <artifactId>testng</artifactId>
-        <version>6.8.7</version>
+        <version>6.10</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -198,7 +222,8 @@
       <dependency>
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
-        <version>${jedis.version}</version>
+        <version>2.9.0</version>
+        <scope>provided</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/weixin-java-common/build.gradle b/weixin-java-common/build.gradle
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
@@ -1,19 +1,73 @@
 <?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>
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.6.0</version>
+    <version>2.7.0</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
   <name>WeiXin Java Tools - Common</name>
   <description>微信公众号、企业号Java SDK Common</description>
 
   <dependencies>
+    <dependency>
+      <groupId>org.jodd</groupId>
+      <artifactId>jodd-http</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.xstream</groupId>
+      <artifactId>xstream</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpmime</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/annotation/Required.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/annotation/Required.java
@@ -7,13 +7,13 @@
 
 /**
  * 标识某个字段是否是必填的
- * 
+ * <p>
  * Created by Binary Wang on 2016/9/25.
- * @author binarywang (https://github.com/binarywang)
  *
+ * @author binarywang (https://github.com/binarywang)
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 public @interface Required {
 
-}
+}
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
@@ -24,7 +24,6 @@ public class WxConsts {
   public static final String XML_MSG_HARDWARE = "hardware";
   public static final String XML_TRANSFER_CUSTOMER_SERVICE = "transfer_customer_service";
 
-
   ///////////////////////
   // 主动发送消息(即客服消息)的消息类型
   ///////////////////////
@@ -88,45 +87,6 @@ public class WxConsts {
   public static final String EVT_LOCATION_SELECT = "location_select";
   public static final String EVT_TEMPLATESENDJOBFINISH = "TEMPLATESENDJOBFINISH";
   public static final String EVT_ENTER_AGENT = "enter_agent";
-  public static final String EVT_CARD_PASS_CHECK = "card_pass_check";
-  public static final String EVT_CARD_NOT_PASS_CHECK = "card_not_pass_check";
-  public static final String EVT_USER_GET_CARD = "user_get_card";
-  public static final String EVT_USER_DEL_CARD = "user_del_card";
-  public static final String EVT_USER_CONSUME_CARD = "user_consume_card";
-  public static final String EVT_USER_PAY_FROM_PAY_CELL = "user_pay_from_pay_cell";
-  public static final String EVT_USER_VIEW_CARD = "user_view_card";
-  public static final String EVT_USER_ENTER_SESSION_FROM_CARD = "user_enter_session_from_card";
-  public static final String EVT_CARD_SKU_REMIND = "card_sku_remind"; // 库存报警
-  public static final String EVT_KF_CREATE_SESSION = "kf_create_session"; // 客服接入会话
-  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 EVN_SUBMIT_MEMBERCARD_USER_INFO = "submit_membercard_user_info"; //接收会员信息事件推送
-  //以下为微信认证事件
-  /**
-   * 资质认证成功
-   */
-  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";
 
   ///////////////////////
   // 上传多媒体文件的类型
@@ -185,7 +145,7 @@ public class WxConsts {
    * 跳转图文消息URL
    */
   public static final String BUTTON_VIEW_LIMITED = "view_limited";
-  
+
   /**
    * 不弹出授权页面，直接跳转，只能获取用户openid
    */

diff --git a/...n-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxMediaUploadResult.java b/...n-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxMediaUploadResult.java
@@ -1,6 +1,8 @@
 package me.chanjar.weixin.common.bean.result;
 
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.io.Serializable;
 
@@ -50,8 +52,7 @@ public void setThumbMediaId(String thumbMediaId) {
 
   @Override
   public String toString() {
-    return "WxUploadResult [type=" + this.type + ", media_id=" + this.mediaId + ", thumb_media_id=" + this.thumbMediaId
-            + ", created_at=" + this.createdAt + "]";
+    return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
   }
 
 }