Merge branch 'master-lyh-edit' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -347,7 +347,7 @@ class FileController
         // 设置响应头
         // 设置响应头
         header('Content-Description: File Transfer');
         header('Content-Description: File Transfer');
         header('Content-Type: application/octet-stream');
         header('Content-Type: application/octet-stream');
-        header('Content-Disposition: attachment; filename="' . $info['name'] . '"');
+        header('Content-Disposition: attachment; filename="' . !empty($info['name']) ? $info['name'] : '未命名'.basename($info['path']) . '"');
         // 下载文件
         // 下载文件
         readfile($fileUrl);
         readfile($fileUrl);
     }
     }

@@ -290,10 +290,14 @@ class ImageController extends Controller
             'name'=>$name,
             'name'=>$name,
             'en_name'=>$fileName
             'en_name'=>$fileName
         ];
         ];
+        $imageModel = new ImageModel();
+        $info = $imageModel->read(['hash'=>$hash,'project_id'=>$this->cache['project_id'] ?? 0]);
+        if($info === false){
             $rs = $imageModel->add($data);
             $rs = $imageModel->add($data);
             if ($rs === false) {
             if ($rs === false) {
                 return $this->response('添加失败', Code::USER_ERROR);
                 return $this->response('添加失败', Code::USER_ERROR);
             }
             }
+        }
         return true;
         return true;
     }
     }
 
 

@@ -25,7 +25,7 @@ class BlogRequest extends FormRequest
     {
     {
         return [
         return [
             'name'=>'required|max:200',
             'name'=>'required|max:200',
-//            'remark'=>'max:500',
+            'seo_keywords'=>'max:1000',
             'url'=>'required',
             'url'=>'required',
         ];
         ];
     }
     }
@@ -36,7 +36,7 @@ class BlogRequest extends FormRequest
             'name.required'=>'请填写名称',
             'name.required'=>'请填写名称',
             'name.max'=>'名称超过最长长度200',
             'name.max'=>'名称超过最长长度200',
             'url.required'=>'链接不能为空',
             'url.required'=>'链接不能为空',
-//            'remark.max'=>'描述超过最长长度500'
+            'seo_keywords.max'=>'seo_keywords太长，请重新编辑'
         ];
         ];
     }
     }
 }
 }