Change oauth to use http
Brightcells
共有 4 个文件被更改，包括 16 次插入 和 13 次删除
+ 7
- 3
pai2/settings.py
@@ -299,6 +299,10 @@ DOMAIN = 'https://pai.ai' |
||
| 299 | 299 |
IMG_DOMAIN = 'https://img.pai.ai' |
| 300 | 300 |
API_DOMAIN = 'https://api.pai.ai' |
| 301 | 301 |
|
| 302 |
+DOMAIN_HTTP = 'http://pai.ai' |
|
| 303 |
+IMG_DOMAIN_HTTP = 'http://img.pai.ai' |
|
| 304 |
+API_DOMAIN_HTTP = 'http://api.pai.ai' |
|
| 305 |
+ |
|
| 302 | 306 |
# LOGIT 设置 |
| 303 | 307 |
LOGIT_BODY_FLAG = True |
| 304 | 308 |
LOGIT_RES_FLAG = True |
@@ -350,9 +354,9 @@ WEBSITE_MOBI = '{0}/pc/'.format(DOMAIN)
|
||
| 350 | 354 |
|
| 351 | 355 |
# 依赖 local_settings 中的配置 |
| 352 | 356 |
# 微信授权设置 |
| 353 |
-WECHAT_BASE_REDIRECT_URI = '{0}/we/base_redirect'.format(DOMAIN)
|
|
| 354 |
-WECHAT_USERINFO_REDIRECT_URI = '{0}/we/userinfo_redirect'.format(DOMAIN)
|
|
| 355 |
-WECHAT_OAUTH2_REDIRECT_URI = '{0}/we/we_oauth2?scope={{0}}redirect_url={{1}}'.format(DOMAIN)
|
|
| 357 |
+WECHAT_OAUTH2_REDIRECT_URI = '{0}/we/we_oauth2?scope={{0}}redirect_url={{1}}'.format(DOMAIN_HTTP)
|
|
| 358 |
+WECHAT_BASE_REDIRECT_URI = '{0}/we/base_redirect'.format(DOMAIN_HTTP)
|
|
| 359 |
+WECHAT_USERINFO_REDIRECT_URI = '{0}/we/userinfo_redirect'.format(DOMAIN_HTTP)
|
|
| 356 | 360 |
|
| 357 | 361 |
# 消息图片设置 |
| 358 | 362 |
PAI2_LOGO_URL = DOMAIN + '/static/pai2/img/paiai_96_96.png' |
+ 1
- 1
pep8.sh
@@ -6,4 +6,4 @@ |
||
| 6 | 6 |
# -- E128 continuation line under-indented for visual indent |
| 7 | 7 |
# -- E501 line too long |
| 8 | 8 |
|
| 9 |
-pep8 --exclude=migrations --ignore=E128,E501 . |
|
| 9 |
+pycodestyle --exclude=migrations --ignore=E128,E501 . |
+ 7
- 8
requirements.txt
@@ -2,14 +2,14 @@ |
||
| 2 | 2 |
CodeConvert==2.0.4 |
| 3 | 3 |
Django==1.8.4 |
| 4 | 4 |
MySQL-python==1.2.5 |
| 5 |
-Pillow==4.2.1 |
|
| 5 |
+Pillow==4.3.0 |
|
| 6 | 6 |
StatusCode==1.0.0 |
| 7 | 7 |
TimeConvert==1.4.1 |
| 8 | 8 |
cryptography==1.5.2 |
| 9 | 9 |
django-curtail-uuid==1.0.0 |
| 10 | 10 |
django-detect==1.0.5 |
| 11 | 11 |
django-file-md5==1.0.1 |
| 12 |
-django-ip==1.0.0 |
|
| 12 |
+django-ip==1.0.2 |
|
| 13 | 13 |
django-json-render==1.0.0 |
| 14 | 14 |
django-json-response==1.1.5 |
| 15 | 15 |
django-logit==1.0.6 |
@@ -18,16 +18,15 @@ django-multidomain==1.1.4 |
||
| 18 | 18 |
django-paginator2==1.0.3 |
| 19 | 19 |
django-rlog==1.0.7 |
| 20 | 20 |
django-shortuuidfield==0.1.3 |
| 21 |
-django-six==1.0.2 |
|
| 21 |
+django-six==1.0.4 |
|
| 22 | 22 |
django-uniapi==1.0.0 |
| 23 |
-django-we==1.0.13 |
|
| 24 |
-djangorestframework==3.6.3 |
|
| 23 |
+django-we==1.0.14 |
|
| 24 |
+djangorestframework==3.7.0 |
|
| 25 | 25 |
furl==1.0.1 |
| 26 | 26 |
hiredis==0.2.0 |
| 27 | 27 |
isoweek==1.3.3 |
| 28 | 28 |
jsonfield==2.0.2 |
| 29 | 29 |
mock==2.0.0 |
| 30 |
-pep8==1.7.0 |
|
| 31 | 30 |
pysnippets==1.0.4 |
| 32 | 31 |
pywe-jssdk==1.0.2 |
| 33 | 32 |
pywe-miniapp==1.0.0 |
@@ -37,11 +36,11 @@ pywe-pay-notify==1.0.1 |
||
| 37 | 36 |
pywe-response==1.0.1 |
| 38 | 37 |
pywe-sign==1.0.6 |
| 39 | 38 |
pywe-xml==1.0.0 |
| 40 |
-qiniu==7.1.5 |
|
| 39 |
+qiniu==7.1.8 |
|
| 41 | 40 |
redis==2.10.6 |
| 42 | 41 |
redis-extensions==1.1.1 |
| 43 | 42 |
requests==2.18.4 |
| 44 |
-rlog==0.2 |
|
| 43 |
+rlog==0.3 |
|
| 45 | 44 |
shortuuid==0.5.0 |
| 46 | 45 |
uWSGI==2.0.15 |
| 47 | 46 |
versions==0.10.0 |
+ 1
- 1
utils/time_utils.py
@@ -7,6 +7,6 @@ from TimeConvert import TimeConvert as tc |
||
| 7 | 7 |
def origin_expired_stamps(created_at, user_id): |
| 8 | 8 |
try: |
| 9 | 9 |
expired_stamps = tc.datetime_to_timestamp(created_at) * 1000 + settings.LENSMAN_PHOTO_ORIGIN_EXPIRED_MSEL |
| 10 |
- except: |
|
| 10 |
+ except Exception: |
|
| 11 | 11 |
expired_stamps = 0 |
| 12 | 12 |
return expired_stamps |