周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 d957c04809d023221be196d4634e45dcd6779428 2 个父辈 bf8348cd d515a54c

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 76 行增加 和 25 行删除
... ... @@ -171,7 +171,7 @@ class VideoTask extends Command
*/
public function getProjectKeyword($number)
{
$keyword_arr_id = Keyword::where('video', null)->whereNotNull('keyword_content')->pluck('id')->toArray();
$keyword_arr_id = Keyword::where('video', null)->where('title', 'not like', '%-tag%')->whereNotNull('keyword_content')->pluck('id')->toArray();
$keyword_id = array_rand($keyword_arr_id, $number);
$keyword = Keyword::whereIn("id", $keyword_id)->get();
return $keyword;
... ... @@ -299,9 +299,19 @@ class VideoTask extends Command
if($logoDom != null){
$logo = $logoDom->src;
}
$bgDom = $dom->find('.section-banner-wrap-block',0)->find('img', 0);
if($bgDom != null){
$bg = $bgDom->src;
$elements = $dom->find('.section-banner-wrap-block');
if (count($elements) >= 2) {
foreach ($elements as $v){
$image = $v->find('img', 0);
if($image != null){
break;
}
}
} else {
$image = $elements->find('img', 0);
}
if($image != null){
$bg = $image->src;
}
$dom->clear();
} catch (\Exception $e) {
... ...
... ... @@ -266,7 +266,7 @@ class Demo extends Command
// }
public function handle(){
$domainModel = new DomainInfo();
$domainInfo = $domainModel->read(['project_id'=>1]);
$domainInfo = $domainModel->read(['project_id'=>45]);
if($domainInfo === false){
dd('11111');
}
... ... @@ -277,12 +277,25 @@ class Demo extends Command
if($logoDom != null){
$logo = $logoDom->src;
}
$bgDom = $dom->find('.section-banner-wrap-block',0)->find('img', 0);
if($bgDom != null){
$bg = $bgDom->src;
$elements = $dom->find('.section-banner-wrap-block');
if (count($elements) >= 2) {
foreach ($elements as $v){
$image = $v->find('img', 0);
if($image != null){
break;
}
}
} else {
$image = $elements->find('img', 0);
}
if($image != null){
$bg = $image->src;
}
if($image != null){
$bg = $image->src;
}
// return $logo;
dd(['logo'=>$logo ?? '','ng'=>$bg ?? '']);
dd(['logo'=>$logo ?? '','bg'=>$bg ?? '']);
// $projectModel = new Project();
// $list = $projectModel->list(['delete_status'=>0,'type'=>['!=',0]]);
// foreach ($list as $v1){
... ...
... ... @@ -47,26 +47,18 @@ class TranslateLogic extends BaseLogic
$languageInfo = $this->getLanguage($this->param['language_id']);
// 原始校对内容
$info = $this->model->read(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]);
//获取当前URl的所有文本内容
$text_array = $this->getUrlRead($url);
// 原始校对程序
$old_key = [];//key值组成数据
if($info !== false){
$data_read = json_decode($info['data']);
foreach ($data_read as $k => $v){
// if(!in_array($k,$text_array)){
// $arr2[] = $k;
// }
// $old_key[] = $k;
$data[] = [$k => $v];
}
return $this->success($data);
}else{
$arr2 = array_values(array_diff($text_array, $old_key));
}
if(!empty($arr2)){
//获取当前URl的所有文本内容
$text_array = $this->getUrlRead($url);
$i = 0;
TranslateText:
$translate_list = Translate::tran($arr2, $languageInfo['short']);
$translate_list = Translate::tran($text_array, $languageInfo['short']);
if(empty($translate_list)){
if ($i < 3) {
$i++;
... ... @@ -74,21 +66,57 @@ class TranslateLogic extends BaseLogic
}
$this->fail('翻译失败，请稍后重试！');
}
if(count($arr2) == 1){
if(count($text_array) == 1){
$data[] = [
$arr2[0]=>$translate_list
$text_array[0]=>$translate_list
];
}else{
foreach ($arr2 as $k => $v){
foreach ($text_array as $k => $v){
$data[] = [
$v=>$translate_list[$k]
];
}
}
}
return $this->success($data);
}
}
// $old_key = [];//key值组成数据
// if($info !== false){
// $data_read = json_decode($info['data']);
// foreach ($data_read as $k => $v){
//// if(!in_array($k,$text_array)){
//// $arr2[] = $k;
//// }
//// $old_key[] = $k;
// $data[] = [$k => $v];
// }
// }else{
// $arr2 = array_values(array_diff($text_array, $old_key));
// }
// if(!empty($arr2)){
// $i = 0;
// TranslateText:
// $translate_list = Translate::tran($arr2, $languageInfo['short']);
// if(empty($translate_list)){
// if ($i < 3) {
// $i++;
// goto TranslateText;
// }
// $this->fail('翻译失败，请稍后重试！');
// }
// if(count($arr2) == 1){
// $data[] = [
// $arr2[0]=>$translate_list
// ];
// }else{
// foreach ($arr2 as $k => $v){
// $data[] = [
// $v=>$translate_list[$k]
// ];
// }
// }
// }
/**
* @remark :获取图片列表
... ...