diff --git a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/QrCodeApi.java b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/QrCodeApi.java
index 4f0890a4..1e45a3b0 100644
--- a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/QrCodeApi.java
+++ b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/QrCodeApi.java
@@ -20,12 +20,10 @@ import com.foxinmy.weixin4j.token.TokenManager;
* @see 获取二维码
* @since 1.8
*/
-public class QrCodeApi extends WxaApi {
-
- private final TokenManager tokenManager;
+public class QrCodeApi extends TokenManagerApi {
public QrCodeApi(TokenManager tokenManager) {
- this.tokenManager = tokenManager;
+ super(tokenManager);
}
/**
@@ -54,8 +52,7 @@ public class QrCodeApi extends WxaApi {
Color lineColor,
Boolean hyaline
) throws WeixinException {
- final String accessToken = tokenManager.getAccessToken();
- final String getWxaCodeUri = this.getRequestUri("wxa_getwxacode", accessToken);
+ final String getWxaCodeUri = this.getAccessTokenRequestUri("wxa_getwxacode");
final WxaCodeParameter param = new WxaCodeParameter(path, width, autoColor, lineColor, hyaline);
return this.postAsImageBytes(getWxaCodeUri, param);
}
@@ -105,8 +102,7 @@ public class QrCodeApi extends WxaApi {
Color lineColor,
Boolean hyaline
) throws WeixinException {
- final String accessToken = tokenManager.getAccessToken();
- final String getWxaCodeUnlimitUri = this.getRequestUri("wxa_getwxacodeunlimit", accessToken);
+ final String getWxaCodeUnlimitUri = this.getAccessTokenRequestUri("wxa_getwxacodeunlimit");
final WxaCodeUnlimitParameter param = new WxaCodeUnlimitParameter(scene, page, width, autoColor, lineColor, hyaline);
return this.postAsImageBytes(getWxaCodeUnlimitUri, param);
}
@@ -131,8 +127,7 @@ public class QrCodeApi extends WxaApi {
String path,
Integer width
) throws WeixinException {
- final String accessToken = tokenManager.getAccessToken();
- final String createWxaQrCode = this.getRequestUri("wxaapp_createwxaqrcode", accessToken);
+ final String createWxaQrCode = this.getAccessTokenRequestUri("wxaapp_createwxaqrcode");
final WxaQrCodeParameter param = new WxaQrCodeParameter(path, width);
return this.postAsImageBytes(createWxaQrCode, param);
}
diff --git a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/TemplateApi.java b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/TemplateApi.java
index 50af65ed..a4bbc910 100644
--- a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/TemplateApi.java
+++ b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/TemplateApi.java
@@ -16,7 +16,7 @@ import com.foxinmy.weixin4j.wxa.model.template.Template;
* @see 模版消息管理
* @since 1.8
*/
-public class TemplateApi extends NoticeApi {
+public class TemplateApi extends TokenManagerApi {
public TemplateApi(TokenManager tokenManager) {
super(tokenManager);
diff --git a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/TemplateMessageApi.java b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/TemplateMessageApi.java
index e88ac3fe..ebc85901 100644
--- a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/TemplateMessageApi.java
+++ b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/TemplateMessageApi.java
@@ -11,7 +11,7 @@ import com.foxinmy.weixin4j.token.TokenManager;
* @see 发送模版消息
* @since 1.8
*/
-public class TemplateMessageApi extends NoticeApi {
+public class TemplateMessageApi extends TokenManagerApi {
public TemplateMessageApi(TokenManager tokenManager) {
super(tokenManager);
diff --git a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/NoticeApi.java b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/TokenManagerApi.java
similarity index 89%
rename from weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/NoticeApi.java
rename to weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/TokenManagerApi.java
index b1ccb6bf..90a4365b 100644
--- a/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/NoticeApi.java
+++ b/weixin4j-wxa/src/main/java/com/foxinmy/weixin4j/wxa/api/TokenManagerApi.java
@@ -6,11 +6,11 @@ import com.foxinmy.weixin4j.exception.WeixinException;
import com.foxinmy.weixin4j.http.weixin.WeixinResponse;
import com.foxinmy.weixin4j.token.TokenManager;
-abstract class NoticeApi extends WxaApi {
+abstract class TokenManagerApi extends WxaApi {
private final TokenManager tokenManager;
- public NoticeApi(final TokenManager tokenManager) {
+ public TokenManagerApi(final TokenManager tokenManager) {
this.tokenManager = tokenManager;
}