|
|
@@ -1,28 +1,7 @@ |
|
|
|
package me.chanjar.weixin.cp.api; |
|
|
|
|
|
|
|
import java.io.File; |
|
|
|
import java.io.IOException; |
|
|
|
import java.io.InputStream; |
|
|
|
import java.util.List; |
|
|
|
import java.util.UUID; |
|
|
|
|
|
|
|
import org.apache.http.HttpHost; |
|
|
|
import org.apache.http.client.ClientProtocolException; |
|
|
|
import org.apache.http.client.config.RequestConfig; |
|
|
|
import org.apache.http.client.methods.CloseableHttpResponse; |
|
|
|
import org.apache.http.client.methods.HttpGet; |
|
|
|
import org.apache.http.impl.client.BasicResponseHandler; |
|
|
|
import org.apache.http.impl.client.CloseableHttpClient; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
|
|
|
|
import com.google.gson.JsonArray; |
|
|
|
import com.google.gson.JsonElement; |
|
|
|
import com.google.gson.JsonObject; |
|
|
|
import com.google.gson.JsonParser; |
|
|
|
import com.google.gson.JsonPrimitive; |
|
|
|
import com.google.gson.*; |
|
|
|
import com.google.gson.reflect.TypeToken; |
|
|
|
|
|
|
|
import me.chanjar.weixin.common.bean.WxAccessToken; |
|
|
|
import me.chanjar.weixin.common.bean.WxJsapiSignature; |
|
|
|
import me.chanjar.weixin.common.bean.menu.WxMenu; |
|
|
@@ -36,20 +15,28 @@ import me.chanjar.weixin.common.util.RandomUtils; |
|
|
|
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.ApacheHttpClientBuilder; |
|
|
|
import me.chanjar.weixin.common.util.http.DefaultApacheHttpClientBuilder; |
|
|
|
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.http.*; |
|
|
|
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.client.ClientProtocolException; |
|
|
|
import org.apache.http.client.config.RequestConfig; |
|
|
|
import org.apache.http.client.methods.CloseableHttpResponse; |
|
|
|
import org.apache.http.client.methods.HttpGet; |
|
|
|
import org.apache.http.impl.client.BasicResponseHandler; |
|
|
|
import org.apache.http.impl.client.CloseableHttpClient; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
|
|
|
|
import java.io.File; |
|
|
|
import java.io.IOException; |
|
|
|
import java.io.InputStream; |
|
|
|
import java.util.List; |
|
|
|
import java.util.UUID; |
|
|
|
|
|
|
|
public class WxCpServiceImpl implements WxCpService { |
|
|
|
|
|
|
@@ -185,10 +172,10 @@ public class WxCpServiceImpl implements WxCpService { |
|
|
|
jsapiSignature.setNoncestr(noncestr); |
|
|
|
jsapiSignature.setUrl(url); |
|
|
|
jsapiSignature.setSignature(signature); |
|
|
|
|
|
|
|
|
|
|
|
// Fixed bug |
|
|
|
jsapiSignature.setAppid(this.configStorage.getCorpId()); |
|
|
|
|
|
|
|
|
|
|
|
return jsapiSignature; |
|
|
|
} |
|
|
|
|
|
|
@@ -503,7 +490,7 @@ this.configStorage.getOauth2redirectUri(), |
|
|
|
public String[] oauth2getUserInfo(String agentId, String code) throws WxErrorException { |
|
|
|
String url = "https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo?" |
|
|
|
+ "code=" + code |
|
|
|
+ "&agendid=" + agentId; |
|
|
|
+ "&agentid=" + agentId; |
|
|
|
String responseText = get(url, null); |
|
|
|
JsonElement je = new JsonParser().parse(responseText); |
|
|
|
JsonObject jo = je.getAsJsonObject(); |
|
|
|