issue binarywang#105 WxCpService.oauth2buildAuthorizationUrl方法设计错误

chanjarster · chanjarster · commit b8d011e73e70 · 2015-02-11T17:56:48.000+08:00
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java
@@ -353,10 +353,11 @@ WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream i
    * 构造oauth2授权的url连接
    * 详情请见: http://qydev.weixin.qq.com/wiki/index.php?title=企业获取code
    * </pre>
+   * @param redirectUri
    * @param state
    * @return code
    */
-  String oauth2buildAuthorizationUrl(String state);
+  String oauth2buildAuthorizationUrl(String redirectUri, String state);
 
   /**
    * <pre>
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java
@@ -412,10 +412,10 @@ public void tagRemoveUsers(String tagId, List<String> userIds) throws WxErrorExc
   }
 
   @Override
-  public String oauth2buildAuthorizationUrl(String state) {
+  public String oauth2buildAuthorizationUrl(String redirectUri, String state) {
     String url = "https://open.weixin.qq.com/connect/oauth2/authorize?" ;
     url += "appid=" + wxCpConfigStorage.getCorpId();
-    url += "&redirect_uri=" + URIUtil.encodeURIComponent(wxCpConfigStorage.getOauth2redirectUri());
+    url += "&redirect_uri=" + URIUtil.encodeURIComponent(redirectUri);
     url += "&response_type=code";
     url += "&scope=snsapi_base";
     if (state != null) {
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServer.java
@@ -62,7 +62,7 @@ public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> co
         @Override
         public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context,
             WxCpService wxCpService, WxSessionManager sessionManager) {
-          String href = "<a href=\"" + wxCpService.oauth2buildAuthorizationUrl(null)
+          String href = "<a href=\"" + wxCpService.oauth2buildAuthorizationUrl(wxCpConfigStorage.getOauth2redirectUri(), null)
               + "\">测试oauth2</a>";
           return WxCpXmlOutMessage
               .TEXT()
