-
5 3
 from utils.redis.connect import r
6 4
 from utils.redis.rkeys import GUEST_ENTRANCE_CONTROL_INFO
7 5
 
@@ -11,13 +9,13 @@ from utils.redis.rkeys import GUEST_ENTRANCE_CONTROL_INFO
11 9
 
12 10
 def set_guest_entrance_control(gen):
13 11
     """ 设置游客入口控制 """
14
-    r.set(GUEST_ENTRANCE_CONTROL_INFO, json.dumps(gen.data))
12
+    r.setjson(GUEST_ENTRANCE_CONTROL_INFO, gen.data)
15 13
     return gen.data
16 14
 
17 15
 
18 16
 def get_guest_entrance_control():
19 17
     """ 获取游客入口控制 """
20
-    return json.loads(r.get(GUEST_ENTRANCE_CONTROL_INFO) or '{}')
18
+    return r.getjson(GUEST_ENTRANCE_CONTROL_INFO)
21 19
 
22 20
 
23 21
 def delete_guest_entrance_control():

+ 4 - 6
utils/redis/rmessage.py

@@ -1,7 +1,5 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-import json
4
-
5 3
 from message.models import SystemMessageDeleteInfo, SystemMessageReadInfo
6 4
 from utils.redis.connect import r
7 5
 from utils.redis.rkeys import SYSTEM_MESSAGE_DELETED_INFO, SYSTEM_MESSAGE_READ_INFO
@@ -14,23 +12,23 @@ def set_system_message_read_info(user_id):
14 12
     """ 设置系统消息读取信息 """
15 13
     read_messages = SystemMessageReadInfo.objects.filter(user_id=user_id, status=True)
16 14
     read_message_ids = [msg.msg_id for msg in read_messages]
17
-    r.setex(SYSTEM_MESSAGE_READ_INFO % user_id, r.REDIS_EXPIRED_ONE_MONTH, json.dumps(read_message_ids))
15
+    r.setexjson(SYSTEM_MESSAGE_READ_INFO % user_id, r.REDIS_EXPIRED_ONE_MONTH, read_message_ids)
18 16
     return read_message_ids
19 17
 
20 18
 
21 19
 def get_system_message_read_info(user_id):
22 20
     """ 获取系统消息读取信息 """
23
-    return json.loads(r.get(SYSTEM_MESSAGE_READ_INFO % user_id) or '[]') or set_system_message_read_info(user_id)
21
+    return r.getjson(SYSTEM_MESSAGE_READ_INFO % user_id, default='[]') or set_system_message_read_info(user_id)
24 22
 
25 23
 
26 24
 def set_system_message_delete_info(user_id):
27 25
     """ 设置系统消息删除信息 """
28 26
     deleted_messages = SystemMessageDeleteInfo.objects.filter(user_id=user_id, status=True)
29 27
     deleted_message_ids = [msg.msg_id for msg in deleted_messages]
30
-    r.setex(SYSTEM_MESSAGE_DELETED_INFO % user_id, r.REDIS_EXPIRED_ONE_MONTH, json.dumps(deleted_message_ids))
28
+    r.setexjson(SYSTEM_MESSAGE_DELETED_INFO % user_id, r.REDIS_EXPIRED_ONE_MONTH, deleted_message_ids)
31 29
     return deleted_message_ids
32 30
 
33 31
 
34 32
 def get_system_message_delete_info(user_id):
35 33
     """ 获取系统消息删除信息 """
36
-    return json.loads(r.get(SYSTEM_MESSAGE_DELETED_INFO % user_id) or '[]') or set_system_message_delete_info(user_id)
34
+    return r.getjson(SYSTEM_MESSAGE_DELETED_INFO % user_id, default='[]') or set_system_message_delete_info(user_id)

+ 2 - 4
utils/redis/rorder.py

@@ -1,7 +1,5 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-import json
4
-
5 3
 from django.core.serializers.json import DjangoJSONEncoder
6 4
 
7 5
 from utils.redis.connect import r
@@ -14,7 +12,7 @@ from utils.redis.rkeys import LENSMAN_PHOTO_ORDER_RECORD
14 12
 def set_lensman_order_record(porder):
15 13
     """ 设置摄影师照片购买记录 """
16 14
     porder_info = porder.porder_info
17
-    r.setex(LENSMAN_PHOTO_ORDER_RECORD % (porder.photo_id, porder.user_id), r.REDIS_EXPIRED_ONE_MONTH, json.dumps(porder_info, cls=DjangoJSONEncoder))
15
+    r.setexjson(LENSMAN_PHOTO_ORDER_RECORD % (porder.photo_id, porder.user_id), r.REDIS_EXPIRED_ONE_MONTH, porder_info, cls=DjangoJSONEncoder)
18 16
     return porder_info
19 17
 
20 18
 
@@ -30,4 +28,4 @@ def set_lensman_order_record_by_id(photo_id, user_id):
30 28
 
31 29
 def get_lensman_order_record(photo_id, user_id):
32 30
     """ 获取摄影师照片购买记录 """
33
-    return json.loads(r.get(LENSMAN_PHOTO_ORDER_RECORD % (photo_id, user_id)) or '{}') or set_lensman_order_record_by_id(photo_id, user_id)
31
+    return r.getjson(LENSMAN_PHOTO_ORDER_RECORD % (photo_id, user_id)) or set_lensman_order_record_by_id(photo_id, user_id)

+ 2 - 4
utils/redis/rpatch.py

