周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 efcd64f788f6dd5acce15ef2e27df8663771b0d7 2 个父辈 3d851b37 ed556aa1

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

内嵌 并排对比
正在显示 7 个修改的文件 包含 117 行增加 和 27 行删除
... ... @@ -585,6 +585,9 @@ class ProjectUpdate extends Command
$category_id = $category_custom['id'];
}
}
if($category_id){
$category_id = ',' . $category_id . ',';
}
//图片
if (is_array($item['images'] ?? '')) {
$image = $item['images'][0] ?? '';
... ... @@ -625,8 +628,8 @@ class ProjectUpdate extends Command
}
//扩展字段
if ($item['extend'][0] ?? []) {
foreach ($item['extend'][0] as $ke => $ve) {
if ($item['extend'] ?? []) {
foreach ($item['extend'] as $ke => $ve) {
$extend = $extend_model->read(['title' => $ke]);
if ($extend) {
$extend_info = $extend_info_model->read(['key' => $extend['key'], 'content_id' => $id]);
... ... @@ -637,7 +640,7 @@ class ProjectUpdate extends Command
foreach ($ve as $ve_img) {
$gallery[] = ['title' => '', 'description' => '', 'url' => $this->source_download($ve_img, $project_id, $domain_arr['host'], $web_url_domain, $home_url)];
}
}else{
} else {
$gallery[] = ['title' => '', 'description' => '', 'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url)];
}
$value = Arr::a2s($gallery);
... ...
... ... @@ -129,7 +129,11 @@ class TranslateController extends BaseController
case RouteMap::SOURCE_PRODUCT_CATE:
//获取当前产品分类关联多少产品
$productModel = new Product();
$count = $productModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%']])->count();
if($v['route'] == 'products'){
$count = $productModel->formatQuery(['status'=>1])->count();
}else{
$count = $productModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%'],'status'=>1])->count();
}
$this->pageList($data,$count,$v,1,15);
break;
case RouteMap::SOURCE_BLOG:
... ... @@ -140,12 +144,20 @@ class TranslateController extends BaseController
break;
case RouteMap::SOURCE_BLOG_CATE:
$blogModel = new Blog();
$count = $blogModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%']])->count();
if($v['route'] == 'blog'){
$count = $blogModel->formatQuery(['status'=>1])->count();
}else{
$count = $blogModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%'],'status'=>1])->count();
}
$this->pageList($data,$count,$v,2,10);
break;
case RouteMap::SOURCE_NEWS_CATE:
$newsModel = new News();
$count = $newsModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%']])->count();
if($v['route'] == 'news'){
$count = $newsModel->formatQuery(['status'=>1])->count();
}else{
$count = $newsModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%'],'status'=>1])->count();
}
$this->pageList($data,$count,$v,3,10);
break;
case RouteMap::SOURCE_MODULE:
... ... @@ -198,7 +210,11 @@ class TranslateController extends BaseController
case RouteMap::SOURCE_PRODUCT_CATE:
//获取当前产品分类关联多少产品
$productModel = new Product();
$count = $productModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%']])->count();
if($v['route'] == 'products'){
$count = $productModel->formatQuery(['status'=>1])->count();
}else{
$count = $productModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%'],'status'=>1])->count();
}
$this->pageSixList($data,$count,$v,1,15);
break;
case RouteMap::SOURCE_BLOG:
... ... @@ -209,12 +225,20 @@ class TranslateController extends BaseController
break;
case RouteMap::SOURCE_BLOG_CATE:
$blogModel = new Blog();
$count = $blogModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%']])->count();
if($v['route'] == 'blog'){
$count = $blogModel->formatQuery(['status'=>1])->count();
}else{
$count = $blogModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%'],'status'=>1])->count();
}
$this->pageSixList($data,$count,$v,2,10);
break;
case RouteMap::SOURCE_NEWS_CATE:
$newsModel = new News();
$count = $newsModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%']])->count();
if($v['route'] == 'news'){
$count = $newsModel->formatQuery(['status'=>1])->count();
}else{
$count = $newsModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%'],'status'=>1])->count();
}
$this->pageSixList($data,$count,$v,3,10);
break;
case RouteMap::SOURCE_MODULE:
... ...
... ... @@ -62,7 +62,6 @@ class MonthCountLogic extends BaseLogic
$startTime = Carbon::now()->startOfMonth()->toDateString();
$endTime = date('Y-m-d',time());
$arr = [];
ProjectServer::useProject($this->user['project_id']);
$arr = $this->inquiryCount($arr,$startTime,$endTime,$this->user['domain']);
$arr = $this->flowCount($arr,$startTime,$endTime,$this->user['project_id']);
$arr = $this->sourceCount($arr,$startTime,$endTime,$this->user['domain']);
... ... @@ -91,11 +90,11 @@ class MonthCountLogic extends BaseLogic
foreach ($data as $v){
if(($startTime.' 00:00:00' <= $v['submit_time']) && $v['submit_time'] <= $endTime.' 23:59:59'){
$arr['month_total']++;
}
if(isset($countryArr[$v['country']])){
$countryArr[$v['country']]++;
}else{
$countryArr[$v['country']] = 1;
if(isset($countryArr[$v['country']])){
$countryArr[$v['country']]++;
}else{
$countryArr[$v['country']] = 1;
}
}
}
}
... ...
... ... @@ -510,6 +510,8 @@ class ProductLogic extends BaseLogic
'created_uid'=>$this->user['id'],
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s'),
'six_read'=>$info['six_read'],
'is_upgrade'=>$info['is_upgrade']
];
if(isset($info['icon']) && !empty($info['icon'])){
foreach ($info['icon'] as $k1 => $v1){
... ...
... ... @@ -70,10 +70,12 @@ class TranslateLogic extends BaseLogic
$arr2[0]=>$translate_list
];
}else{
foreach ($arr2 as $k => $v){
$data[] = [
trim($v)=>$translate_list[$k]
];
if(!empty($translate_list)){
foreach ($arr2 as $k => $v){
$data[] = [
trim($v)=>$translate_list[$k]
];
}
}
}
}
... ... @@ -191,6 +193,7 @@ class TranslateLogic extends BaseLogic
$trimmedString = preg_replace('/\s+/', ' ', $content);
$contentData[] = $trimmedString;
}
$textContentArray = array_unique($textContentArray);
$contentData = array_values($textContentArray);
$pattern = '/<meta\s+[^>]*name=[\'"](keywords|description)[\'"][^>]*content=[\'"]([^\'"]+)[\'"]>/i'; // 匹配 name 为 "keywords" 或 "description" 的 meta 标签的正则表达式
$matches = array();
... ... @@ -244,7 +247,16 @@ class TranslateLogic extends BaseLogic
* @time :2023/6/12 10:52
*/
public function translateSave(){
// try {
$data = [];
//处理传递的data
foreach ($this->param['data'] as $k => $v){
if(!empty($v) && is_array($v)){
foreach ($v as $text => $translate){
$data[$text] = $translate;
}
}
}
try {
$info = $this->model->read(['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'type'=>$this->param['type']]);
if($info === false){
$param = [
... ... @@ -254,15 +266,66 @@ class TranslateLogic extends BaseLogic
'language_id'=>$this->param['language_id'],
'alias'=>$this->param['alias'],
];
$param['data'] = json_encode($this->param['data'],JSON_UNESCAPED_UNICODE);
$param['data'] = json_encode($data,JSON_UNESCAPED_UNICODE);
$this->model->add($param);
}else{
$data = json_encode($this->param['data'],JSON_UNESCAPED_UNICODE);
$data = json_encode($data,JSON_UNESCAPED_UNICODE);
$this->model->edit(['data'=>$data],['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'type'=>$this->param['type']]);
}
// }catch (\Exception $e){
// $this->fail('系统错误请联系管理员');
// }
}catch (\Exception $e){
$this->fail('系统错误请联系管理员');
}
$this->handleRoute($this->param['url']);
return $this->success();
}
/**
* @remark :处理路由
* @name :handleRoute
* @author :lyh
* @method :post
* @time :2024/1/18 17:25
*/
public function handleRoute($url){
$lang = $languageInfo = $this->getLanguage($this->param['language_id'])['short'];
$url = str_replace_url($url);
$arr = explode('/',trim($url,'/'));
$num = count($arr);
$page = 0;
if($num == 1){
$route = $arr[0];
}elseif ($num == 2){
if(ctype_digit($arr[1])){//是数字的情况
$page = $arr[1];
$route = $arr[0];
}else{
$route = $arr[1];
}
}elseif($num == 3){
if(ctype_digit($arr[2])){//是数字的情况
$page = $arr[2];
$route = $arr[0];
}else{
if($arr[2] == 'page'){
$route = $arr[1];
}else{
$route = $arr[0];
}
}
}elseif ($num == 4){
if(ctype_digit($arr[3])){//是数字的情况
$page = $arr[3];
$route = $arr[1];
}
}else{
$route = 'index';
}
if($page != 0){
$data['page'] = $page;
}
$data['new_route'] = $route;
$data['lang'] = $lang;
$data['project_id']= $this->user['project_id'];
$this->curlDelRoute($data);
}
}
... ...
... ... @@ -27,7 +27,6 @@ class AyrReleaseRequest extends FormRequest
'content'=>'required',
'share_id'=>'required',
'platforms'=>'required|array',
'schedule_date'=>'required'
];
}
... ...
... ... @@ -33,7 +33,7 @@ return [
//默认视频
'default_file' =>[
'size' => [
'max' => 1024*1024*50, // 50M
'max' => 1024*1024*500, // 50M
],
'path_b' => '/upload/p',
'path_a' => '/upload/m',
... ...