周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 71645c4402224316a6ee799a8cbd67c39858e730 2 个父辈 fff2b7b3 7f9b9b07

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

内嵌 并排对比
正在显示 1 个修改的文件 包含 68 行增加 和 35 行删除
... ... @@ -397,29 +397,56 @@ class ProjectUpdate extends Command
$ve = '';
}
$extend = $extend_model->read(['title' => $ke]);
if (!$extend) {
$extend_key = $this->get_extend_key($extend_model);
$extend_model->add([
'project_id' => $project_id,
'title' => $ke,
'type' => 1,
'key' => $extend_key
]);
} else {
$extend_key = $extend['key'];
}
$extend_info = $extend_info_model->read(['key' => $extend_key, 'product_id' => $id]);
if (!$extend_info) {
$extend_info_model->add([
'key' => $extend_key,
'project_id' => $project_id,
'product_id' => $id,
'values' => $ve,
'type' => 1
]);
} else {
$extend_info_model->edit(['values' => $ve], ['key' => $extend_key, 'product_id' => $id]);
if ($extend) {
if ($extend['type'] == 3) {
//图片
$gallery = [];
if (is_array($ve)) {
foreach ($ve as $ve_img) {
$gallery[] = ['title' => '', 'description' => '', 'url' => $this->source_download($ve_img, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)];
}
} else {
$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) {
//文件
$file = [];
if (is_array($ve)) {
$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)
];
}
} 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)
];
}
$value = Arr::a2s($file);
} else {
//文本
$value = $ve;
}
$extend_info = $extend_info_model->read(['key' => $extend['key'], 'product_id' => $id]);
if (!$extend_info) {
$extend_info_model->add([
'key' => $extend['key'],
'type' => $extend['type'],
'project_id' => $project_id,
'product_id' => $id,
'values' => $value,
]);
} else {
$extend_info_model->edit(['type' => $extend['type'], 'values' => $value], ['key' => $extend['key'], 'product_id' => $id]);
}
}
}
}
... ... @@ -712,6 +739,9 @@ class ProjectUpdate extends Command
if ($six_read) {
if ($item['extend'] ?? []) {
foreach ($item['extend'] as $ke => $ve) {
if ($ve == '--') {
$ve = '';
}
$extend = $extend_model->read(['title' => $ke]);
if ($extend) {
if ($extend['type'] == 3) {
... ... @@ -727,21 +757,24 @@ 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 = [];
}
$value = Arr::a2s($file);
} else {
$value = Arr::a2s([$this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)]);
} 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)
];
}
$value = Arr::a2s($file);
} else {
//文本
$value = $ve;
... ... @@ -1064,8 +1097,8 @@ class ProjectUpdate extends Command
]);
//同步到177
$error_file = ErrorFile::where('path',$new_url)->first();
if(!$error_file){
$error_file = ErrorFile::where('path', $new_url)->first();
if (!$error_file) {
$error_file = new ErrorFile();
$error_file->path = $new_url;
$error_file->status = 0;
... ...