Commit 8da4aeea authored by 王源's avatar 王源 🎧

Merge branch '1.0' into 2.0

parents 60b3d9b6 9164e00f
......@@ -19,7 +19,7 @@ class UploadManager
public static $pathPrefix = '/upload/';
public static $options = [
'path' => 'default', // 默认保存路径
'maxSize' => 100000000, // 文件大小
'maxSize' => 10 * 1024 * 1024, // 文件大小,10M
'temp' => false, // 是否为临时文件
'mime' => ['jpeg', 'png', 'gif', 'jpg', 'svg', 'txt', 'pdf', 'xlsx', 'xls', 'doc', 'docx', 'rar', 'zip', 'csv'], // 允许上传的文件类型
];
......
......@@ -12,7 +12,7 @@ class CurlRequest
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_TIMEOUT, 50); // 设置超时限制防止死循环
curl_setopt($ch, CURLOPT_TIMEOUT, 100); // 设置超时限制防止死循环
curl_setopt($ch, CURLOPT_HEADER, true);
curl_setopt($ch, CURLOPT_USERAGENT, 'PHPClassic/PHPShopify');
$headers = [];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment