|
|
@@ -50,11 +50,11 @@ class QiniuService extends BaseService
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 查询
|
|
|
- * @param $no 快递单号
|
|
|
- * @param string $phone // 手机号
|
|
|
- * @param string $code 快递公司编号
|
|
|
- * @return bool
|
|
|
+ * 上传文件/图片
|
|
|
+ * @param $filename
|
|
|
+ * @param $file
|
|
|
+ * @return false|string
|
|
|
+ * @throws \Exception
|
|
|
*/
|
|
|
public function upload($filename,$file)
|
|
|
{
|
|
|
@@ -76,7 +76,7 @@ class QiniuService extends BaseService
|
|
|
list($ret, $err) = $uploadMgr->putFile($uptoken, $filename, $file->getPathname());
|
|
|
|
|
|
if ($err !== null) {
|
|
|
- $this->error = 'QINIU图片上传失败:' . $err->getMessage();
|
|
|
+ $this->error = 'QINIU文件上传失败:' . (is_object($err)?$err->getMessage():$err);
|
|
|
return false;
|
|
|
} else {
|
|
|
return '/qiniu/' . $filename;
|
|
|
@@ -84,11 +84,10 @@ class QiniuService extends BaseService
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 查询
|
|
|
- * @param $no 快递单号
|
|
|
- * @param string $phone // 手机号
|
|
|
- * @param string $code 快递公司编号
|
|
|
- * @return bool
|
|
|
+ * 上传base图片
|
|
|
+ * @param $filename
|
|
|
+ * @param $base64
|
|
|
+ * @return false|string
|
|
|
*/
|
|
|
public function uploadBase64($filename,$base64)
|
|
|
{
|
|
|
@@ -109,7 +108,7 @@ class QiniuService extends BaseService
|
|
|
$uploadMgr = new UploadManager();
|
|
|
list($ret, $err) = $uploadMgr->put($uptoken,$filename, $base64,null,'image/png');
|
|
|
if ($err !== null) {
|
|
|
- $this->error = 'QINIU图片上传失败';
|
|
|
+ $this->error = 'QINIU文件上传失败';
|
|
|
return false;
|
|
|
} else {
|
|
|
return '/qiniu/' . $filename;
|