| @@ -5,7 +5,6 @@ from django_we import views as we_views | ||
| 5 | 5 |  | 
| 6 | 6 | from account import views as account_views | 
| 7 | 7 | from account import tourguide_views | 
| 8 | -from api import views as api_views | |
| 9 | 8 | from box import views as box_views | 
| 10 | 9 | from geo import views as geo_views | 
| 11 | 10 | from group import views as group_views | 
| @@ -19,13 +18,8 @@ from photo import views as photo_views | ||
| 19 | 18 | from server import server_views | 
| 20 | 19 |  | 
| 21 | 20 |  | 
| 22 | -# 测试方式:取消注释,请求接口 | |
| 23 | -urlpatterns = [ | |
| 24 | - # url(r'^test$', api_views.mail_error_test, name='mail_error_test'), # 邮件发送错误信息测试接口 | |
| 25 | -] | |
| 26 | - | |
| 27 | 21 | # 帐户相关 | 
| 28 | -urlpatterns += [ | |
| 22 | +urlpatterns = [ | |
| 29 | 23 | url(r'^u/wx/authorize$', account_views.user_wx_authorize_api, name='user_wx_authorize_api'), # 用户端 - 微信用户授权 | 
| 30 | 24 |  | 
| 31 | 25 | url(r'^u/guest/status$', op_views.guest_api, name='user_guest_status_api'), # 用户端 - 微游客状态(是否开启) | 
| @@ -1,9 +1,4 @@ | ||
| 1 | -# -*- coding: utf-8 -*- | |
| 1 | +from django.shortcuts import render | |
| 2 | 2 |  | 
| 3 | -from utils.error.response_utils import response | |
| 4 | 3 |  | 
| 5 | - | |
| 6 | -def mail_error_test(request): | |
| 7 | - # Raise ZeroDivisionError | |
| 8 | - 1 / 0 | |
| 9 | - return response() | |
| 4 | +# Create your views here. | 
| @@ -44,6 +44,7 @@ INSTALLED_APPS = ( | ||
| 44 | 44 | 'rest_framework', | 
| 45 | 45 | 'django_q', | 
| 46 | 46 | 'django_rlog', | 
| 47 | + 'django_uniapi', | |
| 47 | 48 | 'django_we', | 
| 48 | 49 | 'api', | 
| 49 | 50 | 'account', | 
| @@ -89,6 +89,7 @@ urlpatterns += [ | ||
| 89 | 89 | urlpatterns += [ | 
| 90 | 90 | url(r'^api/', include(router.urls)), | 
| 91 | 91 |      url(r'^page/', include('page.urls', namespace='page')), | 
| 92 | +    url(r'^uniapi/', include('django_uniapi.urls', namespace='uniapi')), | |
| 92 | 93 |      url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) | 
| 93 | 94 | ] | 
| 94 | 95 |  | 
| @@ -18,6 +18,7 @@ django-paginator2==1.0.3 | ||
| 18 | 18 | django-rlog==1.0.7 | 
| 19 | 19 | django-shortuuidfield==0.1.3 | 
| 20 | 20 | django-six==1.0.2 | 
| 21 | +django-uniapi==1.0.0 | |
| 21 | 22 | django-we==1.0.1 | 
| 22 | 23 | djangorestframework==3.6.3 | 
| 23 | 24 | furl==1.0.0 |