num-old"> 81
-        'user_status': UserInfo.ACTIVATED,
82
-    }
83
-    # 若 uuid 存在,则 get_or_create,否则 create
84
-    if uuid:
85
-        user, created = UserInfo.objects.select_for_update().get_or_create(user_from=UserInfo.GUEST_USER, uuid=uuid, defaults=fields)
86
-        if created:
87
-            user.nickname = u'游客{}'.format(user.pk)
88
-            user.save()
89
-    else:
90
-        user = UserInfo.objects.select_for_update().create(**fields)
91
-        user.nickname = u'游客{}'.format(user.pk)
92
-        user.save()
93
-
94
-    return response(200, 'Guest Login Success', u'游客登录成功', user.data)
95
-
96
-
97
-class UserViewSet(viewsets.ModelViewSet):
98
-    """
99
-    API endpoint that allows users to be viewed or edited.
100
-    """
101
-    queryset = User.objects.all().order_by('-pk')
102
-    serializer_class = UserSerializer
103
-
104
-
105
-class GroupViewSet(viewsets.ModelViewSet):
106
-    """
107
-    API endpoint that allows groups to be viewed or edited.
108
-    """
109
-    queryset = Group.objects.all()
110
-    serializer_class = GroupSerializer
111
-
112
-
113
-class LensmanInfoViewSet(viewsets.ModelViewSet):
114
-    queryset = LensmanInfo.objects.all().order_by('-pk')
115
-    serializer_class = LensmanInfoSerializer
116
-
117
-
118
-class UserInfoViewSet(viewsets.ModelViewSet):
119
-    queryset = UserInfo.objects.all().order_by('-pk')
120
-    serializer_class = UserInfoSerializer
7
+# Create your views here.

+ 1 - 2
api/urls.py

@@ -2,8 +2,7 @@
2 2
 
3 3
 from django.conf.urls import url
4 4
 
5
-from account import tourguide_views
6
-from account import views as account_views
5
+from account import account_views, tourguide_views
7 6
 from api import encrypt_views, mch_views
8 7
 from box import views as box_views
9 8
 from geo import views as geo_views

+ 1 - 1
pai2/urls.py

@@ -21,7 +21,7 @@ from django.conf.urls.static import static
21 21
 from django.contrib import admin
22 22
 from rest_framework import routers
23 23
 
24
-from account import views as account_views
24
+from account import account_views
25 25
 from group import group_views, grouppage_views
26 26
 from miniapp import views as mini_views
27 27
 from photo import views as photo_views

kodo - Gogs: Go Git Service

Нет описания

Brightcells: 75dbf7fdc8 New migration лет %!s(int64=8): %!d(string=назад)
..
0001_initial.py 7a17d0fb90 add api wxpay & add redis relative лет %!s(int64=10): %!d(string=назад)
0002_orderinfo_trade_type.py 0f425ae151 add api wx_order_query_api лет %!s(int64=10): %!d(string=назад)
0003_auto_20160417_1544.py a0dfcb6f16 Alter field pay_status on orderinfo лет %!s(int64=10): %!d(string=назад)
0004_auto_20160422_1322.py 102152ca4a add api lensman_photo_bought & modify api wx_order_create_api and adjust return field лет %!s(int64=10): %!d(string=назад)
0005_remove_orderinfo_to_lid.py 8c384ff52e remove to_lid лет %!s(int64=9): %!d(string=назад)
0006_auto_20160901_1439.py 6199c8f7ad add api lensman_origin_wanted_api/lensman_origin_photo_upload_api лет %!s(int64=9): %!d(string=назад)
0007_orderinfo_unifiedorder_result.py b2aa0f8533 Add new field unifiedorder_result лет %!s(int64=8): %!d(string=назад)
0008_auto_20170714_0759.py 32061504ff Add some fields for Order лет %!s(int64=8): %!d(string=назад)
0009_auto_20170715_2314.py 75dbf7fdc8 New migration лет %!s(int64=8): %!d(string=назад)
__init__.py 7a17d0fb90 add api wxpay & add redis relative лет %!s(int64=10): %!d(string=назад)