nes-num lines-num-old"> 225 
-        })
193 
+        return response(UserStatusCode.USER_NOT_FOUND)
226 194
227 195 
     try:
228 196 
         group = GroupInfo.objects.get(group_id=group_id)
229 197 
     except GroupInfo.DoesNotExist:
230 
-        return JsonResponse({
231 
-            'status': 4020,
232 
-            'message': u'群组不存在',
233 
-        })
198 
+        return response(GroupStatusCode.GROUP_NOT_FOUND)
234 199 
     if group.admin_id != user_id:
235 200 
         return JsonResponse({
236 201 
             'status': 40221,
@@ -253,23 +218,14 @@ def group_unlock_api(request):
253 218 
     try:
254 219 
         user = UserInfo.objects.get(user_id=user_id)
255 220 
     except UserInfo.DoesNotExist:
256 
-        return JsonResponse({
257 
-            'status': 4011,
258 
-            'message': u'用户不存在',
259 
-        })
221 
+        return response(UserStatusCode.USER_NOT_FOUND)
260 222
261 223 
     try:
262 224 
         group = GroupInfo.objects.get(group_id=group_id)
263 225 
     except GroupInfo.DoesNotExist:
264 
-        return JsonResponse({
265 
-            'status': 4020,
266 
-            'message': u'群组不存在',
267 
-        })
226 
+        return response(GroupStatusCode.GROUP_NOT_FOUND)
268 227 
     if group.admin_id != user_id:
269 
-        return JsonResponse({
270 
-            'status': 40221,
271 
-            'message': u'没有解锁权限',
272 
-        })
228 
+        return response(GroupStatusCode.NO_UNLOCK_PERMISSION)
273 229
274 230 
     group.group_lock = False
275 231 
     group.save()
@@ -288,25 +244,16 @@ def group_remove_api(request):
288 244 
     try:
289 245 
         admin = UserInfo.objects.get(user_id=admin_id)
290 246 
     except UserInfo.DoesNotExist:
291 
-        return JsonResponse({
292 
-            'status': 4011,
293 
-            'message': u'用户不存在',
294 
-        })
247 
+        return response(UserStatusCode.USER_NOT_FOUND)
295 248 
     try:
296 249 
         user = UserInfo.objects.get(user_id=user_id)
297 250 
     except UserInfo.DoesNotExist:
298 
-        return JsonResponse({
299 
-            'status': 4011,
300 
-            'message': u'用户不存在',
301 
-        })
251 
+        return response(UserStatusCode.USER_NOT_FOUND)
302 252
303 253 
     try:
304 254 
         group = GroupInfo.objects.get(group_id=group_id)
305 255 
     except GroupInfo.DoesNotExist:
306 
-        return JsonResponse({
307 
-            'status': 4020,
308 
-            'message': u'群组不存在',
309 
-        })
256 
+        return response(GroupStatusCode.GROUP_NOT_FOUND)
310 257 
     if group.admin_id != admin_id:
311 258 
         return JsonResponse({
312 259 
             'status': 40222,
@@ -316,10 +263,7 @@ def group_remove_api(request):
316 263 
     try:
317 264 
         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)
318 265 
     except GroupUserInfo.DoesNotExist:
319 
-        return JsonResponse({
320 
-            'status': 4029,
321 
-            'message': u'该用户不在群组',
322 
-        })
266 
+        return response(GroupStatusCode.GROUP_USER_NOT_FOUND)
323 267 
     group_user.user_status = GroupUserInfo.DELETED
324 268 
     group_user.deleted_at = tc.utc_datetime()
325 269 
     group_user.save()
@@ -342,38 +286,23 @@ def group_pass_api(request):
342 286 
     try:
343 287 
         admin = UserInfo.objects.get(user_id=admin_id)
344 288 
     except UserInfo.DoesNotExist:
345 
-        return JsonResponse({
346 
-            'status': 4011,
347 
-            'message': u'用户不存在',
348 
-        })
289 
+        return response(UserStatusCode.USER_NOT_FOUND)
349 290 
     try:
350 291 
         user = UserInfo.objects.get(user_id=user_id)
351 292 
     except UserInfo.DoesNotExist:
352 
-        return JsonResponse({
353 
-            'status': 4011,
354 
-            'message': u'用户不存在',
355 
-        })
293 
+        return response(UserStatusCode.USER_NOT_FOUND)
356 294
357 295 
     try:
358 296 
         group = GroupInfo.objects.get(group_id=group_id)
359 297 
     except GroupInfo.DoesNotExist:
360 
-        return JsonResponse({
361 
-            'status': 4020,
362 
-            'message': u'群组不存在',
363 
-        })
298 
+        return response(GroupStatusCode.GROUP_NOT_FOUND)
364 299 
     if group.admin_id != admin_id:
365 
-        return JsonResponse({
366 
-            'status': 40223,
367 
-            'message': u'没有通过权限',
368 
-        })
300 
+        return response(GroupStatusCode.NO_PASS_PERMISSION)
369 301
370 302 
     try:
371 303 
         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.APPLYING)
372 304 
     except GroupUserInfo.DoesNotExist:
373 
-        return JsonResponse({
374 
-            'status': 4028,
375 
-            'message': u'加群申请不存在',
376 
-        })
305 
+        return response(GroupStatusCode.JOIN_REQUEST_NOT_FOUND)
377 306 
     group_user.user_status = GroupUserInfo.PASSED
378 307 
     group_user.passed_at = tc.utc_datetime()
379 308 
     group_user.save()
@@ -396,38 +325,23 @@ def group_refuse_api(request):
396 325 
     try:
397 326 
         admin = UserInfo.objects.get(user_id=admin_id)
398 327 
     except UserInfo.DoesNotExist:
399 
-        return JsonResponse({
400 
-            'status': 4011,
401 
-            'message': u'用户不存在',
402 
-        })
328 
+        return response(UserStatusCode.USER_NOT_FOUND)
403 329 
     try:
404 330 
         user = UserInfo.objects.get(user_id=user_id)
405 331 
     except UserInfo.DoesNotExist:
406 
-        return JsonResponse({
407 
-            'status': 4011,
408 
-            'message': u'用户不存在',
409 
-        })
332 
+        return response(UserStatusCode.USER_NOT_FOUND)
410 333
411 334 
     try:
412 335 
         group = GroupInfo.objects.get(group_id=group_id)
413 336 
     except GroupInfo.DoesNotExist:
414 
-        return JsonResponse({
415 
-            'status': 4020,
416 
-            'message': u'群组不存在',
417 
-        })
337 
+        return response(GroupStatusCode.GROUP_NOT_FOUND)
418 338 
     if group.admin_id != admin_id:
419 
-        return JsonResponse({
420 
-            'status': 40224,
421 
-            'message': u'没有拒绝权限',
422 
-        })
339 
+        return response(GroupStatusCode.NO_REFUSE_PERMISSION)
423 340
424 341 
     try:
425 342 
         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.APPLYING)
426 343 
     except GroupUserInfo.DoesNotExist:
427 
-        return JsonResponse({
428 
-            'status': 4028,
429 
-            'message': u'加群申请不存在',
430 
-        })
344 
+        return response(GroupStatusCode.JOIN_REQUEST_NOT_FOUND)
431 345 
     group_user.user_status = GroupUserInfo.REFUSED
432 346 
     group_user.refused_at = tc.utc_datetime()
433 347 
     group_user.save()
@@ -454,26 +368,17 @@ def flyimg_upload_api(request):
454 368 
     try:
455 369 
         user = UserInfo.objects.get(user_id=user_id)
456 370 
     except UserInfo.DoesNotExist:
457 
-        return JsonResponse({
458 
-            'status': 4011,
459 
-            'message': u'用户不存在',
460 
-        })
371 
+        return response(UserStatusCode.USER_NOT_FOUND)
461 372
462 373 
     try:
463 374 
         group = GroupInfo.objects.get(group_id=group_id)
464 375 
     except GroupInfo.DoesNotExist:
465 
-        return JsonResponse({
466 
-            'status': 4020,
467 
-            'message': u'群组不存在',
468 
-        })
376 
+        return response(GroupStatusCode.GROUP_NOT_FOUND)
469 377
470 378 
     try:
471 379 
         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)
