Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -585,6 +585,9 @@ class ProjectUpdate extends Command
                                                 $category_id = $category_custom['id'];
                                                 $category_id = $category_custom['id'];
                                             }
                                             }
                                         }
                                         }
+                                        if($category_id){
+                                            $category_id = ',' . $category_id . ',';
+                                        }
                                         //图片
                                         //图片
                                         if (is_array($item['images'] ?? '')) {
                                         if (is_array($item['images'] ?? '')) {
                                             $image = $item['images'][0] ?? '';
                                             $image = $item['images'][0] ?? '';
@@ -625,8 +628,8 @@ class ProjectUpdate extends Command
                                             }
                                             }
 
 
                                             //扩展字段
                                             //扩展字段
-                                            if ($item['extend'][0] ?? []) {
-                                                foreach ($item['extend'][0] as $ke => $ve) {
+                                            if ($item['extend'] ?? []) {
+                                                foreach ($item['extend'] as $ke => $ve) {
                                                     $extend = $extend_model->read(['title' => $ke]);
                                                     $extend = $extend_model->read(['title' => $ke]);
                                                     if ($extend) {
                                                     if ($extend) {
                                                         $extend_info = $extend_info_model->read(['key' => $extend['key'], 'content_id' => $id]);
                                                         $extend_info = $extend_info_model->read(['key' => $extend['key'], 'content_id' => $id]);
@@ -637,7 +640,7 @@ class ProjectUpdate extends Command
                                                                     foreach ($ve as $ve_img) {
                                                                     foreach ($ve as $ve_img) {
                                                                         $gallery[] = ['title' => '', 'description' => '', 'url' => $this->source_download($ve_img, $project_id, $domain_arr['host'], $web_url_domain, $home_url)];
                                                                         $gallery[] = ['title' => '', 'description' => '', 'url' => $this->source_download($ve_img, $project_id, $domain_arr['host'], $web_url_domain, $home_url)];
                                                                     }
                                                                     }
-                                                                }else{
+                                                                } else {
                                                                     $gallery[] = ['title' => '', 'description' => '', 'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url)];
                                                                     $gallery[] = ['title' => '', 'description' => '', 'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url)];
                                                                 }
                                                                 }
                                                                 $value = Arr::a2s($gallery);
                                                                 $value = Arr::a2s($gallery);

@@ -27,7 +27,6 @@ class AyrReleaseRequest extends FormRequest
             'content'=>'required',
             'content'=>'required',
             'share_id'=>'required',
             'share_id'=>'required',
             'platforms'=>'required|array',
             'platforms'=>'required|array',
-            'schedule_date'=>'required'
         ];
         ];
     }
     }
 
 

@@ -33,7 +33,7 @@ return [
     //默认视频
     //默认视频
     'default_file'  =>[
     'default_file'  =>[
         'size' => [
         'size' => [
-            'max'   =>  1024*1024*50,    // 50M
+            'max'   =>  1024*1024*500,    // 50M
         ],
         ],
         'path_b'  =>  '/upload/p',
         'path_b'  =>  '/upload/p',
         'path_a'  =>  '/upload/m',
         'path_a'  =>  '/upload/m',