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 148ad6ebefd51ca077f3cd70ef3603fbdfc80096..11aeef612451ecd4cf7cb3f1c219583dc8071d70 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 8c0ccfe66694df594591daa5db9800163109b7c9..da47fc49fa87227003fb679b86a09819e0d1cfb8 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 636bedb855c942e68300e440b1a068f212dbbbd0..f569c09d9d925a7fbaa8f7755f6646f29ab6ec4c 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 ce23512e29bd2f70af4fb471a3478486dbfb142a..3d257b873e3d8b8e2eeed3cfc922be03b5c6eef9 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 3df1de9d57d8d106507664ecf890132ca27c699e..003fa8565c5499d307a78d988f7be906383f5e4f 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 a103315b5d06e0340725c89a54da75c47e38e497..4b195badc385e6a376e84daebfc3bda916922e23 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();