Начало Разгледай Помощ
Регистриране Влизане
Pai2
/
pai2
Следи 2
Харесвам 0
Разклонение 0

Преглед на кода
Change to 'from utils.redis.connect import r'

Brightcells преди 8 години
родител
0a58248c81
ревизия
246a9ff4b8
променени са 24 файла, в които са добавени 41 реда и са изтрити 98 реда
Покажи статистика за разликите
  1. 0 4
      account/tourguide_views.py
  2. 6 6
      geo/views.py
  3. 1 4
      group/groupuser_views.py
  4. 1 4
      group/lensman_views.py
  5. 0 4
      group/models.py
  6. 11 9
      group/tourguidegroup_views.py
  7. 1 3
      group/tourguidegroupuser_views.py
  8. 1 1
      group/views.py
  9. 0 1
      pay/views.py
  10. 1 3
      photo/views.py
  11. 6 0
      utils/redis/connect.py
  12. 1 5
      utils/redis/rapp.py
  13. 1 4
      utils/redis/rbrief.py
  14. 1 7
      utils/redis/retrieve.py
  15. 1 3
      utils/redis/rgroup.py
  16. 1 5
      utils/redis/rguest.py
  17. 1 3
      utils/redis/rmessage.py
  18. 1 3
      utils/redis/rorder.py
  19. 1 5
      utils/redis/rprice.py
  20. 1 5
      utils/redis/rprofile.py
  21. 1 5
      utils/redis/rsettings.py
  22. 1 5
      utils/redis/rtourguide.py
  23. 1 5
      utils/redis/rtouruser.py
  24. 1 4
      utils/redis/ruuid.py

+ 0 - 4
account/tourguide_views.py
Преглед на файла 

@@ -2,7 +2,6 @@
2 2
3 3 
 from __future__ import division
4 4
5 
-from django.conf import settings
6 5 
 from logit import logit
7 6
8 7 
 from account.models import TourGuideInfo, UserInfo
 
@@ -11,9 +10,6 @@ from utils.error.response_utils import response
11 10 
 from utils.redis.rprofile import set_profile_info
12 11
13 12
14 
-r = settings.REDIS_CACHE
15 
-
16 
-
17 13 
 @logit
18 14 
 def tourguide_submit_api(request):
19 15 
     """ 导游信息提交 """

+ 6 - 6
geo/views.py
Преглед на файла 

@@ -4,21 +4,18 @@ from __future__ import division
4 4
5 5 
 import json
6 6
7 
-from django.conf import settings
8 7 
 from django.core.serializers.json import DjangoJSONEncoder
9 8 
 from logit import logit
10 9 
 from TimeConvert import TimeConvert as tc
11 10
12 11 
 from utils.error.errno_utils import GroupUserStatusCode
13 12 
 from utils.error.response_utils import response
13 
+from utils.redis.connect import r
14 14 
 from utils.redis.rkeys import (TOUR_GUIDE_GROUP_CUR_SESSION, TOUR_GUIDE_GROUP_GEO_INFO, TOUR_GUIDE_GROUP_GEO_SUBMIT_DT,
15 15 
                                TOUR_GUIDE_GROUP_USER_GEO_LIST)
16 16 
 from utils.redis.rtouruser import get_tour_user_belong_group
17 17
18 18
19 
-r = settings.REDIS_CACHE
20 
-
21 
-
22 19 
 @logit
23 20 
 def geo_submit_api(request):
24 21 
     user_id = request.POST.get('user_id', '')
 
@@ -30,8 +27,11 @@ def geo_submit_api(request):
30 27 
     if not group_id:
31 28 
         return response(GroupUserStatusCode.USER_HAS_NOT_JOIN_GROUP)
32 29
33 
-    r.geoadd(TOUR_GUIDE_GROUP_GEO_INFO % group_id, longitude, latitude, user_id)
34 
-    r.hset(TOUR_GUIDE_GROUP_GEO_SUBMIT_DT % group_id, user_id, tc.utc_string(format='%Y-%m-%dT%H:%M:%SZ'))
30 
+    r.pipeline().geoadd(
31 
+        TOUR_GUIDE_GROUP_GEO_INFO % group_id, longitude, latitude, user_id
32 
+    ).hset(
33 
+        TOUR_GUIDE_GROUP_GEO_SUBMIT_DT % group_id, user_id, tc.utc_string(format='%Y-%m-%dT%H:%M:%SZ')
34 
+    ).execute()
35 35
36 36 
     session_id = r.get(TOUR_GUIDE_GROUP_CUR_SESSION % group_id)
