|
@@ -56,10 +56,6 @@ class ImageController |
|
@@ -56,10 +56,6 @@ class ImageController |
|
56
|
exit;
|
56
|
exit;
|
|
57
|
}
|
57
|
}
|
|
58
|
$imageModel = new ImageModel();
|
58
|
$imageModel = new ImageModel();
|
|
59
|
- $dotIndex = strpos($hash, '.');
|
|
|
|
60
|
- if ($dotIndex !== false) {
|
|
|
|
61
|
- $hash = substr($dotIndex, 0, $dotIndex); // 删除小数点及其后面的字符
|
|
|
|
62
|
- }
|
|
|
|
63
|
$info = $imageModel->read(['hash'=>$hash]);
|
59
|
$info = $imageModel->read(['hash'=>$hash]);
|
|
64
|
if ($info === false) {
|
60
|
if ($info === false) {
|
|
65
|
$this->response('指定图片不存在!', Code::USER_ERROR);
|
61
|
$this->response('指定图片不存在!', Code::USER_ERROR);
|
|
@@ -139,7 +135,7 @@ class ImageController |
|
@@ -139,7 +135,7 @@ class ImageController |
|
139
|
'path' => $url.$fileName,
|
135
|
'path' => $url.$fileName,
|
|
140
|
'created_at' => date('Y-m-d H:i:s',time()),
|
136
|
'created_at' => date('Y-m-d H:i:s',time()),
|
|
141
|
'size' => $res->getSize(),
|
137
|
'size' => $res->getSize(),
|
|
142
|
- 'hash' => $hash.$files->getClientOriginalExtension(),
|
138
|
+ 'hash' => $hash,
|
|
143
|
'type'=>$files->getClientOriginalExtension(),
|
139
|
'type'=>$files->getClientOriginalExtension(),
|
|
144
|
];
|
140
|
];
|
|
145
|
$rs = $imageModel->add($data);
|
141
|
$rs = $imageModel->add($data);
|
|
@@ -193,7 +189,7 @@ class ImageController |
|
@@ -193,7 +189,7 @@ class ImageController |
|
193
|
'created_at' => date('Y-m-d H:i:s',time()),
|
189
|
'created_at' => date('Y-m-d H:i:s',time()),
|
|
194
|
'updated_at'=>date('Y-m-d H:i:s',time()),
|
190
|
'updated_at'=>date('Y-m-d H:i:s',time()),
|
|
195
|
'size' => $res->getSize(),
|
191
|
'size' => $res->getSize(),
|
|
196
|
- 'hash' => $hash.$files->getClientOriginalExtension(),
|
192
|
+ 'hash' => $hash,
|
|
197
|
'type'=>$file->getClientOriginalExtension(),
|
193
|
'type'=>$file->getClientOriginalExtension(),
|
|
198
|
];
|
194
|
];
|
|
199
|
$data[] = $hash;
|
195
|
$data[] = $hash;
|