From c307f7769fe5a99bce50468c17c804730d8f6083 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 12 Aug 2016 14:13:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb | 12 ++++++++----
 lib/wechat/lib/wechat/api.rb          |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index b58ebd07a..0228be12c 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -440,14 +440,18 @@ class WechatsController < ActionController::Base
 
     private
     def get_openid_from_code(code)
-      info = wechat.web_access_token(code)
-      logger.info "web_access_token!!!!!!!!!!!!"
-      logger.info info
       return 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg' if code =='only-for-test'
       openid = session[:wechat_openid]
       unless openid
         if code
-          openid = wechat.web_access_token(code)["openid"]
+          info = wechat.web_access_token(code)
+          openid =info["openid"]
+          access_token =info["access_token"]
+          if access_token
+             session[:access_token] = access_token
+          end
+
+          # openid = wechat.web_access_token(code)["openid"]
           # info = wechat.web_access_token(code)
           # logger.info "web_access_token!!!!!!!!!!!!"
           # logger.info info
diff --git a/lib/wechat/lib/wechat/api.rb b/lib/wechat/lib/wechat/api.rb
index f1255939a..79dd69889 100644
--- a/lib/wechat/lib/wechat/api.rb
+++ b/lib/wechat/lib/wechat/api.rb
@@ -127,7 +127,7 @@ module Wechat
           openid: openid,
           lang: "zh_CN"
       }
-      get 'user_info', params: params, base: OAUTH2_BASE
+      get 'userinfo', params: params, base: OAUTH2_BASE
     end
   end
 end