@@ -1,7 +1,5 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-import json
4
-
5 3
 from pai2.basemodels import PlatformMixin
6 4
 from utils.redis.connect import r
7 5
 from utils.redis.rkeys import APP_PATCH_INFO
@@ -9,7 +7,7 @@ from utils.redis.rkeys import APP_PATCH_INFO
9 7
 
10 8
 def set_app_patch_info(apppatch):
11 9
     """ 设置 APP 补丁信息 """
12
-    r.set(APP_PATCH_INFO % (apppatch.platform, apppatch.version, apppatch.src), json.dumps(apppatch.data))
10
+    r.setjson(APP_PATCH_INFO % (apppatch.platform, apppatch.version, apppatch.src), apppatch.data)
13 11
 
14 12
 
15 13
 def del_app_patch_info(apppatch):
@@ -20,4 +18,4 @@ def del_app_patch_info(apppatch):
20 18
 def get_app_patch_info(platform, version, src):
21 19
     """ 获取 APP 补丁信息 """
22 20
     platform = platform if isinstance(platform, int) else PlatformMixin.Platforms.get(platform)
23
-    return json.loads(r.get(APP_PATCH_INFO % (platform, version, src)) or '{}')
21
+    return r.getjson(APP_PATCH_INFO % (platform, version, src))

+ 2 - 4
utils/redis/rprice.py

@@ -1,7 +1,5 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-import json
4
-
5 3
 from account.models import LensmanInfo
6 4
 from utils.redis.connect import r
7 5
 from utils.redis.rkeys import LENSMAN_PHOTO_PRICE_FIXED
@@ -22,11 +20,11 @@ def set_lensman_price_fixed(user_id):
22 20
         'origin': (lensman and lensman.origin) or 999,
23 21
     }
24 22
 
25
-    r.set(LENSMAN_PHOTO_PRICE_FIXED % user_id, json.dumps(price_fixed))
23
+    r.setjson(LENSMAN_PHOTO_PRICE_FIXED % user_id, price_fixed)
26 24
 
27 25
     return price_fixed
28 26
 
29 27
 
30 28
 def get_lensman_price_fixed(user_id):
31 29
     """ 获取摄影师价格设定 """
32
-    return json.loads(r.get(LENSMAN_PHOTO_PRICE_FIXED % user_id) or '{}') or set_lensman_price_fixed(user_id)
30
+    return r.getjson(LENSMAN_PHOTO_PRICE_FIXED % user_id) or set_lensman_price_fixed(user_id)

+ 2 - 4
utils/redis/rprofile.py

@@ -1,7 +1,5 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-import json
4
-
5 3
 from utils.redis.connect import r
6 4
 from utils.redis.rkeys import PROFILE_INFO
7 5
 
@@ -11,7 +9,7 @@ from utils.redis.rkeys import PROFILE_INFO
11 9
 
12 10
 def set_profile_info(user):
13 11
     """ 设置用户信息 """
14
-    r.set(PROFILE_INFO % user.user_id, json.dumps(user.data))
12
+    r.setjson(PROFILE_INFO % user.user_id, user.data)
15 13
     return user.data
16 14
 
17 15
 
@@ -27,4 +25,4 @@ def set_profile_by_uid(user_id):
27 25
 
28 26
 def get_profile_by_id(user_id):
29 27
     """ 获取用户信息 """
30
-    return json.loads(r.get(PROFILE_INFO % user_id) or '{}') or set_profile_by_uid(user_id)
28
+    return r.getjson(PROFILE_INFO % user_id) or set_profile_by_uid(user_id)

+ 2 - 4
utils/redis/rsettings.py

@@ -1,7 +1,5 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-import json
4
-
5 3
 from pai2.basemodels import PlatformMixin
6 4
 from utils.redis.connect import r
7 5
 from utils.redis.rkeys import APP_SETTINGS_INFO
@@ -9,7 +7,7 @@ from utils.redis.rkeys import APP_SETTINGS_INFO
9 7
 
10 8
 def set_app_settings_info(appset):
11 9
     """ 设置 APP 设置信息 """
12
-    r.set(APP_SETTINGS_INFO % (appset.platform, appset.channel, appset.version), json.dumps(appset.data))
10
+    r.setjson(APP_SETTINGS_INFO % (appset.platform, appset.channel, appset.version), appset.data)
13 11
 
14 12
 
15 13
 def del_app_settings_info(appset):
@@ -20,4 +18,4 @@ def del_app_settings_info(appset):
20 18
 def get_app_settings_info(platform, channel, version):
21 19
     """ 获取 APP 设置信息 """
22 20
     platform = platform if isinstance(platform, int) else PlatformMixin.Platforms[platform]
23
-    return json.loads(r.get(APP_SETTINGS_INFO % (platform, channel, version)) or '{}')
21
+    return r.getjson(APP_SETTINGS_INFO % (platform, channel, version))

kodo - Gogs: Go Git Service

Brak opisu

Brightcells: 018d52f61d Update package django_xxx 8 lat temu
..
migrations 4547c709bf Add api get_server_time_api 9 lat temu
__init__.py 4547c709bf Add api get_server_time_api 9 lat temu
admin.py 4547c709bf Add api get_server_time_api 9 lat temu
models.py 4547c709bf Add api get_server_time_api 9 lat temu
server_views.py 018d52f61d Update package django_xxx 8 lat temu
tests.py 4547c709bf Add api get_server_time_api 9 lat temu
views.py 4547c709bf Add api get_server_time_api 9 lat temu