37 37 
     r.rpush(TOUR_GUIDE_GROUP_USER_GEO_LIST % (group_id, session_id, user_id), json.dumps({

+ 1 - 4
group/groupuser_views.py
Преглед на файла 

@@ -2,7 +2,6 @@
2 2
3 3 
 from __future__ import division
4 4
5 
-from django.conf import settings
6 5 
 from logit import logit
7 6 
 from TimeConvert import TimeConvert as tc
8 7 
 
@@ -11,14 +10,12 @@ from group.models import GroupInfo, GroupUserInfo
11 10 
 from utils.error.errno_utils import GroupStatusCode, GroupUserStatusCode, UserStatusCode
12 11 
 from utils.error.response_utils import response
13 12 
 from utils.group_photo_utils import get_current_photos
13 
+from utils.redis.connect import r
14 14 
 from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_users_info
15 15 
 from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET,
16 16 
                                GROUP_USERS_QUIT_SET, GROUP_USERS_REFUSED_SET)
17 17
18 18
19 
-r = settings.REDIS_CACHE
20 
-
21 
-
22 19 
 @logit
23 20 
 def group_user_join_api(request):
24 21 
     """ 群成员加群 """

+ 1 - 4
group/lensman_views.py
Преглед на файла 

@@ -6,7 +6,6 @@ import os
6 6
7 7 
 import shortuuid
8 8 
 from curtail_uuid import CurtailUUID
9 
-from django.conf import settings
10 9 
 from django.contrib.auth.hashers import check_password
11 10 
 from django.db import transaction
12 11 
 from isoweek import Week
 
@@ -22,6 +21,7 @@ from utils.error.errno_utils import LensmanStatusCode, OrderStatusCode, UserStat
22 21 
 from utils.error.response_utils import response
23 22 
 from utils.message_utils import system_messages
24 23 
 from utils.page_utils import pagination
24 
+from utils.redis.connect import r
25 25 
 from utils.redis.rbrief import set_brief_info
26 26 
 from utils.redis.rgroup import set_group_info
27 27 
 from utils.redis.rkeys import GROUP_LAST_PHOTO_PK, TODAY_INCOME, TODAY_UPLOAD_PHOTO_AMOUNT, WEEK_INCOME, WEEK_SOLD
 
@@ -33,9 +33,6 @@ from utils.thumbnail_utils import make_thumbnail
33 33 
 from utils.watermark_utils import watermark_wrap
34 34
35 35
36 
-r = settings.REDIS_CACHE
37 
-
38 
-
39 36 
 @logit
40 37 
 def lensman_submit_api(request):
41 38 
     """ 摄影师信息提交 """

+ 0 - 4
group/models.py
Преглед на файла 

@@ -1,6 +1,5 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 
-from django.conf import settings
4 3 
 from django.db import models
5 4 
 from django.utils.translation import ugettext_lazy as _
6 5 
 from TimeConvert import TimeConvert as tc
 
@@ -12,9 +11,6 @@ from utils.time_utils import origin_expired_stamps
12 11 
 from utils.url_utils import img_url, share_url
13 12
14 13
15 
-r = settings.REDIS_CACHE
16 
-
17 
-
18 14 
 class GroupInfo(CreateUpdateMixin):
19 15 
     APP_GROUP = 0
20 16 
     SESSION_GROUP = 1

+ 11 - 9
group/tourguidegroup_views.py
Преглед на файла 

@@ -15,6 +15,7 @@ from account.models import UserInfo
15 15 
 from group.models import GroupInfo, GroupUserInfo
16 16 
 from utils.error.errno_utils import GroupStatusCode, GroupUserStatusCode, TokenStatusCode, UserStatusCode
17 17 
 from utils.error.response_utils import response
18 
+from utils.redis.connect import r
18 19 
 from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_info, set_group_users_info
19 20 
 from utils.redis.rkeys import TOUR_GUIDE_GROUP_CUR_GATHER_INFO, TOUR_GUIDE_GROUP_CUR_SESSION
20 21 
 from utils.redis.rtourguide import get_tour_guide_own_group, set_tour_guide_own_group
 
@@ -22,9 +23,6 @@ from utils.redis.rtouruser import get_tour_user_belong_group
22 23 
 from utils.storage_utils import file_save
23 24
24 25
25 
-r = settings.REDIS_CACHE
26 
-
27 
-
28 26 
 @logit
29 27 
 def tg_group_create_api(request):
30 28 
     """ 旅行团创建 """
 
@@ -276,12 +274,16 @@ def tg_group_gather_start_api(request):
276 274 
     set_group_info(group)
277 275
278 276 
     # 更新Session
279 
-    r.pipeline().set(TOUR_GUIDE_GROUP_CUR_SESSION % group_id, shortuuid.uuid()).set(TOUR_GUIDE_GROUP_CUR_GATHER_INFO % group_id, json.dumps({
280 
-        'gather_at': gather_at,
281 
-        'gather_lon': gather_lon,
282 
-        'gather_lat': gather_lat,
283 
-        'gather_location': gather_location,
284 
-    }, cls=DjangoJSONEncoder)).execute()
277 
+    r.pipeline().set(
278 
+        TOUR_GUIDE_GROUP_CUR_SESSION % group_id, shortuuid.uuid()
279 
+    ).set(
280 
+        TOUR_GUIDE_GROUP_CUR_GATHER_INFO % group_id, json.dumps({
281 
+            'gather_at': gather_at,
282 
+            'gather_lon': gather_lon,
283 
+            'gather_lat': gather_lat,
284 
+            'gather_location': gather_location,
285 
+        }, cls=DjangoJSONEncoder)
286 
+    ).execute()
285 287
286 288 
     return response(200, 'Set Tour Guide Group Gather Info Success', u'设置旅行团集合信息成功')
287 289

+ 1 - 3
group/tourguidegroupuser_views.py
Преглед на файла 

@@ -14,6 +14,7 @@ from group.models import GroupInfo, GroupUserInfo
14 14 
 from utils.error.errno_utils import GroupStatusCode, GroupUserStatusCode, UserStatusCode
15 15 
 from utils.error.response_utils import response
16 16 
 from utils.group_photo_utils import get_current_photos
17 
+from utils.redis.connect import r
17 18 
 from utils.redis.rgroup import get_group_info, get_group_users_info, get_group_users_kv_info, set_group_users_info
18 19 
 from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET,
19 20 
                                GROUP_USERS_QUIT_SET, GROUP_USERS_REFUSED_SET, TOUR_GUIDE_GROUP_CUR_GATHER_INFO,
 
@@ -23,9 +24,6 @@ from utils.redis.rtourguide import get_tour_guide_own_group
23 24 
 from utils.redis.rtouruser import set_tour_user_belong_group
24 25
25 26
26 
-r = settings.REDIS_CACHE
27 
-
28 
-
29 27 
 @logit(res=settings.LOGIT_RES_FLAG)
30 28 
 def tgu_group_user_join_api(request):
31 29 
     """ 旅行团成员加团 """

+ 1 - 1
group/views.py
Преглед на файла 

@@ -20,6 +20,7 @@ from utils.error.errno_utils import GroupPhotoStatusCode, GroupStatusCode, Group
20 20 
 from utils.error.response_utils import response
21 21 
 from utils.group_photo_utils import get_current_photos
22 22 
 from utils.page_utils import pagination
23 
+from utils.redis.connect import r
23 24 
 from utils.redis.rgroup import (del_group_photo_thumbup_flag, get_group_info, get_group_photo_comment_list,
24 25 
                                 get_group_photo_data, get_group_photo_thumbup_flag, get_group_photo_thumbup_list,
25 26 
                                 get_group_photo_watchers, get_group_users_info, set_group_info,
 
@@ -37,7 +38,6 @@ from utils.url_utils import img_url, share_url
37 38
38 39
39 40 
 # db = records.Database(settings.DATABASE_URL['default'])
40 
-r = settings.REDIS_CACHE
41 41
42 42
43 43 
 @logit

+ 0 - 1
pay/views.py
Преглед на файла 

@@ -20,7 +20,6 @@ from utils.redis.rbrief import set_brief_info
20 20 
 from utils.redis.rorder import set_lensman_order_record
21 21
22 22
23 
-r = settings.REDIS_CACHE
24 23 
 WECHAT = settings.WECHAT
25 24
26 25

+ 1 - 3
photo/views.py
Преглед на файла 

@@ -19,6 +19,7 @@ from photo.serializers import PhotosInfoSerializer
19 19 
 from utils.error.errno_utils import LensmanStatusCode, PhotoStatusCode
20 20 
 from utils.error.response_utils import response
21 21 
 from utils.ip_utils import get_client_ip
22 
+from utils.redis.connect import r
22 23 
 from utils.redis.rgroup import get_group_info, set_group_info, set_group_users_info
23 24 
 from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET,
24 25 
                                GROUP_USERS_QUIT_SET, GROUP_USERS_REFUSED_SET, UUID_LIST)
 
@@ -28,9 +29,6 @@ from utils.thumbnail_utils import make_thumbnail
28 29 
 from utils.watermark_utils import watermark_wrap
29 30
30 31
31 
-r = settings.REDIS_CACHE
32 
-
33 
-
34 32 
 @logit
35 33 
 def uuid_init(request):
36 34 
     """ 生成唯一标识 """

+ 6 - 0
utils/redis/connect.py
Преглед на файла 

@@ -0,0 +1,6 @@
1 
+# -*- coding: utf-8 -*-
2 
+
3 
+from django.conf import settings
4 
+
5 
+
6 
+r = settings.REDIS_CACHE

+ 1 - 5
utils/redis/rapp.py
Преглед на файла 

@@ -2,15 +2,11 @@
2 2
3 3 
 import json
4 4
5 
-from django.conf import settings
6 
-
7 5 
 from operation.models import LatestAppInfo
6 
+from utils.redis.connect import r
8 7 
 from utils.redis.rkeys import LATEST_APP_INFO
9 8
10 9
11 
-r = settings.REDIS_CACHE
12 
-
13 
-
14 10 
 # 最新 APP 相关
15 11
16 12

+ 1 - 4
utils/redis/rbrief.py
Преглед на файла 

@@ -1,15 +1,12 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 
-from django.conf import settings
4 3 
 from isoweek import Week
5 4 
 from TimeConvert import TimeConvert as tc
6 5
6 
+from utils.redis.connect import r
7 7 
 from utils.redis.rkeys import TODAY_INCOME, TOTAL_INCOME, WEEK_INCOME, WEEK_SOLD
8 8
9 9
10 
-r = settings.REDIS_CACHE
11 
-
12 
-
13 10 
 # 简报相关
14 11
15 12

+ 1 - 7
utils/redis/retrieve.py
Преглед на файла 

@@ -1,18 +1,12 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 
-import json
4 
-
5 
-from django.conf import settings
6 
-
7 3 
 from group.models import GroupInfo, GroupPhotoInfo, GroupUserInfo, PhotoCommentInfo, PhotoThumbUpInfo
4 
+from utils.redis.connect import r
8 5 
 from utils.redis.rgroup import set_group_photo_data, set_group_users_info
9 6 
 from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_PHOTO_WATCHER_SET, GROUP_USERS_APPLYING_SET,
10 7 
                                GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET, GROUP_USERS_REFUSED_SET)
11 8
12 9
13 
-r = settings.REDIS_CACHE
14 
-
15 
-
16 10 
 def retrieve_group_data():
17 11 
     """ 群组数据 """
18 12 
     groups = GroupInfo.objects.filter(status=True)

+ 1 - 3
utils/redis/rgroup.py
Преглед на файла 

@@ -5,14 +5,12 @@ import json
5 5 
 from django.conf import settings
6 6 
 from django.core.serializers.json import DjangoJSONEncoder
7 7
8 
+from utils.redis.connect import r
8 9 
 from utils.redis.rkeys import (GROUP_INFO, GROUP_PHOTO_COMMENT_LIST, GROUP_PHOTO_DATA, GROUP_PHOTO_THUMB_UP,
9 10 
                                GROUP_PHOTO_THUMB_UP_LIST, GROUP_PHOTO_WATCHER_SET, GROUP_USERS_INFO,
10 11 
                                GROUP_USERS_KV_INFO)
11 12
12 13
13 
-r = settings.REDIS_CACHE
14 
-
15 
-
16 14 
 # 群组信息相关
17 15
18 16

+ 1 - 5
utils/redis/rguest.py
Преглед на файла 

@@ -2,14 +2,10 @@
2 2
3 3 
 import json
4 4
5 
-from django.conf import settings
6 
-
5 
+from utils.redis.connect import r
7 6 
 from utils.redis.rkeys import GUEST_ENTRANCE_CONTROL_INFO
8 7
9 8
10 
-r = settings.REDIS_CACHE
11 
-
12 
-
13 9 
 # 游客入口控制相关
14 10
15 11

+ 1 - 3
utils/redis/rmessage.py
Преглед на файла 

@@ -5,12 +5,10 @@ import json
5 5 
 from django.conf import settings
6 6
7 7 
 from message.models import SystemMessageDeleteInfo, SystemMessageReadInfo
8 
+from utils.redis.connect import r
8 9 
 from utils.redis.rkeys import SYSTEM_MESSAGE_DELETED_INFO, SYSTEM_MESSAGE_READ_INFO
9 10
10 11
11 
-r = settings.REDIS_CACHE
12 
-
13 
-
14 12 
 # 系统消息相关
15 13
16 14

+ 1 - 3
utils/redis/rorder.py
Преглед на файла 

@@ -5,12 +5,10 @@ import json
5 5 
 from django.conf import settings
6 6 
 from django.core.serializers.json import DjangoJSONEncoder
7 7
8 
+from utils.redis.connect import r
8 9 
 from utils.redis.rkeys import LENSMAN_PHOTO_ORDER_RECORD
9 10
10 11
11 
-r = settings.REDIS_CACHE
12 
-
13 
-
14 12 
 # 摄影师照片购买记录相关
15 13
16 14

+ 1 - 5
utils/redis/rprice.py
Преглед на файла 

@@ -2,15 +2,11 @@
2 2
3 3 
 import json
4 4
5 
-from django.conf import settings
6 
-
7 5 
 from account.models import LensmanInfo
6 
+from utils.redis.connect import r
8 7 
 from utils.redis.rkeys import LENSMAN_PHOTO_PRICE_FIXED
9 8
10 9
11 
-r = settings.REDIS_CACHE
12 
-
13 
-
14 10 
 # 最新 APP 相关
15 11
16 12

+ 1 - 5
utils/redis/rprofile.py
Преглед на файла 

@@ -2,14 +2,10 @@
2 2
3 3 
 import json
4 4
5 
-from django.conf import settings
6 
-
5 
+from utils.redis.connect import r
7 6 
 from utils.redis.rkeys import PROFILE_INFO
8 7
9 8
10 
-r = settings.REDIS_CACHE
11 
-
12 
-
13 9 
 # 用户相关
14 10
15 11

+ 1 - 5
utils/redis/rsettings.py
Преглед на файла 

@@ -2,15 +2,11 @@
2 2
3 3 
 import json
4 4
5 
-from django.conf import settings
6 
-
7 5 
 from pai2.basemodels import PlatformMixin
6 
+from utils.redis.connect import r
8 7 
 from utils.redis.rkeys import APP_SETTINGS_INFO
9 8
10 9
11 
-r = settings.REDIS_CACHE
12 
-
13 
-
14 10 
 def set_app_settings_info(appset):
15 11 
     """ 设置 APP 设置信息 """
16 12 
     r.set(APP_SETTINGS_INFO % (appset.platform, appset.channel, appset.version), json.dumps(appset.data))

+ 1 - 5
utils/redis/rtourguide.py
Преглед на файла 

@@ -1,13 +1,9 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 
-from django.conf import settings
4 
-
3 
+from utils.redis.connect import r
5 4 
 from utils.redis.rkeys import TOUR_GUIDE_GROUP_USER_OWN
6 5
7 6
8 
-r = settings.REDIS_CACHE
9 
-
10 
-
11 7 
 # 导游相关
12 8
13 9

+ 1 - 5
utils/redis/rtouruser.py
Преглед на файла 

@@ -1,13 +1,9 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 
-from django.conf import settings
4 
-
3 
+from utils.redis.connect import r
5 4 
 from utils.redis.rkeys import TOUR_GUIDE_GROUP_USER_BELONG
6 5
7 6
8 
-r = settings.REDIS_CACHE
9 
-
10 
-
11 7 
 # 旅行团成员相关
12 8
13 9

+ 1 - 4
utils/redis/ruuid.py
Преглед на файла 

@@ -1,15 +1,12 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 3 
 from curtail_uuid import CurtailUUID
4 
-from django.conf import settings
5 4
6 5 
 from photo.models import UUIDInfo
6 
+from utils.redis.connect import r
7 7 
 from utils.redis.rkeys import UUID_LIST
8 8
9 9
10 
-r = settings.REDIS_CACHE
11 
-
12 
-
13 10 
 def generate_uuid():
14 11 
     uuid = CurtailUUID.uuid(UUIDInfo)
15 12 
     UUIDInfo.objects.create(uuid=uuid)