Merge branch 'develop'

Author: chanjarster

README.md

@@ -17,7 +17,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-mp</artifactId>
-  <version>1.2.0</version>
+  <version>1.3.0</version>
 </dependency>
 ```
 
@@ -27,7 +27,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-cp</artifactId>
-  <version>1.2.0</version>
+  <version>1.3.0</version>
 </dependency>
 ```
 
@@ -54,3 +54,5 @@ weixin-java-tools
 ## 关于Pull Request
 
 非常欢迎和感谢对本项目发起Pull Request的同学，不过本项目基于[git flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)开发流程，因此在发起Pull Request的时候请选择develop分支。
+
+且本项目代码风格是用2个空格代表一个tab，因此在发起PR时注意一下，否则很容易发生在IDE格式化代码后与原代码产生大量diff，这样我在阅读PR的时候就很困难。

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.2.0</version>
+  <version>1.3.0</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
@@ -41,7 +41,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <downloadJavadocs>true</downloadJavadocs>
     <downloadSources>true</downloadSources>
-    <httpclient.version>4.3.5</httpclient.version>
+    <httpclient.version>4.5</httpclient.version>
     <slf4j.version>1.7.10</slf4j.version>
     <logback.version>1.1.2</logback.version>
   </properties>

weixin-java-common/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>me.chanjar</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.0</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

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

@@ -29,6 +29,7 @@ public class WxConsts {
   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_TRANSFER_CUSTOMER_SERVICE = "transfer_customer_service";
 
   ///////////////////////
   // 群发消息的消息类型

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

@@ -6,11 +6,10 @@
  * jspai signature
  */
 public class WxJsapiSignature implements Serializable {
-
+  private String appid;
+  
   private String noncestr;
 
-  private String jsapiTicket;
-
   private long timestamp;
 
   private String url;
@@ -33,14 +32,6 @@ public void setNoncestr(String noncestr) {
     this.noncestr = noncestr;
   }
 
-  public String getJsapiTicket() {
-    return jsapiTicket;
-  }
-
-  public void setJsapiTicket(String jsapiTicket) {
-    this.jsapiTicket = jsapiTicket;
-  }
-
   public long getTimestamp() {
     return timestamp;
   }
@@ -57,4 +48,12 @@ public void setUrl(String url) {
     this.url = url;
   }
 
+  public String getAppid() {
+	  return appid;
+  }
+
+  public void setAppid(String appid) {
+	  this.appid = appid;
+  }
+
 }

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

@@ -49,7 +49,7 @@ public static WxError fromJson(String json) {
 
   @Override
   public String toString() {
-    return "微信错误 errcode=" + errorCode + ", errmsg=" + errorMsg + "\njson:" + json;
+    return "微信错误: errcode=" + errorCode + ", errmsg=" + errorMsg + "\njson:" + json;
   }
 
 }

weixin-java-cp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.3.0</version>
     </parent>
 
     <artifactId>weixin-java-cp</artifactId>

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java

@@ -408,7 +408,7 @@ WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream i
    * </pre>
    * @param redirectUri
    * @param state
-   * @return code
+   * @return url
    */
   String oauth2buildAuthorizationUrl(String redirectUri, String state);
 
@@ -556,4 +556,26 @@ WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream i
    * @param sessionManager
    */
   void setSessionManager(WxSessionManager sessionManager);
+  
+  /**
+   * 上传部门列表覆盖企业号上的部门信息
+   * @param mediaId
+   * @throws WxErrorException
+   */
+  String replaceParty(String mediaId) throws WxErrorException;
+  
+  /**
+   * 上传用户列表覆盖企业号上的用户信息
+   * @param mediaId
+   * @throws WxErrorException
+   */
+  String replaceUser(String mediaId) throws WxErrorException;
+  
+  /**
+   * 获取异步任务结果
+   * @param joinId
+   * @return
+   * @throws WxErrorException
+   */
+  String getTaskResult(String joinId) throws WxErrorException;
 }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java

