周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 7d5d8f60dd02e9727464413f1ff87a0d48c46ccb 1 个父辈 c6bff15e

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 37 行增加 和 41 行删除
... ... @@ -3,10 +3,11 @@
namespace App\Console\Commands;
use App\Helper\Arr;
use App\Models\Domain\DomainInfo;
use App\Models\Project\DeployOptimize;
use App\Models\Product\Category;
use App\Models\Product\Product;
use App\Models\Project\OnlineCheck;
use App\Models\Project\Project;
use App\Models\RouteMap\RouteMap;
use App\Models\Template\BCustomTemplate;
use App\Services\ProjectServer;
use Carbon\Carbon;
use GuzzleHttp\Client;
... ... @@ -190,13 +191,13 @@ class WebTraffic extends Command
$data = [
'ip' => $ips[$project_key]['ip'],
'referrer_url' => $this->getReferer($ips[$project_key]['ip_area']),
'url' => $project['visit_urls'][$j],
'device_port' => $project['device_port'],
'domain' => $project['domain'],
'referrer_url' => $this->getReferer($ips[$project_key]['ip_area']),
'user_agent' => $project['user_agent'],
];
Log::channel('traffic')->info('traffic project_id:' . $project['project_id'], $data);
$promises[] = $client->postAsync($project['domain'] . 'api/customerVisit', ['form_params' => $data]);
$promises[] = $client->postAsync($project['domain'] . 'api/traffic_visit', ['form_params' => $data]);
}
if($promises){
... ... @@ -233,28 +234,29 @@ class WebTraffic extends Command
protected function getProjectList($type, $page){
//推广项目
$list = Project::with('domainInfo')
->leftJoin('gl_project_deploy_optimize', 'gl_project_deploy_optimize.project_id', '=', 'gl_project.id')
->where('gl_project_deploy_optimize.domain', '>', 0)
->leftJoin('gl_project_deploy_optimize as pdo', 'pdo.project_id', '=', 'gl_project.id')
->leftJoin('gl_project_online_check as poc', 'poc.project_id', '=', 'gl_project.id')
->where('pdo.domain', '>', 0)
->where('poc.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)
->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR])
->whereIn('gl_project_deploy_optimize.project_id', [6,25]) //todo 测试两个项目 后面删掉
->where(function ($query) use ($type){
->whereIn('pdo.project_id', [6, 25]) //todo 测试两个项目 后面删掉
->where(function ($query) use ($type) {
if($type == 1){
//1-3个月项目
$startTime = Carbon::now()->addMonths(-4)->toDateString();
$endTime = Carbon::now()->addMonths(-1)->toDateString();
$query->whereBetween('gl_project_deploy_optimize.start_date', [$startTime,$endTime]);
$query->whereBetween('pdo.start_date', [$startTime,$endTime]);
}elseif($type == 2){
//4-8个月项目
$startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString();
$endTime = Carbon::now()->addMonths(-4)->endOfDay()->toDateTimeString();
$query->whereBetween('gl_project_deploy_optimize.start_date', [$startTime,$endTime]);
$query->whereBetween('pdo.start_date', [$startTime,$endTime]);
}else{
//大于9个月项目
$startTime = Carbon::now()->addMonths(-9)->startOfDay()->toDateTimeString();
$query->whereBetween('gl_project_deploy_optimize.start_date', '<', $startTime);
$query->whereBetween('pdo.start_date', '<', $startTime);
}
})->select('gl_project_deploy_optimize.project_id')->forPage($page, 500)->get();
})->select('pdo.project_id')->forPage($page, 500)->get();
//其他地方在引流的域名
$other = DB::connection('projects_mysql')->table('projects')->where('switch', 1)->pluck('domain')->toArray();
... ... @@ -278,28 +280,17 @@ class WebTraffic extends Command
*/
protected function getProductUrls($project_id){
ProjectServer::useProject($project_id);
//产品分类页面
$product_cate_ids = DB::connection('custom_mysql')->table('gl_product_category')
->where('project_id', $project_id)->where('status', 1)->pluck('id')->toArray();
//只查发布的分类路由
$data['urls_cats'] = DB::connection('custom_mysql')->table('gl_route_map')
->where('project_id', $project_id)->where('source', RouteMap::SOURCE_PRODUCT_CATE)
->whereIn('source_id', $product_cate_ids)->get()->toArray();
//单页面
$page_ids = DB::connection('custom_mysql')->table('gl_web_custom_template')
->where('project_id', $project_id)->where('status', 1)->pluck('id')->toArray();
//只查发布的单页面
$data['urls_page'] = DB::connection('custom_mysql')->table('gl_route_map')
->where('project_id', $project_id)->where('source', RouteMap::SOURCE_PAGE)
->whereIn('source_id', $page_ids)->get()->toArray();
//产品详情页
$product_ids = DB::connection('custom_mysql')->table('gl_product')
->where('project_id', $project_id)->where('status', 1)->pluck('id')->toArray();
$data['urls_details'] = DB::connection('custom_mysql')->table('gl_route_map')
->where('project_id', $project_id)->where('source', RouteMap::SOURCE_PRODUCT)
->whereIn('source_id', $product_ids)->get()->toArray();
//已发布产品分类页面
$data['urls_cats'] = DB::connection('custom_mysql')->table('gl_product_category')
->where('project_id', $project_id)->where('status', Category::STATUS_ACTIVE)->pluck('route','id')->toArray();
//已发布单页面
$data['urls_page'] = DB::connection('custom_mysql')->table('gl_web_custom_template')
->where('project_id', $project_id)->where('status', BCustomTemplate::STATUS_ACTIVE)->pluck('url', 'id')->toArray();
//已发布产品详情页
$data['urls_details'] = DB::connection('custom_mysql')->table('gl_product')
->where('project_id', $project_id)->where('status', Product::STATUS_ON)->pluck('route', 'id')->toArray();
$data['urls_cats'] = array_merge($data['urls_cats'], $data['urls_page']);
if(empty($data['urls_cats'])){
... ... @@ -374,21 +365,24 @@ class WebTraffic extends Command
$url = [];
if($res_sdzb == 0){//深度一页
$url[] = $project_urls[$res_ymzb] ? Arr::random($project_urls[$res_ymzb])->route : '';
$url[] = $project_urls[$res_ymzb] ? Arr::random($project_urls[$res_ymzb]) : '';
}elseif($res_sdzb == 1){//深度两页
$url[] = $project_urls['home'];
$url[] = $project_urls[$res_ymzb] ? Arr::random($project_urls[$res_ymzb])->route : '';
$url[] = $project_urls[$res_ymzb] ? Arr::random($project_urls[$res_ymzb]) : '';
}elseif($res_sdzb == 2){//深度3-6页
$yms = rand(2,5); //随机页面数
$url = Arr::pluck(Arr::random($all_url, $yms), 'route');
$url = Arr::random($all_url, $yms);
$url = Arr::prepend($url, $project_urls['home']);//首页加到最前面去
}elseif($res_sdzb == 3){//深度7-11页
$yms = rand(6,10); //随机页面数
$url = Arr::pluck(Arr::random($all_url, $yms), 'route');
$url = Arr::random($all_url, $yms);
$url = Arr::prepend($url, $project_urls['home']);//首页加到最前面去
}
foreach ($url as &$v){
if(!Str::contains($v, $project_urls['home'])){
if (FALSE === strpos($v, '.htm')) {
$v .= '/';
}
$v = $project_urls['home'] . $v;
}
}
... ...
... ... @@ -11,4 +11,6 @@ class BCustomTemplate extends Base
protected $connection = 'custom_mysql';
const NOT_FOUND_PAGE_URL = '404';
const STATUS_ACTIVE = 1;
}
... ...