diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/WxMpConfigStorage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/WxMpConfigStorage.java index 148ad6ebe..11aeef612 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/WxMpConfigStorage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/WxMpConfigStorage.java @@ -22,13 +22,15 @@ public interface WxMpConfigStorage { /** * Is use stable access token api - * @Link https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/getStableAccessToken.html + * * @return the boolean + * @link https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/getStableAccessToken.html */ boolean isStableAccessToken(); /** * Set use stable access token api + * * @param useStableAccessToken true is use, false is not */ void useStableAccessToken(boolean useStableAccessToken); @@ -154,9 +156,28 @@ public interface WxMpConfigStorage { * Gets oauth 2 redirect uri. * * @return the oauth 2 redirect uri + * @deprecated This method is deprecated due to incorrect naming convention. + * Use {@link #getOauth2RedirectUrl()} instead. */ + @Deprecated String getOauth2redirectUri(); + /** + * Gets OAuth 2.0 redirect Url + * + * @return the OAuth 2.0 redirect Url + * @author <a href="https://gitee.com/pengles">Peng Les</a> + */ + String getOauth2RedirectUrl(); + + /** + * Gets QR connect redirect Url + * + * @return the QR connect redirect Url + * @author <a href="https://gitee.com/pengles">Peng Les</a> + */ + String getQrConnectRedirectUrl(); + /** * Gets http proxy host. * diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpDefaultConfigImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpDefaultConfigImpl.java index 8c0ccfe66..da47fc49f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpDefaultConfigImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpDefaultConfigImpl.java @@ -34,7 +34,10 @@ public class WxMpDefaultConfigImpl implements WxMpConfigStorage, Serializable { protected volatile String aesKey; protected volatile long expiresTime; + @Deprecated protected volatile String oauth2redirectUri; + protected volatile String oauth2RedirectUrl; + protected volatile String qrConnectRedirectUrl; protected volatile String httpProxyHost; protected volatile int httpProxyPort; diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java index 636bedb85..f569c09d9 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java @@ -44,6 +44,15 @@ public class WxMpServiceImplTest { System.out.println(qrConnectUrl); } + @Test + public void testBuildQrConnectRedirectUrl() { + String qrConnectRedirectUrl = this.wxService.getWxMpConfigStorage().getQrConnectRedirectUrl(); + String qrConnectUrl = this.wxService.buildQrConnectUrl(qrConnectRedirectUrl, + WxConsts.QrConnectScope.SNSAPI_LOGIN, null); + Assert.assertNotNull(qrConnectUrl); + System.out.println(qrConnectUrl); + } + public void testGetTicket() throws WxErrorException { String ticket = this.wxService.getTicket(TicketType.SDK, false); System.out.println(ticket); diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoOAuth2Handler.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoOAuth2Handler.java index ce23512e2..3d257b873 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoOAuth2Handler.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoOAuth2Handler.java @@ -18,7 +18,7 @@ public class DemoOAuth2Handler implements WxMpMessageHandler { Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) { String href = "<a href=\"" + wxMpService.getOAuth2Service().buildAuthorizationUrl( - wxMpService.getWxMpConfigStorage().getOauth2redirectUri(), + wxMpService.getWxMpConfigStorage().getOauth2RedirectUrl(), WxConsts.OAuth2Scope.SNSAPI_USERINFO, null) + "\">测试oauth2</a>"; return WxMpXmlOutMessage.TEXT().content(href) .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) diff --git a/weixin-java-mp/src/test/resources/test-config.sample.xml b/weixin-java-mp/src/test/resources/test-config.sample.xml index 3df1de9d5..003fa8565 100644 --- a/weixin-java-mp/src/test/resources/test-config.sample.xml +++ b/weixin-java-mp/src/test/resources/test-config.sample.xml @@ -10,7 +10,7 @@ <partnerKey>商户平台设置的API密钥</partnerKey> <keyPath>商户平台的证书文件地址</keyPath> <templateId>模版消息的模版ID</templateId> - <oauth2redirectUri>网页授权获取用户信息回调地址</oauth2redirectUri> - <qrconnectRedirectUrl>网页应用授权登陆回调地址</qrconnectRedirectUrl> + <oauth2RedirectUrl>网页授权获取用户信息回调地址</oauth2RedirectUrl> + <qrConnectRedirectUrl>网页应用授权登陆回调地址</qrConnectRedirectUrl> <kfAccount>完整客服账号,格式为:账号前缀@公众号微信号</kfAccount> </xml> 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 index a103315b5..4b195badc 100644 --- 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 @@ -572,11 +572,22 @@ public class WxOpenInMemoryConfigStorage implements WxOpenConfigStorage { return null; } + @Deprecated @Override public String getOauth2redirectUri() { return null; } + @Override + public String getOauth2RedirectUrl() { + return null; + } + + @Override + public String getQrConnectRedirectUrl() { + return null; + } + @Override public String getHttpProxyHost() { return this.wxOpenConfigStorage.getHttpProxyHost();