|
...
|
...
|
@@ -5,6 +5,7 @@ namespace App\Console\Commands\Update; |
|
|
|
use App\Helper\Arr;
|
|
|
|
use App\Http\Logic\Bside\News\NewsLogic;
|
|
|
|
use App\Http\Logic\Bside\Product\CategoryLogic;
|
|
|
|
use App\Http\Logic\Bside\Product\ExtendLogic;
|
|
|
|
use App\Models\Blog\Blog;
|
|
|
|
use App\Models\Collect\CollectSource;
|
|
|
|
use App\Models\Collect\CollectTask;
|
|
...
|
...
|
@@ -304,6 +305,7 @@ class ProjectUpdate extends Command |
|
|
|
$extend_model = new Extend();
|
|
|
|
$extend_info_model = new ExtendInfo();
|
|
|
|
$logic = new CategoryLogic();
|
|
|
|
$extend_logic = new ExtendLogic();
|
|
|
|
|
|
|
|
foreach ($items as $item) {
|
|
|
|
$route = $this->get_url_route($item['url'] ?? '');
|
|
...
|
...
|
@@ -450,13 +452,26 @@ class ProjectUpdate extends Command |
|
|
|
//扩展字段
|
|
|
|
if ($item['extend'] ?? []) {
|
|
|
|
foreach (array_reverse($item['extend']) as $ke => $ve) {
|
|
|
|
if ($ve == '--') {
|
|
|
|
if ($ve == '--' || $ve == '-') {
|
|
|
|
$ve = '';
|
|
|
|
}
|
|
|
|
$extend = $extend_model->read(['title' => $ke]);
|
|
|
|
|
|
|
|
if (empty($extend) && $project_id == 568) {
|
|
|
|
//568项目由程序添加扩展字段
|
|
|
|
$extend_key = $extend_logic->getKey('pd_extended_field_');
|
|
|
|
$extend_model->add([
|
|
|
|
'project_id' => $project_id,
|
|
|
|
'title' => $ke,
|
|
|
|
'type' => Extend::$textExtendType,
|
|
|
|
'key' => $extend_key
|
|
|
|
]);
|
|
|
|
|
|
|
|
$extend = $extend_model->read(['title' => $ke]);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($extend) {
|
|
|
|
if ($extend['type'] == 3) {
|
|
|
|
if ($extend['type'] == Extend::$imageExtendType) {
|
|
|
|
//图片
|
|
|
|
$gallery = [];
|
|
|
|
if (is_array($ve)) {
|
|
...
|
...
|
@@ -467,7 +482,7 @@ class ProjectUpdate extends Command |
|
|
|
$gallery[] = ['title' => '', 'description' => '', 'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)];
|
|
|
|
}
|
|
|
|
$value = Arr::a2s($gallery);
|
|
|
|
} elseif ($extend['type'] == 4) {
|
|
|
|
} elseif ($extend['type'] == Extend::$fileExtendType) {
|
|
|
|
//文件
|
|
|
|
$file = [];
|
|
|
|
if (is_array($ve)) {
|
...
|
...
|
|