Merge branch 'tamron' of http://git.xfoto.com.cn/Kodo/kodo into tamron
3 fichiers modifiés avec 15 ajouts et 11 suppressions
+ 11
- 7
commands/management/commands/qiniu.py
@@ -41,21 +41,25 @@ class Command(CompatibilityBaseCommand): |
||
| 41 | 41 |
except SaleclerkSubmitLogInfo.DoesNotExist: |
| 42 | 42 |
continue |
| 43 | 43 |
|
| 44 |
+ is_upload_qiniu = True |
|
| 45 |
+ |
|
| 44 | 46 |
if ssli.image: |
| 45 | 47 |
try: |
| 46 |
- upload_file_path(ssli.image.path, key=ssli.image.name, bucket='tamron') |
|
| 47 |
- os.remove(ssli.image.path) |
|
| 48 |
+ if os.path.exists(ssli.image.path): |
|
| 49 |
+ upload_file_path(ssli.image.path, key=ssli.image.name, bucket='tamron') |
|
| 50 |
+ os.remove(ssli.image.path) |
|
| 48 | 51 |
except Exception: |
| 49 |
- pass |
|
| 52 |
+ is_upload_qiniu = False |
|
| 50 | 53 |
|
| 51 | 54 |
if ssli.code_image: |
| 52 | 55 |
try: |
| 53 |
- upload_file_path(ssli.code_image.path, key=ssli.code_image.name, bucket='tamron') |
|
| 54 |
- os.remove(ssli.code_image.path) |
|
| 56 |
+ if os.path.exists(ssli.code_image.path): |
|
| 57 |
+ upload_file_path(ssli.code_image.path, key=ssli.code_image.name, bucket='tamron') |
|
| 58 |
+ os.remove(ssli.code_image.path) |
|
| 55 | 59 |
except Exception: |
| 56 |
- pass |
|
| 60 |
+ is_upload_qiniu = False |
|
| 57 | 61 |
|
| 58 |
- ssli.is_upload_qiniu = True |
|
| 62 |
+ ssli.is_upload_qiniu = is_upload_qiniu |
|
| 59 | 63 |
ssli.save() |
| 60 | 64 |
|
| 61 | 65 |
close_old_connections() |
+ 1
- 1
kodo/settings.py
@@ -252,7 +252,7 @@ QINIU = {
|
||
| 252 | 252 |
'thumbnail': 'http://thumbnail.img.pai.ai', |
| 253 | 253 |
'thumbnail2': 'http://thumbnail2.img.pai.ai', |
| 254 | 254 |
'watermark': 'http://watermark.img.pai.ai', |
| 255 |
- 'tamron': 'http://qbmivthwi.bkt.clouddn.com', |
|
| 255 |
+ 'tamron': 'http://img.tamron.kodo.com.cn', |
|
| 256 | 256 |
} |
| 257 | 257 |
} |
| 258 | 258 |
|
+ 3
- 3
requirements.txt
@@ -7,10 +7,10 @@ isoweek==1.3.3 |
||
| 7 | 7 |
jsonfield==3.1.0 |
| 8 | 8 |
mock==2.0.0 |
| 9 | 9 |
monetary==1.0.3 |
| 10 |
-mysqlclient==2.0.1 |
|
| 10 |
+mysqlclient==2.0.3 |
|
| 11 | 11 |
pysnippets==1.1.2 |
| 12 |
-qiniu==7.2.6 |
|
| 13 |
-requests==2.21.0 |
|
| 12 |
+qiniu==7.3.1 |
|
| 13 |
+requests[security]==2.25.1 |
|
| 14 | 14 |
rlog==0.3 |
| 15 | 15 |
rsa==3.4.2 |
| 16 | 16 |
shortuuid==1.0.1 |