472 380 
     except GroupUserInfo.DoesNotExist:
473 
-        return JsonResponse({
474 
-            'status': 4029,
475 
-            'message': u'该用户不在群组',
476 
-        })
381 
+        return response(GroupStatusCode.GROUP_USER_NOT_FOUND)
477 382
478 383 
     if photo:
479 384 
         _, extension = os.path.splitext(photo.name)
@@ -528,26 +433,17 @@ def comment_submit_api(request):
528 433 
     try:
529 434 
         group = GroupInfo.objects.get(group_id=group_id)
530 435 
     except GroupInfo.DoesNotExist:
531 
-        return JsonResponse({
532 
-            'status': 4020,
533 
-            'message': u'群组不存在',
534 
-        })
436 
+        return response(GroupStatusCode.GROUP_NOT_FOUND)
535 437
536 438 
     try:
537 439 
         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)
538 440 
     except GroupUserInfo.DoesNotExist:
539 
-        return JsonResponse({
540 
-            'status': 4029,
541 
-            'message': u'该用户不在群组',
542 
-        })
441 
+        return response(GroupStatusCode.GROUP_USER_NOT_FOUND)
543 442
544 443 
     try:
545 444 
         group_photo = GroupPhotoInfo.objects.get(pk=photo_id)
546 445 
     except GroupPhotoInfo.DoesNotExist:
