| @@ -44,6 +44,7 @@ | |||||
| <httpclient.version>4.5</httpclient.version> | <httpclient.version>4.5</httpclient.version> | ||||
| <slf4j.version>1.7.10</slf4j.version> | <slf4j.version>1.7.10</slf4j.version> | ||||
| <logback.version>1.1.2</logback.version> | <logback.version>1.1.2</logback.version> | ||||
| <jodd-http.version>3.6.7</jodd-http.version> | |||||
| </properties> | </properties> | ||||
| <dependencies> | <dependencies> | ||||
| @@ -68,6 +69,11 @@ | |||||
| <artifactId>httpmime</artifactId> | <artifactId>httpmime</artifactId> | ||||
| <version>${httpclient.version}</version> | <version>${httpclient.version}</version> | ||||
| </dependency> | </dependency> | ||||
| <dependency> | |||||
| <groupId>org.jodd</groupId> | |||||
| <artifactId>jodd-http</artifactId> | |||||
| <version>${jodd-http.version}</version> | |||||
| </dependency> | |||||
| <dependency> | <dependency> | ||||
| <groupId>com.google.code.gson</groupId> | <groupId>com.google.code.gson</groupId> | ||||
| <artifactId>gson</artifactId> | <artifactId>gson</artifactId> | ||||
| @@ -47,7 +47,7 @@ public class WxConsts { | |||||
| /////////////////////// | /////////////////////// | ||||
| public static final String MASS_ST_SUCCESS = "send success"; | public static final String MASS_ST_SUCCESS = "send success"; | ||||
| public static final String MASS_ST_FAIL = "send fail"; | 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(20001)"; | ||||
| public static final String MASS_ST_涉嫌社会 = "err(20004)"; | public static final String MASS_ST_涉嫌社会 = "err(20004)"; | ||||
| public static final String MASS_ST_涉嫌色情 = "err(20002)"; | 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_LOCATION_SELECT = "location_select"; | ||||
| public static final String EVT_TEMPLATESENDJOBFINISH = "TEMPLATESENDJOBFINISH"; | public static final String EVT_TEMPLATESENDJOBFINISH = "TEMPLATESENDJOBFINISH"; | ||||
| public static final String EVT_ENTER_AGENT = "enter_agent"; | 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"; // 库存报警 | |||||
| /////////////////////// | /////////////////////// | ||||
| // 上传多媒体文件的类型 | // 上传多媒体文件的类型 | ||||
| @@ -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; | |||||
| } | |||||
| } | |||||
| @@ -1,15 +1,14 @@ | |||||
| package me.chanjar.weixin.common.bean; | 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.InputStream; | ||||
| import java.io.InputStreamReader; | import java.io.InputStreamReader; | ||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import java.util.List; | import java.util.List; | ||||
| import org.apache.commons.codec.Charsets; | |||||
| import me.chanjar.weixin.common.util.json.WxGsonBuilder; | |||||
| /** | /** | ||||
| * 企业号菜单 | * 企业号菜单 | ||||
| * @author Daniel Qian | * @author Daniel Qian | ||||
| @@ -136,6 +135,7 @@ public class WxMenu implements Serializable { | |||||
| private String province; | private String province; | ||||
| private String city; | private String city; | ||||
| private String clientPlatformType; | private String clientPlatformType; | ||||
| private String language; | |||||
| public String getGroupId() { | public String getGroupId() { | ||||
| return groupId; | return groupId; | ||||
| @@ -184,8 +184,16 @@ public class WxMenu implements Serializable { | |||||
| public void setClientPlatformType(String clientPlatformType) { | public void setClientPlatformType(String clientPlatformType) { | ||||
| this.clientPlatformType = clientPlatformType; | this.clientPlatformType = clientPlatformType; | ||||
| } | } | ||||
| @Override | |||||
| public String getLanguage() { | |||||
| return language; | |||||
| } | |||||
| public void setLanguage(String language) { | |||||
| this.language = language; | |||||
| } | |||||
| @Override | |||||
| public String toString() { | public String toString() { | ||||
| return "matchrule:{" + | return "matchrule:{" + | ||||
| "group_id='" + groupId + '\'' + | "group_id='" + groupId + '\'' + | ||||
| @@ -194,6 +202,7 @@ public class WxMenu implements Serializable { | |||||
| ", province" + province + '\'' + | ", province" + province + '\'' + | ||||
| ", city" + city + '\'' + | ", city" + city + '\'' + | ||||
| ", client_platform_type" + clientPlatformType + '\'' + | ", client_platform_type" + clientPlatformType + '\'' + | ||||
| ", language" + language + '\'' + | |||||
| "}"; | "}"; | ||||
| } | } | ||||
| } | } | ||||
| @@ -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); | |||||
| } | |||||
| @@ -0,0 +1,199 @@ | |||||
| package me.chanjar.weixin.common.util.http; | |||||
| import me.chanjar.weixin.common.util.StringUtils; | |||||
| import org.apache.http.annotation.NotThreadSafe; | |||||
| import org.apache.http.auth.AuthScope; | |||||
| import org.apache.http.auth.UsernamePasswordCredentials; | |||||
| import org.apache.http.client.CredentialsProvider; | |||||
| import org.apache.http.client.HttpRequestRetryHandler; | |||||
| import org.apache.http.client.config.RequestConfig; | |||||
| import org.apache.http.config.Registry; | |||||
| import org.apache.http.config.RegistryBuilder; | |||||
| import org.apache.http.config.SocketConfig; | |||||
| import org.apache.http.conn.HttpClientConnectionManager; | |||||
| import org.apache.http.conn.socket.ConnectionSocketFactory; | |||||
| import org.apache.http.conn.socket.PlainConnectionSocketFactory; | |||||
| import org.apache.http.conn.ssl.SSLConnectionSocketFactory; | |||||
| import org.apache.http.impl.client.BasicCredentialsProvider; | |||||
| import org.apache.http.impl.client.CloseableHttpClient; | |||||
| import org.apache.http.impl.client.HttpClientBuilder; | |||||
| import org.apache.http.impl.client.HttpClients; | |||||
| import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; | |||||
| import org.apache.http.protocol.HttpContext; | |||||
| import java.io.IOException; | |||||
| import java.util.concurrent.TimeUnit; | |||||
| /** | |||||
| * httpclient 连接管理器 | |||||
| */ | |||||
| @NotThreadSafe | |||||
| public class DefaultApacheHttpHttpClientBuilder implements ApacheHttpClientBuilder { | |||||
| private int connectionRequestTimeout = 3000; | |||||
| private int connectionTimeout = 5000; | |||||
| private int soTimeout = 5000; | |||||
| private int idleConnTimeout = 60000; | |||||
| private int checkWaitTime = 5000; | |||||
| private int maxConnPerHost = 10; | |||||
| private int maxTotalConn = 50; | |||||
| private String userAgent; | |||||
| private HttpRequestRetryHandler httpRequestRetryHandler = new HttpRequestRetryHandler() { | |||||
| @Override | |||||
| public boolean retryRequest(IOException exception, int executionCount, HttpContext context) { | |||||
| return false; | |||||
| } | |||||
| }; | |||||
| private SSLConnectionSocketFactory sslConnectionSocketFactory = SSLConnectionSocketFactory.getSocketFactory(); | |||||
| private PlainConnectionSocketFactory plainConnectionSocketFactory = PlainConnectionSocketFactory.getSocketFactory(); | |||||
| private String httpProxyHost; | |||||
| private int httpProxyPort; | |||||
| private String httpProxyUsername; | |||||
| private String httpProxyPassword; | |||||
| /** | |||||
| * 连接管理器 | |||||
| */ | |||||
| private PoolingHttpClientConnectionManager connectionManager; | |||||
| /** | |||||
| * 闲置连接监控线程 | |||||
| */ | |||||
| private IdleConnectionMonitorThread idleConnectionMonitorThread; | |||||
| /** | |||||
| * httpClientBuilder | |||||
| */ | |||||
| private HttpClientBuilder httpClientBuilder; | |||||
| private boolean prepared = false; | |||||
| private DefaultApacheHttpHttpClientBuilder() { | |||||
| } | |||||
| public static DefaultApacheHttpHttpClientBuilder get() { | |||||
| return new DefaultApacheHttpHttpClientBuilder(); | |||||
| } | |||||
| public ApacheHttpClientBuilder httpProxyHost(String httpProxyHost) { | |||||
| this.httpProxyHost = httpProxyHost; | |||||
| return this; | |||||
| } | |||||
| public ApacheHttpClientBuilder httpProxyPort(int httpProxyPort) { | |||||
| this.httpProxyPort = httpProxyPort; | |||||
| return this; | |||||
| } | |||||
| public ApacheHttpClientBuilder httpProxyUsername(String httpProxyUsername) { | |||||
| this.httpProxyUsername = httpProxyUsername; | |||||
| return this; | |||||
| } | |||||
| public ApacheHttpClientBuilder httpProxyPassword(String httpProxyPassword) { | |||||
| this.httpProxyPassword = httpProxyPassword; | |||||
| return this; | |||||
| } | |||||
| public ApacheHttpClientBuilder sslConnectionSocketFactory(SSLConnectionSocketFactory sslConnectionSocketFactory){ | |||||
| this.sslConnectionSocketFactory = sslConnectionSocketFactory; | |||||
| return this; | |||||
| } | |||||
| public IdleConnectionMonitorThread getIdleConnectionMonitorThread() { | |||||
| return idleConnectionMonitorThread; | |||||
| } | |||||
| private void prepare(){ | |||||
| Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create() | |||||
| .register("http", plainConnectionSocketFactory) | |||||
| .register("https", sslConnectionSocketFactory) | |||||
| .build(); | |||||
| connectionManager = new PoolingHttpClientConnectionManager(registry); | |||||
| connectionManager.setMaxTotal(maxTotalConn); | |||||
| connectionManager.setDefaultMaxPerRoute(maxConnPerHost); | |||||
| connectionManager.setDefaultSocketConfig( | |||||
| SocketConfig.copy(SocketConfig.DEFAULT) | |||||
| .setSoTimeout(soTimeout) | |||||
| .build() | |||||
| ); | |||||
| idleConnectionMonitorThread = new IdleConnectionMonitorThread(connectionManager, idleConnTimeout, checkWaitTime); | |||||
| idleConnectionMonitorThread.setDaemon(true); | |||||
| idleConnectionMonitorThread.start(); | |||||
| httpClientBuilder = HttpClients.custom() | |||||
| .setConnectionManager(connectionManager) | |||||
| .setDefaultRequestConfig( | |||||
| RequestConfig.custom() | |||||
| .setSocketTimeout(soTimeout) | |||||
| .setConnectTimeout(connectionTimeout) | |||||
| .setConnectionRequestTimeout(connectionRequestTimeout) | |||||
| .build() | |||||
| ) | |||||
| .setRetryHandler(httpRequestRetryHandler); | |||||
| if (StringUtils.isNotBlank(httpProxyHost) && StringUtils.isNotBlank(httpProxyUsername)) { | |||||
| // 使用代理服务器 需要用户认证的代理服务器 | |||||
| CredentialsProvider credsProvider = new BasicCredentialsProvider(); | |||||
| credsProvider.setCredentials( | |||||
| new AuthScope(httpProxyHost, httpProxyPort), | |||||
| new UsernamePasswordCredentials(httpProxyUsername, httpProxyPassword)); | |||||
| httpClientBuilder.setDefaultCredentialsProvider(credsProvider); | |||||
| } | |||||
| if (StringUtils.isNotBlank(userAgent)) { | |||||
| httpClientBuilder.setUserAgent(userAgent); | |||||
| } | |||||
| } | |||||
| public CloseableHttpClient build() { | |||||
| if(!prepared){ | |||||
| prepare(); | |||||
| prepared = true; | |||||
| } | |||||
| return httpClientBuilder.build(); | |||||
| } | |||||
| public static class IdleConnectionMonitorThread extends Thread { | |||||
| private final HttpClientConnectionManager connMgr; | |||||
| private final int idleConnTimeout; | |||||
| private final int checkWaitTime; | |||||
| private volatile boolean shutdown; | |||||
| public IdleConnectionMonitorThread(HttpClientConnectionManager connMgr, int idleConnTimeout, int checkWaitTime) { | |||||
| super("IdleConnectionMonitorThread"); | |||||
| this.connMgr = connMgr; | |||||
| this.idleConnTimeout = idleConnTimeout; | |||||
| this.checkWaitTime = checkWaitTime; | |||||
| } | |||||
| @Override | |||||
| public void run() { | |||||
| try { | |||||
| while (!shutdown) { | |||||
| synchronized (this) { | |||||
| wait(checkWaitTime); | |||||
| connMgr.closeExpiredConnections(); | |||||
| connMgr.closeIdleConnections(idleConnTimeout, TimeUnit.MILLISECONDS); | |||||
| } | |||||
| } | |||||
| } catch (InterruptedException ignore) { | |||||
| } | |||||
| } | |||||
| public void trigger() { | |||||
| synchronized (this) { | |||||
| notifyAll(); | |||||
| } | |||||
| } | |||||
| public void shutdown() { | |||||
| shutdown = true; | |||||
| synchronized (this) { | |||||
| notifyAll(); | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
| @@ -0,0 +1,56 @@ | |||||
| package me.chanjar.weixin.common.util.http; | |||||
| import jodd.http.HttpRequest; | |||||
| import jodd.http.HttpResponse; | |||||
| import jodd.http.ProxyInfo; | |||||
| import jodd.http.net.SocketHttpConnectionProvider; | |||||
| import me.chanjar.weixin.common.bean.result.WxError; | |||||
| import me.chanjar.weixin.common.exception.WxErrorException; | |||||
| import org.apache.http.HttpHost; | |||||
| import org.apache.http.impl.client.CloseableHttpClient; | |||||
| import java.io.IOException; | |||||
| /** | |||||
| * 简单的GET请求执行器,请求的参数是String, 返回的结果也是String | |||||
| * | |||||
| * @author Daniel Qian | |||||
| */ | |||||
| public class JoddGetRequestExecutor implements RequestExecutor<String, String> { | |||||
| @Override | |||||
| public String execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, | |||||
| String queryParam) throws WxErrorException, IOException { | |||||
| if (queryParam != null) { | |||||
| if (uri.indexOf('?') == -1) { | |||||
| uri += '?'; | |||||
| } | |||||
| uri += uri.endsWith("?") ? queryParam : '&' + queryParam; | |||||
| } | |||||
| SocketHttpConnectionProvider provider = new SocketHttpConnectionProvider(); | |||||
| if (httpProxy != null) { | |||||
| ProxyInfo proxyInfoObj = new ProxyInfo( | |||||
| ProxyInfo.ProxyType.HTTP, | |||||
| httpProxy.getHostName(), | |||||
| httpProxy.getPort(), "", ""); | |||||
| provider.useProxy(proxyInfoObj); | |||||
| } | |||||
| HttpRequest request = HttpRequest.get(uri); | |||||
| request.method("GET"); | |||||
| request.charset("UTF-8"); | |||||
| HttpResponse response = request.open(provider).send(); | |||||
| response.charset("UTF-8"); | |||||
| String result = response.bodyText(); | |||||
| WxError error = WxError.fromJson(result); | |||||
| if (error.getErrorCode() != 0) { | |||||
| throw new WxErrorException(error); | |||||
| } | |||||
| return result; | |||||
| } | |||||
| } | |||||
| @@ -0,0 +1,50 @@ | |||||
| package me.chanjar.weixin.common.util.http; | |||||
| import jodd.http.HttpRequest; | |||||
| import jodd.http.HttpResponse; | |||||
| import jodd.http.ProxyInfo; | |||||
| import jodd.http.net.SocketHttpConnectionProvider; | |||||
| import me.chanjar.weixin.common.bean.result.WxError; | |||||
| import me.chanjar.weixin.common.exception.WxErrorException; | |||||
| import org.apache.http.HttpHost; | |||||
| import org.apache.http.impl.client.CloseableHttpClient; | |||||
| import java.io.IOException; | |||||
| /** | |||||
| * 简单的POST请求执行器,请求的参数是String, 返回的结果也是String | |||||
| * | |||||
| * @author Edison Guo | |||||
| */ | |||||
| public class JoddPostRequestExecutor implements RequestExecutor<String, String> { | |||||
| @Override | |||||
| public String execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, | |||||
| String postEntity) throws WxErrorException, IOException { | |||||
| SocketHttpConnectionProvider provider = new SocketHttpConnectionProvider(); | |||||
| if (httpProxy != null) { | |||||
| ProxyInfo proxyInfoObj = new ProxyInfo( | |||||
| ProxyInfo.ProxyType.HTTP, | |||||
| httpProxy.getAddress().getHostAddress(), | |||||
| httpProxy.getPort(), "", ""); | |||||
| provider.useProxy(proxyInfoObj); | |||||
| } | |||||
| HttpRequest request = HttpRequest.get(uri); | |||||
| request.method("POST"); | |||||
| request.charset("UTF-8"); | |||||
| request.bodyText(postEntity); | |||||
| HttpResponse response = request.open(provider).send(); | |||||
| response.charset("UTF-8"); | |||||
| String result = response.bodyText(); | |||||
| WxError error = WxError.fromJson(result); | |||||
| if (error.getErrorCode() != 0) { | |||||
| throw new WxErrorException(error); | |||||
| } | |||||
| return result; | |||||
| } | |||||
| } | |||||
| @@ -74,6 +74,8 @@ public class MediaDownloadRequestExecutor implements RequestExecutor<File, Strin | |||||
| File localFile = FileUtils.createTmpFile(inputStream, name_ext[0], name_ext[1], tmpDirFile); | File localFile = FileUtils.createTmpFile(inputStream, name_ext[0], name_ext[1], tmpDirFile); | ||||
| return localFile; | return localFile; | ||||
| }finally { | |||||
| httpGet.releaseConnection(); | |||||
| } | } | ||||
| } | } | ||||
| @@ -1,9 +1,8 @@ | |||||
| package me.chanjar.weixin.common.util.http; | package me.chanjar.weixin.common.util.http; | ||||
| import java.io.File; | |||||
| import java.io.IOException; | |||||
| import me.chanjar.weixin.common.bean.result.WxError; | |||||
| import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; | import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; | ||||
| import me.chanjar.weixin.common.exception.WxErrorException; | |||||
| import org.apache.http.HttpEntity; | import org.apache.http.HttpEntity; | ||||
| import org.apache.http.HttpHost; | import org.apache.http.HttpHost; | ||||
| import org.apache.http.client.ClientProtocolException; | import org.apache.http.client.ClientProtocolException; | ||||
| @@ -13,11 +12,11 @@ import org.apache.http.client.methods.HttpPost; | |||||
| import org.apache.http.entity.ContentType; | import org.apache.http.entity.ContentType; | ||||
| import org.apache.http.entity.mime.HttpMultipartMode; | import org.apache.http.entity.mime.HttpMultipartMode; | ||||
| import org.apache.http.entity.mime.MultipartEntityBuilder; | import org.apache.http.entity.mime.MultipartEntityBuilder; | ||||
| import me.chanjar.weixin.common.bean.result.WxError; | |||||
| import me.chanjar.weixin.common.exception.WxErrorException; | |||||
| import org.apache.http.impl.client.CloseableHttpClient; | import org.apache.http.impl.client.CloseableHttpClient; | ||||
| import java.io.File; | |||||
| import java.io.IOException; | |||||
| /** | /** | ||||
| * 上传媒体文件请求执行器,请求的参数是File, 返回的结果是String | * 上传媒体文件请求执行器,请求的参数是File, 返回的结果是String | ||||
| * @author Daniel Qian | * @author Daniel Qian | ||||
| @@ -48,6 +47,8 @@ public class MediaUploadRequestExecutor implements RequestExecutor<WxMediaUpload | |||||
| throw new WxErrorException(error); | throw new WxErrorException(error); | ||||
| } | } | ||||
| return WxMediaUploadResult.fromJson(responseContent); | return WxMediaUploadResult.fromJson(responseContent); | ||||
| }finally { | |||||
| httpPost.releaseConnection(); | |||||
| } | } | ||||
| } | } | ||||
| @@ -1,17 +1,16 @@ | |||||
| package me.chanjar.weixin.common.util.http; | package me.chanjar.weixin.common.util.http; | ||||
| import java.io.IOException; | |||||
| import me.chanjar.weixin.common.bean.result.WxError; | |||||
| import me.chanjar.weixin.common.exception.WxErrorException; | |||||
| import org.apache.http.HttpHost; | import org.apache.http.HttpHost; | ||||
| import org.apache.http.client.ClientProtocolException; | import org.apache.http.client.ClientProtocolException; | ||||
| import org.apache.http.client.config.RequestConfig; | import org.apache.http.client.config.RequestConfig; | ||||
| import org.apache.http.client.methods.CloseableHttpResponse; | import org.apache.http.client.methods.CloseableHttpResponse; | ||||
| import org.apache.http.client.methods.HttpGet; | import org.apache.http.client.methods.HttpGet; | ||||
| import me.chanjar.weixin.common.bean.result.WxError; | |||||
| import me.chanjar.weixin.common.exception.WxErrorException; | |||||
| import org.apache.http.impl.client.CloseableHttpClient; | import org.apache.http.impl.client.CloseableHttpClient; | ||||
| import java.io.IOException; | |||||
| /** | /** | ||||
| * 简单的GET请求执行器,请求的参数是String, 返回的结果也是String | * 简单的GET请求执行器,请求的参数是String, 返回的结果也是String | ||||
| * @author Daniel Qian | * @author Daniel Qian | ||||
| @@ -40,6 +39,8 @@ public class SimpleGetRequestExecutor implements RequestExecutor<String, String> | |||||
| throw new WxErrorException(error); | throw new WxErrorException(error); | ||||
| } | } | ||||
| return responseContent; | return responseContent; | ||||
| }finally { | |||||
| httpGet.releaseConnection(); | |||||
| } | } | ||||
| } | } | ||||
| @@ -1,24 +1,17 @@ | |||||
| package me.chanjar.weixin.common.util.http; | package me.chanjar.weixin.common.util.http; | ||||
| import java.io.IOException; | |||||
| import me.chanjar.weixin.common.bean.result.WxError; | import me.chanjar.weixin.common.bean.result.WxError; | ||||
| import me.chanjar.weixin.common.exception.WxErrorException; | import me.chanjar.weixin.common.exception.WxErrorException; | ||||
| import org.apache.http.Consts; | import org.apache.http.Consts; | ||||
| import org.apache.http.HttpHost; | import org.apache.http.HttpHost; | ||||
| import org.apache.http.auth.AuthScope; | |||||
| import org.apache.http.auth.UsernamePasswordCredentials; | |||||
| import org.apache.http.client.ClientProtocolException; | import org.apache.http.client.ClientProtocolException; | ||||
| import org.apache.http.client.CredentialsProvider; | |||||
| import org.apache.http.client.config.RequestConfig; | import org.apache.http.client.config.RequestConfig; | ||||
| import org.apache.http.client.methods.CloseableHttpResponse; | import org.apache.http.client.methods.CloseableHttpResponse; | ||||
| import org.apache.http.client.methods.HttpGet; | |||||
| import org.apache.http.client.methods.HttpPost; | import org.apache.http.client.methods.HttpPost; | ||||
| import org.apache.http.entity.StringEntity; | import org.apache.http.entity.StringEntity; | ||||
| import org.apache.http.impl.client.BasicCredentialsProvider; | |||||
| import org.apache.http.impl.client.CloseableHttpClient; | import org.apache.http.impl.client.CloseableHttpClient; | ||||
| import org.apache.http.impl.client.HttpClients; | |||||
| import org.apache.http.util.EntityUtils; | |||||
| import java.io.IOException; | |||||
| /** | /** | ||||
| * 简单的POST请求执行器,请求的参数是String, 返回的结果也是String | * 简单的POST请求执行器,请求的参数是String, 返回的结果也是String | ||||
| @@ -47,6 +40,8 @@ public class SimplePostRequestExecutor implements RequestExecutor<String, String | |||||
| throw new WxErrorException(error); | throw new WxErrorException(error); | ||||
| } | } | ||||
| return responseContent; | return responseContent; | ||||
| }finally { | |||||
| httpPost.releaseConnection(); | |||||
| } | } | ||||
| } | } | ||||
| @@ -8,9 +8,6 @@ | |||||
| */ | */ | ||||
| package me.chanjar.weixin.common.util.json; | package me.chanjar.weixin.common.util.json; | ||||
| import java.lang.reflect.Type; | |||||
| import com.google.gson.Gson; | |||||
| import com.google.gson.JsonArray; | import com.google.gson.JsonArray; | ||||
| import com.google.gson.JsonDeserializationContext; | import com.google.gson.JsonDeserializationContext; | ||||
| import com.google.gson.JsonDeserializer; | import com.google.gson.JsonDeserializer; | ||||
| @@ -19,9 +16,10 @@ import com.google.gson.JsonObject; | |||||
| import com.google.gson.JsonParseException; | import com.google.gson.JsonParseException; | ||||
| import com.google.gson.JsonSerializationContext; | import com.google.gson.JsonSerializationContext; | ||||
| import com.google.gson.JsonSerializer; | import com.google.gson.JsonSerializer; | ||||
| import me.chanjar.weixin.common.bean.WxMenu; | import me.chanjar.weixin.common.bean.WxMenu; | ||||
| import java.lang.reflect.Type; | |||||
| /** | /** | ||||
| * | * | ||||
| * @author Daniel Qian | * @author Daniel Qian | ||||
| @@ -40,8 +38,7 @@ public class WxMenuGsonAdapter implements JsonSerializer<WxMenu>, JsonDeserializ | |||||
| json.add("button", buttonArray); | json.add("button", buttonArray); | ||||
| if (menu.getMatchRule() != null) { | if (menu.getMatchRule() != null) { | ||||
| Gson gson = new Gson(); | |||||
| json.add("matchrule", gson.toJsonTree(menu.getMatchRule())); | |||||
| json.add("matchrule", convertToJson(menu.getMatchRule())); | |||||
| } | } | ||||
| return json; | return json; | ||||
| @@ -63,6 +60,18 @@ public class WxMenuGsonAdapter implements JsonSerializer<WxMenu>, JsonDeserializ | |||||
| return buttonJson; | return buttonJson; | ||||
| } | } | ||||
| protected JsonObject convertToJson(WxMenu.WxMenuRule menuRule){ | |||||
| JsonObject matchRule = new JsonObject(); | |||||
| matchRule.addProperty("group_id",menuRule.getGroupId()); | |||||
| matchRule.addProperty("sex",menuRule.getSex()); | |||||
| matchRule.addProperty("country",menuRule.getCountry()); | |||||
| matchRule.addProperty("province",menuRule.getProvince()); | |||||
| matchRule.addProperty("city",menuRule.getCity()); | |||||
| matchRule.addProperty("client_platform_type",menuRule.getClientPlatformType()); | |||||
| matchRule.addProperty("language",menuRule.getLanguage()); | |||||
| return matchRule; | |||||
| } | |||||
| public WxMenu deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { | public WxMenu deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { | ||||
| /* | /* | ||||
| * 操蛋的微信 | * 操蛋的微信 | ||||
| @@ -55,6 +55,29 @@ public class WxMenuTest { | |||||
| Assert.assertEquals(menu.toJson(), json); | Assert.assertEquals(menu.toJson(), json); | ||||
| } | } | ||||
| @Test(dataProvider = "wxAddConditionalMenu") | |||||
| public void testAddConditionalToJson(String json) { | |||||
| WxMenu menu = new WxMenu(); | |||||
| WxMenuButton button1 = new WxMenuButton(); | |||||
| button1.setType("click"); | |||||
| button1.setName("今日歌曲"); | |||||
| button1.setKey("V1001_TODAY_MUSIC"); | |||||
| menu.getButtons().add(button1); | |||||
| WxMenu.WxMenuRule wxMenuRule = new WxMenu.WxMenuRule(); | |||||
| wxMenuRule.setGroupId("2"); | |||||
| wxMenuRule.setSex("1"); | |||||
| wxMenuRule.setCountry("中国"); | |||||
| wxMenuRule.setProvince("广东"); | |||||
| wxMenuRule.setCity("广州"); | |||||
| wxMenuRule.setClientPlatformType("2"); | |||||
| wxMenuRule.setLanguage("zh_CN"); | |||||
| menu.setMatchRule(wxMenuRule); | |||||
| Assert.assertEquals(menu.toJson(), json); | |||||
| } | |||||
| @DataProvider | @DataProvider | ||||
| public Object[][] wxReturnMenu() { | public Object[][] wxReturnMenu() { | ||||
| @@ -106,5 +129,31 @@ public class WxMenuTest { | |||||
| new Object[] { json } | new Object[] { json } | ||||
| }; | }; | ||||
| } | } | ||||
| @DataProvider(name = "wxAddConditionalMenu") | |||||
| public Object[][] addConditionalMenuJson(){ | |||||
| String json = | |||||
| "{" | |||||
| +"\"button\":[" | |||||
| +"{" | |||||
| +"\"type\":\"click\"," | |||||
| +"\"name\":\"今日歌曲\"," | |||||
| +"\"key\":\"V1001_TODAY_MUSIC\"" | |||||
| +"}" | |||||
| +"]," | |||||
| +"\"matchrule\":{" | |||||
| +"\"group_id\":\"2\"," | |||||
| +"\"sex\":\"1\"," | |||||
| +"\"country\":\"中国\"," | |||||
| +"\"province\":\"广东\"," | |||||
| +"\"city\":\"广州\"," | |||||
| +"\"client_platform_type\":\"2\"," | |||||
| +"\"language\":\"zh_CN\"" | |||||
| +"}" | |||||
| +"}"; | |||||
| return new Object[][]{ | |||||
| new Object[]{json} | |||||
| }; | |||||
| } | |||||
| } | } | ||||
| @@ -1,8 +1,9 @@ | |||||
| package me.chanjar.weixin.cp.api; | package me.chanjar.weixin.cp.api; | ||||
| import java.io.File; | |||||
| import me.chanjar.weixin.common.bean.WxAccessToken; | import me.chanjar.weixin.common.bean.WxAccessToken; | ||||
| import me.chanjar.weixin.common.util.http.ApacheHttpClientBuilder; | |||||
| import java.io.File; | |||||
| /** | /** | ||||
| * 微信客户端配置存储 | * 微信客户端配置存储 | ||||
| @@ -63,4 +64,9 @@ public interface WxCpConfigStorage { | |||||
| public File getTmpDirFile(); | public File getTmpDirFile(); | ||||
| /** | |||||
| * http client builder | |||||
| * @return ApacheHttpClientBuilder | |||||
| */ | |||||
| public ApacheHttpClientBuilder getApacheHttpClientBuilder(); | |||||
| } | } | ||||
| @@ -1,8 +1,9 @@ | |||||
| package me.chanjar.weixin.cp.api; | package me.chanjar.weixin.cp.api; | ||||
| import java.io.File; | |||||
| import me.chanjar.weixin.common.bean.WxAccessToken; | import me.chanjar.weixin.common.bean.WxAccessToken; | ||||
| import me.chanjar.weixin.common.util.http.ApacheHttpClientBuilder; | |||||
| import java.io.File; | |||||
| /** | /** | ||||
| * 基于内存的微信配置provider,在实际生产环境中应该将这些配置持久化 | * 基于内存的微信配置provider,在实际生产环境中应该将这些配置持久化 | ||||
| @@ -32,6 +33,8 @@ public class WxCpInMemoryConfigStorage implements WxCpConfigStorage { | |||||
| protected volatile File tmpDirFile; | protected volatile File tmpDirFile; | ||||
| private volatile ApacheHttpClientBuilder apacheHttpClientBuilder; | |||||
| public String getAccessToken() { | public String getAccessToken() { | ||||
| return this.accessToken; | return this.accessToken; | ||||
| } | } | ||||
| @@ -205,4 +208,12 @@ public class WxCpInMemoryConfigStorage implements WxCpConfigStorage { | |||||
| this.tmpDirFile = tmpDirFile; | this.tmpDirFile = tmpDirFile; | ||||
| } | } | ||||
| @Override | |||||
| public ApacheHttpClientBuilder getApacheHttpClientBuilder() { | |||||
| return this.apacheHttpClientBuilder; | |||||
| } | |||||
| public void setApacheHttpClientBuilder(ApacheHttpClientBuilder apacheHttpClientBuilder) { | |||||
| this.apacheHttpClientBuilder = apacheHttpClientBuilder; | |||||
| } | |||||
| } | } | ||||
| @@ -1,14 +1,12 @@ | |||||
| package me.chanjar.weixin.cp.api; | package me.chanjar.weixin.cp.api; | ||||
| 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; | |||||
| import me.chanjar.weixin.common.bean.WxAccessToken; | import me.chanjar.weixin.common.bean.WxAccessToken; | ||||
| import me.chanjar.weixin.common.bean.WxJsapiSignature; | import me.chanjar.weixin.common.bean.WxJsapiSignature; | ||||
| import me.chanjar.weixin.common.bean.WxMenu; | import me.chanjar.weixin.common.bean.WxMenu; | ||||
| @@ -22,41 +20,30 @@ import me.chanjar.weixin.common.util.RandomUtils; | |||||
| import me.chanjar.weixin.common.util.StringUtils; | import me.chanjar.weixin.common.util.StringUtils; | ||||
| import me.chanjar.weixin.common.util.crypto.SHA1; | import me.chanjar.weixin.common.util.crypto.SHA1; | ||||
| import me.chanjar.weixin.common.util.fs.FileUtils; | import me.chanjar.weixin.common.util.fs.FileUtils; | ||||
| 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.common.util.json.GsonHelper; | ||||
| import me.chanjar.weixin.cp.bean.WxCpDepart; | import me.chanjar.weixin.cp.bean.WxCpDepart; | ||||
| import me.chanjar.weixin.cp.bean.WxCpMessage; | import me.chanjar.weixin.cp.bean.WxCpMessage; | ||||
| import me.chanjar.weixin.cp.bean.WxCpTag; | import me.chanjar.weixin.cp.bean.WxCpTag; | ||||
| import me.chanjar.weixin.cp.bean.WxCpUser; | import me.chanjar.weixin.cp.bean.WxCpUser; | ||||
| import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; | import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; | ||||
| import org.apache.http.HttpHost; | import org.apache.http.HttpHost; | ||||
| import org.apache.http.auth.AuthScope; | |||||
| import org.apache.http.auth.UsernamePasswordCredentials; | |||||
| import org.apache.http.client.ClientProtocolException; | import org.apache.http.client.ClientProtocolException; | ||||
| import org.apache.http.client.CredentialsProvider; | |||||
| import org.apache.http.client.config.RequestConfig; | import org.apache.http.client.config.RequestConfig; | ||||
| import org.apache.http.client.methods.CloseableHttpResponse; | import org.apache.http.client.methods.CloseableHttpResponse; | ||||
| import org.apache.http.client.methods.HttpGet; | import org.apache.http.client.methods.HttpGet; | ||||
| import org.apache.http.impl.client.BasicCredentialsProvider; | |||||
| import org.apache.http.impl.client.BasicResponseHandler; | import org.apache.http.impl.client.BasicResponseHandler; | ||||
| import org.apache.http.impl.client.CloseableHttpClient; | import org.apache.http.impl.client.CloseableHttpClient; | ||||
| import org.apache.http.impl.client.HttpClients; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| 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 java.io.File; | |||||
| import java.io.IOException; | |||||
| import java.io.InputStream; | |||||
| import java.io.StringReader; | |||||
| import java.security.NoSuchAlgorithmException; | |||||
| import java.util.List; | |||||
| import java.util.UUID; | |||||
| public class WxCpServiceImpl implements WxCpService { | public class WxCpServiceImpl implements WxCpService { | ||||
| @@ -126,6 +113,8 @@ public class WxCpServiceImpl implements WxCpService { | |||||
| String resultContent = null; | String resultContent = null; | ||||
| try (CloseableHttpResponse response = httpclient.execute(httpGet)) { | try (CloseableHttpResponse response = httpclient.execute(httpGet)) { | ||||
| resultContent = new BasicResponseHandler().handleResponse(response); | resultContent = new BasicResponseHandler().handleResponse(response); | ||||
| }finally { | |||||
| httpGet.releaseConnection(); | |||||
| } | } | ||||
| WxError error = WxError.fromJson(resultContent); | WxError error = WxError.fromJson(resultContent); | ||||
| if (error.getErrorCode() != 0) { | if (error.getErrorCode() != 0) { | ||||
| @@ -256,9 +245,9 @@ public class WxCpServiceImpl implements WxCpService { | |||||
| public Integer departCreate(WxCpDepart depart) throws WxErrorException { | public Integer departCreate(WxCpDepart depart) throws WxErrorException { | ||||
| String url = "https://qyapi.weixin.qq.com/cgi-bin/department/create"; | String url = "https://qyapi.weixin.qq.com/cgi-bin/department/create"; | ||||
| String responseContent = execute( | String responseContent = execute( | ||||
| new SimplePostRequestExecutor(), | |||||
| url, | |||||
| depart.toJson()); | |||||
| new SimplePostRequestExecutor(), | |||||
| url, | |||||
| depart.toJson()); | |||||
| JsonElement tmpJsonElement = Streams.parse(new JsonReader(new StringReader(responseContent))); | JsonElement tmpJsonElement = Streams.parse(new JsonReader(new StringReader(responseContent))); | ||||
| return GsonHelper.getAsInteger(tmpJsonElement.getAsJsonObject().get("id")); | return GsonHelper.getAsInteger(tmpJsonElement.getAsJsonObject().get("id")); | ||||
| } | } | ||||
| @@ -594,32 +583,16 @@ public class WxCpServiceImpl implements WxCpService { | |||||
| public void setWxCpConfigStorage(WxCpConfigStorage wxConfigProvider) { | public void setWxCpConfigStorage(WxCpConfigStorage wxConfigProvider) { | ||||
| this.wxCpConfigStorage = wxConfigProvider; | this.wxCpConfigStorage = wxConfigProvider; | ||||
| String http_proxy_host = wxCpConfigStorage.getHttp_proxy_host(); | |||||
| int http_proxy_port = wxCpConfigStorage.getHttp_proxy_port(); | |||||
| String http_proxy_username = wxCpConfigStorage.getHttp_proxy_username(); | |||||
| String http_proxy_password = wxCpConfigStorage.getHttp_proxy_password(); | |||||
| if(StringUtils.isNotBlank(http_proxy_host)) { | |||||
| // 使用代理服务器 | |||||
| if(StringUtils.isNotBlank(http_proxy_username)) { | |||||
| // 需要用户认证的代理服务器 | |||||
| CredentialsProvider credsProvider = new BasicCredentialsProvider(); | |||||
| credsProvider.setCredentials( | |||||
| new AuthScope(http_proxy_host, http_proxy_port), | |||||
| new UsernamePasswordCredentials(http_proxy_username, http_proxy_password)); | |||||
| httpClient = HttpClients | |||||
| .custom() | |||||
| .setDefaultCredentialsProvider(credsProvider) | |||||
| .build(); | |||||
| } else { | |||||
| // 无需用户认证的代理服务器 | |||||
| httpClient = HttpClients.createDefault(); | |||||
| } | |||||
| httpProxy = new HttpHost(http_proxy_host, http_proxy_port); | |||||
| } else { | |||||
| httpClient = HttpClients.createDefault(); | |||||
| ApacheHttpClientBuilder apacheHttpClientBuilder = wxCpConfigStorage.getApacheHttpClientBuilder(); | |||||
| if (null == apacheHttpClientBuilder) { | |||||
| apacheHttpClientBuilder = DefaultApacheHttpHttpClientBuilder.get(); | |||||
| } | } | ||||
| apacheHttpClientBuilder.httpProxyHost(wxCpConfigStorage.getHttp_proxy_host()) | |||||
| .httpProxyPort(wxCpConfigStorage.getHttp_proxy_port()) | |||||
| .httpProxyUsername(wxCpConfigStorage.getHttp_proxy_username()) | |||||
| .httpProxyPassword(wxCpConfigStorage.getHttp_proxy_password()); | |||||
| httpClient = apacheHttpClientBuilder.build(); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -685,12 +658,5 @@ public class WxCpServiceImpl implements WxCpService { | |||||
| this.tmpDirFile = tmpDirFile; | this.tmpDirFile = tmpDirFile; | ||||
| } | } | ||||
| public static void main(String[] args) { | |||||
| Float a = 3.1f; | |||||
| System.out.println(3.1d); | |||||
| System.out.println(new BigDecimal(3.1d)); | |||||
| System.out.println(new BigDecimal(a)); | |||||
| System.out.println(a.toString()); | |||||
| System.out.println(a.doubleValue()); | |||||
| } | |||||
| } | } | ||||
| @@ -31,6 +31,15 @@ public class XStreamTransformer { | |||||
| return object; | return object; | ||||
| } | } | ||||
| /** | |||||
| * 注册扩展消息的解析器 | |||||
| * @param clz 类型 | |||||
| * @param xStream xml解析器 | |||||
| */ | |||||
| public static void register(Class clz,XStream xStream){ | |||||
| CLASS_2_XSTREAM_INSTANCE.put(clz,xStream); | |||||
| } | |||||
| /** | /** | ||||
| * pojo -> xml | * pojo -> xml | ||||
| * | * | ||||
| @@ -1,10 +1,10 @@ | |||||
| package me.chanjar.weixin.mp.api; | package me.chanjar.weixin.mp.api; | ||||
| import java.io.File; | |||||
| import me.chanjar.weixin.common.bean.WxAccessToken; | |||||
| import me.chanjar.weixin.common.util.http.ApacheHttpClientBuilder; | |||||
| import javax.net.ssl.SSLContext; | import javax.net.ssl.SSLContext; | ||||
| import me.chanjar.weixin.common.bean.WxAccessToken; | |||||
| import java.io.File; | |||||
| /** | /** | ||||
| * 微信客户端配置存储 | * 微信客户端配置存储 | ||||
| @@ -50,6 +50,21 @@ public interface WxMpConfigStorage { | |||||
| */ | */ | ||||
| public void updateJsapiTicket(String jsapiTicket, int expiresInSeconds); | public void updateJsapiTicket(String jsapiTicket, int expiresInSeconds); | ||||
| public String getCardApiTicket(); | |||||
| public boolean isCardApiTicketExpired(); | |||||
| /** | |||||
| * 强制将卡券api ticket过期掉 | |||||
| */ | |||||
| public void expireCardApiTicket(); | |||||
| /** | |||||
| * 应该是线程安全的 | |||||
| * @param cardApiTicket | |||||
| */ | |||||
| public void updateCardApiTicket(String cardApiTicket, int expiresInSeconds); | |||||
| public String getAppId(); | public String getAppId(); | ||||
| public String getSecret(); | public String getSecret(); | ||||
| @@ -77,4 +92,10 @@ public interface WxMpConfigStorage { | |||||
| public File getTmpDirFile(); | public File getTmpDirFile(); | ||||
| public SSLContext getSSLContext(); | public SSLContext getSSLContext(); | ||||
| /** | |||||
| * http client builder | |||||
| * @return ApacheHttpClientBuilder | |||||
| */ | |||||
| public ApacheHttpClientBuilder getApacheHttpClientBuilder(); | |||||
| } | } | ||||
| @@ -1,10 +1,10 @@ | |||||
| package me.chanjar.weixin.mp.api; | package me.chanjar.weixin.mp.api; | ||||
| import java.io.File; | |||||
| import me.chanjar.weixin.common.bean.WxAccessToken; | |||||
| import me.chanjar.weixin.common.util.http.ApacheHttpClientBuilder; | |||||
| import javax.net.ssl.SSLContext; | import javax.net.ssl.SSLContext; | ||||
| import me.chanjar.weixin.common.bean.WxAccessToken; | |||||
| import java.io.File; | |||||
| /** | /** | ||||
| * 基于内存的微信配置provider,在实际生产环境中应该将这些配置持久化 | * 基于内存的微信配置provider,在实际生产环境中应该将这些配置持久化 | ||||
| @@ -32,13 +32,18 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage { | |||||
| protected volatile String jsapiTicket; | protected volatile String jsapiTicket; | ||||
| protected volatile long jsapiTicketExpiresTime; | protected volatile long jsapiTicketExpiresTime; | ||||
| protected volatile String cardApiTicket; | |||||
| protected volatile long cardApiTicketExpiresTime; | |||||
| /** | /** | ||||
| * 临时文件目录 | * 临时文件目录 | ||||
| */ | */ | ||||
| protected volatile File tmpDirFile; | protected volatile File tmpDirFile; | ||||
| protected volatile SSLContext sslContext; | protected volatile SSLContext sslContext; | ||||
| protected volatile ApacheHttpClientBuilder apacheHttpClientBuilder; | |||||
| public String getAccessToken() { | public String getAccessToken() { | ||||
| return this.accessToken; | return this.accessToken; | ||||
| } | } | ||||
| @@ -90,6 +95,27 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage { | |||||
| this.jsapiTicketExpiresTime = 0; | this.jsapiTicketExpiresTime = 0; | ||||
| } | } | ||||
| /** | |||||
| * 卡券api_ticket | |||||
| */ | |||||
| public String getCardApiTicket() { | |||||
| return cardApiTicket; | |||||
| } | |||||
| public boolean isCardApiTicketExpired() { | |||||
| return System.currentTimeMillis() > this.cardApiTicketExpiresTime; | |||||
| } | |||||
| public synchronized void updateCardApiTicket(String cardApiTicket, int expiresInSeconds) { | |||||
| this.cardApiTicket = cardApiTicket; | |||||
| // 预留200秒的时间 | |||||
| this.cardApiTicketExpiresTime = System.currentTimeMillis() + (expiresInSeconds - 200) * 1000l; | |||||
| } | |||||
| public void expireCardApiTicket() { | |||||
| this.cardApiTicketExpiresTime = 0; | |||||
| } | |||||
| public String getAppId() { | public String getAppId() { | ||||
| return this.appId; | return this.appId; | ||||
| } | } | ||||
| @@ -192,6 +218,8 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage { | |||||
| ", http_proxy_password='" + http_proxy_password + '\'' + | ", http_proxy_password='" + http_proxy_password + '\'' + | ||||
| ", jsapiTicket='" + jsapiTicket + '\'' + | ", jsapiTicket='" + jsapiTicket + '\'' + | ||||
| ", jsapiTicketExpiresTime='" + jsapiTicketExpiresTime + '\'' + | ", jsapiTicketExpiresTime='" + jsapiTicketExpiresTime + '\'' + | ||||
| ", cardApiTicket='" + cardApiTicket + '\'' + | |||||
| ", cardApiTicketExpiresTime='" + cardApiTicketExpiresTime + '\'' + | |||||
| ", tmpDirFile='" + tmpDirFile + '\'' + | ", tmpDirFile='" + tmpDirFile + '\'' + | ||||
| '}'; | '}'; | ||||
| } | } | ||||
| @@ -232,4 +260,12 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage { | |||||
| sslContext = context; | sslContext = context; | ||||
| } | } | ||||
| @Override | |||||
| public ApacheHttpClientBuilder getApacheHttpClientBuilder() { | |||||
| return this.apacheHttpClientBuilder; | |||||
| } | |||||
| public void setApacheHttpClientBuilder(ApacheHttpClientBuilder apacheHttpClientBuilder) { | |||||
| this.apacheHttpClientBuilder = apacheHttpClientBuilder; | |||||
| } | |||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| package me.chanjar.weixin.mp.api; | package me.chanjar.weixin.mp.api; | ||||
| import me.chanjar.weixin.common.bean.WxCardApiSignature; | |||||
| import me.chanjar.weixin.common.bean.WxMenu; | import me.chanjar.weixin.common.bean.WxMenu; | ||||
| import me.chanjar.weixin.common.bean.WxJsapiSignature; | import me.chanjar.weixin.common.bean.WxJsapiSignature; | ||||
| import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; | import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; | ||||
| @@ -725,8 +726,9 @@ public interface WxMpService { | |||||
| * @param parameters | * @param parameters | ||||
| * the required or optional parameters | * the required or optional parameters | ||||
| * @return | * @return | ||||
| * @throws WxErrorException | |||||
| */ | */ | ||||
| Map<String, String> getJSSDKPayInfo(Map<String, String> parameters); | |||||
| Map<String, String> getJSSDKPayInfo(Map<String, String> parameters) throws WxErrorException; | |||||
| /** | /** | ||||
| * 该接口调用“统一下单”接口,并拼装JSSDK发起支付请求需要的参数 | * 该接口调用“统一下单”接口,并拼装JSSDK发起支付请求需要的参数 | ||||
| @@ -739,10 +741,11 @@ public interface WxMpService { | |||||
| * @param ip 发起支付的客户端IP | * @param ip 发起支付的客户端IP | ||||
| * @param notifyUrl 通知地址 | * @param notifyUrl 通知地址 | ||||
| * @return | * @return | ||||
| * @throws WxErrorException | |||||
| * @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getJSSDKPayInfo(Map<String, String>) instead | * @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getJSSDKPayInfo(Map<String, String>) instead | ||||
| */ | */ | ||||
| @Deprecated | @Deprecated | ||||
| Map<String, String> getJSSDKPayInfo(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String notifyUrl); | |||||
| Map<String, String> getJSSDKPayInfo(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String notifyUrl) throws WxErrorException; | |||||
| /** | /** | ||||
| * 该接口提供所有微信支付订单的查询,当支付通知处理异常戒丢失的情冴,商户可以通过该接口查询订单支付状态。 | * 该接口提供所有微信支付订单的查询,当支付通知处理异常戒丢失的情冴,商户可以通过该接口查询订单支付状态。 | ||||
| @@ -760,6 +763,20 @@ public interface WxMpService { | |||||
| */ | */ | ||||
| WxMpPayCallback getJSSDKCallbackData(String xmlData); | WxMpPayCallback getJSSDKCallbackData(String xmlData); | ||||
| /** | |||||
| * 微信支付-申请退款 | |||||
| * 详见 https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_4 | |||||
| * @param parameters 需要传入的退款参数的Map。以下几项为参数的必须项:<br/> | |||||
| * <li/> transaction_id | |||||
| * <li/> out_trade_no (仅在上述transaction_id为空时是必须项) | |||||
| * <li/> out_refund_no | |||||
| * <li/> total_fee | |||||
| * <li/> refund_fee | |||||
| * @return 退款操作结果 | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| public WxMpPayRefundResult refundPay(Map<String, String> parameters) throws WxErrorException; | |||||
| /** | /** | ||||
| * <pre> | * <pre> | ||||
| * 计算Map键值对是否和签名相符, | * 计算Map键值对是否和签名相符, | ||||
| @@ -770,12 +787,131 @@ public interface WxMpService { | |||||
| * @return | * @return | ||||
| */ | */ | ||||
| public boolean checkJSSDKCallbackDataSignature(Map<String, String> kvm, String signature); | public boolean checkJSSDKCallbackDataSignature(Map<String, String> kvm, String signature); | ||||
| /** | /** | ||||
| * 发送微信红包给个人用户 | * 发送微信红包给个人用户 | ||||
| * | |||||
| * 需要传入的必填参数如下: | |||||
| * mch_billno//商户订单号 | |||||
| * send_name//商户名称 | |||||
| * re_openid//用户openid | |||||
| * total_amount//红包总额 | |||||
| * total_num//红包发放总人数 | |||||
| * wishing//红包祝福语 | |||||
| * client_ip//服务器Ip地址 | |||||
| * act_name//活动名称 | |||||
| * remark //备注 | |||||
| * 文档详见:https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_5 | |||||
| * | |||||
| * 使用现金红包功能需要在xml配置文件中额外设置: | |||||
| * <partnerId></partnerId>微信商户平台ID | |||||
| * <partnerKey></partnerKey>商户平台设置的API密钥 | |||||
| * | |||||
| * @param parameters | * @param parameters | ||||
| * @return | * @return | ||||
| * @throws WxErrorException | * @throws WxErrorException | ||||
| */ | */ | ||||
| public WxRedpackResult sendRedpack(Map<String, String> parameters) throws WxErrorException; | public WxRedpackResult sendRedpack(Map<String, String> parameters) throws WxErrorException; | ||||
| /** | |||||
| * 获得卡券api_ticket,不强制刷新卡券api_ticket | |||||
| * @see #getCardApiTicket(boolean) | |||||
| * @return 卡券api_ticket | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| public String getCardApiTicket() throws WxErrorException; | |||||
| /** | |||||
| * <pre> | |||||
| * 获得卡券api_ticket | |||||
| * 获得时会检查卡券apiToken是否过期,如果过期了,那么就刷新一下,否则就什么都不干 | |||||
| * | |||||
| * 详情请见:http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E9.99.84.E5.BD.954-.E5.8D.A1.E5.88.B8.E6.89.A9.E5.B1.95.E5.AD.97.E6.AE.B5.E5.8F.8A.E7.AD.BE.E5.90.8D.E7.94.9F.E6.88.90.E7.AE.97.E6.B3.95 | |||||
| * </pre> | |||||
| * @param forceRefresh 强制刷新 | |||||
| * @return 卡券api_ticket | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| public String getCardApiTicket(boolean forceRefresh) throws WxErrorException; | |||||
| /** | |||||
| * <pre> | |||||
| * 创建调用卡券api时所需要的签名 | |||||
| * | |||||
| * 详情请见:http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E9.99.84.E5.BD | |||||
| * .954-.E5.8D.A1.E5.88.B8.E6.89.A9.E5.B1.95.E5.AD.97.E6.AE.B5.E5.8F.8A.E7.AD.BE.E5.90.8D.E7.94 | |||||
| * .9F.E6.88.90.E7.AE.97.E6.B3.95 | |||||
| * </pre> | |||||
| * | |||||
| * @param optionalSignParam 参与签名的参数数组。 | |||||
| * 可以为下列字段:app_id, card_id, card_type, code, openid, location_id | |||||
| * </br>注意:当做wx.chooseCard调用时,必须传入app_id参与签名,否则会造成签名失败导致拉取卡券列表为空 | |||||
| * @return 卡券Api签名对象 | |||||
| */ | |||||
| public WxCardApiSignature createCardApiSignature(String... optionalSignParam) throws | |||||
| WxErrorException; | |||||
| /** | |||||
| * 卡券Code解码 | |||||
| * @param encryptCode 加密Code,通过JSSDK的chooseCard接口获得 | |||||
| * @return 解密后的Code | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| public String decryptCardCode(String encryptCode) throws WxErrorException; | |||||
| /** | |||||
| * 卡券Code查询 | |||||
| * @param cardId 卡券ID代表一类卡券 | |||||
| * @param code 单张卡券的唯一标准 | |||||
| * @param checkConsume 是否校验code核销状态,填入true和false时的code异常状态返回数据不同 | |||||
| * @return WxMpCardResult对象 | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| public WxMpCardResult queryCardCode(String cardId, String code, boolean checkConsume) | |||||
| throws WxErrorException; | |||||
| /** | |||||
| * 卡券Code核销。核销失败会抛出异常 | |||||
| * | |||||
| * @param code 单张卡券的唯一标准 | |||||
| * @return 调用返回的JSON字符串。 | |||||
| * <br>可用 com.google.gson.JsonParser#parse 等方法直接取JSON串中的errcode等信息。 | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| public String consumeCardCode(String code) throws WxErrorException; | |||||
| /** | |||||
| * 卡券Code核销。核销失败会抛出异常 | |||||
| * | |||||
| * @param code 单张卡券的唯一标准 | |||||
| * @param cardId 当自定义Code卡券时需要传入card_id | |||||
| * @return 调用返回的JSON字符串。 | |||||
| * <br>可用 com.google.gson.JsonParser#parse 等方法直接取JSON串中的errcode等信息。 | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| public String consumeCardCode(String code, String cardId) throws WxErrorException; | |||||
| /** | |||||
| * 卡券Mark接口。 | |||||
| * 开发者在帮助消费者核销卡券之前,必须帮助先将此code(卡券串码)与一个openid绑定(即mark住), | |||||
| * 才能进一步调用核销接口,否则报错。 | |||||
| * @param code 卡券的code码 | |||||
| * @param cardId 卡券的ID | |||||
| * @param openId 用券用户的openid | |||||
| * @param isMark 是否要mark(占用)这个code,填写true或者false,表示占用或解除占用 | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| public void markCardCode(String code, String cardId, String openId, boolean isMark) throws | |||||
| WxErrorException; | |||||
| /** | |||||
| * 查看卡券详情接口 | |||||
| * 详见 https://mp.weixin.qq.com/wiki/14/8dd77aeaee85f922db5f8aa6386d385e.html#.E6.9F.A5.E7.9C.8B.E5.8D.A1.E5.88.B8.E8.AF.A6.E6.83.85 | |||||
| * @param cardId 卡券的ID | |||||
| * @return 返回的卡券详情JSON字符串 | |||||
| * <br> [注] 由于返回的JSON格式过于复杂,难以定义其对应格式的Bean并且难以维护,因此只返回String格式的JSON串。 | |||||
| * <br> 可由 com.google.gson.JsonParser#parse 等方法直接取JSON串中的某个字段。 | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| public String getCardDetail(String cardId) throws WxErrorException; | |||||
| } | } | ||||
| @@ -1,21 +1,13 @@ | |||||
| package me.chanjar.weixin.mp.api; | package me.chanjar.weixin.mp.api; | ||||
| import java.io.File; | |||||
| import java.io.IOException; | |||||
| import java.io.InputStream; | |||||
| import java.io.StringReader; | |||||
| import java.security.NoSuchAlgorithmException; | |||||
| import java.util.Date; | |||||
| import java.util.HashMap; | |||||
| import java.util.List; | |||||
| import java.util.Map; | |||||
| import java.util.Map.Entry; | |||||
| import java.util.SortedMap; | |||||
| import java.util.TreeMap; | |||||
| import java.util.UUID; | |||||
| import com.google.gson.*; | |||||
| import com.google.gson.internal.Streams; | |||||
| import com.google.gson.reflect.TypeToken; | |||||
| import com.google.gson.stream.JsonReader; | |||||
| import com.thoughtworks.xstream.XStream; | |||||
| import me.chanjar.weixin.common.api.WxConsts; | import me.chanjar.weixin.common.api.WxConsts; | ||||
| import me.chanjar.weixin.common.bean.WxAccessToken; | import me.chanjar.weixin.common.bean.WxAccessToken; | ||||
| import me.chanjar.weixin.common.bean.WxCardApiSignature; | |||||
| import me.chanjar.weixin.common.bean.WxJsapiSignature; | import me.chanjar.weixin.common.bean.WxJsapiSignature; | ||||
| import me.chanjar.weixin.common.bean.WxMenu; | import me.chanjar.weixin.common.bean.WxMenu; | ||||
| import me.chanjar.weixin.common.bean.result.WxError; | import me.chanjar.weixin.common.bean.result.WxError; | ||||
| @@ -24,85 +16,39 @@ import me.chanjar.weixin.common.exception.WxErrorException; | |||||
| import me.chanjar.weixin.common.session.StandardSessionManager; | import me.chanjar.weixin.common.session.StandardSessionManager; | ||||
| import me.chanjar.weixin.common.session.WxSessionManager; | import me.chanjar.weixin.common.session.WxSessionManager; | ||||
| import me.chanjar.weixin.common.util.RandomUtils; | 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.crypto.SHA1; | ||||
| import me.chanjar.weixin.common.util.crypto.WxCryptUtil; | import me.chanjar.weixin.common.util.crypto.WxCryptUtil; | ||||
| import me.chanjar.weixin.common.util.fs.FileUtils; | import me.chanjar.weixin.common.util.fs.FileUtils; | ||||
| 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.Utf8ResponseHandler; | |||||
| import me.chanjar.weixin.common.util.http.*; | |||||
| import me.chanjar.weixin.common.util.json.GsonHelper; | import me.chanjar.weixin.common.util.json.GsonHelper; | ||||
| import me.chanjar.weixin.common.util.json.WxGsonBuilder; | import me.chanjar.weixin.common.util.json.WxGsonBuilder; | ||||
| import me.chanjar.weixin.common.util.xml.XStreamInitializer; | import me.chanjar.weixin.common.util.xml.XStreamInitializer; | ||||
| import me.chanjar.weixin.mp.bean.WxMpCustomMessage; | |||||
| import me.chanjar.weixin.mp.bean.WxMpGroup; | |||||
| import me.chanjar.weixin.mp.bean.WxMpMassGroupMessage; | |||||
| import me.chanjar.weixin.mp.bean.WxMpMassNews; | |||||
| import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage; | |||||
| import me.chanjar.weixin.mp.bean.WxMpMassVideo; | |||||
| import me.chanjar.weixin.mp.bean.WxMpMaterial; | |||||
| import me.chanjar.weixin.mp.bean.WxMpMaterialArticleUpdate; | |||||
| import me.chanjar.weixin.mp.bean.WxMpMaterialNews; | |||||
| import me.chanjar.weixin.mp.bean.WxMpSemanticQuery; | |||||
| import me.chanjar.weixin.mp.bean.WxMpTemplateMessage; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpMaterialCountResult; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpMaterialFileBatchGetResult; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpMaterialNewsBatchGetResult; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpMaterialUploadResult; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpMaterialVideoInfoResult; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpPayCallback; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpPayResult; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpPrepayIdResult; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpUser; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpUserCumulate; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpUserList; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpUserSummary; | |||||
| import me.chanjar.weixin.mp.bean.result.WxRedpackResult; | |||||
| import me.chanjar.weixin.mp.util.http.MaterialDeleteRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.MaterialUploadRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.MaterialVideoInfoRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.MaterialVoiceAndImageDownloadRequestExecutor; | |||||
| import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor; | |||||
| import me.chanjar.weixin.mp.bean.*; | |||||
| import me.chanjar.weixin.mp.bean.result.*; | |||||
| import me.chanjar.weixin.mp.util.http.*; | |||||
| import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | ||||
| import org.apache.http.Consts; | import org.apache.http.Consts; | ||||
| import org.apache.http.HttpHost; | import org.apache.http.HttpHost; | ||||
| import org.apache.http.auth.AuthScope; | |||||
| import org.apache.http.auth.UsernamePasswordCredentials; | |||||
| import org.apache.http.client.ClientProtocolException; | import org.apache.http.client.ClientProtocolException; | ||||
| import org.apache.http.client.CredentialsProvider; | |||||
| import org.apache.http.client.config.RequestConfig; | import org.apache.http.client.config.RequestConfig; | ||||
| import org.apache.http.client.methods.CloseableHttpResponse; | import org.apache.http.client.methods.CloseableHttpResponse; | ||||
| import org.apache.http.client.methods.HttpGet; | import org.apache.http.client.methods.HttpGet; | ||||
| import org.apache.http.client.methods.HttpPost; | import org.apache.http.client.methods.HttpPost; | ||||
| import org.apache.http.conn.ssl.SSLConnectionSocketFactory; | import org.apache.http.conn.ssl.SSLConnectionSocketFactory; | ||||
| import org.apache.http.entity.StringEntity; | import org.apache.http.entity.StringEntity; | ||||
| import org.apache.http.impl.client.BasicCredentialsProvider; | |||||
| import org.apache.http.impl.client.BasicResponseHandler; | import org.apache.http.impl.client.BasicResponseHandler; | ||||
| import org.apache.http.impl.client.CloseableHttpClient; | import org.apache.http.impl.client.CloseableHttpClient; | ||||
| import org.apache.http.impl.client.HttpClientBuilder; | |||||
| import org.apache.http.impl.client.HttpClients; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.slf4j.helpers.MessageFormatter; | import org.slf4j.helpers.MessageFormatter; | ||||
| import com.google.gson.JsonArray; | |||||
| import com.google.gson.JsonElement; | |||||
| import com.google.gson.JsonObject; | |||||
| import com.google.gson.internal.Streams; | |||||
| import com.google.gson.reflect.TypeToken; | |||||
| import com.google.gson.stream.JsonReader; | |||||
| import com.thoughtworks.xstream.XStream; | |||||
| import java.io.File; | |||||
| import java.io.IOException; | |||||
| import java.io.InputStream; | |||||
| import java.io.StringReader; | |||||
| import java.security.NoSuchAlgorithmException; | |||||
| import java.util.*; | |||||
| import java.util.Map.Entry; | |||||
| public class WxMpServiceImpl implements WxMpService { | public class WxMpServiceImpl implements WxMpService { | ||||
| @@ -118,6 +64,11 @@ public class WxMpServiceImpl implements WxMpService { | |||||
| */ | */ | ||||
| protected final Object globalJsapiTicketRefreshLock = new Object(); | protected final Object globalJsapiTicketRefreshLock = new Object(); | ||||
| /** | |||||
| * 全局的是否正在刷新卡券api_ticket的锁 | |||||
| */ | |||||
| protected final Object globalCardApiTicketRefreshLock = new Object(); | |||||
| protected WxMpConfigStorage wxMpConfigStorage; | protected WxMpConfigStorage wxMpConfigStorage; | ||||
| protected CloseableHttpClient httpClient; | protected CloseableHttpClient httpClient; | ||||
| @@ -158,14 +109,17 @@ public class WxMpServiceImpl implements WxMpService { | |||||
| RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build(); | RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build(); | ||||
| httpGet.setConfig(config); | httpGet.setConfig(config); | ||||
| } | } | ||||
| CloseableHttpResponse response = getHttpclient().execute(httpGet); | |||||
| String resultContent = new BasicResponseHandler().handleResponse(response); | |||||
| WxError error = WxError.fromJson(resultContent); | |||||
| if (error.getErrorCode() != 0) { | |||||
| throw new WxErrorException(error); | |||||
| try (CloseableHttpResponse response = getHttpclient().execute(httpGet)) { | |||||
| String resultContent = new BasicResponseHandler().handleResponse(response); | |||||
| WxError error = WxError.fromJson(resultContent); | |||||
| if (error.getErrorCode() != 0) { | |||||
| throw new WxErrorException(error); | |||||
| } | |||||
| WxAccessToken accessToken = WxAccessToken.fromJson(resultContent); | |||||
| wxMpConfigStorage.updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn()); | |||||
| }finally { | |||||
| httpGet.releaseConnection(); | |||||
| } | } | ||||
| WxAccessToken accessToken = WxAccessToken.fromJson(resultContent); | |||||
| wxMpConfigStorage.updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn()); | |||||
| } catch (ClientProtocolException e) { | } catch (ClientProtocolException e) { | ||||
| throw new RuntimeException(e); | throw new RuntimeException(e); | ||||
| } catch (IOException e) { | } catch (IOException e) { | ||||
| @@ -766,36 +720,25 @@ public class WxMpServiceImpl implements WxMpService { | |||||
| public void setWxMpConfigStorage(WxMpConfigStorage wxConfigProvider) { | public void setWxMpConfigStorage(WxMpConfigStorage wxConfigProvider) { | ||||
| this.wxMpConfigStorage = wxConfigProvider; | this.wxMpConfigStorage = wxConfigProvider; | ||||
| String http_proxy_host = wxMpConfigStorage.getHttp_proxy_host(); | |||||
| int http_proxy_port = wxMpConfigStorage.getHttp_proxy_port(); | |||||
| String http_proxy_username = wxMpConfigStorage.getHttp_proxy_username(); | |||||
| String http_proxy_password = wxMpConfigStorage.getHttp_proxy_password(); | |||||
| final HttpClientBuilder builder = HttpClients.custom(); | |||||
| if (StringUtils.isNotBlank(http_proxy_host)) { | |||||
| // 使用代理服务器 | |||||
| if (StringUtils.isNotBlank(http_proxy_username)) { | |||||
| // 需要用户认证的代理服务器 | |||||
| CredentialsProvider credsProvider = new BasicCredentialsProvider(); | |||||
| credsProvider.setCredentials( | |||||
| new AuthScope(http_proxy_host, http_proxy_port), | |||||
| new UsernamePasswordCredentials(http_proxy_username, http_proxy_password)); | |||||
| builder | |||||
| .setDefaultCredentialsProvider(credsProvider); | |||||
| } else { | |||||
| // 无需用户认证的代理服务器 | |||||
| } | |||||
| httpProxy = new HttpHost(http_proxy_host, http_proxy_port); | |||||
| ApacheHttpClientBuilder apacheHttpClientBuilder = wxMpConfigStorage.getApacheHttpClientBuilder(); | |||||
| if (null == apacheHttpClientBuilder) { | |||||
| apacheHttpClientBuilder = DefaultApacheHttpHttpClientBuilder.get(); | |||||
| } | } | ||||
| apacheHttpClientBuilder.httpProxyHost(wxMpConfigStorage.getHttp_proxy_host()) | |||||
| .httpProxyPort(wxMpConfigStorage.getHttp_proxy_port()) | |||||
| .httpProxyUsername(wxMpConfigStorage.getHttp_proxy_username()) | |||||
| .httpProxyPassword(wxMpConfigStorage.getHttp_proxy_password()); | |||||
| if (wxConfigProvider.getSSLContext() != null){ | if (wxConfigProvider.getSSLContext() != null){ | ||||
| SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory( | SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory( | ||||
| wxConfigProvider.getSSLContext(), | wxConfigProvider.getSSLContext(), | ||||
| new String[] { "TLSv1" }, | new String[] { "TLSv1" }, | ||||
| null, | null, | ||||
| SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER); | SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER); | ||||
| builder.setSSLSocketFactory(sslsf); | |||||
| apacheHttpClientBuilder.sslConnectionSocketFactory(sslsf); | |||||
| } | } | ||||
| httpClient = builder.build(); | |||||
| httpClient = apacheHttpClientBuilder.build(); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -851,8 +794,7 @@ public class WxMpServiceImpl implements WxMpService { | |||||
| StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); | StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); | ||||
| httpPost.setEntity(entity); | httpPost.setEntity(entity); | ||||
| try { | |||||
| CloseableHttpResponse response = getHttpclient().execute(httpPost); | |||||
| try(CloseableHttpResponse response = getHttpclient().execute(httpPost)) { | |||||
| String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | ||||
| XStream xstream = XStreamInitializer.getInstance(); | XStream xstream = XStreamInitializer.getInstance(); | ||||
| xstream.alias("xml", WxMpPrepayIdResult.class); | xstream.alias("xml", WxMpPrepayIdResult.class); | ||||
| @@ -860,6 +802,8 @@ public class WxMpServiceImpl implements WxMpService { | |||||
| return wxMpPrepayIdResult; | return wxMpPrepayIdResult; | ||||
| } catch (IOException e) { | } catch (IOException e) { | ||||
| throw new RuntimeException("Failed to get prepay id due to IO exception.", e); | throw new RuntimeException("Failed to get prepay id due to IO exception.", e); | ||||
| }finally { | |||||
| httpPost.releaseConnection(); | |||||
| } | } | ||||
| } | } | ||||
| @@ -878,13 +822,14 @@ public class WxMpServiceImpl implements WxMpService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public Map<String, String> getJSSDKPayInfo(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String callbackUrl) { | |||||
| public Map<String, String> getJSSDKPayInfo(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String callbackUrl) | |||||
| throws WxErrorException { | |||||
| Map<String, String> packageParams = new HashMap<String, String>(); | Map<String, String> packageParams = new HashMap<String, String>(); | ||||
| packageParams.put("appid", wxMpConfigStorage.getAppId()); | packageParams.put("appid", wxMpConfigStorage.getAppId()); | ||||
| packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); | packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); | ||||
| packageParams.put("body", body); | packageParams.put("body", body); | ||||
| packageParams.put("out_trade_no", outTradeNo); | packageParams.put("out_trade_no", outTradeNo); | ||||
| packageParams.put("total_fee", (int) (amt * 100) + ""); | |||||
| packageParams.put("total_fee", String.format("%.0f", amt * 100)); | |||||
| packageParams.put("spbill_create_ip", ip); | packageParams.put("spbill_create_ip", ip); | ||||
| packageParams.put("notify_url", callbackUrl); | packageParams.put("notify_url", callbackUrl); | ||||
| packageParams.put("trade_type", tradeType); | packageParams.put("trade_type", tradeType); | ||||
| @@ -894,8 +839,21 @@ public class WxMpServiceImpl implements WxMpService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public Map<String, String> getJSSDKPayInfo(Map<String, String> parameters) { | |||||
| public Map<String, String> getJSSDKPayInfo(Map<String, String> parameters) throws WxErrorException { | |||||
| WxMpPrepayIdResult wxMpPrepayIdResult = getPrepayId(parameters); | WxMpPrepayIdResult wxMpPrepayIdResult = getPrepayId(parameters); | ||||
| if (!"SUCCESS".equalsIgnoreCase(wxMpPrepayIdResult.getReturn_code()) | |||||
| ||!"SUCCESS".equalsIgnoreCase(wxMpPrepayIdResult.getResult_code())) { | |||||
| WxError error = new WxError(); | |||||
| error.setErrorCode(-1); | |||||
| error.setErrorMsg("return_code:" + wxMpPrepayIdResult.getReturn_code() + | |||||
| ";return_msg:" + wxMpPrepayIdResult.getReturn_msg() + | |||||
| ";result_code:" + wxMpPrepayIdResult.getResult_code() + | |||||
| ";err_code" + wxMpPrepayIdResult.getErr_code() + | |||||
| ";err_code_des" + wxMpPrepayIdResult.getErr_code_des()); | |||||
| throw new WxErrorException(error); | |||||
| } | |||||
| String prepayId = wxMpPrepayIdResult.getPrepay_id(); | String prepayId = wxMpPrepayIdResult.getPrepay_id(); | ||||
| if (prepayId == null || prepayId.equals("")) { | if (prepayId == null || prepayId.equals("")) { | ||||
| throw new RuntimeException(String.format("Failed to get prepay id due to error code '%s'(%s).", wxMpPrepayIdResult.getErr_code(), wxMpPrepayIdResult.getErr_code_des())); | throw new RuntimeException(String.format("Failed to get prepay id due to error code '%s'(%s).", wxMpPrepayIdResult.getErr_code(), wxMpPrepayIdResult.getErr_code_des())); | ||||
| @@ -908,6 +866,7 @@ public class WxMpServiceImpl implements WxMpService { | |||||
| payInfo.put("nonceStr", System.currentTimeMillis() + ""); | payInfo.put("nonceStr", System.currentTimeMillis() + ""); | ||||
| payInfo.put("package", "prepay_id=" + prepayId); | payInfo.put("package", "prepay_id=" + prepayId); | ||||
| payInfo.put("signType", "MD5"); | payInfo.put("signType", "MD5"); | ||||
| payInfo.put("code_url",wxMpPrepayIdResult.getCode_url()); | |||||
| String finalSign = WxCryptUtil.createSign(payInfo, wxMpConfigStorage.getPartnerKey()); | String finalSign = WxCryptUtil.createSign(payInfo, wxMpConfigStorage.getPartnerKey()); | ||||
| payInfo.put("paySign", finalSign); | payInfo.put("paySign", finalSign); | ||||
| @@ -944,8 +903,7 @@ public class WxMpServiceImpl implements WxMpService { | |||||
| StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); | StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); | ||||
| httpPost.setEntity(entity); | httpPost.setEntity(entity); | ||||
| try { | |||||
| CloseableHttpResponse response = httpClient.execute(httpPost); | |||||
| try(CloseableHttpResponse response = httpClient.execute(httpPost)) { | |||||
| String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | ||||
| XStream xstream = XStreamInitializer.getInstance(); | XStream xstream = XStreamInitializer.getInstance(); | ||||
| xstream.alias("xml", WxMpPayResult.class); | xstream.alias("xml", WxMpPayResult.class); | ||||
| @@ -969,6 +927,61 @@ public class WxMpServiceImpl implements WxMpService { | |||||
| return new WxMpPayCallback(); | return new WxMpPayCallback(); | ||||
| } | } | ||||
| @Override | |||||
| public WxMpPayRefundResult refundPay(Map<String, String> parameters) throws WxErrorException { | |||||
| SortedMap<String, String> refundParams = new TreeMap<String, String>(parameters); | |||||
| refundParams.put("appid", wxMpConfigStorage.getAppId()); | |||||
| refundParams.put("mch_id", wxMpConfigStorage.getPartnerId()); | |||||
| refundParams.put("nonce_str", System.currentTimeMillis() + ""); | |||||
| refundParams.put("op_user_id", wxMpConfigStorage.getPartnerId()); | |||||
| String sign = WxCryptUtil.createSign(refundParams, wxMpConfigStorage.getPartnerKey()); | |||||
| refundParams.put("sign", sign); | |||||
| StringBuilder request = new StringBuilder("<xml>"); | |||||
| for (Entry<String, String> para : refundParams.entrySet()) { | |||||
| request.append(String.format("<%s>%s</%s>", para.getKey(), para.getValue(), para.getKey())); | |||||
| } | |||||
| request.append("</xml>"); | |||||
| HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/secapi/pay/refund"); | |||||
| if (httpProxy != null) { | |||||
| RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build(); | |||||
| httpPost.setConfig(config); | |||||
| } | |||||
| StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); | |||||
| httpPost.setEntity(entity); | |||||
| try( | |||||
| CloseableHttpResponse response = getHttpclient().execute(httpPost)) { | |||||
| String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | |||||
| XStream xstream = XStreamInitializer.getInstance(); | |||||
| xstream.processAnnotations(WxMpPayRefundResult.class); | |||||
| WxMpPayRefundResult wxMpPayRefundResult = (WxMpPayRefundResult) xstream.fromXML(responseContent); | |||||
| if (!"SUCCESS".equalsIgnoreCase(wxMpPayRefundResult.getResultCode()) | |||||
| ||!"SUCCESS".equalsIgnoreCase(wxMpPayRefundResult.getReturnCode())) { | |||||
| WxError error = new WxError(); | |||||
| error.setErrorCode(-1); | |||||
| error.setErrorMsg("return_code:" + wxMpPayRefundResult.getReturnCode() + | |||||
| ";return_msg:" + wxMpPayRefundResult.getReturnMsg() + | |||||
| ";result_code:" + wxMpPayRefundResult.getResultCode() + | |||||
| ";err_code" + wxMpPayRefundResult.getErrCode() + | |||||
| ";err_code_des" + wxMpPayRefundResult.getErrCodeDes()); | |||||
| throw new WxErrorException(error); | |||||
| } | |||||
| return wxMpPayRefundResult; | |||||
| } catch (IOException e) { | |||||
| log.error(MessageFormatter.format("The exception was happened when sending refund '{}'.", request.toString()).getMessage(), e); | |||||
| WxError error = new WxError(); | |||||
| error.setErrorCode(-1); | |||||
| error.setErrorMsg("incorrect response."); | |||||
| throw new WxErrorException(error); | |||||
| }finally { | |||||
| httpPost.releaseConnection(); | |||||
| } | |||||
| } | |||||
| @Override | @Override | ||||
| public boolean checkJSSDKCallbackDataSignature(Map<String, String> kvm, String signature) { | public boolean checkJSSDKCallbackDataSignature(Map<String, String> kvm, String signature) { | ||||
| return signature.equals(WxCryptUtil.createSign(kvm, wxMpConfigStorage.getPartnerKey())); | return signature.equals(WxCryptUtil.createSign(kvm, wxMpConfigStorage.getPartnerKey())); | ||||
| @@ -1000,8 +1013,7 @@ public class WxMpServiceImpl implements WxMpService { | |||||
| StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); | StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); | ||||
| httpPost.setEntity(entity); | httpPost.setEntity(entity); | ||||
| try { | |||||
| CloseableHttpResponse response = getHttpclient().execute(httpPost); | |||||
| try(CloseableHttpResponse response = getHttpclient().execute(httpPost)) { | |||||
| String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | ||||
| XStream xstream = XStreamInitializer.getInstance(); | XStream xstream = XStreamInitializer.getInstance(); | ||||
| xstream.processAnnotations(WxRedpackResult.class); | xstream.processAnnotations(WxRedpackResult.class); | ||||
| @@ -1012,6 +1024,221 @@ public class WxMpServiceImpl implements WxMpService { | |||||
| WxError error = new WxError(); | WxError error = new WxError(); | ||||
| error.setErrorCode(-1); | error.setErrorCode(-1); | ||||
| throw new WxErrorException(error); | throw new WxErrorException(error); | ||||
| }finally { | |||||
| httpPost.releaseConnection(); | |||||
| } | |||||
| } | |||||
| /** | |||||
| * 获得卡券api_ticket,不强制刷新卡券api_ticket | |||||
| * | |||||
| * @return 卡券api_ticket | |||||
| * @throws WxErrorException | |||||
| * @see #getCardApiTicket(boolean) | |||||
| */ | |||||
| @Override | |||||
| public String getCardApiTicket() throws WxErrorException { | |||||
| return getCardApiTicket(false); | |||||
| } | |||||
| /** | |||||
| * <pre> | |||||
| * 获得卡券api_ticket | |||||
| * 获得时会检查卡券apiToken是否过期,如果过期了,那么就刷新一下,否则就什么都不干 | |||||
| * | |||||
| * 详情请见:http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E9.99.84.E5.BD | |||||
| * .954-.E5.8D.A1.E5.88.B8.E6.89.A9.E5.B1.95.E5.AD.97.E6.AE.B5.E5.8F.8A.E7.AD.BE.E5.90.8D.E7.94 | |||||
| * .9F.E6.88.90.E7.AE.97.E6.B3.95 | |||||
| * </pre> | |||||
| * | |||||
| * @param forceRefresh 强制刷新 | |||||
| * @return 卡券api_ticket | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| @Override | |||||
| public String getCardApiTicket(boolean forceRefresh) throws WxErrorException { | |||||
| if (forceRefresh) { | |||||
| wxMpConfigStorage.expireCardApiTicket(); | |||||
| } | |||||
| if (wxMpConfigStorage.isCardApiTicketExpired()) { | |||||
| synchronized (globalCardApiTicketRefreshLock) { | |||||
| if (wxMpConfigStorage.isCardApiTicketExpired()) { | |||||
| String url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?type=wx_card"; | |||||
| String responseContent = execute(new SimpleGetRequestExecutor(), url, null); | |||||
| JsonElement tmpJsonElement = Streams.parse(new JsonReader(new StringReader(responseContent))); | |||||
| JsonObject tmpJsonObject = tmpJsonElement.getAsJsonObject(); | |||||
| String cardApiTicket = tmpJsonObject.get("ticket").getAsString(); | |||||
| int expiresInSeconds = tmpJsonObject.get("expires_in").getAsInt(); | |||||
| wxMpConfigStorage.updateCardApiTicket(cardApiTicket, expiresInSeconds); | |||||
| } | |||||
| } | |||||
| } | |||||
| return wxMpConfigStorage.getCardApiTicket(); | |||||
| } | |||||
| /** | |||||
| * <pre> | |||||
| * 创建调用卡券api时所需要的签名 | |||||
| * | |||||
| * 详情请见:http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E9.99.84.E5.BD | |||||
| * .954-.E5.8D.A1.E5.88.B8.E6.89.A9.E5.B1.95.E5.AD.97.E6.AE.B5.E5.8F.8A.E7.AD.BE.E5.90.8D.E7.94 | |||||
| * .9F.E6.88.90.E7.AE.97.E6.B3.95 | |||||
| * </pre> | |||||
| * | |||||
| * @param optionalSignParam 参与签名的参数数组。 | |||||
| * 可以为下列字段:app_id, card_id, card_type, code, openid, location_id | |||||
| * </br>注意:当做wx.chooseCard调用时,必须传入app_id参与签名,否则会造成签名失败导致拉取卡券列表为空 | |||||
| * @return 卡券Api签名对象 | |||||
| */ | |||||
| @Override | |||||
| public WxCardApiSignature createCardApiSignature(String... optionalSignParam) throws | |||||
| WxErrorException { | |||||
| long timestamp = System.currentTimeMillis() / 1000; | |||||
| String nonceStr = RandomUtils.getRandomStr(); | |||||
| String cardApiTicket = getCardApiTicket(false); | |||||
| String[] signParam = Arrays.copyOf(optionalSignParam, optionalSignParam.length + 3); | |||||
| signParam[optionalSignParam.length] = String.valueOf(timestamp); | |||||
| signParam[optionalSignParam.length + 1] = nonceStr; | |||||
| signParam[optionalSignParam.length + 2] = cardApiTicket; | |||||
| try { | |||||
| String signature = SHA1.gen(signParam); | |||||
| WxCardApiSignature cardApiSignature = new WxCardApiSignature(); | |||||
| cardApiSignature.setTimestamp(timestamp); | |||||
| cardApiSignature.setNonceStr(nonceStr); | |||||
| cardApiSignature.setSignature(signature); | |||||
| return cardApiSignature; | |||||
| } catch (NoSuchAlgorithmException e) { | |||||
| throw new RuntimeException(e); | |||||
| } | |||||
| } | |||||
| /** | |||||
| * 卡券Code解码 | |||||
| * | |||||
| * @param encryptCode 加密Code,通过JSSDK的chooseCard接口获得 | |||||
| * @return 解密后的Code | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| @Override | |||||
| public String decryptCardCode(String encryptCode) throws WxErrorException { | |||||
| String url = "https://api.weixin.qq.com/card/code/decrypt"; | |||||
| JsonObject param = new JsonObject(); | |||||
| param.addProperty("encrypt_code", encryptCode); | |||||
| String responseContent = post(url, param.toString()); | |||||
| JsonElement tmpJsonElement = Streams.parse(new JsonReader(new StringReader(responseContent))); | |||||
| JsonObject tmpJsonObject = tmpJsonElement.getAsJsonObject(); | |||||
| JsonPrimitive jsonPrimitive = tmpJsonObject.getAsJsonPrimitive("code"); | |||||
| return jsonPrimitive.getAsString(); | |||||
| } | |||||
| /** | |||||
| * 卡券Code查询 | |||||
| * | |||||
| * @param cardId 卡券ID代表一类卡券 | |||||
| * @param code 单张卡券的唯一标准 | |||||
| * @param checkConsume 是否校验code核销状态,填入true和false时的code异常状态返回数据不同 | |||||
| * @return WxMpCardResult对象 | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| @Override | |||||
| public WxMpCardResult queryCardCode(String cardId, String code, boolean checkConsume) throws WxErrorException { | |||||
| String url = "https://api.weixin.qq.com/card/code/get"; | |||||
| JsonObject param = new JsonObject(); | |||||
| param.addProperty("card_id", cardId); | |||||
| param.addProperty("code", code); | |||||
| param.addProperty("check_consume", checkConsume); | |||||
| String responseContent = post(url, param.toString()); | |||||
| JsonElement tmpJsonElement = Streams.parse(new JsonReader(new StringReader(responseContent))); | |||||
| return WxMpGsonBuilder.INSTANCE.create().fromJson(tmpJsonElement, | |||||
| new TypeToken<WxMpCardResult>() { | |||||
| }.getType()); | |||||
| } | |||||
| /** | |||||
| * 卡券Code核销。核销失败会抛出异常 | |||||
| * | |||||
| * @param code 单张卡券的唯一标准 | |||||
| * @return 调用返回的JSON字符串。 | |||||
| * <br>可用 com.google.gson.JsonParser#parse 等方法直接取JSON串中的errcode等信息。 | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| @Override | |||||
| public String consumeCardCode(String code) throws WxErrorException { | |||||
| return consumeCardCode(code, null); | |||||
| } | |||||
| /** | |||||
| * 卡券Code核销。核销失败会抛出异常 | |||||
| * | |||||
| * @param code 单张卡券的唯一标准 | |||||
| * @param cardId 当自定义Code卡券时需要传入card_id | |||||
| * @return 调用返回的JSON字符串。 | |||||
| * <br>可用 com.google.gson.JsonParser#parse 等方法直接取JSON串中的errcode等信息。 | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| @Override | |||||
| public String consumeCardCode(String code, String cardId) throws WxErrorException { | |||||
| String url = "https://api.weixin.qq.com/card/code/consume"; | |||||
| JsonObject param = new JsonObject(); | |||||
| param.addProperty("code", code); | |||||
| if (cardId != null && !"".equals(cardId)) { | |||||
| param.addProperty("card_id", cardId); | |||||
| } | |||||
| String responseContent = post(url, param.toString()); | |||||
| return responseContent; | |||||
| } | |||||
| /** | |||||
| * 卡券Mark接口。 | |||||
| * 开发者在帮助消费者核销卡券之前,必须帮助先将此code(卡券串码)与一个openid绑定(即mark住), | |||||
| * 才能进一步调用核销接口,否则报错。 | |||||
| * | |||||
| * @param code 卡券的code码 | |||||
| * @param cardId 卡券的ID | |||||
| * @param openId 用券用户的openid | |||||
| * @param isMark 是否要mark(占用)这个code,填写true或者false,表示占用或解除占用 | |||||
| * @throws WxErrorException | |||||
| */ | |||||
| @Override | |||||
| public void markCardCode(String code, String cardId, String openId, boolean isMark) throws | |||||
| WxErrorException { | |||||
| String url = "https://api.weixin.qq.com/card/code/mark"; | |||||
| JsonObject param = new JsonObject(); | |||||
| param.addProperty("code", code); | |||||
| param.addProperty("card_id", cardId); | |||||
| param.addProperty("openid", openId); | |||||
| param.addProperty("is_mark", isMark); | |||||
| String responseContent = post(url, param.toString()); | |||||
| JsonElement tmpJsonElement = Streams.parse(new JsonReader(new StringReader(responseContent))); | |||||
| WxMpCardResult cardResult = WxMpGsonBuilder.INSTANCE.create().fromJson(tmpJsonElement, | |||||
| new TypeToken<WxMpCardResult>() { }.getType()); | |||||
| if (!cardResult.getErrorCode().equals("0")) { | |||||
| log.warn("朋友的券mark失败:{}", cardResult.getErrorMsg()); | |||||
| } | |||||
| } | |||||
| @Override | |||||
| public String getCardDetail(String cardId) throws WxErrorException { | |||||
| String url = "https://api.weixin.qq.com/card/get"; | |||||
| JsonObject param = new JsonObject(); | |||||
| param.addProperty("card_id", cardId); | |||||
| String responseContent = post(url, param.toString()); | |||||
| // 判断返回值 | |||||
| JsonObject json = (new JsonParser()).parse(responseContent).getAsJsonObject(); | |||||
| String errcode = json.get("errcode").getAsString(); | |||||
| if (!"0".equals(errcode)) { | |||||
| String errmsg = json.get("errmsg").getAsString(); | |||||
| WxError error = new WxError(); | |||||
| error.setErrorCode(Integer.valueOf(errcode)); | |||||
| error.setErrorMsg(errmsg); | |||||
| throw new WxErrorException(error); | |||||
| } | } | ||||
| return responseContent; | |||||
| } | } | ||||
| } | } | ||||
| @@ -0,0 +1,72 @@ | |||||
| package me.chanjar.weixin.mp.bean; | |||||
| /** | |||||
| * 微信卡券 | |||||
| * | |||||
| * @author YuJian | |||||
| * @version 15/11/11 | |||||
| */ | |||||
| public class WxMpCard { | |||||
| private String cardId; | |||||
| private Long beginTime; | |||||
| private Long endTime; | |||||
| private String userCardStatus; | |||||
| private Boolean canConsume; | |||||
| public String getCardId() { | |||||
| return cardId; | |||||
| } | |||||
| public void setCardId(String cardId) { | |||||
| this.cardId = cardId; | |||||
| } | |||||
| public Long getBeginTime() { | |||||
| return beginTime; | |||||
| } | |||||
| public void setBeginTime(Long beginTime) { | |||||
| this.beginTime = beginTime; | |||||
| } | |||||
| public Long getEndTime() { | |||||
| return endTime; | |||||
| } | |||||
| public void setEndTime(Long endTime) { | |||||
| this.endTime = endTime; | |||||
| } | |||||
| public String getUserCardStatus() { | |||||
| return userCardStatus; | |||||
| } | |||||
| public void setUserCardStatus(String userCardStatus) { | |||||
| this.userCardStatus = userCardStatus; | |||||
| } | |||||
| public Boolean getCanConsume() { | |||||
| return canConsume; | |||||
| } | |||||
| public void setCanConsume(Boolean canConsume) { | |||||
| this.canConsume = canConsume; | |||||
| } | |||||
| @Override | |||||
| public String toString() { | |||||
| return "WxMpCard{" + | |||||
| "cardId='" + cardId + '\'' + | |||||
| ", beginTime=" + beginTime + | |||||
| ", endTime=" + endTime + | |||||
| ", userCardStatus='" + userCardStatus + '\'' + | |||||
| ", canConsume=" + canConsume + | |||||
| '}'; | |||||
| } | |||||
| } | |||||
| @@ -46,6 +46,10 @@ public class WxMpMaterialNews implements Serializable { | |||||
| * (必填) 图文消息缩略图的media_id,可以在基础支持-上传多媒体文件接口中获得 | * (必填) 图文消息缩略图的media_id,可以在基础支持-上传多媒体文件接口中获得 | ||||
| */ | */ | ||||
| private String thumbMediaId; | private String thumbMediaId; | ||||
| /** | |||||
| * 图文消息的封面url | |||||
| */ | |||||
| private String thumbUrl; | |||||
| /** | /** | ||||
| * 图文消息的作者 | * 图文消息的作者 | ||||
| */ | */ | ||||
| @@ -141,9 +145,17 @@ public class WxMpMaterialNews implements Serializable { | |||||
| this.url = url; | this.url = url; | ||||
| } | } | ||||
| public String getThumbUrl() { | |||||
| return thumbUrl; | |||||
| } | |||||
| public void setThumbUrl(String thumbUrl) { | |||||
| this.thumbUrl = thumbUrl; | |||||
| } | |||||
| @Override | @Override | ||||
| public String toString() { | public String toString() { | ||||
| return "WxMpMassNewsArticle [" + "thumbMediaId=" + thumbMediaId + ", author=" + author + ", title=" + title + | |||||
| return "WxMpMassNewsArticle [" + "thumbMediaId=" + thumbMediaId + "thumbUrl=" + thumbUrl + ", author=" + author + ", title=" + title + | |||||
| ", contentSourceUrl=" + contentSourceUrl + ", content=" + content + ", digest=" + digest + | ", contentSourceUrl=" + contentSourceUrl + ", content=" + content + ", digest=" + digest + | ||||
| ", showCoverPic=" + showCoverPic +", url=" + url + "]"; | ", showCoverPic=" + showCoverPic +", url=" + url + "]"; | ||||
| } | } | ||||
| @@ -150,6 +150,31 @@ public class WxMpXmlMessage implements Serializable { | |||||
| @XStreamAlias("ErrorCount") | @XStreamAlias("ErrorCount") | ||||
| private Integer errorCount; | private Integer errorCount; | ||||
| /////////////////////////////////////// | |||||
| // 卡券相关事件推送 | |||||
| /////////////////////////////////////// | |||||
| @XStreamAlias("CardId") | |||||
| @XStreamConverter(value=XStreamCDataConverter.class) | |||||
| private String cardId; | |||||
| @XStreamAlias("FriendUserName") | |||||
| @XStreamConverter(value=XStreamCDataConverter.class) | |||||
| private String friendUserName; | |||||
| @XStreamAlias("IsGiveByFriend") | |||||
| private Integer isGiveByFriend; // 是否为转赠,1代表是,0代表否 | |||||
| @XStreamAlias("UserCardCode") | |||||
| @XStreamConverter(value=XStreamCDataConverter.class) | |||||
| private String userCardCode; | |||||
| @XStreamAlias("OldUserCardCode") | |||||
| @XStreamConverter(value=XStreamCDataConverter.class) | |||||
| private String oldUserCardCode; | |||||
| @XStreamAlias("OuterId") | |||||
| private Integer outerId; | |||||
| @XStreamAlias("ScanCodeInfo") | @XStreamAlias("ScanCodeInfo") | ||||
| private ScanCodeInfo scanCodeInfo = new ScanCodeInfo(); | private ScanCodeInfo scanCodeInfo = new ScanCodeInfo(); | ||||
| @@ -456,6 +481,54 @@ public class WxMpXmlMessage implements Serializable { | |||||
| this.errorCount = errorCount; | this.errorCount = errorCount; | ||||
| } | } | ||||
| public String getCardId() { | |||||
| return cardId; | |||||
| } | |||||
| public void setCardId(String cardId) { | |||||
| this.cardId = cardId; | |||||
| } | |||||
| public String getFriendUserName() { | |||||
| return friendUserName; | |||||
| } | |||||
| public void setFriendUserName(String friendUserName) { | |||||
| this.friendUserName = friendUserName; | |||||
| } | |||||
| public Integer getIsGiveByFriend() { | |||||
| return isGiveByFriend; | |||||
| } | |||||
| public void setIsGiveByFriend(Integer isGiveByFriend) { | |||||
| this.isGiveByFriend = isGiveByFriend; | |||||
| } | |||||
| public String getUserCardCode() { | |||||
| return userCardCode; | |||||
| } | |||||
| public void setUserCardCode(String userCardCode) { | |||||
| this.userCardCode = userCardCode; | |||||
| } | |||||
| public String getOldUserCardCode() { | |||||
| return oldUserCardCode; | |||||
| } | |||||
| public void setOldUserCardCode(String oldUserCardCode) { | |||||
| this.oldUserCardCode = oldUserCardCode; | |||||
| } | |||||
| public Integer getOuterId() { | |||||
| return outerId; | |||||
| } | |||||
| public void setOuterId(Integer outerId) { | |||||
| this.outerId = outerId; | |||||
| } | |||||
| public WxMpXmlMessage.ScanCodeInfo getScanCodeInfo() { | public WxMpXmlMessage.ScanCodeInfo getScanCodeInfo() { | ||||
| return scanCodeInfo; | return scanCodeInfo; | ||||
| } | } | ||||
| @@ -652,6 +725,11 @@ public class WxMpXmlMessage implements Serializable { | |||||
| ", filterCount=" + filterCount + | ", filterCount=" + filterCount + | ||||
| ", sentCount=" + sentCount + | ", sentCount=" + sentCount + | ||||
| ", errorCount=" + errorCount + | ", errorCount=" + errorCount + | ||||
| ", cardId='" + cardId + '\'' + | |||||
| ", isGiveByFriend=" + isGiveByFriend + | |||||
| ", userCardCode='" + userCardCode + '\'' + | |||||
| ", oldUserCardCode='" + oldUserCardCode + '\'' + | |||||
| ", outerId=" + outerId + | |||||
| ", scanCodeInfo=" + scanCodeInfo + | ", scanCodeInfo=" + scanCodeInfo + | ||||
| ", sendPicsInfo=" + sendPicsInfo + | ", sendPicsInfo=" + sendPicsInfo + | ||||
| ", sendLocationInfo=" + sendLocationInfo + | ", sendLocationInfo=" + sendLocationInfo + | ||||
| @@ -4,23 +4,22 @@ import com.thoughtworks.xstream.annotations.XStreamAlias; | |||||
| import com.thoughtworks.xstream.annotations.XStreamConverter; | import com.thoughtworks.xstream.annotations.XStreamConverter; | ||||
| import me.chanjar.weixin.common.api.WxConsts; | import me.chanjar.weixin.common.api.WxConsts; | ||||
| import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; | import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; | ||||
| import me.chanjar.weixin.common.util.xml.XStreamMediaIdConverter; | |||||
| @XStreamAlias("xml") | @XStreamAlias("xml") | ||||
| public class WxMpXmlOutTransferCustomerServiceMessage extends WxMpXmlOutMessage { | public class WxMpXmlOutTransferCustomerServiceMessage extends WxMpXmlOutMessage { | ||||
| @XStreamAlias("TransInfo") | @XStreamAlias("TransInfo") | ||||
| protected final TransInfo transInfo = new TransInfo(); | |||||
| protected TransInfo transInfo; | |||||
| public WxMpXmlOutTransferCustomerServiceMessage() { | public WxMpXmlOutTransferCustomerServiceMessage() { | ||||
| this.msgType = WxConsts.CUSTOM_MSG_TRANSFER_CUSTOMER_SERVICE; | this.msgType = WxConsts.CUSTOM_MSG_TRANSFER_CUSTOMER_SERVICE; | ||||
| } | } | ||||
| public String getKfAccount() { | |||||
| return transInfo.getKfAccount(); | |||||
| public TransInfo getTransInfo() { | |||||
| return transInfo; | |||||
| } | } | ||||
| public void setKfAccount(String kfAccount) { | |||||
| transInfo.setKfAccount(kfAccount); | |||||
| public void setTransInfo(TransInfo transInfo) { | |||||
| this.transInfo = transInfo; | |||||
| } | } | ||||
| @XStreamAlias("TransInfo") | @XStreamAlias("TransInfo") | ||||
| @@ -1,5 +1,6 @@ | |||||
| package me.chanjar.weixin.mp.bean.outxmlbuilder; | package me.chanjar.weixin.mp.bean.outxmlbuilder; | ||||
| import me.chanjar.weixin.common.util.StringUtils; | |||||
| import me.chanjar.weixin.mp.bean.WxMpXmlOutTransferCustomerServiceMessage; | import me.chanjar.weixin.mp.bean.WxMpXmlOutTransferCustomerServiceMessage; | ||||
| /** | /** | ||||
| @@ -22,7 +23,11 @@ public final class TransferCustomerServiceBuilder extends BaseBuilder<TransferCu | |||||
| public WxMpXmlOutTransferCustomerServiceMessage build() { | public WxMpXmlOutTransferCustomerServiceMessage build() { | ||||
| WxMpXmlOutTransferCustomerServiceMessage m = new WxMpXmlOutTransferCustomerServiceMessage(); | WxMpXmlOutTransferCustomerServiceMessage m = new WxMpXmlOutTransferCustomerServiceMessage(); | ||||
| setCommon(m); | setCommon(m); | ||||
| m.setKfAccount(kfAccount); | |||||
| if(StringUtils.isNotBlank(kfAccount)){ | |||||
| WxMpXmlOutTransferCustomerServiceMessage.TransInfo transInfo = new WxMpXmlOutTransferCustomerServiceMessage.TransInfo(); | |||||
| transInfo.setKfAccount(kfAccount); | |||||
| m.setTransInfo(transInfo); | |||||
| } | |||||
| return m; | return m; | ||||
| } | } | ||||
| } | } | ||||
| @@ -0,0 +1,87 @@ | |||||
| package me.chanjar.weixin.mp.bean.result; | |||||
| import me.chanjar.weixin.mp.bean.WxMpCard; | |||||
| import java.io.Serializable; | |||||
| /** | |||||
| * 卡券查询Code,核销Code接口返回结果 | |||||
| * | |||||
| * @author YuJian | |||||
| * @version 15/11/11 | |||||
| */ | |||||
| public class WxMpCardResult implements Serializable { | |||||
| private String errorCode; | |||||
| private String errorMsg; | |||||
| private String openId; | |||||
| private WxMpCard card; | |||||
| private String userCardStatus; | |||||
| private Boolean canConsume; | |||||
| public String getErrorCode() { | |||||
| return errorCode; | |||||
| } | |||||
| public void setErrorCode(String errorCode) { | |||||
| this.errorCode = errorCode; | |||||
| } | |||||
| public String getErrorMsg() { | |||||
| return errorMsg; | |||||
| } | |||||
| public void setErrorMsg(String errorMsg) { | |||||
| this.errorMsg = errorMsg; | |||||
| } | |||||
| public String getOpenId() { | |||||
| return openId; | |||||
| } | |||||
| public void setOpenId(String openId) { | |||||
| this.openId = openId; | |||||
| } | |||||
| public WxMpCard getCard() { | |||||
| return card; | |||||
| } | |||||
| public void setCard(WxMpCard card) { | |||||
| this.card = card; | |||||
| } | |||||
| @Override | |||||
| public String toString() { | |||||
| return "WxMpCardResult{" + | |||||
| "errorCode='" + errorCode + '\'' + | |||||
| ", errorMsg='" + errorMsg + '\'' + | |||||
| ", openId='" + openId + '\'' + | |||||
| ", card=" + card + | |||||
| ", userCardStatus='" + userCardStatus + '\'' + | |||||
| ", canConsume=" + canConsume + | |||||
| '}'; | |||||
| } | |||||
| public String getUserCardStatus() { | |||||
| return userCardStatus; | |||||
| } | |||||
| public void setUserCardStatus(String userCardStatus) { | |||||
| this.userCardStatus = userCardStatus; | |||||
| } | |||||
| public Boolean getCanConsume() { | |||||
| return canConsume; | |||||
| } | |||||
| public void setCanConsume(Boolean canConsume) { | |||||
| this.canConsume = canConsume; | |||||
| } | |||||
| } | |||||
| @@ -0,0 +1,278 @@ | |||||
| package me.chanjar.weixin.mp.bean.result; | |||||
| import java.io.Serializable; | |||||
| import com.thoughtworks.xstream.annotations.XStreamAlias; | |||||
| /** | |||||
| * 微信支付-申请退款返回结果 | |||||
| * https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_4 | |||||
| * @author liukaitj | |||||
| * | |||||
| */ | |||||
| @XStreamAlias("xml") | |||||
| public class WxMpPayRefundResult implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| @XStreamAlias("return_code") | |||||
| private String returnCode; | |||||
| @XStreamAlias("return_msg") | |||||
| private String returnMsg; | |||||
| @XStreamAlias("result_code") | |||||
| private String resultCode; | |||||
| @XStreamAlias("err_code") | |||||
| private String errCode; | |||||
| @XStreamAlias("err_code_des") | |||||
| private String errCodeDes; | |||||
| @XStreamAlias("appid") | |||||
| private String appid; | |||||
| @XStreamAlias("mch_id") | |||||
| private String mchId; | |||||
| @XStreamAlias("device_info") | |||||
| private String deviceInfo; | |||||
| @XStreamAlias("nonce_str") | |||||
| private String nonceStr; | |||||
| @XStreamAlias("sign") | |||||
| private String sign; | |||||
| @XStreamAlias("transaction_id") | |||||
| private String transactionId; | |||||
| @XStreamAlias("out_trade_no") | |||||
| private String outTradeNo; | |||||
| @XStreamAlias("out_refund_no") | |||||
| private String outRefundNo; | |||||
| @XStreamAlias("refund_id") | |||||
| private String refundId; | |||||
| @XStreamAlias("refund_channel") | |||||
| private String refundChannel; | |||||
| @XStreamAlias("refund_fee") | |||||
| private String refundFee; | |||||
| @XStreamAlias("total_fee") | |||||
| private String totalFee; | |||||
| @XStreamAlias("fee_type") | |||||
| private String feeType; | |||||
| @XStreamAlias("cash_fee") | |||||
| private String cashFee; | |||||
| @XStreamAlias("cash_refund_fee") | |||||
| private String cashRefundfee; | |||||
| @XStreamAlias("coupon_refund_fee") | |||||
| private String couponRefundFee; | |||||
| @XStreamAlias("coupon_refund_count") | |||||
| private String couponRefundCount; | |||||
| @XStreamAlias("coupon_refund_id") | |||||
| private String couponRefundId; | |||||
| public String getReturnCode() { | |||||
| return returnCode; | |||||
| } | |||||
| public void setReturnCode(String returnCode) { | |||||
| this.returnCode = returnCode; | |||||
| } | |||||
| public String getReturnMsg() { | |||||
| return returnMsg; | |||||
| } | |||||
| public void setReturnMsg(String returnMsg) { | |||||
| this.returnMsg = returnMsg; | |||||
| } | |||||
| public String getResultCode() { | |||||
| return resultCode; | |||||
| } | |||||
| public void setResultCode(String resultCode) { | |||||
| this.resultCode = resultCode; | |||||
| } | |||||
| public String getErrCode() { | |||||
| return errCode; | |||||
| } | |||||
| public void setErrCode(String errCode) { | |||||
| this.errCode = errCode; | |||||
| } | |||||
| public String getErrCodeDes() { | |||||
| return errCodeDes; | |||||
| } | |||||
| public void setErrCodeDes(String errCodeDes) { | |||||
| this.errCodeDes = errCodeDes; | |||||
| } | |||||
| public String getAppid() { | |||||
| return appid; | |||||
| } | |||||
| public void setAppid(String appid) { | |||||
| this.appid = appid; | |||||
| } | |||||
| public String getMchId() { | |||||
| return mchId; | |||||
| } | |||||
| public void setMchId(String mchId) { | |||||
| this.mchId = mchId; | |||||
| } | |||||
| public String getDeviceInfo() { | |||||
| return deviceInfo; | |||||
| } | |||||
| public void setDeviceInfo(String deviceInfo) { | |||||
| this.deviceInfo = deviceInfo; | |||||
| } | |||||
| public String getNonceStr() { | |||||
| return nonceStr; | |||||
| } | |||||
| public void setNonceStr(String nonceStr) { | |||||
| this.nonceStr = nonceStr; | |||||
| } | |||||
| public String getSign() { | |||||
| return sign; | |||||
| } | |||||
| public void setSign(String sign) { | |||||
| this.sign = sign; | |||||
| } | |||||
| public String getTransactionId() { | |||||
| return transactionId; | |||||
| } | |||||
| public void setTransactionId(String transactionId) { | |||||
| this.transactionId = transactionId; | |||||
| } | |||||
| public String getOutTradeNo() { | |||||
| return outTradeNo; | |||||
| } | |||||
| public void setOutTradeNo(String outTradeNo) { | |||||
| this.outTradeNo = outTradeNo; | |||||
| } | |||||
| public String getOutRefundNo() { | |||||
| return outRefundNo; | |||||
| } | |||||
| public void setOutRefundNo(String outRefundNo) { | |||||
| this.outRefundNo = outRefundNo; | |||||
| } | |||||
| public String getRefundId() { | |||||
| return refundId; | |||||
| } | |||||
| public void setRefundId(String refundId) { | |||||
| this.refundId = refundId; | |||||
| } | |||||
| public String getRefundChannel() { | |||||
| return refundChannel; | |||||
| } | |||||
| public void setRefundChannel(String refundChannel) { | |||||
| this.refundChannel = refundChannel; | |||||
| } | |||||
| public String getRefundFee() { | |||||
| return refundFee; | |||||
| } | |||||
| public void setRefundFee(String refundFee) { | |||||
| this.refundFee = refundFee; | |||||
| } | |||||
| public String getTotalFee() { | |||||
| return totalFee; | |||||
| } | |||||
| public void setTotalFee(String totalFee) { | |||||
| this.totalFee = totalFee; | |||||
| } | |||||
| public String getFeeType() { | |||||
| return feeType; | |||||
| } | |||||
| public void setFeeType(String feeType) { | |||||
| this.feeType = feeType; | |||||
| } | |||||
| public String getCashFee() { | |||||
| return cashFee; | |||||
| } | |||||
| public void setCashFee(String cashFee) { | |||||
| this.cashFee = cashFee; | |||||
| } | |||||
| public String getCashRefundfee() { | |||||
| return cashRefundfee; | |||||
| } | |||||
| public void setCashRefundfee(String cashRefundfee) { | |||||
| this.cashRefundfee = cashRefundfee; | |||||
| } | |||||
| public String getCouponRefundFee() { | |||||
| return couponRefundFee; | |||||
| } | |||||
| public void setCouponRefundFee(String couponRefundFee) { | |||||
| this.couponRefundFee = couponRefundFee; | |||||
| } | |||||
| public String getCouponRefundCount() { | |||||
| return couponRefundCount; | |||||
| } | |||||
| public void setCouponRefundCount(String couponRefundCount) { | |||||
| this.couponRefundCount = couponRefundCount; | |||||
| } | |||||
| public String getCouponRefundId() { | |||||
| return couponRefundId; | |||||
| } | |||||
| public void setCouponRefundId(String couponRefundId) { | |||||
| this.couponRefundId = couponRefundId; | |||||
| } | |||||
| @Override | |||||
| public String toString() { | |||||
| return "[" + | |||||
| "return_code:" + returnCode + ";" + | |||||
| "return_msg" + returnMsg + ";"; | |||||
| } | |||||
| } | |||||
| @@ -34,13 +34,16 @@ public class MaterialDeleteRequestExecutor implements RequestExecutor<Boolean, S | |||||
| Map<String, String> params = new HashMap<>(); | Map<String, String> params = new HashMap<>(); | ||||
| params.put("media_id", materialId); | params.put("media_id", materialId); | ||||
| httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params))); | httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params))); | ||||
| CloseableHttpResponse response = httpclient.execute(httpPost); | |||||
| String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | |||||
| WxError error = WxError.fromJson(responseContent); | |||||
| if (error.getErrorCode() != 0) { | |||||
| throw new WxErrorException(error); | |||||
| } else { | |||||
| return true; | |||||
| try(CloseableHttpResponse response = httpclient.execute(httpPost)){ | |||||
| String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | |||||
| WxError error = WxError.fromJson(responseContent); | |||||
| if (error.getErrorCode() != 0) { | |||||
| throw new WxErrorException(error); | |||||
| } else { | |||||
| return true; | |||||
| } | |||||
| }finally { | |||||
| httpPost.releaseConnection(); | |||||
| } | } | ||||
| } | } | ||||
| @@ -35,14 +35,18 @@ public class MaterialNewsInfoRequestExecutor implements RequestExecutor<WxMpMate | |||||
| Map<String, String> params = new HashMap<>(); | Map<String, String> params = new HashMap<>(); | ||||
| params.put("media_id", materialId); | params.put("media_id", materialId); | ||||
| httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params))); | httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params))); | ||||
| CloseableHttpResponse response = httpclient.execute(httpPost); | |||||
| String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | |||||
| WxError error = WxError.fromJson(responseContent); | |||||
| if (error.getErrorCode() != 0) { | |||||
| throw new WxErrorException(error); | |||||
| } else { | |||||
| return WxMpGsonBuilder.create().fromJson(responseContent, WxMpMaterialNews.class); | |||||
| try(CloseableHttpResponse response = httpclient.execute(httpPost)){ | |||||
| String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | |||||
| WxError error = WxError.fromJson(responseContent); | |||||
| if (error.getErrorCode() != 0) { | |||||
| throw new WxErrorException(error); | |||||
| } else { | |||||
| return WxMpGsonBuilder.create().fromJson(responseContent, WxMpMaterialNews.class); | |||||
| } | |||||
| }finally { | |||||
| httpPost.releaseConnection(); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -15,7 +15,6 @@ import org.apache.http.client.methods.HttpPost; | |||||
| import org.apache.http.entity.ContentType; | import org.apache.http.entity.ContentType; | ||||
| import org.apache.http.entity.mime.HttpMultipartMode; | import org.apache.http.entity.mime.HttpMultipartMode; | ||||
| import org.apache.http.entity.mime.MultipartEntityBuilder; | import org.apache.http.entity.mime.MultipartEntityBuilder; | ||||
| import org.apache.http.entity.mime.content.InputStreamBody; | |||||
| import org.apache.http.impl.client.CloseableHttpClient; | import org.apache.http.impl.client.CloseableHttpClient; | ||||
| import java.io.*; | import java.io.*; | ||||
| @@ -23,6 +22,7 @@ import java.util.Map; | |||||
| public class MaterialUploadRequestExecutor implements RequestExecutor<WxMpMaterialUploadResult, WxMpMaterial> { | public class MaterialUploadRequestExecutor implements RequestExecutor<WxMpMaterialUploadResult, WxMpMaterial> { | ||||
| @Override | |||||
| public WxMpMaterialUploadResult execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, WxMpMaterial material) throws WxErrorException, ClientProtocolException, IOException { | public WxMpMaterialUploadResult execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, WxMpMaterial material) throws WxErrorException, ClientProtocolException, IOException { | ||||
| HttpPost httpPost = new HttpPost(uri); | HttpPost httpPost = new HttpPost(uri); | ||||
| if (httpProxy != null) { | if (httpProxy != null) { | ||||
| @@ -35,10 +35,9 @@ public class MaterialUploadRequestExecutor implements RequestExecutor<WxMpMateri | |||||
| if (file == null || !file.exists()) { | if (file == null || !file.exists()) { | ||||
| throw new FileNotFoundException(); | throw new FileNotFoundException(); | ||||
| } | } | ||||
| BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file)); | |||||
| MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create(); | MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create(); | ||||
| multipartEntityBuilder | multipartEntityBuilder | ||||
| .addPart("media", new InputStreamBody(bufferedInputStream, material.getName())) | |||||
| .addBinaryBody("media", file) | |||||
| .setMode(HttpMultipartMode.RFC6532); | .setMode(HttpMultipartMode.RFC6532); | ||||
| Map<String, String> form = material.getForm(); | Map<String, String> form = material.getForm(); | ||||
| if (material.getForm() != null) { | if (material.getForm() != null) { | ||||
| @@ -48,13 +47,16 @@ public class MaterialUploadRequestExecutor implements RequestExecutor<WxMpMateri | |||||
| httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString()); | httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString()); | ||||
| } | } | ||||
| CloseableHttpResponse response = httpclient.execute(httpPost); | |||||
| String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | |||||
| WxError error = WxError.fromJson(responseContent); | |||||
| if (error.getErrorCode() != 0) { | |||||
| throw new WxErrorException(error); | |||||
| } else { | |||||
| return WxMpMaterialUploadResult.fromJson(responseContent); | |||||
| try (CloseableHttpResponse response = httpclient.execute(httpPost)) { | |||||
| String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | |||||
| WxError error = WxError.fromJson(responseContent); | |||||
| if (error.getErrorCode() != 0) { | |||||
| throw new WxErrorException(error); | |||||
| } else { | |||||
| return WxMpMaterialUploadResult.fromJson(responseContent); | |||||
| } | |||||
| }finally { | |||||
| httpPost.releaseConnection(); | |||||
| } | } | ||||
| } | } | ||||
| @@ -34,13 +34,16 @@ public class MaterialVideoInfoRequestExecutor implements RequestExecutor<WxMpMat | |||||
| Map<String, String> params = new HashMap<>(); | Map<String, String> params = new HashMap<>(); | ||||
| params.put("media_id", materialId); | params.put("media_id", materialId); | ||||
| httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params))); | httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params))); | ||||
| CloseableHttpResponse response = httpclient.execute(httpPost); | |||||
| String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | |||||
| WxError error = WxError.fromJson(responseContent); | |||||
| if (error.getErrorCode() != 0) { | |||||
| throw new WxErrorException(error); | |||||
| } else { | |||||
| return WxMpMaterialVideoInfoResult.fromJson(responseContent); | |||||
| try(CloseableHttpResponse response = httpclient.execute(httpPost)){ | |||||
| String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | |||||
| WxError error = WxError.fromJson(responseContent); | |||||
| if (error.getErrorCode() != 0) { | |||||
| throw new WxErrorException(error); | |||||
| } else { | |||||
| return WxMpMaterialVideoInfoResult.fromJson(responseContent); | |||||
| } | |||||
| }finally { | |||||
| httpPost.releaseConnection(); | |||||
| } | } | ||||
| } | } | ||||
| @@ -44,22 +44,25 @@ public class MaterialVoiceAndImageDownloadRequestExecutor implements RequestExec | |||||
| Map<String, String> params = new HashMap<>(); | Map<String, String> params = new HashMap<>(); | ||||
| params.put("media_id", materialId); | params.put("media_id", materialId); | ||||
| httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params))); | httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params))); | ||||
| CloseableHttpResponse response = httpclient.execute(httpPost); | |||||
| // 下载媒体文件出错 | |||||
| InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response); | |||||
| byte[] responseContent = IOUtils.toByteArray(inputStream); | |||||
| String responseContentString = new String(responseContent, "UTF-8"); | |||||
| if (responseContentString.length() < 100) { | |||||
| try { | |||||
| WxError wxError = WxGsonBuilder.create().fromJson(responseContentString, WxError.class); | |||||
| if (wxError.getErrorCode() != 0) { | |||||
| throw new WxErrorException(wxError); | |||||
| try(CloseableHttpResponse response = httpclient.execute(httpPost)){ | |||||
| // 下载媒体文件出错 | |||||
| InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response); | |||||
| byte[] responseContent = IOUtils.toByteArray(inputStream); | |||||
| String responseContentString = new String(responseContent, "UTF-8"); | |||||
| if (responseContentString.length() < 100) { | |||||
| try { | |||||
| WxError wxError = WxGsonBuilder.create().fromJson(responseContentString, WxError.class); | |||||
| if (wxError.getErrorCode() != 0) { | |||||
| throw new WxErrorException(wxError); | |||||
| } | |||||
| } catch (com.google.gson.JsonSyntaxException ex) { | |||||
| return new ByteArrayInputStream(responseContent); | |||||
| } | } | ||||
| } catch (com.google.gson.JsonSyntaxException ex) { | |||||
| return new ByteArrayInputStream(responseContent); | |||||
| } | } | ||||
| return new ByteArrayInputStream(responseContent); | |||||
| }finally { | |||||
| httpPost.releaseConnection(); | |||||
| } | } | ||||
| return new ByteArrayInputStream(responseContent); | |||||
| } | } | ||||
| } | } | ||||
| @@ -58,8 +58,9 @@ public class QrCodeRequestExecutor implements RequestExecutor<File, WxMpQrCodeTi | |||||
| } | } | ||||
| InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response); | InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response); | ||||
| File localFile = FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg"); | |||||
| return localFile; | |||||
| return FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg"); | |||||
| }finally { | |||||
| httpGet.releaseConnection(); | |||||
| } | } | ||||
| } | } | ||||
| @@ -0,0 +1,38 @@ | |||||
| package me.chanjar.weixin.mp.util.json; | |||||
| import com.google.gson.JsonDeserializationContext; | |||||
| import com.google.gson.JsonDeserializer; | |||||
| import com.google.gson.JsonElement; | |||||
| import com.google.gson.JsonObject; | |||||
| import com.google.gson.JsonParseException; | |||||
| import com.google.gson.reflect.TypeToken; | |||||
| import me.chanjar.weixin.common.util.json.GsonHelper; | |||||
| import me.chanjar.weixin.mp.bean.WxMpCard; | |||||
| import org.slf4j.Logger; | |||||
| import org.slf4j.LoggerFactory; | |||||
| import java.lang.reflect.Type; | |||||
| import java.util.List; | |||||
| /** | |||||
| * Created by YuJian on 15/11/11. | |||||
| * | |||||
| * @author YuJian | |||||
| * @version 15/11/11 | |||||
| */ | |||||
| public class WxMpCardGsonAdapter implements JsonDeserializer<WxMpCard> { | |||||
| @Override | |||||
| public WxMpCard deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext | |||||
| jsonDeserializationContext) throws JsonParseException { | |||||
| WxMpCard card = new WxMpCard(); | |||||
| JsonObject jsonObject = jsonElement.getAsJsonObject(); | |||||
| card.setCardId(GsonHelper.getString(jsonObject, "card_id")); | |||||
| card.setBeginTime(GsonHelper.getLong(jsonObject, "begin_time")); | |||||
| card.setEndTime(GsonHelper.getLong(jsonObject, "end_time")); | |||||
| return card; | |||||
| } | |||||
| } | |||||
| @@ -0,0 +1,45 @@ | |||||
| package me.chanjar.weixin.mp.util.json; | |||||
| import com.google.gson.JsonDeserializationContext; | |||||
| import com.google.gson.JsonDeserializer; | |||||
| import com.google.gson.JsonElement; | |||||
| import com.google.gson.JsonObject; | |||||
| import com.google.gson.JsonParseException; | |||||
| import com.google.gson.reflect.TypeToken; | |||||
| import me.chanjar.weixin.common.util.json.GsonHelper; | |||||
| import me.chanjar.weixin.mp.bean.WxMpCard; | |||||
| import me.chanjar.weixin.mp.bean.result.WxMpCardResult; | |||||
| import org.slf4j.Logger; | |||||
| import org.slf4j.LoggerFactory; | |||||
| import java.lang.reflect.Type; | |||||
| import java.text.ParseException; | |||||
| import java.util.List; | |||||
| /** | |||||
| * Created by YuJian on 15/11/11. | |||||
| * | |||||
| * @author YuJian | |||||
| * @version 15/11/11 | |||||
| */ | |||||
| public class WxMpCardResultGsonAdapter implements JsonDeserializer<WxMpCardResult> { | |||||
| @Override | |||||
| public WxMpCardResult deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException { | |||||
| WxMpCardResult cardResult = new WxMpCardResult(); | |||||
| JsonObject jsonObject = jsonElement.getAsJsonObject(); | |||||
| cardResult.setOpenId(GsonHelper.getString(jsonObject, "openid")); | |||||
| cardResult.setErrorCode(GsonHelper.getString(jsonObject, "errcode")); | |||||
| cardResult.setErrorMsg(GsonHelper.getString(jsonObject, "errmsg")); | |||||
| cardResult.setCanConsume(GsonHelper.getBoolean(jsonObject, "can_consume")); | |||||
| cardResult.setUserCardStatus(GsonHelper.getString(jsonObject, "user_card_status")); | |||||
| WxMpCard card = WxMpGsonBuilder.INSTANCE.create().fromJson(jsonObject.get("card"), | |||||
| new TypeToken<WxMpCard>() { | |||||
| }.getType()); | |||||
| cardResult.setCard(card); | |||||
| return cardResult; | |||||
| } | |||||
| } | |||||
| @@ -38,6 +38,8 @@ public class WxMpGsonBuilder { | |||||
| INSTANCE.registerTypeAdapter(WxMpMaterialNewsBatchGetResult.WxMaterialNewsBatchGetNewsItem.class, new WxMpMaterialNewsBatchGetGsonItemAdapter()); | INSTANCE.registerTypeAdapter(WxMpMaterialNewsBatchGetResult.WxMaterialNewsBatchGetNewsItem.class, new WxMpMaterialNewsBatchGetGsonItemAdapter()); | ||||
| INSTANCE.registerTypeAdapter(WxMpMaterialFileBatchGetResult.class, new WxMpMaterialFileBatchGetGsonAdapter()); | INSTANCE.registerTypeAdapter(WxMpMaterialFileBatchGetResult.class, new WxMpMaterialFileBatchGetGsonAdapter()); | ||||
| INSTANCE.registerTypeAdapter(WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem.class, new WxMpMaterialFileBatchGetGsonItemAdapter()); | INSTANCE.registerTypeAdapter(WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem.class, new WxMpMaterialFileBatchGetGsonItemAdapter()); | ||||
| INSTANCE.registerTypeAdapter(WxMpCardResult.class, new WxMpCardResultGsonAdapter()); | |||||
| INSTANCE.registerTypeAdapter(WxMpCard.class, new WxMpCardGsonAdapter()); | |||||
| } | } | ||||
| public static Gson create() { | public static Gson create() { | ||||
| @@ -20,6 +20,7 @@ public class WxMpMaterialNewsArticleGsonAdapter implements JsonSerializer<WxMpMa | |||||
| JsonObject articleJson = new JsonObject(); | JsonObject articleJson = new JsonObject(); | ||||
| articleJson.addProperty("thumb_media_id", article.getThumbMediaId()); | articleJson.addProperty("thumb_media_id", article.getThumbMediaId()); | ||||
| articleJson.addProperty("thumb_url",article.getThumbUrl()); | |||||
| articleJson.addProperty("title", article.getTitle()); | articleJson.addProperty("title", article.getTitle()); | ||||
| articleJson.addProperty("content", article.getContent()); | articleJson.addProperty("content", article.getContent()); | ||||
| if (null != article.getAuthor()) { | if (null != article.getAuthor()) { | ||||
| @@ -66,6 +67,10 @@ public class WxMpMaterialNewsArticleGsonAdapter implements JsonSerializer<WxMpMa | |||||
| if (thumbMediaId != null && !thumbMediaId.isJsonNull()) { | if (thumbMediaId != null && !thumbMediaId.isJsonNull()) { | ||||
| article.setThumbMediaId(GsonHelper.getAsString(thumbMediaId)); | article.setThumbMediaId(GsonHelper.getAsString(thumbMediaId)); | ||||
| } | } | ||||
| JsonElement thumbUrl = articleInfo.get("thumb_url"); | |||||
| if(thumbUrl != null && !thumbUrl.isJsonNull()) { | |||||
| article.setThumbUrl(GsonHelper.getAsString(thumbUrl)); | |||||
| } | |||||
| JsonElement showCoverPic = articleInfo.get("show_cover_pic"); | JsonElement showCoverPic = articleInfo.get("show_cover_pic"); | ||||
| if (showCoverPic != null && !showCoverPic.isJsonNull()) { | if (showCoverPic != null && !showCoverPic.isJsonNull()) { | ||||
| article.setShowCoverPic(GsonHelper.getAsBoolean(showCoverPic)); | article.setShowCoverPic(GsonHelper.getAsBoolean(showCoverPic)); | ||||
| @@ -31,6 +31,16 @@ public class XStreamTransformer { | |||||
| return object; | return object; | ||||
| } | } | ||||
| /** | |||||
| * 注册扩展消息的解析器 | |||||
| * @param clz 类型 | |||||
| * @param xStream xml解析器 | |||||
| */ | |||||
| public static void register(Class clz,XStream xStream){ | |||||
| CLASS_2_XSTREAM_INSTANCE.put(clz,xStream); | |||||
| } | |||||
| /** | /** | ||||
| * pojo -> xml | * pojo -> xml | ||||
| * | * | ||||
| @@ -0,0 +1,70 @@ | |||||
| package me.chanjar.weixin.mp.bean; | |||||
| import org.testng.Assert; | |||||
| import org.testng.annotations.Test; | |||||
| /** | |||||
| * Created by ben on 2015/12/29. | |||||
| */ | |||||
| public class WxMpXmlOutTransferCustomerServiceMessageTest { | |||||
| @Test | |||||
| public void test() { | |||||
| WxMpXmlOutTransferCustomerServiceMessage m = new WxMpXmlOutTransferCustomerServiceMessage(); | |||||
| m.setCreateTime(1399197672L); | |||||
| m.setFromUserName("fromuser"); | |||||
| m.setToUserName("touser"); | |||||
| String expected = "<xml>" + | |||||
| "<ToUserName><![CDATA[touser]]></ToUserName>" + | |||||
| "<FromUserName><![CDATA[fromuser]]></FromUserName>" + | |||||
| "<CreateTime>1399197672</CreateTime>" + | |||||
| "<MsgType><![CDATA[transfer_customer_service]]></MsgType>" + | |||||
| "</xml>"; | |||||
| System.out.println(m.toXml()); | |||||
| Assert.assertEquals(m.toXml().replaceAll("\\s", ""), expected.replaceAll("\\s", "")); | |||||
| expected = " <xml>" + | |||||
| "<ToUserName><![CDATA[touser]]></ToUserName>" + | |||||
| "<FromUserName><![CDATA[fromuser]]></FromUserName>" + | |||||
| "<CreateTime>1399197672</CreateTime>" + | |||||
| "<MsgType><![CDATA[transfer_customer_service]]></MsgType>" + | |||||
| "<TransInfo>" + | |||||
| "<KfAccount><![CDATA[test1@test]]></KfAccount>" + | |||||
| "</TransInfo>" + | |||||
| "</xml>"; | |||||
| WxMpXmlOutTransferCustomerServiceMessage.TransInfo transInfo = new WxMpXmlOutTransferCustomerServiceMessage.TransInfo(); | |||||
| transInfo.setKfAccount("test1@test"); | |||||
| m.setTransInfo(transInfo); | |||||
| System.out.println(m.toXml()); | |||||
| Assert.assertEquals(m.toXml().replaceAll("\\s", ""), expected.replaceAll("\\s", "")); | |||||
| } | |||||
| @Test | |||||
| public void testBuild() { | |||||
| WxMpXmlOutTransferCustomerServiceMessage m = WxMpXmlOutMessage.TRANSFER_CUSTOMER_SERVICE().fromUser("fromuser").toUser("touser").build(); | |||||
| m.setCreateTime(1399197672L); | |||||
| String expected = "<xml>" + | |||||
| "<ToUserName><![CDATA[touser]]></ToUserName>" + | |||||
| "<FromUserName><![CDATA[fromuser]]></FromUserName>" + | |||||
| "<CreateTime>1399197672</CreateTime>" + | |||||
| "<MsgType><![CDATA[transfer_customer_service]]></MsgType>" + | |||||
| "</xml>"; | |||||
| System.out.println(m.toXml()); | |||||
| Assert.assertEquals(m.toXml().replaceAll("\\s", ""), expected.replaceAll("\\s", "")); | |||||
| expected = " <xml>" + | |||||
| "<ToUserName><![CDATA[touser]]></ToUserName>" + | |||||
| "<FromUserName><![CDATA[fromuser]]></FromUserName>" + | |||||
| "<CreateTime>1399197672</CreateTime>" + | |||||
| "<MsgType><![CDATA[transfer_customer_service]]></MsgType>" + | |||||
| "<TransInfo>" + | |||||
| "<KfAccount><![CDATA[test1@test]]></KfAccount>" + | |||||
| "</TransInfo>" + | |||||
| "</xml>"; | |||||
| m = WxMpXmlOutMessage.TRANSFER_CUSTOMER_SERVICE().kfAccount("test1@test").fromUser("fromuser").toUser("touser").build(); | |||||
| m.setCreateTime(1399197672L); | |||||
| System.out.println(m.toXml()); | |||||
| Assert.assertEquals(m.toXml().replaceAll("\\s", ""), expected.replaceAll("\\s", "")); | |||||
| } | |||||
| } | |||||