26
+from utils.watermark_utils import watermark_wrap
34 27
 
35 28
 r = settings.REDIS_CACHE
36 29
 

+ 4 - 5
utils/redis/retrieve.py

@@ -2,11 +2,10 @@
2 2
 
3 3
 from django.conf import settings
4 4
 
5
-from group.models import GroupInfo, GroupUserInfo, GroupPhotoInfo
6
-
7
-from utils.redis.rkeys import GROUP_USERS_APPLYING_SET, GROUP_USERS_PASSED_SET, GROUP_USERS_REFUSED_SET, GROUP_USERS_DELETED_SET
8
-from utils.redis.rkeys import GROUP_LAST_PHOTO_PK
9
-
5
+from group.models import GroupInfo, GroupPhotoInfo, GroupUserInfo
6
+from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_APPLYING_SET,
7
+                               GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET,
8
+                               GROUP_USERS_REFUSED_SET)
10 9
 
11 10
 r = settings.REDIS_CACHE
12 11
 

+ 4 - 4
utils/redis/rgroup.py

@@ -1,12 +1,12 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
+import json
4
+
3 5
 from django.conf import settings
4 6
 from django.core.serializers.json import DjangoJSONEncoder
5 7
 
6
-from utils.redis.rkeys import GROUP_INFO, GROUP_USERS_INFO, GROUP_PHOTO_THUMB_UP
7
-
8
-import json
9
-
8
+from utils.redis.rkeys import (GROUP_INFO, GROUP_PHOTO_THUMB_UP,
9
+                               GROUP_USERS_INFO)
10 10
 
11 11
 r = settings.REDIS_CACHE
12 12
 

+ 5 - 6
utils/redis/rmessage.py

@@ -1,13 +1,12 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-from django.conf import settings
4
-
5
-from message.models import SystemMessageReadInfo, SystemMessageDeleteInfo
6
-
7
-from utils.redis.rkeys import SYSTEM_MESSAGE_READ_INFO, SYSTEM_MESSAGE_DELETED_INFO
8
-
9 3
 import json
10 4
 
5
+from django.conf import settings
6
+
7
+from message.models import SystemMessageDeleteInfo, SystemMessageReadInfo
8
+from utils.redis.rkeys import (SYSTEM_MESSAGE_DELETED_INFO,
9
+                               SYSTEM_MESSAGE_READ_INFO)
11 10
 
12 11
 r = settings.REDIS_CACHE
13 12
 

+ 2 - 3
utils/redis/rorder.py

@@ -1,13 +1,12 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
+import json
4
+
3 5
 from django.conf import settings
4 6
 from django.core.serializers.json import DjangoJSONEncoder
5 7
 
6 8
 from utils.redis.rkeys import LENSMAN_PHOTO_ORDER_RECORD
7 9
 
8
-import json
9
-
10
-
11 10
 r = settings.REDIS_CACHE
12 11
 
13 12
 

Kodo/kodo - Gogs: Go Git Service

54 Коммиты (a221274ff0f9faa9381ab7e8aa00048da8875be5)