547 
-        return JsonResponse({
548 
-            'status': 4030,
549 
-            'message': u'飞图不存在',
550 
-        })
446 
+        return response(GroupPhotoStatusCode.MESSAGE_NOT_FOUND)
551 447
552 448 
     if comment:
553 449 
         PhotoCommentInfo.objects.create(
@@ -591,26 +487,17 @@ def thumbup_submit_api(request):
591 487 
     try:
592 488 
         group = GroupInfo.objects.get(group_id=group_id)
593 489 
     except GroupInfo.DoesNotExist:
594 
-        return JsonResponse({
595 
-            'status': 4020,
596 
-            'message': u'群组不存在',
597 
-        })
490 
+        return response(GroupStatusCode.GROUP_NOT_FOUND)
598 491
599 492 
     try:
600 493 
         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)
601 494 
     except GroupUserInfo.DoesNotExist:
602 
-        return JsonResponse({
603 
-            'status': 4029,
604 
-            'message': u'该用户不在群组',
605 
-        })
495 
+        return response(GroupStatusCode.GROUP_USER_NOT_FOUND)
606 496
607 497 
     try:
608 498 
         group_photo = GroupPhotoInfo.objects.get(pk=photo_id)
609 499 
     except GroupPhotoInfo.DoesNotExist:
610 
-        return JsonResponse({
611 
-            'status': 4030,
612 
-            'message': u'飞图不存在',
613 
-        })
500 
+        return response(GroupPhotoStatusCode.MESSAGE_NOT_FOUND)
614 501
615 502 
     photo_thumbup, created = PhotoThumbUpInfo.objects.get_or_create(
616 503 
         photo_id=photo_id,
@@ -660,26 +547,17 @@ def thumbup_list_api(request):
660 547 
     try:
661 548 
         group = GroupInfo.objects.get(group_id=group_id)
662 549 
     except GroupInfo.DoesNotExist:
663 
-        return JsonResponse({
664 
-            'status': 4020,
665 
-            'message': u'群组不存在',
666 
-        })
550 
+        return response(GroupStatusCode.GROUP_NOT_FOUND)
667 551
668 552 
     try:
669 553 
         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)
670 554 
     except GroupUserInfo.DoesNotExist:
671 
-        return JsonResponse({
672 
-            'status': 4029,
673 
-            'message': u'该用户不在群组',
674 
-        })
555 
+        return response(GroupStatusCode.GROUP_USER_NOT_FOUND)
675 556
676 557 
     try:
677 558 
         group_photo = GroupPhotoInfo.objects.get(pk=photo_id)
678 559 
     except GroupPhotoInfo.DoesNotExist:
679 
-        return JsonResponse({
680 
-            'status': 4030,
681 
-            'message': u'飞图不存在',
682 
-        })
560 
+        return response(GroupPhotoStatusCode.MESSAGE_NOT_FOUND)
683 561
684 562 
     try:
