周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 4e9186617d6a9ef970b817645baddce76157b57b 2 个父辈 ccec57fd b8079158

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

内嵌 并排对比
正在显示 4 个修改的文件 包含 56 行增加 和 15 行删除
... ... @@ -154,6 +154,7 @@ class ProjectUpdate extends Command
'seo_title' => $item['seo_title'] ?? '',
'seo_keywords' => $item['seo_keywords'] ?? '',
'seo_description' => $item['seo_description'] ?? '',
'is_upgrade' => 1,
'route' => $route
]);
$this->set_map($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $project_id);
... ... @@ -272,7 +273,7 @@ class ProjectUpdate extends Command
}
try {
$item['ttile'] = $this->special2str($item['ttile'] ?? '');
$id = $model->addReturnId([
$id = $model->insertGetId([
'project_id' => $project_id,
'title' => $item['ttile'],
'intro' => $item['description'] ?? '',
... ... @@ -286,6 +287,9 @@ class ProjectUpdate extends Command
'description' => $item['description'] ?? ''
]),
'status' => Product::STATUS_ON,
'created_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'updated_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'sort' => $item['sort'] ?? 0,
'is_upgrade' => 1,
'route' => $route
]);
... ... @@ -338,7 +342,7 @@ class ProjectUpdate extends Command
$image = $item['images'] ?? '';
}
$id = $model->addReturnId([
$id = $model->insertGetId([
'project_id' => $project_id,
'name' => $item['ttile'],
'seo_title' => $item['ttile'],
... ... @@ -347,6 +351,9 @@ class ProjectUpdate extends Command
'text' => $item['content'] ?? '',
'image' => $this->source_download($image, $project_id, $domain_arr['host'], $web_url_domain, $home_url),
'status' => $api_type == 'news' ? News::STATUS_ONE : Blog::STATUS_ONE,
'created_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'updated_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'sort' => $item['sort'] ?? 0,
'is_upgrade' => 1,
'url' => $route
]);
... ... @@ -388,7 +395,7 @@ class ProjectUpdate extends Command
if (!$custom) {
try {
$item['ttile'] = $this->special2str($item['ttile'] ?? '');
$id = $model->addReturnId([
$id = $model->insertGetId([
'project_id' => $project_id,
'name' => $item['ttile'],
'title' => $item['ttile'],
... ... @@ -396,6 +403,8 @@ class ProjectUpdate extends Command
'description' => $item['description'] ?? '',
'html' => $item['content'] ?? '',
'status' => 1,
'created_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'updated_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'is_upgrade' => 1,
'url' => $route
]);
... ...
... ... @@ -268,13 +268,21 @@ class BlogLogic extends BaseLogic
$text = '';
if($data[4]){
//处理内容中的图片
$pattern = '/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i';
preg_match_all($pattern, $data[4], $result);
if($result[2]){
preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[4], $result);
if($result[2]??[]){
foreach ($result[2] as $img){
$data[4] = str_replace($img,getImageUrl(CosService::uploadRemote($project_id,'image_news',$img)),$data[4]);
}
}
//处理内容中的视频
preg_match_all('/<source\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[4], $result_video);
if($result_video[2]??[]){
foreach ($result_video[2] as $video){
$data[4] = str_replace($video,getImageUrl(CosService::uploadRemote($project_id,'image_news',$video)),$data[4]);
}
}
$text = $data[4];
}
... ...
... ... @@ -304,13 +304,21 @@ class NewsLogic extends BaseLogic
$text = '';
if($data[4]){
//处理内容中的图片
$pattern = '/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i';
preg_match_all($pattern, $data[4], $result);
if($result[2]){
preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[4], $result);
if($result[2]??[]){
foreach ($result[2] as $img){
$data[4] = str_replace($img,getImageUrl(CosService::uploadRemote($project_id,'image_news',$img)),$data[4]);
}
}
//处理内容中的视频
preg_match_all('/<source\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[4], $result_video);
if($result_video[2]??[]){
foreach ($result_video[2] as $video){
$data[4] = str_replace($video,getImageUrl(CosService::uploadRemote($project_id,'image_news',$video)),$data[4]);
}
}
$text = $data[4];
}
... ...
... ... @@ -602,26 +602,42 @@ class ProductLogic extends BaseLogic
$intro = '';
if($data[5]){
//处理短描述中的图片
$pattern = '/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i';
preg_match_all($pattern, $data[5], $result_intro);
if($result_intro[2]){
preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[5], $result_intro);
if($result_intro[2]??[]){
foreach ($result_intro[2] as $vi_img){
$data[5] = str_replace($vi_img,getImageUrl(CosService::uploadRemote($project_id,'image_product',$vi_img)),$data[5]);
}
}
//处理短描述中的视频
preg_match_all('/<source\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[5], $result_intro_video);
if($result_intro_video[2]??[]){
foreach ($result_intro_video[2] as $vi_video){
$data[5] = str_replace($vi_video,getImageUrl(CosService::uploadRemote($project_id,'image_product',$vi_video)),$data[5]);
}
}
$intro = $data[5];
}
$content = '';
if($data[6]){
//处理内容中的图片
$pattern = '/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i';
preg_match_all($pattern, $data[6], $result_content);
if($result_content[2]){
preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[6], $result_content);
if($result_content[2]??[]){
foreach ($result_content[2] as $vc_img){
$data[6] = str_replace($vc_img,getImageUrl(CosService::uploadRemote($project_id,'image_product',$vc_img)),$data[6]);
}
}
//处理内容中的视频
preg_match_all('/<source\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[6], $result_content_video);
if($result_content_video[2]??[]){
foreach ($result_content_video[2] as $vc_video){
$data[6] = str_replace($vc_video,getImageUrl(CosService::uploadRemote($project_id,'image_product',$vc_video)),$data[6]);
}
}
$content = $data[6];
}
... ...