binarywang#324: 修复分布式刷新access_token冲突问题

Author: binarywang

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java

@@ -38,10 +38,7 @@ public HttpType getRequestType() {
 
  @Override
  public String getAccessToken(boolean forceRefresh) throws WxErrorException {
- if (forceRefresh) {
- this.configStorage.expireAccessToken();
- }
- if (this.configStorage.isAccessTokenExpired()) {
+ if (this.configStorage.isAccessTokenExpired() || forceRefresh) {
  synchronized (this.globalAccessTokenRefreshLock) {
  if (this.configStorage.isAccessTokenExpired()) {
  String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?"

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java

@@ -29,10 +29,7 @@ public HttpType getRequestType() {
 
  @Override
  public String getAccessToken(boolean forceRefresh) throws WxErrorException {
- if (forceRefresh) {
- this.configStorage.expireAccessToken();
- }
- if (this.configStorage.isAccessTokenExpired()) {
+ if (this.configStorage.isAccessTokenExpired() || forceRefresh) {
  synchronized (this.globalAccessTokenRefreshLock) {
  if (this.configStorage.isAccessTokenExpired()) {
  String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?"

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java

@@ -37,10 +37,7 @@ public HttpType getRequestType() {
  @Override
  public String getAccessToken(boolean forceRefresh) throws WxErrorException {
  logger.debug("WxCpServiceOkHttpImpl is running");
- if (forceRefresh) {
- this.configStorage.expireAccessToken();
- }
- if (this.configStorage.isAccessTokenExpired()) {
+ if (this.configStorage.isAccessTokenExpired() || forceRefresh) {
  synchronized (this.globalAccessTokenRefreshLock) {
  if (this.configStorage.isAccessTokenExpired()) {
  String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?"

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java

@@ -87,11 +87,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
  try {
  lock.lock();
 
- if (forceRefresh) {
- this.getWxMaConfig().expireAccessToken();
- }
-
- if (this.getWxMaConfig().isAccessTokenExpired()) {
+ if (this.getWxMaConfig().isAccessTokenExpired() || forceRefresh) {
  String url = String.format(WxMaService.GET_ACCESS_TOKEN_URL, this.getWxMaConfig().getAppid(),
  this.getWxMaConfig().getSecret());
  try {

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java

@@ -51,11 +51,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
  try {
  lock.lock();
 
- if (forceRefresh) {
- this.getWxMpConfigStorage().expireAccessToken();
- }
-
- if (this.getWxMpConfigStorage().isAccessTokenExpired()) {
+ if (this.getWxMpConfigStorage().isAccessTokenExpired() || forceRefresh) {
  String url = String.format(WxMpService.GET_ACCESS_TOKEN_URL,
  this.getWxMpConfigStorage().getAppId(), this.getWxMpConfigStorage().getSecret());
 

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java

@@ -43,11 +43,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
  try {
  lock.lock();
 
- if (forceRefresh) {
- this.getWxMpConfigStorage().expireAccessToken();
- }
-
- if (this.getWxMpConfigStorage().isAccessTokenExpired()) {
+ if (this.getWxMpConfigStorage().isAccessTokenExpired() || forceRefresh) {
  String url = String.format(WxMpService.GET_ACCESS_TOKEN_URL,
  this.getWxMpConfigStorage().getAppId(), this.getWxMpConfigStorage().getSecret());