685 563 
         thumbup = PhotoThumbUpInfo.objects.get(
@@ -712,26 +590,17 @@ def thumbup_cancel_api(request):
712 590 
     try:
713 591 
         group = GroupInfo.objects.get(group_id=group_id)
714 592 
     except GroupInfo.DoesNotExist:
715 
-        return JsonResponse({
716 
-            'status': 4020,
717 
-            'message': u'群组不存在',
718 
-        })
593 
+        return response(GroupStatusCode.GROUP_NOT_FOUND)
719 594
720 595 
     try:
721 596 
         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)
722 597 
     except GroupUserInfo.DoesNotExist:
723 
-        return JsonResponse({
724 
-            'status': 4029,
725 
-            'message': u'该用户不在群组',
726 
-        })
598 
+        return response(GroupStatusCode.GROUP_USER_NOT_FOUND)
727 599
728 600 
     try:
729 601 
         group_photo = GroupPhotoInfo.objects.get(pk=photo_id)
730 602 
     except GroupPhotoInfo.DoesNotExist:
731 
-        return JsonResponse({
732 
-            'status': 4030,
733 
-            'message': u'飞图不存在',
734 
-        })
603 
+        return response(GroupPhotoStatusCode.MESSAGE_NOT_FOUND)
735 604
736 605 
     photo_thumbup, created = PhotoThumbUpInfo.objects.get_or_create(
737 606 
         photo_id=photo_id,

+ 3 - 4
message/views.py
ファイルの表示 

@@ -5,6 +5,8 @@ from django.http import JsonResponse
5 5
6 6 
 from message.models import UserMessageInfo
7 7
8 
+from utils.errno_utils import MessageStatusCode
9 
+from utils.response_utils import response
8 10 
 from utils.page_utils import pagination
9 11
10 12 
 
@@ -65,10 +67,7 @@ def message_read_api(request):
65 67 
     try:
66 68 
         message = UserMessageInfo.objects.get(pk=pk, to_uid=user_id)
67 69 
     except UserMessageInfo.DoesNotExist:
68 
-        return JsonResponse({
69 
-            'status': 4091,
70 
-            'message': u'该消息不存在'
71 
-        })
70 
+        return response(MessageStatusCode.MESSAGE_NOT_FOUND)
72 71
73 72 
     message.read = True
74 73 
     message.save()

+ 4 - 5
photo/views.py
ファイルの表示 

@@ -13,7 +13,9 @@ from group.models import GroupInfo, GroupUserInfo, GroupPhotoInfo
13 13 
 from photo.models import UUIDInfo, PhotosInfo
14 14 
 from photo.serializers import PhotosInfoSerializer
15 15
16 
+from utils.errno_utils import PhotoStatusCode
16 17 
 from utils.ip_utils import ip_addr
18 
+from utils.response_utils import response
17 19 
 from utils.watermark_utils import watermark_wrap
18 20
19 21 
 from curtail_uuid import CurtailUUID
 
@@ -76,16 +78,13 @@ def upload_photo(request):
76 78 
     photo = request.FILES.get('photo', '')
77 79
78 80 
     if not (lensman_id and session_id and photo):
79 
-        return JsonResponse({
80 
-            'status': 4010,
81 
-            'message': u'参数错误',
82 
-        })
81 
+        return response(PhotoStatusCode.PARAMS_ERROR)
83 82
84 83 
     try:
85 84 
         LensmanInfo.objects.get(lensman_id=lensman_id)
86 85 
     except LensmanInfo.DoesNotExist:
87 86 
         return JsonResponse({
88 
-            'status': 4011,
87 
+            'status': 4000,
89 88 
             'message': u'摄影师不存在',
90 89 
         })
91 90

+ 1 - 0
requirements.txt
ファイルの表示 

@@ -8,6 +8,7 @@ django-shortuuidfield==0.1.3
8 8 
 djangorestframework==3.3.1
9 9 
 ipdb==0.8.1
10 10 
 ipython==4.0.0
11 
+kkconst==1.1.2
11 12 
 pep8==1.6.2
12 13 
 pillow==2.9.0
13 14 
 pytz==2015.7

+ 49 - 0
utils/errno_utils.py
ファイルの表示 

@@ -0,0 +1,49 @@
1 
+# -*- coding: utf-8 -*-
2 
+
3 
+from kkconst import BaseConst, ConstIntField
4 
+
5 
+
6 
+class BaseStatusCode(BaseConst):
7 
+    class Meta:
8 
+        allow_duplicated_value = False  # status_code should be no duplicated value
9 
+
10 
+
11 
+class StatusCodeField(ConstIntField):
12 
+    def __init__(self, status_code, message='', description=''):
13 
+        ConstIntField.__init__(status_code, verbose_name=message, description=description)
14 
+        self.message = message
15 
+
16 
+
17 
+class UserStatusCode(BaseStatusCode):
18 
+    LENSMAN_NOT_FOUND = StatusCodeField(4000, u'Lensman Not Found', description=u'摄影师不存在')
19 
+    LENSMAN_PASSWORD_ERROR = StatusCodeField(4001, u'Lensman Password Error', description=u'摄影师密码错误')
20 
+    USERNAME_HAS_REGISTERED = StatusCodeField(4010, u'Username Has Registered', description=u'用户名已注册')
21 
+    USER_NOT_FOUND = StatusCodeField(4011, u'User Not Found', description=u'用户不存在')
22 
+    USER_PASSWORD_ERROR = StatusCodeField(4012, u'User Password Error', description=u'用户密码错误')
23 
+
24 
+
25 
+class PhotoStatusCode(BaseStatusCode):
26 
+    PARAMS_ERROR = StatusCodeField(4039, u'Params Error', description=u'参数错误')
27 
+
28 
+
29 
+class GroupStatusCode(BaseStatusCode):
30 
+    GROUP_NOT_FOUND = StatusCodeField(4020, u'Group Not Found', description=u'群组不存在')
31 
+    GROUP_HAS_LOCKED = StatusCodeField(4021, u'Group Has Locked', description=u'群组已锁定')
32 
+    NOT_GROUP_ADMIN = StatusCodeField(4022, u'Not Group Admin', description=u'非群组管理员')
33 
+    NO_UPDATE_PERMISSION = StatusCodeField(40220, u'No Update Permission', description=u'没有更新权限')
34 
+    NO_LOCK_PERMISSION = StatusCodeField(40221, u'No Lock Permission', description=u'没有锁定权限')
35 
+    NO_UNLOCK_PERMISSION = StatusCodeField(40221, u'No Unlock Permission', description=u'没有解锁权限')
36 
+    NO_REMOVE_PERMISSION = StatusCodeField(40222, u'No Remove Permission', description=u'没有移除权限')
37 
+    NO_PASS_PERMISSION = StatusCodeField(40223, u'No Pass Permission', description=u'没有通过权限')
38 
+    NO_REFUSE_PERMISSION = StatusCodeField(40224, u'No Refuse Permission', description=u'没有拒绝权限')
39 
+    DUPLICATE_JOIN_REQUEST = StatusCodeField(4027, u'Duplicate Join Request', description=u'重复加群申请')
40 
+    JOIN_REQUEST_NOT_FOUND = StatusCodeField(4028, u'Join Request Not Found', description=u'加群申请不存在')
41 
+    GROUP_USER_NOT_FOUND = StatusCodeField(4029, u'Group User Not Found', description=u'该用户不在群组')
42 
+
43 
+
44 
+class GroupPhotoStatusCode(BaseStatusCode):
45 
+    GROUP_PHOTO_NOT_FOUND = StatusCodeField(4030, u'Group Photo Not Found', description=u'飞图不存在')
46 
+
47 
+
48 
+class MessageStatusCode(BaseStatusCode):
49 
+    MESSAGE_NOT_FOUND = StatusCodeField(4091, u'Message Not Found', description=u'消息不存在')

+ 10 - 0
utils/response_utils.py
ファイルの表示 

@@ -0,0 +1,10 @@
1 
+# -*- coding: utf-8 -*-
2 
+
3 
+from django.http import JsonResponse
4 
+
5 
+
6 
+def response(status_code):
7 
+    return JsonResponse({
8 
+        'status': status_code,
9 
+        'message': status_code.description
10 
+    })

tonglan/adminSystem - Gogs: Go Git Service
Home Explore Help
Register Sign In
tonglan
/
adminSystem
Watch 1
Star 0
Fork 0
Issues 0 Pull Requests 0 Commits 1 Releases 0

1 Commits (11e3a9652a62b867d722e5aebdba895bb86f9ed3)

Author SHA1 Message Date
  FFIB 11e3a9652a first 8 years ago