完善ticket相关代码，完成#844遗留问题

binarywang · binarywang · commit c590e54c07b8 · 2018-11-29T20:46:36.000+08:00
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/WxMaConfig.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/WxMaConfig.java
@@ -1,10 +1,10 @@
 package cn.binarywang.wx.miniapp.config;
 
+import java.util.concurrent.locks.Lock;
+
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 
-import java.util.concurrent.locks.Lock;
-
 /**
  * 小程序配置
  *
@@ -57,21 +57,24 @@ public interface WxMaConfig {
    */
   void updateJsapiTicket(String jsapiTicket, int expiresInSeconds);
 
+  /**
+   * 卡券api_ticket.
+   */
   String getCardApiTicket();
 
   Lock getCardApiTicketLock();
 
   boolean isCardApiTicketExpired();
 
   /**
-   * 强制将卡券api ticket过期掉
+   * 强制将卡券api ticket过期掉.
    */
   void expireCardApiTicket();
 
   /**
-   * 应该是线程安全的
+   * 应该是线程安全的.
    *
-   * @param 卡券apiTicket      新的卡券api ticket值
+   * @param apiTicket      新的卡券api ticket值
    * @param expiresInSeconds 过期时间，以秒为单位
    */
   void updateCardApiTicket(String apiTicket, int expiresInSeconds);
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
@@ -325,26 +325,85 @@ public synchronized void updateAccessToken(String accessToken, int expiresInSeco
 
     @Override
     public String getTicket(TicketType type) {
+      switch (type) {
+        case JSAPI: {
+          return wxOpenConfigStorage.getJsapiTicket(appId);
+        }
+        case WX_CARD: {
+          return wxOpenConfigStorage.getCardApiTicket(appId);
+        }
+        default: {
+          // do nothing
+        }
+      }
       return null;
     }
 
     @Override
     public Lock getTicketLock(TicketType type) {
+      switch (type) {
+        case JSAPI: {
+          return this.jsapiTicketLock;
+        }
+        case WX_CARD: {
+          return this.cardApiTicketLock;
+        }
+        default: {
+          // do nothing
+        }
+      }
       return null;
     }
 
     @Override
     public boolean isTicketExpired(TicketType type) {
+      switch (type) {
+        case JSAPI: {
+          return wxOpenConfigStorage.isJsapiTicketExpired(appId);
+        }
+        case WX_CARD: {
+          return wxOpenConfigStorage.isCardApiTicketExpired(appId);
+        }
+        default: {
+          // do nothing
+        }
+      }
+
       return false;
     }
 
     @Override
     public void expireTicket(TicketType type) {
-
+      switch (type) {
+        case JSAPI: {
+          wxOpenConfigStorage.expireJsapiTicket(appId);
+          break;
+        }
+        case WX_CARD: {
+          wxOpenConfigStorage.expireCardApiTicket(appId);
+          break;
+        }
+        default: {
+          // do nothing
+        }
+      }
     }
 
     @Override
     public void updateTicket(TicketType type, String ticket, int expiresInSeconds) {
+      switch (type) {
+        case JSAPI: {
+          wxOpenConfigStorage.updateJsapiTicket(appId, ticket, expiresInSeconds);
+          break;
+        }
+        case WX_CARD: {
+          wxOpenConfigStorage.updateCardApiTicket(appId, ticket, expiresInSeconds);
+          break;
+        }
+        default: {
+          // do nothing
+        }
+      }
 
     }
 
@@ -383,9 +442,6 @@ public void expireJsapiTicket() {
       wxOpenConfigStorage.expireJsapiTicket(appId);
     }
 
-    /**
-     * 卡券api_ticket
-     */
     @Override
     public String getCardApiTicket() {
       return wxOpenConfigStorage.getCardApiTicket(appId);
