@@ -17,6 +17,7 @@ from utils.error.errno_utils import ContractStatusCode

 from utils.redis.rimage import get_images_data

 from utils.tencentcloud.ess import (callback_decode, create_document, create_flow, create_scheme_url, start_flow,

                                     test_upload_document_files, upload_document_files)

+from utils.thumbnail_utils import make_thumbnail2

 @logit(res=True)

@@ -71,6 +72,7 @@ def get_contribtion_contract_api(request):

         'scheme_url': scheme_url

     })

+

 def get_contribtion_contract_sign_mppath_api(request):

     user_id = request.POST.get('user_id', '')

     flow_id = request.POST.get('flow_id', '')

@@ -99,6 +101,7 @@ def get_contribtion_contract_sign_mppath_api(request):

 def generate_file_from_qiniu(file_url):

     try:

         data = requests.get(file_url).content

+        data = make_thumbnail2(data)

         data = base64.b64encode(data).decode('utf-8')

     except Exception:

         data = None

@@ -163,9 +166,8 @@ def create_contribution_contract_flow(lensman):

 def create_contribution_contract_document(lensman, contribution_id, file_ids, FlowId):

     # 创建电子签文档 https://qian.tencent.com/developers/companyApis/startFlows/CreateDocument

-    IMAGE_COMPONENTIDS = ['ComponentId_37', 'ComponentId_38','ComponentId_39','ComponentId_40','ComponentId_41','ComponentId_42',

-                           'ComponentId_43','ComponentId_44','ComponentId_45','ComponentId_46','ComponentId_47','ComponentId_48','ComponentId_49','ComponentId_50','ComponentId_51','ComponentId_52','ComponentId_53','ComponentId_54','ComponentId_55', 'ComponentId_55', 'ComponentId_56', 'ComponentId_57', 'ComponentId_58', 'ComponentId_59', 'ComponentId_60', 'ComponentId_9', 'ComponentId_10', 'ComponentId_11', 'ComponentId_12', 'ComponentId_13', 'ComponentId_14', 'ComponentId_15', 'ComponentId_16', 'ComponentId_17', 'ComponentId_18', 'ComponentId_19', 'ComponentId_20', 'ComponentId_21', 'ComponentId_22', 'ComponentId_23', 'ComponentId_24', 'ComponentId_25', 'ComponentId_26', 'ComponentId_27', 'ComponentId_28','ComponentId_29', 'ComponentId_30', 'ComponentId_31', 'ComponentId_32']

-     

+    IMAGE_COMPONENTIDS = ['ComponentId_37', 'ComponentId_38', 'ComponentId_39', 'ComponentId_40', 'ComponentId_41', 'ComponentId_42', 'ComponentId_43', 'ComponentId_44', 'ComponentId_45', 'ComponentId_46', 'ComponentId_47', 'ComponentId_48', 'ComponentId_49', 'ComponentId_50', 'ComponentId_51', 'ComponentId_52', 'ComponentId_53', 'ComponentId_54', 'ComponentId_55', 'ComponentId_55', 'ComponentId_56', 'ComponentId_57', 'ComponentId_58', 'ComponentId_59', 'ComponentId_60', 'ComponentId_9', 'ComponentId_10', 'ComponentId_11', 'ComponentId_12', 'ComponentId_13', 'ComponentId_14', 'ComponentId_15', 'ComponentId_16', 'ComponentId_17', 'ComponentId_18', 'ComponentId_19', 'ComponentId_20', 'ComponentId_21', 'ComponentId_22', 'ComponentId_23', 'ComponentId_24', 'ComponentId_25', 'ComponentId_26', 'ComponentId_27', 'ComponentId_28', 'ComponentId_29', 'ComponentId_30', 'ComponentId_31', 'ComponentId_32']

+

     try:

         amount = LensmanContributionActivityIncomeExpensesInfo.objects.get(contribution_id=contribution_id, lensman_id=lensman.lensman_id).amount

     except LensmanContributionActivityIncomeExpensesInfo.DoesNotExist:

