Complete change to use django-we's urls.py
Brightcells
9 fichiers modifiés avec 16 ajouts et 28 suppressions
+ 0
- 13
api/urls.py
@@ -1,7 +1,6 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
|
| 3 | 3 |
from django.conf.urls import url |
| 4 |
-from django_we import views as we_views |
|
| 5 | 4 |
|
| 6 | 5 |
from account import views as account_views |
| 7 | 6 |
from account import tourguide_views |
@@ -163,18 +162,6 @@ urlpatterns += [ |
||
| 163 | 162 |
url(r'^wx/balance_withdraw$', pay_views.wx_balance_withdraw_api, name='wx_balance_withdraw_api'), # 余额提现: 企业付款/现金红包 |
| 164 | 163 |
] |
| 165 | 164 |
|
| 166 |
-# 微信授权相关 |
|
| 167 |
-urlpatterns += [ |
|
| 168 |
- url(r'^wx_oauth2$', we_views.we_oauth2, name='we_oauth2'), |
|
| 169 |
- url(r'^base_redirect$', we_views.base_redirect, name='base_redirect'), |
|
| 170 |
- url(r'^userinfo_redirect$', we_views.userinfo_redirect, name='userinfo_redirect'), |
|
| 171 |
-] |
|
| 172 |
- |
|
| 173 |
-# 微信分享相关 |
|
| 174 |
-urlpatterns += [ |
|
| 175 |
- url(r'^wx/jsapi_signature$', we_views.we_jsapi_signature_api, name='we_jsapi_signature_api'), # jsapi_signature |
|
| 176 |
-] |
|
| 177 |
- |
|
| 178 | 165 |
# 首页相关 |
| 179 | 166 |
urlpatterns += [ |
| 180 | 167 |
url(r'^pai2/home$', group_views.pai2_home_api, name='pai2_home_api'), # 首页照片信息 |
+ 2
- 2
page/templates/page/lensman_oauth.html
@@ -185,11 +185,11 @@ |
||
| 185 | 185 |
{% endif %}
|
| 186 | 186 |
</script> |
| 187 | 187 |
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
| 188 |
- <script type="text/javascript" src="{% static 'pai2/js/jswe.js' %}?v=1"></script>
|
|
| 188 |
+ <script type="text/javascript" src="{% static 'pai2/js/jswe-0.0.1.js' %}"></script>
|
|
| 189 | 189 |
<script> |
| 190 | 190 |
V.initWxData({
|
| 191 | 191 |
imgUrl: "http://pai.ai/static/pai2/img/paiai_96_96.png", |
| 192 |
- link: 'http://api.pai.ai/wx_oauth2?redirect_url=http://pai.ai/page/lensman&scope=snsapi_base', |
|
| 192 |
+ link: 'http://pai.ai/we/we_oauth2?redirect_url=http://pai.ai/page/lensman&scope=snsapi_base', |
|
| 193 | 193 |
desc: "摄影师授权", |
| 194 | 194 |
title: "摄影师授权", |
| 195 | 195 |
timeLine: "" |
+ 2
- 2
page/templates/page/login_qrcode.html
@@ -47,11 +47,11 @@ |
||
| 47 | 47 |
}); |
| 48 | 48 |
</script> |
| 49 | 49 |
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
| 50 |
- <script type="text/javascript" src="{% static 'pai2/js/jswe.js' %}?v=1"></script>
|
|
| 50 |
+ <script type="text/javascript" src="{% static 'pai2/js/jswe-0.0.1.js' %}"></script>
|
|
| 51 | 51 |
<script> |
| 52 | 52 |
V.initWxData({
|
| 53 | 53 |
imgUrl: "http://pai.ai/static/pai2/img/paiai_96_96.png", |
| 54 |
- link: 'http://api.pai.ai/wx_oauth2?redirect_url=http://pai.ai/page/lensman&scope=snsapi_base', |
|
| 54 |
+ link: 'http://pai.ai/we/we_oauth2?redirect_url=http://pai.ai/page/lensman&scope=snsapi_base', |
|
| 55 | 55 |
desc: "摄影师授权", |
| 56 | 56 |
title: "摄影师授权", |
| 57 | 57 |
timeLine: "" |
+ 2
- 2
page/templates/page/tourguide_oauth.html
@@ -152,7 +152,7 @@ |
||
| 152 | 152 |
|
| 153 | 153 |
<script type="text/javascript" src="//cdn.bootcss.com/zepto/1.1.6/zepto.min.js"></script> |
| 154 | 154 |
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
| 155 |
- <script type="text/javascript" src="{% static 'pai2/js/jswe.js' %}?v=15"></script>
|
|
| 155 |
+ <script type="text/javascript" src="{% static 'pai2/js/jswe-0.0.1.js' %}"></script>
|
|
| 156 | 156 |
<script> |
| 157 | 157 |
{% if modified %}
|
| 158 | 158 |
$(function() {
|
@@ -255,7 +255,7 @@ |
||
| 255 | 255 |
} |
| 256 | 256 |
V.initWxData({
|
| 257 | 257 |
imgUrl: "http://pai.ai/static/pai2/img/paiai_96_96.png", |
| 258 |
- link: 'http://api.pai.ai/wx_oauth2?redirect_url=http://pai.ai/page/tourguide&scope=snsapi_base', |
|
| 258 |
+ link: 'http://pai.ai/we/we_oauth2?redirect_url=http://pai.ai/page/tourguide&scope=snsapi_base', |
|
| 259 | 259 |
desc: "导游授权", |
| 260 | 260 |
title: "导游授权", |
| 261 | 261 |
timeLine: "" |
+ 6
- 6
pai2/settings.py
@@ -220,11 +220,6 @@ WECHAT = {
|
||
| 220 | 220 |
}, |
| 221 | 221 |
} |
| 222 | 222 |
|
| 223 |
-# 微信授权设置 |
|
| 224 |
-WECHAT_BASE_REDIRECT_URI = 'https://api.pai.ai/base_redirect' |
|
| 225 |
-WECHAT_USERINFO_REDIRECT_URI = 'https://api.pai.ai/userinfo_redirect' |
|
| 226 |
-WECHAT_OAUTH2_RETRY_REDIRECT_URI = 'https://api.pai.ai/wx_oauth2?redirect_url={}'
|
|
| 227 |
- |
|
| 228 | 223 |
# 七牛设置 |
| 229 | 224 |
QINIU = {
|
| 230 | 225 |
'access_key': 'yCE3xWXduLTERkx_vSNVAIHNcg1pje6EwygiRPjP', |
@@ -345,9 +340,14 @@ try: |
||
| 345 | 340 |
except ImportError: |
| 346 | 341 |
pass |
| 347 | 342 |
|
| 343 |
+# 依赖 local_settings 中的配置 |
|
| 344 |
+# 微信授权设置 |
|
| 345 |
+WECHAT_BASE_REDIRECT_URI = '{0}/we/base_redirect'.format(DOMAIN)
|
|
| 346 |
+WECHAT_USERINFO_REDIRECT_URI = '{0}/we/userinfo_redirect'.format(DOMAIN)
|
|
| 347 |
+WECHAT_OAUTH2_REDIRECT_URI = '{0}/we/we_oauth2?scope={{0}}redirect_url={{1}}'.format(DOMAIN)
|
|
| 348 |
+ |
|
| 348 | 349 |
# 消息图片设置 |
| 349 | 350 |
PAI2_LOGO_URL = DOMAIN + '/static/pai2/img/paiai_96_96.png' |
| 350 |
- |
|
| 351 | 351 |
SYSTEM_MESSAGE_AVATAR = PAI2_LOGO_URL |
| 352 | 352 |
COMMENT_MESSAGE_AVATAR = PAI2_LOGO_URL |
| 353 | 353 |
THUMBUP_MESSAGE_AVATAR = PAI2_LOGO_URL |
+ 1
- 1
pai2/static/pai2/js/jswe.js
@@ -1,6 +1,6 @@ |
||
| 1 | 1 |
!(function(e, t) {
|
| 2 | 2 |
var config = {
|
| 3 |
- wxconfig: 'http://api.pai.ai/wx/jsapi_signature', |
|
| 3 |
+ wxconfig: 'https://pai.ai/we/jsapi_signature', |
|
| 4 | 4 |
callback: 'callback' |
| 5 | 5 |
}, wxData = {
|
| 6 | 6 |
debug: false, |
+ 1
- 0
pai2/urls.py
@@ -90,6 +90,7 @@ urlpatterns += [ |
||
| 90 | 90 |
url(r'^api/', include(router.urls)), |
| 91 | 91 |
url(r'^page/', include('page.urls', namespace='page')),
|
| 92 | 92 |
url(r'^uniapi/', include('django_uniapi.urls', namespace='uniapi')),
|
| 93 |
+ url(r'^we/', include('django_we.urls', namespace='wechat')),
|
|
| 93 | 94 |
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
|
| 94 | 95 |
] |
| 95 | 96 |
|
+ 1
- 1
photo/templates/photo/photo_detail.html
@@ -47,7 +47,7 @@ |
||
| 47 | 47 |
|
| 48 | 48 |
<script type="text/javascript" src="//cdn.bootcss.com/zepto/1.1.6/zepto.min.js"></script> |
| 49 | 49 |
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
| 50 |
- <script type="text/javascript" src="{% static 'pai2/js/jswe.js' %}?v=1"></script>
|
|
| 50 |
+ <script type="text/javascript" src="{% static 'pai2/js/jswe-0.0.1.js' %}"></script>
|
|
| 51 | 51 |
<script> |
| 52 | 52 |
V.initWxData({
|
| 53 | 53 |
imgUrl: "http://pai.ai/static/pai2/img/paiai_96_96.png", |
+ 1
- 1
photo/templates/photo/session_detail.html
@@ -49,7 +49,7 @@ |
||
| 49 | 49 |
|
| 50 | 50 |
<script type="text/javascript" src="//cdn.bootcss.com/zepto/1.1.6/zepto.min.js"></script> |
| 51 | 51 |
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
| 52 |
- <script type="text/javascript" src="{% static 'pai2/js/jswe.js' %}?v=1"></script>
|
|
| 52 |
+ <script type="text/javascript" src="{% static 'pai2/js/jswe-0.0.1.js' %}"></script>
|
|
| 53 | 53 |
<script> |
| 54 | 54 |
V.initWxData({
|
| 55 | 55 |
imgUrl: "http://pai.ai/static/pai2/img/paiai_96_96.png", |