修复vditor编辑器粘贴图片URL上传失败的异常处理

This commit is contained in:
yangjian 2021-06-15 20:31:58 +08:00
parent 66ee8c6dde
commit ea2463971e
2 changed files with 33 additions and 17 deletions

View File

@ -6,6 +6,7 @@
- [新增]后台站点设置文档长代码显示控制选项;
- [修复]开启「全站登录」后URL跳转异常的问题
- [修复]Vditor编辑器编写的文档搜索高亮文档不解析的问题
- [修复]Vditor编辑器粘贴上传图片异常的处理
- [优化]用户禁止同名文集创建,文集下禁止同名文档创建;
- [优化]文集导出异常提示;
- [优化]Vditor文档目录样式

View File

@ -7,6 +7,7 @@ from django.utils.translation import gettext_lazy as _
import datetime,time,json,base64,os,uuid
from app_doc.models import Image,ImageGroup,Attachment
from app_admin.models import SysSetting
from loguru import logger
import requests
import random
@ -255,24 +256,38 @@ def url_img_upload(url,dir_name,user):
header = {
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36"
}
r = requests.get(url, headers=header, stream=True)
try:
r = requests.get(url, headers=header, stream=True)
if r.status_code == 200:
with open(path_file, 'wb') as f:
f.write(r.content) # 保存文件
Image.objects.create(
user=user,
file_path=file_url,
file_name=file_name,
remark=_('粘贴上传'),
)
if r.status_code == 200:
with open(path_file, 'wb') as f:
f.write(r.content) # 保存文件
Image.objects.create(
user=user,
file_path=file_url,
file_name=file_name,
remark=_('粘贴上传'),
)
resp_data = {
'msg': '',
'code': 0,
'data' : {
'originalURL': url,
'url': file_url
}
resp_data = {
'msg': '',
'code': 0,
'data' : {
'originalURL': url,
'url': file_url
}
}
else:
resp_data = {
'msg': '',
'code': 1,
'data': {}
}
except Exception as e:
logger.error("上传URL图片异常{}".format(repr(e)))
resp_data = {
'msg': '',
'code': 1,
'data': {}
}
return resp_data
# return {"success": 1, "url": file_url, 'message': '上传图片成功'}