Merge branch 'tianmu' into develop

2025-08-24 07:23:01 +08:00 · 2016-06-18 21:56:09 +08:00 · 2016-06-18 21:56:09 +08:00 · d64f5020c4
commit d64f5020c4
parent 7057b8a960 5349da96f6
6 changed files with 286 additions and 286 deletions
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
@ -199,18 +199,18 @@ public class WxMpMessageRouter {

  protected boolean isDuplicateMessage(WxMpXmlMessage wxMessage) {

-    String messageId = "";
+    StringBuffer messageId = new StringBuffer();
    if (wxMessage.getMsgId() == null) {
-      messageId = String.valueOf(wxMessage.getCreateTime())
-          + "-" + wxMessage.getFromUserName()
-          + "-" + String.valueOf(wxMessage.getEventKey() == null ? "" : wxMessage.getEventKey())
-          + "-" + String.valueOf(wxMessage.getEvent() == null ? "" : wxMessage.getEvent())
+      messageId.append(wxMessage.getCreateTime())
+        .append("-").append(wxMessage.getFromUserName())
+        .append("-").append(wxMessage.getEventKey() == null ? "" : wxMessage.getEventKey())
+        .append("-").append(wxMessage.getEvent() == null ? "" : wxMessage.getEvent())
      ;
    } else {
-      messageId = String.valueOf(wxMessage.getMsgId());
+      messageId.append(wxMessage.getMsgId());
    }

-    if (messageDuplicateChecker.isDuplicate(messageId)) {
+    if (messageDuplicateChecker.isDuplicate(messageId.toString())) {
      return true;
    }
    return false;
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java
@ -105,9 +105,10 @@ public class WxMpServiceImpl implements WxMpService {
    if (wxMpConfigStorage.isAccessTokenExpired()) {
      synchronized (globalAccessTokenRefreshLock) {
        if (wxMpConfigStorage.isAccessTokenExpired()) {
-          String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential"
-              + "&appid=" + wxMpConfigStorage.getAppId()
-              + "&secret=" + wxMpConfigStorage.getSecret();
+          String url = new StringBuffer()
+              .append("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential")
+              .append("&appid=").append(wxMpConfigStorage.getAppId())
+              .append("&secret=").append(wxMpConfigStorage.getSecret()).toString();
          try {
            HttpGet httpGet = new HttpGet(url);
            if (httpProxy != null) {
@ -522,29 +523,31 @@ public class WxMpServiceImpl implements WxMpService {

  @Override
  public String oauth2buildAuthorizationUrl(String redirectURI, String scope, String state) {
-    String url = "https://open.weixin.qq.com/connect/oauth2/authorize?";
-    url += "appid=" + wxMpConfigStorage.getAppId();
-    url += "&redirect_uri=" + URIUtil.encodeURIComponent(redirectURI);
-    url += "&response_type=code";
-    url += "&scope=" + scope;
+    StringBuffer url = new StringBuffer();
+    url.append("https://open.weixin.qq.com/connect/oauth2/authorize?");
+    url.append("appid=").append(wxMpConfigStorage.getAppId());
+    url.append("&redirect_uri=").append(URIUtil.encodeURIComponent(redirectURI));
+    url.append("&response_type=code");
+    url.append("&scope=").append(scope);
    if (state != null) {
-      url += "&state=" + state;
+      url.append("&state=").append(state);
    }
-    url += "#wechat_redirect";
-    return url;
+    url.append("#wechat_redirect");
+    return url.toString();
  }

  @Override
  public WxMpOAuth2AccessToken oauth2getAccessToken(String code) throws WxErrorException {
-    String url = "https://api.weixin.qq.com/sns/oauth2/access_token?";
-    url += "appid=" + wxMpConfigStorage.getAppId();
-    url += "&secret=" + wxMpConfigStorage.getSecret();
-    url += "&code=" + code;
-    url += "&grant_type=authorization_code";
+    StringBuffer url = new StringBuffer();
+    url.append("https://api.weixin.qq.com/sns/oauth2/access_token?");
+    url.append("appid=").append(wxMpConfigStorage.getAppId());
+    url.append("&secret=").append(wxMpConfigStorage.getSecret());
+    url.append("&code=").append(code);
+    url.append("&grant_type=authorization_code");

    try {
      RequestExecutor<String, String> executor = new SimpleGetRequestExecutor();
-      String responseText = executor.execute(getHttpclient(), httpProxy, url, null);
+      String responseText = executor.execute(getHttpclient(), httpProxy, url.toString(), null);
      return WxMpOAuth2AccessToken.fromJson(responseText);
    } catch (ClientProtocolException e) {
      throw new RuntimeException(e);
@ -555,14 +558,15 @@ public class WxMpServiceImpl implements WxMpService {

  @Override
  public WxMpOAuth2AccessToken oauth2refreshAccessToken(String refreshToken) throws WxErrorException {
-    String url = "https://api.weixin.qq.com/sns/oauth2/refresh_token?";
-    url += "appid=" + wxMpConfigStorage.getAppId();
-    url += "&grant_type=refresh_token";
-    url += "&refresh_token=" + refreshToken;
+    StringBuffer url = new StringBuffer();
+    url.append("https://api.weixin.qq.com/sns/oauth2/refresh_token?");
+    url.append("appid=").append(wxMpConfigStorage.getAppId());
+    url.append("&grant_type=refresh_token");
+    url.append("&refresh_token=").append(refreshToken);

    try {
      RequestExecutor<String, String> executor = new SimpleGetRequestExecutor();
-      String responseText = executor.execute(getHttpclient(), httpProxy, url, null);
+      String responseText = executor.execute(getHttpclient(), httpProxy, url.toString(), null);
      return WxMpOAuth2AccessToken.fromJson(responseText);
    } catch (ClientProtocolException e) {
      throw new RuntimeException(e);
@ -573,18 +577,19 @@ public class WxMpServiceImpl implements WxMpService {

  @Override
  public WxMpUser oauth2getUserInfo(WxMpOAuth2AccessToken oAuth2AccessToken, String lang) throws WxErrorException {
-    String url = "https://api.weixin.qq.com/sns/userinfo?";
-    url += "access_token=" + oAuth2AccessToken.getAccessToken();
-    url += "&openid=" + oAuth2AccessToken.getOpenId();
+    StringBuffer url = new StringBuffer();
+    url.append("https://api.weixin.qq.com/sns/userinfo?");
+    url.append("access_token=").append(oAuth2AccessToken.getAccessToken());
+    url.append("&openid=").append(oAuth2AccessToken.getOpenId());
    if (lang == null) {
-      url += "&lang=zh_CN";
+      url.append("&lang=zh_CN");
    } else {
-      url += "&lang=" + lang;
+      url.append("&lang=").append(lang);
    }

    try {
      RequestExecutor<String, String> executor = new SimpleGetRequestExecutor();
-      String responseText = executor.execute(getHttpclient(), httpProxy, url, null);
+      String responseText = executor.execute(getHttpclient(), httpProxy, url.toString(), null);
      return WxMpUser.fromJson(responseText);
    } catch (ClientProtocolException e) {
      throw new RuntimeException(e);
@ -595,13 +600,14 @@ public class WxMpServiceImpl implements WxMpService {

  @Override
  public boolean oauth2validateAccessToken(WxMpOAuth2AccessToken oAuth2AccessToken) {
-    String url = "https://api.weixin.qq.com/sns/auth?";
-    url += "access_token=" + oAuth2AccessToken.getAccessToken();
-    url += "&openid=" + oAuth2AccessToken.getOpenId();
+    StringBuffer url = new StringBuffer();
+    url.append("https://api.weixin.qq.com/sns/auth?");
+    url.append("access_token=").append(oAuth2AccessToken.getAccessToken());
+    url.append("&openid=").append(oAuth2AccessToken.getOpenId());

    try {
      RequestExecutor<String, String> executor = new SimpleGetRequestExecutor();
-      executor.execute(getHttpclient(), httpProxy, url, null);
+      executor.execute(getHttpclient(), httpProxy, url.toString(), null);
    } catch (ClientProtocolException e) {
      throw new RuntimeException(e);
    } catch (IOException e) {
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java
@ -30,15 +30,15 @@ import java.util.UUID;
 public class QrCodeRequestExecutor implements RequestExecutor<File, WxMpQrCodeTicket> {

  @Override
-  public File execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, WxMpQrCodeTicket ticket) throws WxErrorException, ClientProtocolException, IOException {
+  public File execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, 
+      WxMpQrCodeTicket ticket) throws WxErrorException, ClientProtocolException, IOException {
    if (ticket != null) {
      if (uri.indexOf('?') == -1) {
        uri += '?';
      }
-      uri += uri.endsWith("?") ? 
-          "ticket=" + URLEncoder.encode(ticket.getTicket(), "UTF-8") 
-          : 
-          "&ticket=" + URLEncoder.encode(ticket.getTicket(), "UTF-8");
+      uri += uri.endsWith("?") 
+          ? "ticket=" + URLEncoder.encode(ticket.getTicket(), "UTF-8") 
+          : "&ticket=" + URLEncoder.encode(ticket.getTicket(), "UTF-8");
    }
    
    HttpGet httpGet = new HttpGet(uri);
@ -59,7 +59,7 @@ public class QrCodeRequestExecutor implements RequestExecutor<File, WxMpQrCodeTi
      InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);

      return FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg");
-    }finally {
+    } finally {
      httpGet.releaseConnection();
    }

--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCardGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCardGsonAdapter.java
@ -1,18 +1,15 @@
 package me.chanjar.weixin.mp.util.json;

+import java.lang.reflect.Type;
+
 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.
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCardResultGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCardResultGsonAdapter.java
@ -1,20 +1,17 @@
 package me.chanjar.weixin.mp.util.json;

+import java.lang.reflect.Type;
+
 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.