Merge remote-tracking branch 'origin/master'

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/ESign/ESignHttpUtil.java

@@ -124,6 +124,7 @@ public class ESignHttpUtil {
             conn.setUseCaches(false);//设置不要缓存
             conn.setDoOutput(true);
             conn.setDoInput(true);
+
             out = new PrintWriter(conn.getOutputStream());
             out.write(json);
             out.flush();
@@ -157,6 +158,8 @@ public class ESignHttpUtil {
         }
         finally
         {
+            //清除token缓存
+            eSignConfig.geteSignToken().reSetToken();
             try
             {
                 if (out != null)
@@ -245,6 +248,8 @@ public class ESignHttpUtil {
         }
         finally
         {
+            //清除token缓存
+            eSignConfig.geteSignToken().reSetToken();
             try
             {
                 if (out != null)
@@ -315,6 +320,8 @@ public class ESignHttpUtil {
         }
         finally
         {
+            //清除token缓存
+            eSignConfig.geteSignToken().reSetToken();
             try
             {
                 if (out != null)
@@ -381,6 +388,8 @@ public class ESignHttpUtil {
         }
         finally
         {
+            //清除token缓存
+            eSignConfig.geteSignToken().reSetToken();
             try
             {
                 if (in != null)

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/ESign/ESignToken.java

@@ -41,7 +41,7 @@ public class ESignToken {
         try {
             //token未过期使用缓存的token
             long currentTiem = new Date().getTime();
-            if(this.accessToken!=null &&(currentTiem-createTime)<(expires)){
+            if(this.accessToken!=null &&(currentTiem)<(expires-10000)){
                 log.info("本身的token为{}",this.accessToken);
                 return this.accessToken;
             }
@@ -69,6 +69,12 @@ public class ESignToken {
         return this.accessToken;
     }
 
+    public void reSetToken() {
+        accessToken =null;
+        expires = 0;
+        refreshToken = null;
+        createTime = 0;
 
+    }
 
 }