@@ -1,13 +1,14 @@
 package me.chanjar.weixin.cp.api;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.internal.Streams;
-import com.google.gson.reflect.TypeToken;
-import com.google.gson.stream.JsonReader;
-import com.sun.media.sound.SoftTuning;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.math.BigDecimal;
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+import java.util.UUID;
+
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.bean.WxJsapiSignature;
 import me.chanjar.weixin.common.bean.WxMenu;
@@ -21,13 +22,19 @@
 import me.chanjar.weixin.common.util.StringUtils;
 import me.chanjar.weixin.common.util.crypto.SHA1;
 import me.chanjar.weixin.common.util.fs.FileUtils;
-import me.chanjar.weixin.common.util.http.*;
+import me.chanjar.weixin.common.util.http.MediaDownloadRequestExecutor;
+import me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor;
+import me.chanjar.weixin.common.util.http.RequestExecutor;
+import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor;
+import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
+import me.chanjar.weixin.common.util.http.URIUtil;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.cp.bean.WxCpDepart;
 import me.chanjar.weixin.cp.bean.WxCpMessage;
 import me.chanjar.weixin.cp.bean.WxCpTag;
 import me.chanjar.weixin.cp.bean.WxCpUser;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
@@ -43,14 +50,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.math.BigDecimal;
-import java.security.NoSuchAlgorithmException;
-import java.util.List;
-import java.util.UUID;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.internal.Streams;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
 
 public class WxCpServiceImpl implements WxCpService {
 
@@ -243,7 +249,6 @@ public WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErr
 
   public File mediaDownload(String media_id) throws WxErrorException {
     String url = "https://qyapi.weixin.qq.com/cgi-bin/media/get";
-    
     return execute(new MediaDownloadRequestExecutor(wxCpConfigStorage.getTmpDirFile()), url, "media_id=" + media_id);
   }
 
@@ -551,6 +556,9 @@ public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) thro
   }
 
   protected <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {
+    if (uri.indexOf("access_token=") != -1) {
+      throw new IllegalArgumentException("uri参数中不允许有access_token: " + uri);
+    }
     String accessToken = getAccessToken(false);
 
     String uriWithAccessToken = uri;
@@ -647,6 +655,28 @@ public void setSessionManager(WxSessionManager sessionManager) {
     this.sessionManager = sessionManager;
   }
 
+  @Override
+  public String replaceParty(String mediaId) throws WxErrorException {
+	  String url = "https://qyapi.weixin.qq.com/cgi-bin/batch/replaceparty";
+	  JsonObject jsonObject = new JsonObject();
+	  jsonObject.addProperty("media_id", mediaId);
+	  return post(url, jsonObject.toString());
+  }
+
+  @Override
+  public String replaceUser(String mediaId) throws WxErrorException {
+	  String url = "https://qyapi.weixin.qq.com/cgi-bin/batch/replaceuser";
+	  JsonObject jsonObject = new JsonObject();
+	  jsonObject.addProperty("media_id", mediaId);
+	  return post(url, jsonObject.toString());
+  }
+
+  @Override
+  public String getTaskResult(String joinId) throws WxErrorException {
+	  String url = "https://qyapi.weixin.qq.com/cgi-bin/batch/getresult?jobid="+joinId;
+	  return get(url, null);
+  }
+
   public File getTmpDirFile() {
     return tmpDirFile;
   }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java

@@ -24,6 +24,7 @@ public class WxCpUser implements Serializable {
   private String weiXinId;
   private String avatar;
   private Integer status;
+  private Integer enable;
   private final List<Attr> extAttrs = new ArrayList<Attr>();
 
   public String getUserId() {
@@ -114,6 +115,14 @@ public void setStatus(Integer status) {
     this.status = status;
   }
 
+  public Integer getEnable() {
+	return enable;
+  }
+	
+  public void setEnable(Integer enable) {
+	this.enable = enable;
+  }
+	
   public void addExtAttr(String name, String value) {
     this.extAttrs.add(new Attr(name, value));
   }