From a6af57464f3e45b1987850a79b32ee9c2cfeaf6e Mon Sep 17 00:00:00 2001
From: wenzl <wenzl@touzhijia.com>
Date: Wed, 25 Oct 2017 18:05:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=A2=9D=E5=A4=96=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oauth/oauth.go |  5 +++--
 wechat.go      | 36 ++++++++++++++----------------------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/oauth/oauth.go b/oauth/oauth.go
index 27fe17a..5e49e60 100644
--- a/oauth/oauth.go
+++ b/oauth/oauth.go
@@ -38,12 +38,13 @@ func (oauth *Oauth) GetRedirectURL(redirectURI, scope, state string) (string, er
 }
 
 //Redirect 跳转到网页授权
-func (oauth *Oauth) Redirect(redirectURI, scope, state string) error {
+func (oauth *Oauth) Redirect(writer http.ResponseWriter, redirectURI, scope, state string) error {
 	location, err := oauth.GetRedirectURL(redirectURI, scope, state)
 	if err != nil {
 		return err
 	}
-	http.Redirect(oauth.Writer, oauth.Request, location, 302)
+	//location 为完整地址，所以不需要request
+	http.Redirect(writer, nil, location, 302)
 	return nil
 }
 
diff --git a/wechat.go b/wechat.go
index c856072..9a810f7 100644
--- a/wechat.go
+++ b/wechat.go
@@ -45,11 +45,6 @@ func copyConfigToContext(cfg *Config, context *context.Context) {
 	context.SetJsAPITicketLock(new(sync.RWMutex))
 }
 
-//GetAccessToken 获取access_token
-func (wc *Wechat) GetAccessToken() (string, error) {
-	return wc.Context.GetAccessToken()
-}
-
 // GetServer 消息管理
 func (wc *Wechat) GetServer(req *http.Request, writer http.ResponseWriter) *server.Server {
 	wc.Context.Request = req
@@ -57,35 +52,32 @@ func (wc *Wechat) GetServer(req *http.Request, writer http.ResponseWriter) *serv
 	return server.NewServer(wc.Context)
 }
 
+//GetAccessToken 获取access_token
+func (wc *Wechat) GetAccessToken() (string, error) {
+	return wc.Context.GetAccessToken()
+}
+
+// GetOauth oauth2网页授权
+func (wc *Wechat) GetOauth() *oauth.Oauth {
+	return oauth.NewOauth(wc.Context)
+}
+
 // GetMaterial 素材管理
 func (wc *Wechat) GetMaterial() *material.Material {
 	return material.NewMaterial(wc.Context)
 }
 
-// GetOauth oauth2网页授权
-func (wc *Wechat) GetOauth(req *http.Request, writer http.ResponseWriter) *oauth.Oauth {
-	wc.Context.Request = req
-	wc.Context.Writer = writer
-	return oauth.NewOauth(wc.Context)
-}
-
 // GetJs js-sdk配置
-func (wc *Wechat) GetJs(req *http.Request, writer http.ResponseWriter) *js.Js {
-	wc.Context.Request = req
-	wc.Context.Writer = writer
+func (wc *Wechat) GetJs() *js.Js {
 	return js.NewJs(wc.Context)
 }
 
 // GetMenu 菜单管理接口
-func (wc *Wechat) GetMenu(req *http.Request, writer http.ResponseWriter) *menu.Menu {
-	wc.Context.Request = req
-	wc.Context.Writer = writer
+func (wc *Wechat) GetMenu() *menu.Menu {
 	return menu.NewMenu(wc.Context)
 }
 
-// GetUser 菜单管理接口
-func (wc *Wechat) GetUser(req *http.Request, writer http.ResponseWriter) *user.User {
-	wc.Context.Request = req
-	wc.Context.Writer = writer
+// GetUser 用户管理接口
+func (wc *Wechat) GetUser() *user.User {
 	return user.NewUser(wc.Context)
 }