合并分支 'akun' 到 'master'

update



查看合并请求 !812

@@ -412,20 +412,20 @@ class ProjectUpdate extends Command
                                                             $value = Arr::a2s($gallery);
                                                         } elseif ($extend['type'] == 4) {
                                                             //文件
+                                                            $file = [];
                                                             if (is_array($ve)) {
-                                                                if (isset($ve['title']) || isset($ve['url'])) {
-                                                                    $file = [
-                                                                        [
-                                                                            'name' => isset($ve['title']) ? $ve['title'] : '',
-                                                                            'url' => isset($ve['url']) ? $this->source_download($ve['url'], $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1) : ''
-                                                                        ]
+                                                                $file_title = $ve['title'] ?? '';
+                                                                $file_url = $ve['url'] ?? '';
+                                                                if ($file_url) {
+                                                                    $file[] = [
+                                                                        'name' => $file_title,
+                                                                        'url' => $this->source_download($file_url, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)
                                                                     ];
-                                                                } else {
-                                                                    $file = [];
                                                                 }
-                                                            } else {
-                                                                $file = [
-                                                                    'name' => 'file' . $id,
+                                                            } elseif ($ve) {
+                                                                $ve_array = explode('/', $ve);
+                                                                $file[] = [
+                                                                    'name' => end($ve_array),
                                                                     'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)
                                                                 ];
                                                             }
@@ -757,20 +757,20 @@ class ProjectUpdate extends Command
                                                                 $value = Arr::a2s($gallery);
                                                             } elseif ($extend['type'] == 4) {
                                                                 //文件
+                                                                $file = [];
                                                                 if (is_array($ve)) {
-                                                                    if (isset($ve['title']) || isset($ve['url'])) {
-                                                                        $file = [
-                                                                            [
-                                                                                'name' => isset($ve['title']) ? $ve['title'] : '',
-                                                                                'url' => isset($ve['url']) ? $this->source_download($ve['url'], $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1) : ''
-                                                                            ]
+                                                                    $file_title = $ve['title'] ?? '';
+                                                                    $file_url = $ve['url'] ?? '';
+                                                                    if ($file_url) {
+                                                                        $file[] = [
+                                                                            'name' => $file_title,
+                                                                            'url' => $this->source_download($file_url, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)
                                                                         ];
-                                                                    } else {
-                                                                        $file = [];
                                                                     }
-                                                                } else {
-                                                                    $file = [
-                                                                        'name' => 'file' . $id,
+                                                                } elseif ($ve) {
+                                                                    $ve_array = explode('/', $ve);
+                                                                    $file[] = [
+                                                                        'name' => end($ve_array),
                                                                         'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)
                                                                     ];
                                                                 }