From dfe05debb772f0efa7981fa5e6aedff20ada3c48 Mon Sep 17 00:00:00 2001
From: lipeng <pleech@qq.com>
Date: Fri, 6 Dec 2024 11:12:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mp):=20=E9=87=8D=E6=9E=84=20OAuth2=20?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=E5=92=8C=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 getOauth2redirectUri 方法重命名为 getOauth2redirectUrl
- 新增 getQrConnectRedirectUrl 方法
- 更新相关配置项名称
- 修改 DemoOAuth2Handler 中的调用示例
---
 .../weixin/mp/config/WxMpConfigStorage.java        | 14 ++++++++++++--
 .../mp/config/impl/WxMpDefaultConfigImpl.java      |  3 ++-
 .../chanjar/weixin/mp/demo/DemoOAuth2Handler.java  |  2 +-
 .../open/api/impl/WxOpenInMemoryConfigStorage.java |  7 ++++++-
 4 files changed, 21 insertions(+), 5 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..4c802cf60 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);
@@ -155,7 +157,15 @@ public interface WxMpConfigStorage {
    *
    * @return the oauth 2 redirect uri
    */
-  String getOauth2redirectUri();
+  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..79052d75d 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,8 @@ public class WxMpDefaultConfigImpl implements WxMpConfigStorage, Serializable {
   protected volatile String aesKey;
   protected volatile long expiresTime;
 
-  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/demo/DemoOAuth2Handler.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoOAuth2Handler.java
index ce23512e2..8ad8875e4 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-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..f64732152 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
@@ -573,7 +573,12 @@ public class WxOpenInMemoryConfigStorage implements WxOpenConfigStorage {
     }
 
     @Override
-    public String getOauth2redirectUri() {
+    public String getOauth2redirectUrl() {
+      return null;
+    }
+
+    @Override
+    public String getQrConnectRedirectUrl() {
       return null;
     }
 
-- 
Gitee