Автор SHA1 Сообщение Дата
  Brightcells 208fc20a24 Change to use django-response лет %!s(int64=8): %!d(string=назад)
  Brightcells 24e345a32f Add price func get_group_photo_price лет %!s(int64=8): %!d(string=назад)
  Brightcells 37c5365a18 Change to use django-we support WeChat OAuth2/Share relative api лет %!s(int64=8): %!d(string=назад)
  Brightcells 32a7d9ffa0 Update wx relative лет %!s(int64=8): %!d(string=назад)
  Brightcells 76e666637d Fix Bug: photo_id dump for PhotosInfo лет %!s(int64=8): %!d(string=назад)
  Brightcells 7eaff4171b Update transaction_id/notify_msg for wx_order_query_api лет %!s(int64=8): %!d(string=назад)
  Brightcells a44bae18ee Update to use pywe-pay-notify to check pay notify success or fail лет %!s(int64=8): %!d(string=назад)
  Brightcells 32061504ff Add some fields for Order лет %!s(int64=8): %!d(string=назад)
  Brightcells b2aa0f8533 Add new field unifiedorder_result лет %!s(int64=8): %!d(string=назад)
  Brightcells 06b6949c6c Change pay relative from wechatpy to pywe-pay лет %!s(int64=8): %!d(string=назад)
  Brightcells d38cc6ceb2 Add multi openid for UserInfo & Change create order support miniapp лет %!s(int64=8): %!d(string=назад)
  Brightcells b6ab791315 Change relative pk to photo_id лет %!s(int64=9): %!d(string=назад)
  Brightcells 2eba3ed7f9 Add guest login for tourguide лет %!s(int64=9): %!d(string=назад)
  Brightcells d4c2c2a8d7 Change to use pywe-response лет %!s(int64=9): %!d(string=назад)
  Brightcells dd0d652498 Change to use 'from paginator import pagination' лет %!s(int64=9): %!d(string=назад)
  Brightcells 246a9ff4b8 Change to 'from utils.redis.connect import r' лет %!s(int64=9): %!d(string=назад)
  Brightcells 0d046d557e Return order detail for api wx_order_detail_api лет %!s(int64=9): %!d(string=назад)
  Brightcells f818f4127f Docstring simplify лет %!s(int64=9): %!d(string=назад)
  Brightcells 7dd4575a8c Add select_for_update for UserInfo/OrderInfo/GroupPhotoOrderInfo лет %!s(int64=9): %!d(string=назад)
  Brightcells 36e351b13d Update errno лет %!s(int64=9): %!d(string=назад)
  Brightcells c7abce172a Rename field name лет %!s(int64=9): %!d(string=назад)
  Brightcells da19301800 Update set_brief_info after origin photo upload лет %!s(int64=9): %!d(string=назад)
  Brightcells e249360c0c Add freeze_balance for lensman/user лет %!s(int64=9): %!d(string=назад)
  Brightcells d79857ed0e lensman balance decr when origin deleted & update redis лет %!s(int64=9): %!d(string=назад)
  Brightcells 23f00aedae fix bug: ValueError: invalid literal for int() with base 10: 'origin' лет %!s(int64=9): %!d(string=назад)
  Brightcells 07da1c3383 add order_id for lensman_origin_photo_upload_api & check multi paid лет %!s(int64=9): %!d(string=назад)
  Brightcells a45976ca99 update brief returns лет %!s(int64=9): %!d(string=назад)
  Brightcells 6199c8f7ad add api lensman_origin_wanted_api/lensman_origin_photo_upload_api лет %!s(int64=9): %!d(string=назад)
  Brightcells 48995aae69 update redis_extensions —— class StrictRedisExtensions(StrictRedis) лет %!s(int64=9): %!d(string=назад)
  Brightcells 05faf3c5db update lensman_brief_api лет %!s(int64=9): %!d(string=назад)
  Brightcells 8c384ff52e remove to_lid лет %!s(int64=9): %!d(string=назад)
  Brightcells 8468d9f9c5 remove to_lid лет %!s(int64=9): %!d(string=назад)
  Brightcells 21b4a5403a add api lensman_brief_api лет %!s(int64=9): %!d(string=назад)
  Brightcells c7071ae7f1 wx_uid to openid лет %!s(int64=9): %!d(string=назад)
  Brightcells f07f4fc893 JsonResponse to response лет %!s(int64=9): %!d(string=назад)
  Brightcells 6102143d8e reduce balance лет %!s(int64=9): %!d(string=назад)
  Brightcells 92da943e9e check wx_uid for api wx_balance_withdraw_api лет %!s(int64=9): %!d(string=назад)
  Brightcells fa2729a4e1 add api wx_balance_withdraw_api лет %!s(int64=10): %!d(string=назад)
  Brightcells 8d6858fb00 adjust website content лет %!s(int64=10): %!d(string=назад)
  Brightcells a8d890cb70 filter order by pay_status лет %!s(int64=10): %!d(string=назад)
  Brightcells 70689e758c add lensman and user's balance лет %!s(int64=10): %!d(string=назад)
  Brightcells fabef63211 set line_length=200 for isort лет %!s(int64=10): %!d(string=назад)
  Brightcells f72ccb1875 isort import лет %!s(int64=10): %!d(string=назад)
  Brightcells ee258aeb8b GroupPhotoOrderInfo value set error лет %!s(int64=10): %!d(string=назад)
  Brightcells 6f4b4a7f5c unify fee(return and params) to fen лет %!s(int64=10): %!d(string=назад)
  Brightcells 102152ca4a add api lensman_photo_bought & modify api wx_order_create_api and adjust return field лет %!s(int64=10): %!d(string=назад)
  Brightcells 98f968c53c add api lesman_photo_price/wx_order_list_api/wx_order_detail_api лет %!s(int64=10): %!d(string=назад)
  Brightcells 0f425ae151 add api wx_order_query_api лет %!s(int64=10): %!d(string=назад)
  Brightcells 097426009e Fix Bug: sign error when trade_type == 'APP' лет %!s(int64=10): %!d(string=назад)
  Brightcells 0e1b1fb160 adjust WECHAT in settings.py & use django-logit лет %!s(int64=10): %!d(string=назад)