@@ -9,7 +9,7 @@ urlpatterns = [

     url(r'^mp/lensman/contribution/contract/get$', contract_mp_views.get_contribtion_contract_api, name='get_contribtion_contract_api'),

     url(r'^mp/lensman/contribution/contract/status/get$', contract_mp_views.get_contribtion_contract_status_api, name='get_contribtion_contract_status_api'),

     url(r'^mp/lensman/contribution/contract/sign/mppach/get$', contract_mp_views.get_contribtion_contract_sign_mppath_api, name='get_contribtion_contract_sign_mppath_api'),

-    

+

     url(r'^mp/ess/callback$', contract_mp_views.ess_callback, name='ess_callback'),

 ]

@@ -75,6 +75,7 @@ def lensman_audit(request, administrator):

     return response(200, 'Lensman Audit Pass Suceess', u'摄影师审核通过')

+

 @logit

 @check_admin

 def lensman_delete(request, administrator):

@@ -393,4 +393,4 @@ urlpatterns += [

 # 会员活动模块

 urlpatterns += [

     url(r'', include(('api.activity.activity_urls', 'activity'), namespace='activity')),

-]

+]

@@ -112,7 +112,7 @@ class MaintenaceInfo(BaseModelMixin):

             'model_id': self.model_id,

             'model_name': model.model_name if model else '',

             'model_full_name': model.model_full_name if model else '',

-            #'model_image_url': model.image2_url,

+            # 'model_image_url': model.image2_url,

             'log_id': self.log_id,

             'sn': self.sn,

             'desc': self.desc,

@@ -153,7 +153,7 @@ def activity_contribute_create(request):

         try:

             lensman = LensmanInfo.objects.get(user_id=user_id, status=True)

             user_name = lensman.name

-        except:

+        except LensmanInfo.DoesNotExist:

             pass

     try:

@@ -44,7 +44,6 @@ def upload_document_files(files, file_type='png'):

         file_ids = file_ids + res.FileIds

         _files = _files[20:]

-        

     return file_ids

@@ -4,6 +4,15 @@ from __future__ import division

 try:

+    from cStringIO import StringIO

+    from cStringIO import StringIO as BytesIO

+except ImportError:

+    try:

+        from StringIO import StringIO

+        from StringIO import StringIO as BytesIO

+    except ImportError:

+        from io import BytesIO, StringIO

+try:

     from PIL import Image

 except ImportError:

     import Image

@@ -17,3 +26,18 @@ def make_thumbnail(im_path, im_thumbnail_path=None, max_width=360):

     im.thumbnail((thumb_width, thumb_height), Image.ANTIALIAS)

     im.save(im_thumbnail_path or im_path, im.format or 'JPEG', quality=90)

     return width, height, thumb_width, thumb_height

+

+

+def make_thumbnail2(data, w=360, h=240):

+    im = Image.open(BytesIO(data))

+    fmt = im.format.lower()

+    width, height = im.size

+    if width > height:

+        thumb_width, thumb_height = w, height * w / width

+    else:

+        thumb_width, thumb_height = width * h / height, h

+    im.thumbnail((thumb_width, thumb_height), Image.ANTIALIAS)

+    out = BytesIO()

+    im.save(out, format=fmt)

+    data = out.getvalue()

+    return data

Home Esplora Aiuto

Registrati Accedi

Kodo

/

kodo

Segui 2

Vota 0

Forka 0

Problemi 0 Pull Requests 0 Commit 921 Rilasci 0

Nessuna descrizione

SSH HTTPS

ZIP TAR.GZ

• Albero (Tree): a08152d677

  Rami (Branch) Tag

  demo

  py3.11dj4.x

  tamron

  wine
• kodo

  /

  commands

Brightcells: 290ff6960f pyzbar 6 anni fa
	..
	management	290ff6960f	pyzbar	6 anni fa
	migrations	b95db9c5c3	Basic gis command	8 anni fa
	__init__.py	b95db9c5c3	Basic gis command	8 anni fa
	admin.py	b95db9c5c3	Basic gis command	8 anni fa
	apps.py	b95db9c5c3	Basic gis command	8 anni fa
	models.py	b95db9c5c3	Basic gis command	8 anni fa
	tests.py	b95db9c5c3	Basic gis command	8 anni fa
	views.py	b95db9c5c3	Basic gis command	8 anni fa