Merge branch 'develop'

Author: binarywang

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.3.3</version>
+  <version>1.3.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
@@ -44,6 +44,7 @@
     <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>
   </properties>
 
   <dependencies>
@@ -68,6 +69,11 @@
       <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>

weixin-java-common/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>me.chanjar</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>1.3.3</version>
+    <version>1.3.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

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

@@ -47,7 +47,7 @@ public class WxConsts {
   ///////////////////////
   public static final String MASS_ST_SUCCESS = "send success";
   public static final String MASS_ST_FAIL = "send fail";
-  public static final String MASS_ST_涉嫌广告 = "err(10001)"; 
+  public static final String MASS_ST_涉嫌广告 = "err(10001)";
   public static final String MASS_ST_涉嫌政治 = "err(20001)";
   public static final String MASS_ST_涉嫌社会 = "err(20004)";
   public static final String MASS_ST_涉嫌色情 = "err(20002)";
@@ -93,6 +93,15 @@ 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"; // 库存报警
 
   ///////////////////////
   // 上传多媒体文件的类型

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

@@ -0,0 +1,102 @@
+package me.chanjar.weixin.common.bean;
+
+import java.io.Serializable;
+
+/**
+ * 卡券Api签名
+ *
+ * @author YuJian
+ * @version 15/11/8
+ */
+public class WxCardApiSignature implements Serializable {
+
+    private String appId;
+
+    private String cardId;
+
+    private String cardType;
+
+    private String locationId;
+
+    private String code;
+
+    private String openId;
+
+    private Long timestamp;
+
+    private String nonceStr;
+
+    private String signature;
+
+    public String getAppId() {
+      return appId;
+    }
+
+    public void setAppId(String appId) {
+      this.appId = appId;
+    }
+
+    public String getCardId() {
+      return cardId;
+    }
+
+    public void setCardId(String cardId) {
+      this.cardId = cardId;
+    }
+
+    public String getCardType() {
+      return cardType;
+    }
+
+    public void setCardType(String cardType) {
+      this.cardType = cardType;
+    }
+
+    public String getLocationId() {
+      return locationId;
+    }
+
+  public void setLocationId(String locationId) {
+    this.locationId = locationId;
+  }
+
+  public String getCode() {
+      return code;
+    }
+
+    public void setCode(String code) {
+      this.code = code;
+    }
+
+    public String getOpenId() {
+      return openId;
+    }
+
+    public void setOpenId(String openId) {
+      this.openId = openId;
+    }
+
+    public Long getTimestamp() {
+      return timestamp;
+    }
+
+    public void setTimestamp(Long timestamp) {
+      this.timestamp = timestamp;
+    }
+
+    public String getNonceStr() {
+      return nonceStr;
+    }
+
+    public void setNonceStr(String nonceStr) {
+      this.nonceStr = nonceStr;
+    }
+
+    public String getSignature() {
+      return signature;
+    }
+
+    public void setSignature(String signature) {
+      this.signature = signature;
+    }
+}

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

@@ -1,15 +1,14 @@
 package me.chanjar.weixin.common.bean;
 
+import me.chanjar.weixin.common.util.json.WxGsonBuilder;
+import org.apache.commons.codec.Charsets;
+
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.codec.Charsets;
-
-import me.chanjar.weixin.common.util.json.WxGsonBuilder;
-
 /**
  * 企业号菜单
  * @author Daniel Qian
@@ -136,6 +135,7 @@ public static class WxMenuRule {
     private String province;
     private String city;
     private String clientPlatformType;
+    private String language;
 
     public String getGroupId() {
       return groupId;
@@ -184,8 +184,16 @@ public String getClientPlatformType() {
     public void setClientPlatformType(String clientPlatformType) {
       this.clientPlatformType = clientPlatformType;
     }
-	
-    @Override
+
+    public String getLanguage() {
+      return language;
+    }
+
+    public void setLanguage(String language) {
+      this.language = language;
+    }
+
+      @Override
     public String toString() {
       return "matchrule:{" +
           "group_id='" + groupId + '\'' +
@@ -194,6 +202,7 @@ public String toString() {
           ", province" + province + '\'' +
           ", city" + city + '\'' +
           ", client_platform_type" + clientPlatformType + '\'' +
+          ", language" + language + '\'' +
           "}";
     }
   }

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/ApacheHttpClientBuilder.java

@@ -0,0 +1,51 @@
+package me.chanjar.weixin.common.util.http;
+
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.CloseableHttpClient;
+
+/**
+ * httpclient build interface
+ */
+public interface ApacheHttpClientBuilder {
+
+  /**
+   * 构建httpclient实例
+   * @return new instance of CloseableHttpClient
+   */
+  CloseableHttpClient build();
+
+  /**
+   * 代理服务器地址
+   * @param httpProxyHost
+   * @return
+   */
+  ApacheHttpClientBuilder httpProxyHost(String httpProxyHost);
+
+  /**
+   * 代理服务器端口
+   * @param httpProxyPort
+   * @return
+   */
+  ApacheHttpClientBuilder httpProxyPort(int httpProxyPort);
+
+  /**
+   * 代理服务器用户名
+   * @param httpProxyUsername
+   * @return
+   */
+  ApacheHttpClientBuilder httpProxyUsername(String httpProxyUsername);
+
+  /**
+   * 代理服务器密码
+   * @param httpProxyPassword
+   * @return
+   */
+  ApacheHttpClientBuilder httpProxyPassword(String httpProxyPassword);
+
+  /**
+   * ssl连接socket工厂
+   * @param sslConnectionSocketFactory
+   * @return
+   */
+  ApacheHttpClientBuilder sslConnectionSocketFactory(SSLConnectionSocketFactory sslConnectionSocketFactory);
+}