from pay.models import OrderInfo
10 14
 from photo.models import PhotosInfo
11
-
12
-from utils.page_utils import pagination
13
-
14 15
 from utils.error.errno_utils import GroupPhotoStatusCode, OrderStatusCode
15 16
 from utils.error.response_utils import response
16
-
17
+from utils.page_utils import pagination
17 18
 from utils.redis.rkeys import LENSMAN_PHOTO_PRICE
18 19
 from utils.redis.rorder import set_lensman_order_record
19 20
 
20
-from logit import logit
21
-
22
-from TimeConvert import TimeConvert as tc
23
-from wechatpy import WeChatPay, WeChatPayException
24
-
25
-import xmltodict
26
-
27
-
28 21
 r = settings.REDIS_CACHE
29 22
 WECHAT = settings.WECHAT
30 23
 

+ 1 - 1
photo/admin.py

@@ -2,7 +2,7 @@
2 2
 
3 3
 from django.contrib import admin
4 4
 
5
-from photo.models import UUIDInfo, PhotosInfo
5
+from photo.models import PhotosInfo, UUIDInfo
6 6
 
7 7
 
8 8
 class UUIDInfoAdmin(admin.ModelAdmin):

+ 0 - 1
photo/models.py

@@ -5,7 +5,6 @@ from django.db import models
5 5
 from django.utils.translation import ugettext_lazy as _
6 6
 
7 7
 from pai2.basemodels import CreateUpdateMixin
8
-
9 8
 from utils.url_utils import img_url
10 9
 
11 10
 

+ 2 - 1
photo/serializers.py

@@ -1,8 +1,9 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-from photo.models import PhotosInfo
4 3
 from rest_framework import serializers
5 4
 
5
+from photo.models import PhotosInfo
6
+
6 7
 
7 8
 class PhotosInfoSerializer(serializers.HyperlinkedModelSerializer):
8 9
     class Meta:

+ 12 - 19
photo/views.py

@@ -1,36 +1,29 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
+import os
4
+
5
+import shortuuid
6
+from curtail_uuid import CurtailUUID
3 7
 from django.conf import settings
4 8
 from django.core.files.storage import default_storage
5 9
 from django.db import transaction
6 10
 from django.http import JsonResponse
7 11
 from django.shortcuts import render
8
-
9 12
 from rest_framework import viewsets
13
+from TimeConvert import TimeConvert as tc
10 14
 
11 15
 from account.models import LensmanInfo, UserInfo
12
-from group.models import GroupInfo, GroupUserInfo, GroupPhotoInfo
13
-from photo.models import UUIDInfo, PhotosInfo
16
+from group.models import GroupInfo, GroupPhotoInfo, GroupUserInfo
17
+from photo.models import PhotosInfo, UUIDInfo
14 18
 from photo.serializers import PhotosInfoSerializer
15
-
16
-from utils.ip_utils import ip_addr
17
-from utils.thumbnail_utils import make_thumbnail
18
-from utils.watermark_utils import watermark_wrap
19
-
20 19
 from utils.error.errno_utils import PhotoStatusCode
21 20
 from utils.error.response_utils import response
22
-
21
+from utils.ip_utils import ip_addr
22
+from utils.redis.rgroup import (get_group_info, get_group_users_info,
23
+                                set_group_info, set_group_users_info)
23 24
 from utils.redis.rkeys import GROUP_LAST_PHOTO_PK
24
-from utils.redis.rgroup import get_group_info, get_group_users_info
25
-from utils.redis.rgroup import set_group_info, set_group_users_info
26
-
27
-from curtail_uuid import CurtailUUID
28
-
29
-from TimeConvert import TimeConvert as tc
30
-
31
-import os
32
-import shortuuid
33
-
25
+from utils.thumbnail_utils import make_thumbnail
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
 

thermometer - Gogs: Go Git Service

Geen omschrijving

huangqimin001: 4d7b4a929b :art: IsolationPointStatusCode.ISOLATIONPOINT_USER_NOT_FOUND 4 jaren geleden
..
__init__.py a6bdd3725f :tada: Initial 4 jaren geleden
errno_utils.py 4d7b4a929b :art: IsolationPointStatusCode.ISOLATIONPOINT_USER_NOT_FOUND 4 jaren geleden
response_utils.py a6bdd3725f :tada: Initial 4 jaren geleden