|
@@ -992,20 +992,24 @@ class CameraApiController extends BaseController
|
|
|
curl_setopt($ch, CURLOPT_BINARYTRANSFER,1);
|
|
|
$rawdata = curl_exec ($ch);
|
|
|
curl_close ($ch);
|
|
|
+
|
|
|
+ $houzhui = explode('.',$file_path);
|
|
|
+ $houzhui = '.'.$houzhui[count($houzhui)-1];
|
|
|
+
|
|
|
// 使用中文文件名需要转码
|
|
|
- $fp = fopen(public_path() . '/filedownload/' . $rename.'.jpg', 'w');
|
|
|
+ $fp = fopen(public_path() . '/filedownload/' . $rename.$houzhui, 'w');
|
|
|
fwrite($fp, $rawdata);
|
|
|
fclose($fp);
|
|
|
|
|
|
$file_name = $rename;
|
|
|
|
|
|
//上传文件
|
|
|
- $file_oss_path = $this->uploadFile($file_name);
|
|
|
+ $file_oss_path = $this->uploadFile($file_name,$houzhui);
|
|
|
return $file_oss_path;
|
|
|
}
|
|
|
|
|
|
//上传文件
|
|
|
- public function uploadFile($file_name)
|
|
|
+ public function uploadFile($file_name,$houzhui)
|
|
|
{
|
|
|
try{
|
|
|
$oss = new OssClient(
|
|
@@ -1014,8 +1018,8 @@ class CameraApiController extends BaseController
|
|
|
Config::get('filesystems.disks.oss_view.endpoint')
|
|
|
);
|
|
|
|
|
|
- $file_path = public_path() . '/filedownload/' . $file_name.'.jpg';
|
|
|
- $res = $oss->uploadFile(Config::get('filesystems.disks.oss_view.bucket'), $file_name.'.jpeg', $file_path);
|
|
|
+ $file_path = public_path() . '/filedownload/' . $file_name.$houzhui;
|
|
|
+ $res = $oss->uploadFile(Config::get('filesystems.disks.oss_view.bucket'), $file_name.$houzhui, $file_path);
|
|
|
} catch(\OssException $e) {
|
|
|
printf(__FUNCTION__ . ": FAILED\n");
|
|
|
printf($e->getMessage() . "\n");
|