Home Explore Help
Register Sign In
Pai2
/
pai2
Watch 2
Star 0
Fork 0

Browse Source
Change to 'r.REDIS_EXPIRED_xx_xx'

Brightcells 8 years ago
parent
246a9ff4b8
commit
3d1118760c
4 changed files with 7 additions and 18 deletions
Show Diff Stats
  1. 0 7
      pai2/settings.py
  2. 4 5
      utils/redis/rgroup.py
  3. 2 4
      utils/redis/rmessage.py
  4. 1 2
      utils/redis/rorder.py

+ 0 - 7
pai2/settings.py
View File 

@@ -220,13 +220,6 @@ REDIS = {
220 220 
     }
221 221 
 }
222 222
223 
-# Redis 缓存时间设置
224 
-REDIS_EXPIRED_HOUR = 3600  # 60 * 60
225 
-REDIS_EXPIRED_DAY = 86400  # 24 * 60 * 60
226 
-REDIS_EXPIRED_WEEK = 604800  # 7 * 24 * 60 * 60
227 
-REDIS_EXPIRED_MONTH = 2678400  # 31 * 24 * 60 * 60
228 
-REDIS_EXPIRED_YEAR = 31622400  # 366 * 24 * 60 * 60
229 
-
230 223 
 # 微信设置
231 224 
 WECHAT = {
232 225 
     'JSAPI': {

+ 4 - 5
utils/redis/rgroup.py
View File 

@@ -2,7 +2,6 @@
2 2
3 3 
 import json
4 4
5 
-from django.conf import settings
6 5 
 from django.core.serializers.json import DjangoJSONEncoder
7 6
8 7 
 from utils.redis.connect import r
 
@@ -17,7 +16,7 @@ from utils.redis.rkeys import (GROUP_INFO, GROUP_PHOTO_COMMENT_LIST, GROUP_PHOTO
17 16 
 def set_group_info(group):
18 17 
     """ 设置群组信息 """
19 18 
     group_data = group.data
20 
-    r.setex(GROUP_INFO % group.group_id, settings.REDIS_EXPIRED_MONTH, json.dumps(group_data, cls=DjangoJSONEncoder))
19 
+    r.setex(GROUP_INFO % group.group_id, r.REDIS_EXPIRED_ONE_MONTH, json.dumps(group_data, cls=DjangoJSONEncoder))
21 20 
     return group_data
22 21
23 22 
 
@@ -47,10 +46,10 @@ def set_group_users_info(group):
47 46 
         'group_users': group_users,
48 47 
         'admin_id': group.admin_id,
49 48 
     }
50 
-    r.setex(GROUP_USERS_INFO % group.group_id, settings.REDIS_EXPIRED_MONTH, json.dumps(group_users_data, cls=DjangoJSONEncoder))
49 
+    r.setex(GROUP_USERS_INFO % group.group_id, r.REDIS_EXPIRED_ONE_MONTH, json.dumps(group_users_data, cls=DjangoJSONEncoder))
51 50
52 51 
     group_users_kv_data = {user_info.get('user_id', ''): user_info for user_info in group_users.get('passed', [])}
53 
-    r.setex(GROUP_USERS_KV_INFO % group.group_id, settings.REDIS_EXPIRED_MONTH, json.dumps(group_users_kv_data, cls=DjangoJSONEncoder))
52 
+    r.setex(GROUP_USERS_KV_INFO % group.group_id, r.REDIS_EXPIRED_ONE_MONTH, json.dumps(group_users_kv_data, cls=DjangoJSONEncoder))
54 53
55 54 
     return group_users_data, group_users_kv_data
56 55 
 
@@ -98,7 +97,7 @@ def get_group_photo_data(group_id):
98 97
99 98 
 def set_group_photo_thumbup_flag(photo_id, user_id):
100 99 
     """ 设置群组照片用户点赞标识信息 """
101 
-    r.setex(GROUP_PHOTO_THUMB_UP % (photo_id, user_id), settings.REDIS_EXPIRED_MONTH, True)
100 
+    r.setex(GROUP_PHOTO_THUMB_UP % (photo_id, user_id), r.REDIS_EXPIRED_ONE_MONTH, True)
102 101
103 102
104 103 
 def del_group_photo_thumbup_flag(photo_id, user_id):

+ 2 - 4
utils/redis/rmessage.py
View File 

@@ -2,8 +2,6 @@
2 2
3 3 
 import json
4 4
5 
-from django.conf import settings
6 
-
7 5 
 from message.models import SystemMessageDeleteInfo, SystemMessageReadInfo
8 6 
 from utils.redis.connect import r
9 7 
 from utils.redis.rkeys import SYSTEM_MESSAGE_DELETED_INFO, SYSTEM_MESSAGE_READ_INFO
 
@@ -16,7 +14,7 @@ def set_system_message_read_info(user_id):
16 14 
     """ 设置系统消息读取信息 """
17 15 
     read_messages = SystemMessageReadInfo.objects.filter(user_id=user_id, status=True)
18 16 
     read_message_ids = [msg.msg_id for msg in read_messages]
19 
-    r.setex(SYSTEM_MESSAGE_READ_INFO % user_id, settings.REDIS_EXPIRED_MONTH, json.dumps(read_message_ids))
17 
+    r.setex(SYSTEM_MESSAGE_READ_INFO % user_id, r.REDIS_EXPIRED_ONE_MONTH, json.dumps(read_message_ids))
20 18 
     return read_message_ids
21 19
22 20 
 
@@ -29,7 +27,7 @@ def set_system_message_delete_info(user_id):
29 27 
     """ 设置系统消息删除信息 """
30 28 
     deleted_messages = SystemMessageDeleteInfo.objects.filter(user_id=user_id, status=True)
31 29 
     deleted_message_ids = [msg.msg_id for msg in deleted_messages]
32 
-    r.setex(SYSTEM_MESSAGE_DELETED_INFO % user_id, settings.REDIS_EXPIRED_MONTH, json.dumps(deleted_message_ids))
30 
+    r.setex(SYSTEM_MESSAGE_DELETED_INFO % user_id, r.REDIS_EXPIRED_ONE_MONTH, json.dumps(deleted_message_ids))
33 31 
     return deleted_message_ids
34 32
35 33

+ 1 - 2
utils/redis/rorder.py
View File 

@@ -2,7 +2,6 @@
2 2
3 3 
 import json
4 4
5 
-from django.conf import settings
6 5 
 from django.core.serializers.json import DjangoJSONEncoder
7 6
8 7 
 from utils.redis.connect import r
 
@@ -15,7 +14,7 @@ from utils.redis.rkeys import LENSMAN_PHOTO_ORDER_RECORD
15 14 
 def set_lensman_order_record(porder):
16 15 
     """ 设置摄影师照片购买记录 """
17 16 
     porder_info = porder.porder_info
18 
-    r.setex(LENSMAN_PHOTO_ORDER_RECORD % (porder.photo_id, porder.user_id), settings.REDIS_EXPIRED_MONTH, json.dumps(porder_info, cls=DjangoJSONEncoder))
17 
+    r.setex(LENSMAN_PHOTO_ORDER_RECORD % (porder.photo_id, porder.user_id), r.REDIS_EXPIRED_ONE_MONTH, json.dumps(porder_info, cls=DjangoJSONEncoder))
19 18 
     return porder_info
20 19
21 20