/td> 12
+
12 13
 try:
13 14
     from PIL import Image, ImageOps
14 15
 except ImportError:

+ 2 - 2
simditor/urls.py

@@ -2,13 +2,13 @@
2 2
 from __future__ import absolute_import
3 3
 
4 4
 import django
5
-
6 5
 from django.conf import settings
7
-from django.conf.urls import url, static
6
+from django.conf.urls import static, url
8 7
 from django.contrib.admin.views.decorators import staff_member_required
9 8
 
10 9
 from . import views
11 10
 
11
+
12 12
 if django.VERSION >= (2, 0):
13 13
     # pylint disable=C0103
14 14
     from django.urls import path

+ 0 - 1
simditor/utils.py

@@ -3,7 +3,6 @@ from __future__ import absolute_import
3 3
 
4 4
 import os.path
5 5
 import random
6
-
7 6
 import string
8 7
 
9 8
 from django.core.files.storage import default_storage

+ 1 - 3
simditor/views.py

@@ -6,13 +6,11 @@ from datetime import datetime
6 6
 
7 7
 from django.conf import settings
8 8
 from django.core.files.storage import default_storage
9
-
10 9
 from django.http import JsonResponse
11
-
12 10
 from django.views import generic
13 11
 from django.views.decorators.csrf import csrf_exempt
14 12
 
15
-from . import utils, image_processing
13
+from . import image_processing, utils
16 14
 
17 15
 
18 16
 def get_upload_filename(upload_name):

+ 3 - 3
simditor/widgets.py

@@ -5,12 +5,12 @@ from django import forms
5 5
 from django.conf import settings
6 6
 from django.core.exceptions import ImproperlyConfigured
7 7
 from django.core.serializers.json import DjangoJSONEncoder
8
-
9 8
 from django.template.loader import render_to_string
10 9
 from django.utils.encoding import force_text
11
-from django.utils.safestring import mark_safe
12
-from django.utils.html import conditional_escape
13 10
 from django.utils.functional import Promise
11
+from django.utils.html import conditional_escape
12
+from django.utils.safestring import mark_safe
13
+
14 14
 
15 15
 try:
16 16
     # Django >=2.1

+ 16 - 11
utils/error/errno_utils.py

@@ -2,17 +2,6 @@
2 2
 
3 3
 from StatusCode import BaseStatusCode, StatusCodeField
4 4
 
5
-class UserStatusCode(BaseStatusCode):
6
-    USER_NOT_FOUND = StatusCodeField(400001, 'User Not Found', description=u'用户不存在')
7
-
8
-class KOLStatusCode(BaseStatusCode):
9
-    KOL_NOT_FOUND = StatusCodeField(400001, 'KOL Not Found', description=u'KOL不存在')
10
-
11
-class PackStatusCode(BaseStatusCode):
12
-    PACK_NOT_FOUND = StatusCodeField(100001, 'Pack Not Found', description=u'包不存在')
13
-
14
-class PackGoodsStatusCode(BaseStatusCode):
15
-    PACK_GOODS_NOT_FOUND = StatusCodeField(100001, 'Pack Goods Not Found', description=u'包商品不存在')
16 5
 
17 6
 class ParamStatusCode(BaseStatusCode):
18 7
     """ 4000xx 参数相关错误码 """
@@ -31,6 +20,22 @@ class PhoneStatusCode(BaseStatusCode):
31 20
     PHONE_ALREADY_EXISTS = StatusCodeField(400202, 'Phone Already Exists', description=u'手机号已存在')
32 21
 
33 22
 
23
+class UserStatusCode(BaseStatusCode):
24
+    USER_NOT_FOUND = StatusCodeField(400301, 'User Not Found', description=u'用户不存在')
25
+
26
+
27
+class KOLStatusCode(BaseStatusCode):
28
+    KOL_NOT_FOUND = StatusCodeField(401001, 'KOL Not Found', description=u'KOL不存在')
29
+
30
+
31
+class PackStatusCode(BaseStatusCode):
32
+    PACK_NOT_FOUND = StatusCodeField(402001, 'Pack Not Found', description=u'包不存在')
33
+
34
+
35
+class PackGoodsStatusCode(BaseStatusCode):
36
+    PACK_GOODS_NOT_FOUND = StatusCodeField(403001, 'Pack Goods Not Found', description=u'包商品不存在')
37
+
38
+
34 39
 class OrderStatusCode(BaseStatusCode):
35 40
     """ 4040xx 订单/支付相关错误码 """
36 41
     UNIFIED_ORDER_FAIL = StatusCodeField(404000, 'Unified Order Fail', description=u'统一下单失败')

kodo - Gogs: Go Git Service

No Description

huangqimin: b9de70e7be :art: Change print to print() 6 years ago
..
algorithm f38d3bf980 Caesar Alg 8 years ago
error a5595665af :art: Format Codes 6 years ago
redis d659c6e1e2 :art: TimeConvert local_string utc_dt 6 years ago
sql f3cf68f957 Add PAI2_HOME_WX_API for request.weixin 9 years ago
zbar b9de70e7be :art: Change print to print() 6 years ago
__init__.py 52ce35cbfc add api uuid_init/uuid 11 years ago
admin_utils.py 9e4ac4fd3b Add admin_status for GroupUserInfo 9 years ago
disk_utils.py af2b3f483f change download.html to be generated from download.tmpl.html 10 years ago
group_photo_utils.py 0e7b5eb1af Update order_by of group session photos 9 years ago
message_utils.py 21b4a5403a add api lensman_brief_api 10 years ago
original_CGzC_10a50000c8811190.bak.jpg 290ff6960f pyzbar 7 years ago
original_CGzC_10a50000c8811190.jpg 680f424408 Update water mark 9 years ago
paiai_96_96.png 4a8b4f8819 add watermark 11 years ago
paiai_water_mark.png 680f424408 Update water mark 9 years ago
price_utils.py 24e345a32f Add price func get_group_photo_price 9 years ago
qiniucdn.py 4ce7f5c87b :art: Member Relative APIs 6 years ago
rdm_utils.py 4efb7f6f87 Statistic 8 years ago
storage_qiniu_utils.py f2fc73685d Update package django_xxx 8 years ago
storage_utils.py f2fc73685d Update package django_xxx 8 years ago
thumbnail_utils.py 5c9e21b29b add Only Once Function statistic_thumbnail_size to statistic thumbnail size 10 years ago
time_utils.py 511533855d Change oauth to use http 9 years ago
url_utils.py 135c21b40c from models_ext import BaseModelMixin, upload_file_url, upload_path 8 years ago
version_utils.py 13816e8774 Fix Bug: REQUEST 8 years ago
watermark_utils.py 5411626ebe Change watermark position 9 years ago
wx_utils.py 32a7d9ffa0 Update wx relative 9 years ago