Merge pull request #10 from Wechat-Group/develop

同步

Author: aimilin6688

.travis.yml

@@ -1,12 +1,26 @@
 language: java
-jdk:
-  - oraclejdk7
-
-script: "mvn clean package -Dmaven.test.skip=true"
+sudo: false
+install: true
+addons:
+  sonarqube:
+    token:
+      secure: "834110c7191f97ecb226970c46dcaff8e681da5a"
 
+jdk:
+  - oraclejdk8
+#script: "mvn clean package -Dmaven.test.skip=true"
+    
+script:
+  - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar
+  
 branches:
   only:
     - develop
+  
+cache:
+  directories:
+    - '$HOME/.m2/repository'
+    - '$HOME/.sonar/cache'
 
 notifications:
   email:

README.md

@@ -1,7 +1,7 @@
 Weixin Java Tools 微信公众号/企业号开发Java SDK
 =====================================
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.binarywang/weixin-java-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.binarywang/weixin-java-parent)
-[![Build Status](https://travis-ci.org/wechat-group/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/wechat-group/weixin-java-tools)
+[![Build Status](https://travis-ci.org/Wechat-Group/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/Wechat-Group/weixin-java-tools)
 
 ### 注意：
 1. ***本项目Fork自chanjarster/weixin-java-tools，但由于原项目已停止维护，故单独维护和发布，且发布到maven上的groupId也会不同，详细信息见下文。***
@@ -13,7 +13,7 @@ Weixin Java Tools 微信公众号/企业号开发Java SDK
 
 ## 开发交流方式及注意事项：
 1. QQ群：343954419（推荐点击按钮入群： [![Join QQ Group](http://pub.idqqimg.com/wpa/images/group.png)](http://shang.qq.com/wpa/qunwpa?idkey=731dc3e7ea31ebe25376cc1a791445468612c63fd0e9e05399b088ec81fd9e15) 或 [![Join QQ Group](http://pub.idqqimg.com/wpa/images/group.png)](http://jq.qq.com/?_wv=1027&k=40lRskK)，如果无反应，可以自行搜索群号进行添加 ）
-1. 由于群容量有限即将爆满，现开启付费入群模式，并不定期清理长时间不活跃人士；
+1. 由于群容量有限，即将爆满，故开启付费入群模式以保证只有真实交流需求的人进入，并为保证群的活跃度，将不定期清理长时间不活跃的同学；
 1. 微信群： 因微信群已达到100人限制，故如有想加入微信群的，请入QQ群后联系管理员，提供微信号以便邀请加入；
 1. 新手提问前，请先阅读此文章：http://t.cn/RV93MRB
 1. 寻求帮助时需贴代码或大长串异常信息的，请利用http://paste.ubuntu.com
@@ -25,12 +25,12 @@ Weixin Java Tools 微信公众号/企业号开发Java SDK
 ===========
 
 ## 版本说明
-1. 本项目定为每月发布一次正式版，版本号格式为X.X.0（如2.1.0，2.2.0等），月初或月底发布新版本，遇到重大问题需修复会及时提交新版本，欢迎大家随时提交Pull Request；
+1. 本项目定为每两个月发布一次正式版，版本号格式为X.X.0（如2.1.0，2.2.0等），月底发布新版本，遇到重大问题需修复会及时提交新版本，欢迎大家随时提交Pull Request；
 1. BUG修复和新特性一般会先发布成小版本作为临时版本（如2.0.1，2.0.2等，即尾号不为0，以区别于正式版）；
 1. 目前最新版本号为 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.binarywang/weixin-java-parent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.binarywang/weixin-java-parent) ，也可以通过访问链接 [【公众号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-mp%22) 、[【企业号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-cp%22)
 分别查看所有最新的版本。 
 
-## Maven & Gradle
+## Maven & Gradle 最新正式版本
 
 * 公众号（订阅号、服务号）：
 

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

@@ -20,8 +20,7 @@ public class WxError implements Serializable {
   private String json;
 
   public static WxError fromJson(String json) {
-    WxError error = WxGsonBuilder.create().fromJson(json, WxError.class);
-    return error;
+    return WxGsonBuilder.create().fromJson(json, WxError.class);
   }
 
   public static Builder newBuilder() {

weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSession.java

@@ -11,12 +11,12 @@ public class StandardSession implements WxSession, InternalSession {
   /**
    * The string manager for this package.
    */
-  protected static final StringManager sm =
-          StringManager.getManager(Constants.Package);
+  protected static final StringManager sm = StringManager.getManager(Constants.Package);
   /**
    * Type array.
    */
-  protected static final String EMPTY_ARRAY[] = new String[0];
+  private static final String[] EMPTY_ARRAY = new String[0];
+
   // ------------------------------ WxSession
   protected Map<String, Object> attributes = new ConcurrentHashMap<>();
   /**
@@ -71,20 +71,23 @@ public StandardSession(InternalSessionManager manager) {
   @Override
   public Object getAttribute(String name) {
 
-    if (!isValidInternal())
+    if (!isValidInternal()) {
       throw new IllegalStateException
-              (sm.getString("sessionImpl.getAttribute.ise"));
+        (sm.getString("sessionImpl.getAttribute.ise"));
+    }
 
-    if (name == null) return null;
+    if (name == null) {
+      return null;
+    }
 
-    return (this.attributes.get(name));
+    return this.attributes.get(name);
   }
 
   @Override
   public Enumeration<String> getAttributeNames() {
-    if (!isValidInternal())
-      throw new IllegalStateException
-              (sm.getString("sessionImpl.getAttributeNames.ise"));
+    if (!isValidInternal()) {
+      throw new IllegalStateException(sm.getString("sessionImpl.getAttributeNames.ise"));
+    }
 
     Set<String> names = new HashSet<>();
     names.addAll(this.attributes.keySet());
@@ -94,9 +97,9 @@ public Enumeration<String> getAttributeNames() {
   @Override
   public void setAttribute(String name, Object value) {
     // Name cannot be null
-    if (name == null)
-      throw new IllegalArgumentException
-              (sm.getString("sessionImpl.setAttribute.namenull"));
+    if (name == null) {
+      throw new IllegalArgumentException(sm.getString("sessionImpl.setAttribute.namenull"));
+    }
 
     // Null value is the same as removeAttribute()
     if (value == null) {
@@ -105,9 +108,9 @@ public void setAttribute(String name, Object value) {
     }
 
     // Validate our current state
-    if (!isValidInternal())
-      throw new IllegalStateException(sm.getString(
-              "sessionImpl.setAttribute.ise", getIdInternal()));
+    if (!isValidInternal()) {
+      throw new IllegalStateException(sm.getString("sessionImpl.setAttribute.ise", getIdInternal()));
+    }
 
     this.attributes.put(name, value);
 
@@ -121,8 +124,7 @@ public void removeAttribute(String name) {
   @Override
   public void invalidate() {
     if (!isValidInternal())
-      throw new IllegalStateException
-              (sm.getString("sessionImpl.invalidate.ise"));
+      throw new IllegalStateException(sm.getString("sessionImpl.invalidate.ise"));
 
     // Cause this session to expire
     expire();
@@ -131,12 +133,11 @@ public void invalidate() {
 
   @Override
   public WxSession getSession() {
-
     if (this.facade == null) {
       this.facade = new StandardSessionFacade(this);
     }
-    return (this.facade);
 
+    return this.facade;
   }
 
   /**
@@ -185,12 +186,14 @@ public void setValid(boolean isValid) {
 
   @Override
   public String getIdInternal() {
-    return (this.id);
+    return this.id;
   }
 
   protected void removeAttributeInternal(String name) {
     // Avoid NPE
-    if (name == null) return;
+    if (name == null) {
+      return;
+    }
 
     // Remove this attribute from our collection
     this.attributes.remove(name);
@@ -202,19 +205,22 @@ public void expire() {
     // Check to see if session has already been invalidated.
     // Do not check expiring at this point as expire should not return until
     // isValid is false
-    if (!this.isValid)
+    if (!this.isValid) {
       return;
+    }
 
     synchronized (this) {
       // Check again, now we are inside the sync so this code only runs once
       // Double check locking - isValid needs to be volatile
       // The check of expiring is to ensure that an infinite loop is not
       // entered as per bug 56339
-      if (this.expiring || !this.isValid)
+      if (this.expiring || !this.isValid) {
         return;
+      }
 
-      if (this.manager == null)
+      if (this.manager == null) {
         return;
+      }
 
       // Mark this session as "being expired"
       this.expiring = true;
@@ -230,9 +236,9 @@ public void expire() {
       this.expiring = false;
 
       // Unbind any objects associated with this session
-      String keys[] = keys();
-      for (int i = 0; i < keys.length; i++) {
-        removeAttributeInternal(keys[i]);
+      String[] keys = keys();
+      for (String key : keys) {
+        removeAttributeInternal(key);
       }
     }
 
@@ -273,13 +279,15 @@ public void setMaxInactiveInterval(int interval) {
 
   @Override
   public void setId(String id) {
-    if ((this.id != null) && (this.manager != null))
+    if ((this.id != null) && (this.manager != null)) {
       this.manager.remove(this);
+    }
 
     this.id = id;
 
-    if (this.manager != null)
+    if (this.manager != null) {
       this.manager.add(this);
+    }
   }
 
   /**
@@ -295,21 +303,41 @@ protected String[] keys() {
 
   @Override
   public boolean equals(Object o) {
-    if (this == o) return true;
-    if (!(o instanceof StandardSession)) return false;
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof StandardSession)) {
+      return false;
+    }
 
     StandardSession session = (StandardSession) o;
 
-    if (this.creationTime != session.creationTime) return false;
-    if (this.expiring != session.expiring) return false;
-    if (this.isValid != session.isValid) return false;
-    if (this.maxInactiveInterval != session.maxInactiveInterval) return false;
-    if (this.thisAccessedTime != session.thisAccessedTime) return false;
-    if (!this.accessCount.equals(session.accessCount)) return false;
-    if (!this.attributes.equals(session.attributes)) return false;
-    if (!this.facade.equals(session.facade)) return false;
-    if (!this.id.equals(session.id)) return false;
-    return this.manager.equals(session.manager);
+    if (this.creationTime != session.creationTime) {
+      return false;
+    }
+    if (this.expiring != session.expiring) {
+      return false;
+    }
+    if (this.isValid != session.isValid) {
+      return false;
+    }
+    if (this.maxInactiveInterval != session.maxInactiveInterval) {
+      return false;
+    }
+    if (this.thisAccessedTime != session.thisAccessedTime) {
+      return false;
+    }
+    if (this.accessCount.get() != session.accessCount.get()) {
+      return false;
+    }
+    if (!this.attributes.equals(session.attributes)) {
+      return false;
+    }
+    if (!this.facade.equals(session.facade)) {
+      return false;
+    }
+
+    return this.id.equals(session.id) && this.manager.equals(session.manager);
 
   }
 

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

@@ -538,17 +538,24 @@ public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) thro
     int retryTimes = 0;
     do {
       try {
-        return executeInternal(executor, uri, data);
+        T result = this.executeInternal(executor, uri, data);
+        this.log.debug("\n[URL]:  {}\n[PARAMS]: {}\n[RESPONSE]: {}",uri, data, result);
+        return result;
       } catch (WxErrorException e) {
+        if (retryTimes + 1 > this.maxRetryTimes) {
+          this.log.warn("重试达到最大次数【{}】", this.maxRetryTimes);
+          //最后一次重试失败后，直接抛出异常，不再等待
+          throw new RuntimeException("微信服务端异常，超出重试次数");
+        }
+
         WxError error = e.getError();
         /*
          * -1 系统繁忙, 1000ms后重试
          */
         if (error.getErrorCode() == -1) {
           int sleepMillis = this.retrySleepMillis * (1 << retryTimes);
           try {
-            this.log.debug("微信系统繁忙，{}ms 后重试(第{}次)", sleepMillis,
-              retryTimes + 1);
+            this.log.debug("微信系统繁忙，{} ms 后重试(第{}次)", sleepMillis, retryTimes + 1);
             Thread.sleep(sleepMillis);
           } catch (InterruptedException e1) {
             throw new RuntimeException(e1);
@@ -557,8 +564,9 @@ public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) thro
           throw e;
         }
       }
-    } while (++retryTimes < this.maxRetryTimes);
+    } while (retryTimes++ < this.maxRetryTimes);
 
+    this.log.warn("重试达到最大次数【{}】", this.maxRetryTimes);
     throw new RuntimeException("微信服务端异常，超出重试次数");
   }
 
@@ -572,8 +580,7 @@ protected synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor,
     uriWithAccessToken += uri.indexOf('?') == -1 ? "?access_token=" + accessToken : "&access_token=" + accessToken;
 
     try {
-      return executor.execute(getHttpclient(), this.httpProxy,
-        uriWithAccessToken, data);
+      return executor.execute(getHttpclient(), this.httpProxy, uriWithAccessToken, data);
     } catch (WxErrorException e) {
       WxError error = e.getError();
       /*
@@ -586,11 +593,14 @@ protected synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor,
         this.configStorage.expireAccessToken();
         return execute(executor, uri, data);
       }
+
       if (error.getErrorCode() != 0) {
+        this.log.error("\n[URL]:  {}\n[PARAMS]: {}\n[RESPONSE]: {}", uri, data, error);
         throw new WxErrorException(error);
       }
       return null;
     } catch (IOException e) {
+      this.log.error("\n[URL]:  {}\n[PARAMS]: {}\n[EXCEPTION]: {}", uri, data, e.getMessage());
       throw new RuntimeException(e);
     }
   }

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpBusyRetryTest.java

@@ -1,17 +1,16 @@
 package me.chanjar.weixin.cp.api;
 
+import me.chanjar.weixin.common.bean.result.WxError;
+import me.chanjar.weixin.common.exception.WxErrorException;
+import me.chanjar.weixin.common.util.http.RequestExecutor;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import me.chanjar.weixin.common.bean.result.WxError;
-import me.chanjar.weixin.common.exception.WxErrorException;
-import me.chanjar.weixin.common.util.http.RequestExecutor;
-
 @Test
 public class WxCpBusyRetryTest {
 
@@ -23,6 +22,7 @@ public Object[][] getService() {
       protected synchronized <T, E> T executeInternal(
           RequestExecutor<T, E> executor, String uri, E data)
           throws WxErrorException {
+        this.log.info("Executed");
         WxError error = new WxError();
         error.setErrorCode(-1);
         throw new WxErrorException(error);