From ca005534d4270713c951a6a1c30accd95193fb81 Mon Sep 17 00:00:00 2001 From: pengles Date: Mon, 9 Dec 2024 09:01:12 +0000 Subject: [PATCH] =?UTF-8?q?:new:=20=E3=80=90=E5=85=AC=E4=BC=97=E5=8F=B7?= =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE=E7=B1=BB=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E6=96=B9=E6=B3=95=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=20OAuth=202.0=E9=87=8D=E5=AE=9A=E5=90=91=20URL=20=E5=92=8C=20Q?= =?UTF-8?q?R=20=E8=BF=9E=E6=8E=A5=E9=87=8D=E5=AE=9A=E5=90=91=20URL=20!146?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/config/WxMpConfigStorage.java | 23 ++++++++++++++++++- .../mp/config/impl/WxMpDefaultConfigImpl.java | 3 +++ .../mp/api/impl/WxMpServiceImplTest.java | 9 ++++++++ .../weixin/mp/demo/DemoOAuth2Handler.java | 2 +- .../src/test/resources/test-config.sample.xml | 4 ++-- .../api/impl/WxOpenInMemoryConfigStorage.java | 11 +++++++++ 6 files changed, 48 insertions(+), 4 deletions(-) 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 Peng Les + */ + String getOauth2RedirectUrl(); + + /** + * Gets QR connect redirect Url + * + * @return the QR connect redirect Url + * @author Peng Les + */ + 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 context, WxMpService wxMpService, WxSessionManager sessionManager) { String href = "测试oauth2"; 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 @@ 商户平台设置的API密钥 商户平台的证书文件地址 模版消息的模版ID - 网页授权获取用户信息回调地址 - 网页应用授权登陆回调地址 + 网页授权获取用户信息回调地址 + 网页应用授权登陆回调地址 完整客服账号，格式为：账号前缀@公众号微信号 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();