pai2/settings.py

@@ -275,11 +275,10 @@ WECHAT = {

                 
              

                 WECHAT_REDIRECT_URI = 'http://api.pai.ai/to_redirect'
              

                 
              

                -WECHAT_GET_CODE_BASE = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=snsapi_base&state=%s#wechat_redirect'
              

                -WECHAT_GET_CODE_USERINFO = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=snsapi_userinfo&state=%s#wechat_redirect'
              

                -WECHAT_GET_OAUTH2_ACCESS_TOKEN = 'https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code'
              

                +WECHAT_OAUTH2_AUTHORIZE = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid={appid}&redirect_uri={redirect_uri}&response_type=code&scope={scope}&state={state}#wechat_redirect'
              

                +WECHAT_OAUTH2_ACCESS_TOKEN = 'https://api.weixin.qq.com/sns/oauth2/access_token?appid={appid}&secret={secret}&code={code}&grant_type=authorization_code'
              

                 
              

                -WECHAT_GET_USERINFO = 'https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s'
              

                +WECHAT_OAUTH2_USERINFO = 'https://api.weixin.qq.com/sns/userinfo?access_token={access_token}&openid={openid}'
              

                 
              

                 # 微信支付设置
              

                 WXPAY_NOTIFY_SUCCESS = '<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>'
              

requirements.txt

@@ -19,7 +19,6 @@ ipython==4.0.0

                 jsonfield==1.0.3
              

                 kkconst==1.1.2
              

                 pep8==1.6.2
              

                -pysnippets==1.0.2
              

                 pytz==2015.7
              

                 records==0.4.3
              

                 redis==2.10.5
              

wechat/views.py

@@ -5,12 +5,10 @@ import urllib

                 
              

                 import requests
              

                 import shortuuid
              

                -from CodeConvert import CodeConvert as cc
              

                 from django.conf import settings
              

                 from django.shortcuts import redirect
              

                 from furl import furl
              

                 from json_response import auto_response
              

                -from pysnippets import dictsnippets as dsnippets
              

                 from wechatpy import WeChatClient
              

                 
              

                 
              
@@ -25,9 +23,12 @@ def get_openid(request):

                     default_url = request.GET.get('default_url', '')
              

                 
              

                     if request.weixin:
              

                -        authorize_url = settings.WECHAT_GET_CODE_USERINFO if scope == 'snsapi_userinfo' else settings.WECHAT_GET_CODE_BASE
              

                -        get_code_url = authorize_url % (JSAPI['appID'], urllib.quote_plus(settings.WECHAT_REDIRECT_URI), urllib.quote_plus(redirect_url))
              

                -        return redirect(get_code_url)
              

                +        return redirect(settings.WECHAT_OAUTH2_AUTHORIZE.format(
              

                +            appid=JSAPI['appID'],
              

                +            redirect_uri=urllib.quote_plus(settings.WECHAT_REDIRECT_URI),
              

                +            scope=scope,
              

                +            state=urllib.quote_plus(redirect_url)
              

                +        ))
              

                 
              

                     return redirect(default_url if default_url else redirect_url)
              

                 
              
@@ -36,14 +37,18 @@ def to_redirect(request):

                     code = request.GET.get('code', '')
              

                     state = request.GET.get('state', '')
              

                 
              

                -    access_info = requests.get(settings.WECHAT_GET_OAUTH2_ACCESS_TOKEN % (JSAPI['appID'], JSAPI['appsecret'], code), verify=False).json()
              

                +    access_info = requests.get(settings.WECHAT_OAUTH2_ACCESS_TOKEN.format(
              

                +        appid=JSAPI['appID'],
              

                +        secret=JSAPI['appsecret'],
              

                +        code=code
              

                +    ), verify=False).json()
              

                     unionid, openid, access_token = access_info.get('unionid', ''), access_info.get('openid', ''), access_info.get('access_token', '')
              

                 
              

                -    res = requests.get(settings.WECHAT_GET_USERINFO % (access_token, openid), verify=False)
              

                +    res = requests.get(settings.WECHAT_OAUTH2_USERINFO.format(access_token=access_token, openid=openid), verify=False)
              

                     res.encoding = 'utf-8'
              

                     userinfo = res.json()
              

                 
              

                -    return redirect(furl(state).add(cc.Convert2Utf8(dsnippets.filter(userinfo, ['unionid', 'openid', 'nickname', 'headimgurl']))).url)
              

                +    return redirect(furl(state).add(userinfo).url)
              

                 
              

                 
              

                 @auto_response