作者 李宇航

合并分支 'lyh-server' 到 'master'

gx大网站开启翻译



查看合并请求 !2100
@@ -514,22 +514,22 @@ class ImageController extends Controller @@ -514,22 +514,22 @@ class ImageController extends Controller
514 foreach ($files as $file){ 514 foreach ($files as $file){
515 if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){ 515 if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){
516 if ($file->getSize() > $this->cache['image_max'] * 1024) { 516 if ($file->getSize() > $this->cache['image_max'] * 1024) {
517 - $this->response('图片最大为'.$this->cache['image_max'],Code::SYSTEM_ERROR); 517 + $this->response('图片最大为'.$this->cache['image_max'].'k',Code::SYSTEM_ERROR);
518 } 518 }
519 }else{ 519 }else{
520 if ($file->getSize() > $max) { 520 if ($file->getSize() > $max) {
521 - $this->response('图片最大为1024K',Code::SYSTEM_ERROR); 521 + $this->response('图片最大为2m',Code::SYSTEM_ERROR);
522 } 522 }
523 } 523 }
524 } 524 }
525 }else{ 525 }else{
526 if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){ 526 if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){
527 if ($files->getSize() > $this->cache['image_max'] * 1024) { 527 if ($files->getSize() > $this->cache['image_max'] * 1024) {
528 - $this->response('图片最大为'.$this->cache['image_max'],Code::SYSTEM_ERROR); 528 + $this->response('图片最大为'.$this->cache['image_max'].'k',Code::SYSTEM_ERROR);
529 } 529 }
530 }else{ 530 }else{
531 if ($files->getSize() > $max) { 531 if ($files->getSize() > $max) {
532 - $this->response('图片最大为1024K',Code::SYSTEM_ERROR); 532 + $this->response('图片最大为2m',Code::SYSTEM_ERROR);
533 } 533 }
534 } 534 }
535 } 535 }