Merge branch 'tamron' of http://git.xfoto.com.cn/Kodo/kodo into tamron
4 измененных файлов с 15 добавлено и 12 удалено
+ 4
- 3
kodo/settings.py
@@ -37,6 +37,7 @@ ALLOWED_HOSTS = [] |
||
| 37 | 37 |
# Application definition |
| 38 | 38 |
|
| 39 | 39 |
INSTALLED_APPS = ( |
| 40 |
+ 'simpleui', |
|
| 40 | 41 |
'django.contrib.admin', |
| 41 | 42 |
'django.contrib.auth', |
| 42 | 43 |
'django.contrib.contenttypes', |
@@ -443,17 +444,17 @@ TESTING_ZBAR = os.path.join(BASE_DIR, 'utils/zbar/zbar.jpg').replace('\\', '/')
|
||
| 443 | 444 |
# 开发调试相关配置 |
| 444 | 445 |
if DEBUG: |
| 445 | 446 |
try: |
| 446 |
- from local_settings_dev import * |
|
| 447 |
+ from .local_settings_dev import * |
|
| 447 | 448 |
except ImportError: |
| 448 | 449 |
pass |
| 449 | 450 |
|
| 450 | 451 |
try: |
| 451 |
- from local_settings import * |
|
| 452 |
+ from .local_settings import * |
|
| 452 | 453 |
except ImportError: |
| 453 | 454 |
pass |
| 454 | 455 |
|
| 455 | 456 |
try: |
| 456 |
- from oauth_settings import * |
|
| 457 |
+ from .oauth_settings import * |
|
| 457 | 458 |
except ImportError: |
| 458 | 459 |
pass |
| 459 | 460 |
|
+ 8
- 8
kodo/urls.py
@@ -84,24 +84,24 @@ urlpatterns += [ |
||
| 84 | 84 |
# Additionally, we include login URLs for the browsable API. |
| 85 | 85 |
urlpatterns += [ |
| 86 | 86 |
# url(r'^restapi/', include(router.urls)), |
| 87 |
- url(r'^api/', include('api.urls', namespace='api')),
|
|
| 88 |
- url(r'^uniapi/', include('django_uniapi.urls', namespace='uniapi')),
|
|
| 89 |
- url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
|
|
| 87 |
+ url(r'^api/', include(('api.urls', 'api'), namespace='api')),
|
|
| 88 |
+ url(r'^uniapi/', include(('django_uniapi.urls', 'uniapi'), namespace='uniapi')),
|
|
| 89 |
+ url(r'^api-auth/', include(('rest_framework.urls', 'rest_framework'), namespace='rest_framework')),
|
|
| 90 | 90 |
] |
| 91 | 91 |
|
| 92 | 92 |
urlpatterns += [ |
| 93 |
- url(r'^w/', include('django_we.urls', namespace='shortwechat')),
|
|
| 94 |
- url(r'^we/', include('django_we.urls', namespace='wechat')),
|
|
| 93 |
+ url(r'^w/', include(('django_we.urls', 'shortwechat'), namespace='shortwechat')),
|
|
| 94 |
+ url(r'^we/', include(('django_we.urls', 'wechat'), namespace='wechat')),
|
|
| 95 | 95 |
] |
| 96 | 96 |
|
| 97 | 97 |
urlpatterns += [ |
| 98 |
- url(r'^p/', include('page.urls', namespace='shortpage')),
|
|
| 99 |
- url(r'^page/', include('page.urls', namespace='page')),
|
|
| 98 |
+ url(r'^p/', include(('page.urls', 'shortpage'), namespace='shortpage')),
|
|
| 99 |
+ url(r'^page/', include(('page.urls', 'page'), namespace='page')),
|
|
| 100 | 100 |
] |
| 101 | 101 |
|
| 102 | 102 |
# Simditor编辑器 |
| 103 | 103 |
urlpatterns += [ |
| 104 |
- url(r'^simditor/', include('simditor.urls'))
|
|
| 104 |
+ url(r'^simditor/', include(('simditor.urls', 'simditor'), namespace='simditor'))
|
|
| 105 | 105 |
] |
| 106 | 106 |
|
| 107 | 107 |
if settings.DEBUG: |
+ 1
- 0
requirements_dj.txt
@@ -19,6 +19,7 @@ django-redis-connector==1.0.3 |
||
| 19 | 19 |
django-response==1.1.1 |
| 20 | 20 |
django-rlog==1.0.7 |
| 21 | 21 |
django-shortuuidfield==0.1.3 |
| 22 |
+# django-simpleui==3.9.1 |
|
| 22 | 23 |
django-six==1.0.4 |
| 23 | 24 |
django-uniapi==1.0.7 |
| 24 | 25 |
django-we==1.5.3 |
+ 2
- 1
requirements_pywe.txt
@@ -1,7 +1,8 @@ |
||
| 1 |
+pywe-card==1.0.0 |
|
| 1 | 2 |
pywe-component==1.0.1 |
| 2 | 3 |
pywe-component-preauthcode==1.0.3 |
| 3 | 4 |
pywe-jssdk==1.1.0 |
| 4 |
-pywe-marketcode==1.0.2 |
|
| 5 |
+pywe-marketcode==1.0.3 |
|
| 5 | 6 |
pywe-membercard==1.0.1 |
| 6 | 7 |
pywe-custom-message==1.0.1 |
| 7 | 8 |
pywe-miniapp==1.1.5 |