正在显示
3 个修改的文件
包含
6 行增加
和
6 行删除
| @@ -153,7 +153,7 @@ class FileController | @@ -153,7 +153,7 @@ class FileController | ||
| 153 | 'path' => $url.$fileName, | 153 | 'path' => $url.$fileName, |
| 154 | 'created_at' => date('Y-m-d H:i:s',time()), | 154 | 'created_at' => date('Y-m-d H:i:s',time()), |
| 155 | 'size' => $res->getSize(), | 155 | 'size' => $res->getSize(), |
| 156 | - 'hash' => $hash, | 156 | + 'hash' => $hash.$files->getClientOriginalExtension(),, |
| 157 | 'type'=>$files->getClientOriginalExtension(), | 157 | 'type'=>$files->getClientOriginalExtension(), |
| 158 | ]; | 158 | ]; |
| 159 | $rs = $fileModel->add($data); | 159 | $rs = $fileModel->add($data); |
| @@ -191,7 +191,7 @@ class FileController | @@ -191,7 +191,7 @@ class FileController | ||
| 191 | 'path' => $url.$fileName, | 191 | 'path' => $url.$fileName, |
| 192 | 'created_at' => date('Y-m-d H:i:s',time()), | 192 | 'created_at' => date('Y-m-d H:i:s',time()), |
| 193 | 'size' => $res->getSize(), | 193 | 'size' => $res->getSize(), |
| 194 | - 'hash' => $hash, | 194 | + 'hash' => $hash.$files->getClientOriginalExtension(),, |
| 195 | 'type'=>$files->getClientOriginalExtension(), | 195 | 'type'=>$files->getClientOriginalExtension(), |
| 196 | ]; | 196 | ]; |
| 197 | $data[] = $hash; | 197 | $data[] = $hash; |
| @@ -139,7 +139,7 @@ class ImageController | @@ -139,7 +139,7 @@ class ImageController | ||
| 139 | 'path' => $url.$fileName, | 139 | 'path' => $url.$fileName, |
| 140 | 'created_at' => date('Y-m-d H:i:s',time()), | 140 | 'created_at' => date('Y-m-d H:i:s',time()), |
| 141 | 'size' => $res->getSize(), | 141 | 'size' => $res->getSize(), |
| 142 | - 'hash' => $hash, | 142 | + 'hash' => $hash.$files->getClientOriginalExtension(), |
| 143 | 'type'=>$files->getClientOriginalExtension(), | 143 | 'type'=>$files->getClientOriginalExtension(), |
| 144 | ]; | 144 | ]; |
| 145 | $rs = $imageModel->add($data); | 145 | $rs = $imageModel->add($data); |
| @@ -193,7 +193,7 @@ class ImageController | @@ -193,7 +193,7 @@ class ImageController | ||
| 193 | 'created_at' => date('Y-m-d H:i:s',time()), | 193 | 'created_at' => date('Y-m-d H:i:s',time()), |
| 194 | 'updated_at'=>date('Y-m-d H:i:s',time()), | 194 | 'updated_at'=>date('Y-m-d H:i:s',time()), |
| 195 | 'size' => $res->getSize(), | 195 | 'size' => $res->getSize(), |
| 196 | - 'hash' => $hash, | 196 | + 'hash' => $hash.$files->getClientOriginalExtension(), |
| 197 | 'type'=>$file->getClientOriginalExtension(), | 197 | 'type'=>$file->getClientOriginalExtension(), |
| 198 | ]; | 198 | ]; |
| 199 | $data[] = $hash; | 199 | $data[] = $hash; |
| @@ -63,10 +63,10 @@ class AyrReleaseLogic extends BaseLogic | @@ -63,10 +63,10 @@ class AyrReleaseLogic extends BaseLogic | ||
| 63 | $imageModel = new Image(); | 63 | $imageModel = new Image(); |
| 64 | $list = $imageModel->list(['hash'=>['in',$images]],'id'); | 64 | $list = $imageModel->list(['hash'=>['in',$images]],'id'); |
| 65 | foreach ($list as $v1){ | 65 | foreach ($list as $v1){ |
| 66 | - $arr[] = url('/b/image/' . $v1['hash'].'/'.$v1['type']); | 66 | + $arr[] = url('/b/images/' . $v1['hash']); |
| 67 | } | 67 | } |
| 68 | }else{ | 68 | }else{ |
| 69 | - $arr[] = url('/b/file_hash/' . $v.'/mp4'); | 69 | + $arr[] = url('/b/file_hash/' . $v); |
| 70 | } | 70 | } |
| 71 | } | 71 | } |
| 72 | return $this->success($arr); | 72 | return $this->success($arr); |
-
请 注册 或 登录 后发表评论