fix wxpub_oauth; add long_description

samurai00 · samurai00 · commit 38ead3cae6db · 2018-02-09T11:54:36.000+08:00
diff --git a/LONG_DESCRIPTION.rst b/LONG_DESCRIPTION.rst
@@ -0,0 +1,17 @@
+Ping++ Python SDK
+===================================
+
+Ping++ 官方 Python SDK。
+
+安装
+-----
+
+使用 pip 安装
+
+    $ pip install pingpp
+
+API 文档及接入文档
+--------------------
+
+- https://www.pingxx.com/api
+- https://www.pingxx.com/docs/overview
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.6.1
+2.6.2
diff --git a/example/wxpub_oauth.py b/example/wxpub_oauth.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+import pingpp
+
+
+# 微信公众号平台的 App ID
+wx_app_id = 'wx9283883h477376s'
+# 微信公众号平台的 App Secret
+wx_app_secret = 'da38db82d0e495a037aec19df178572b'
+
+# -------
+# 获取 openid
+# 微信回调的页面，用于接收 code 来获取 openid
+redirect_url = 'https://example.com/authorize'
+
+oauth_url = pingpp.WxpubOauth.create_oauth_url_for_code(
+    wx_app_id, redirect_url, False)
+print(oauth_url)
+
+# 在微信中打开 oauth_url，页面会跳转到 redirect_url，并带有参数 code
+code = 'CODE_IN_URL_QUERY'
+openid = pingpp.WxpubOauth.get_openid(
+    wx_app_id, wx_app_secret, code)
+print(openid)
+
+# -------
+# 获取 jsapi_ticket
+jsapi_ticket = pingpp.WxpubOauth.get_jsapi_ticket(wx_app_id, wx_app_secret)
+print(jsapi_ticket)
diff --git a/pingpp/http_client.py b/pingpp/http_client.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, division, print_function
 
-import os
 import sys
 import textwrap
 import warnings
diff --git a/pingpp/version.py b/pingpp/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-VERSION = '2.6.1'
+VERSION = '2.6.2'
diff --git a/pingpp/wxpub_oauth.py b/pingpp/wxpub_oauth.py
@@ -2,8 +2,9 @@
 
 import hashlib
 
-from pingpp import http_client, util
+from pingpp import http_client, util, proxy, ca_bundle
 from pingpp.six.moves.urllib.parse import urlencode, quote_plus
+from pingpp import verify_ssl_certs as verify
 
 
 class WxpubOauth:
@@ -23,11 +24,13 @@ def get_openid(app_id, app_secret, code):
         :return: openid 微信公众号授权用户唯一标识, 可用于微信网页内支付
         """
         url = WxpubOauth.create_oauth_url_for_openid(app_id, app_secret, code)
-        client = http_client.new_default_http_client()
-        rbody, rcode = client.request('GET', url, {})
+        client = http_client.new_default_http_client(
+            verify_ssl_certs=verify, proxy=proxy, ca_bundle=ca_bundle)
+        rbody, rcode, headers = client.request('GET', url, {})
         if rcode == 200:
             data = util.json.loads(rbody)
-            return data['openid']
+            if 'openid' in data:
+                return data['openid']
 
         return None
 
@@ -88,24 +91,31 @@ def get_jsapi_ticket(app_id, app_secret):
         query_str = urlencode(data)
         access_token_url = \
             'https://api.weixin.qq.com/cgi-bin/token?' + query_str
-        client = http_client.new_default_http_client()
-        rbody, rcode = client.request('GET', access_token_url, {})
+        client = http_client.new_default_http_client(
+            verify_ssl_certs=verify, proxy=proxy, ca_bundle=ca_bundle)
+        rbody, rcode, headers = client.request('GET', access_token_url, {})
         rbody = util.json.loads(rbody)
         if rcode != 200:
             return rbody
 
+        if 'access_token' not in rbody:
+            return None
+
         data = dict()
         data['access_token'] = rbody['access_token']
         data['type'] = 'jsapi'
         query_str = urlencode(data)
         jsapi_ticket_url = \
             'https://api.weixin.qq.com/cgi-bin/ticket/getticket?' + query_str
-        client = http_client.new_default_http_client()
-        rbody, rcode = client.request('GET', jsapi_ticket_url, {})
+        client = http_client.new_default_http_client(
+            verify_ssl_certs=verify, proxy=proxy, ca_bundle=ca_bundle)
+        rbody, rcode, headers = client.request('GET', jsapi_ticket_url, {})
         data = util.json.loads(rbody)
         if rcode == 200:
             return data
 
+        return None
+
     @staticmethod
     def get_signature(charge, jsapi_ticket, url):
         """
@@ -126,5 +136,5 @@ def get_signature(charge, jsapi_ticket, url):
             key.lower(),
             sign_dict[key]
         ) for key in sorted(sign_dict)])
-        sign_dict['signature'] = hashlib.sha1(string).hexdigest()
-        return sign_dict['signature']
+
+        return hashlib.sha1(string).hexdigest()
diff --git a/setup.py b/setup.py
@@ -25,6 +25,9 @@
     install_requires.append('requests >= 0.8.8')
     install_requires.append('pycryptodome >= 3.4.7')
 
+with open('LONG_DESCRIPTION.rst') as f:
+    long_description = f.read()
+
 # Don't import pingpp module here, since deps may not be installed
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pingpp'))
 from version import VERSION  # noqa
@@ -43,6 +46,7 @@
               'pingpp.api_resources.abstract'],
     version=VERSION,
     description='Ping++ python bindings',
+    long_description=long_description,
     author='Ping++',
     author_email='support@pingxx.com',
     url='https://pingxx.com/',

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`# -- coding: utf-8 --`
`2`	`2`
`3`		`-VERSION = '2.6.1'`
	`3`	`+VERSION = '2.6.2'`