周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 fe2a7f719c2ae3da5a2c3fb4ffb8374afd0705a8 2 个父辈 6b5e4bc6 97d9f568

合并分支 'master-server' 到 'master' 

gx脚本



查看合并请求 !1222
内嵌 并排对比
正在显示 6 个修改的文件 包含 95 行增加 和 5 行删除
... ... @@ -123,7 +123,7 @@ class AiBlogAuthorTask extends Command
'description'=>$v['description'],
];
$id = $aiBlogAuthorModel->addReturnId($param);
$route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_AI_BLOG_AUTHOR, $id, $project_id);
$route = RouteMap::setRoute($v['route'] ?? $v['title'], RouteMap::SOURCE_AI_BLOG_AUTHOR, $id, $project_id);
$aiBlogAuthorModel->edit(['route'=>$route],['id'=>$id]);
}
}
... ...
... ... @@ -16,13 +16,16 @@ use App\Models\HomeCount\Count;
use App\Models\News\News;
use App\Models\Product\Product;
use App\Models\Project\Project;
use App\Models\ProjectAssociation\ProjectAssociation;
use App\Models\RankData\ExternalLinks;
use App\Models\RankData\RankData;
use App\Models\RankData\RankWeek;
use App\Models\Workchat\MessagePush;
use App\Services\ProjectServer;
use Carbon\Carbon;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
class WeekProject extends Command
{
... ... @@ -97,8 +100,10 @@ class WeekProject extends Command
$data['keyword_ten_num'] = $rankInfo['first_ten_pages_num'] ?? 0;
$productModel = new Product();
$data['product_num'] = $productModel->counts(['status'=>1]) ?? 0;
$data['week_product_num'] = $productModel->counts(['status'=>1,'created_at'=>['between',[$startOfLastWeek,$endOfLastWeek]]]) ?? 0;
$newsModel = new News();
$data['news_num'] = $newsModel->counts(['status'=>1]) ?? 0;
$data['week_news_num'] = $newsModel->counts(['status'=>1,'created_at'=>['between',[$startOfLastWeek,$endOfLastWeek]]]) ?? 0;
$blogModel = new Blog();
$data['blog_num'] = $blogModel->counts(['status'=>1]) ?? 0;
$notifyModel = new Notify();
... ... @@ -117,4 +122,81 @@ class WeekProject extends Command
$v6WeeklyReportModel->add($data);
return true;
}
/**
* @remark :推送消息
* @name :workChatMessage
* @author :lyh
* @method :post
* @time :2025/2/26 10:15
*/
public function workChatMessage($data,$project_id){
//项目是否有绑定群
$friend_id = ProjectAssociation::where('project_id', $project_id)
->where('status', ProjectAssociation::STATUS_NORMAL)
->where('binding_app', ProjectAssociation::ENTERPRISE_WECHAT)
->value('friend_id');
if(!$friend_id){
echo date('Y-m-d H:i:s') . '没有绑定企微群:'.$project_id . PHP_EOL;
return false;
}
$content1 = '';
if(!empty($data['inquiry_total'])){
$content1 .= '项目共计已收到询盘 '.$data['inquiry_total'].'条,';
if(!empty($data['week_inquiry_total'])){
$content1 .= '本周新收 '.$data['week_inquiry_total'].' 封询盘。';
}
if(!empty($data['inquiry_country'])){
$data['inquiry_country'] = json_decode($data['inquiry_country']);
arsort($data);
$data['inquiry_country'] = array_slice($data, 0, 4, true);
$country = '';
foreach ($data['inquiry_country'] as $k => $v){
$country .= $k.'、';
};
trim($country,'、');
$content1 = '询盘主要来源于'.$country.'等国家地区';
}
$content1 .= '如有高质量客户，请您密切关注与跟进;';
}
$content2 = '';
if(!empty($data['google_indexed_num']) || !empty($data['google_links_num']) || !empty($data['keyword_home_num']) || !empty($data['keyword_three_num']) || !empty($data['keyword_five_num']) || !empty($data['keyword_ten_num']) || !empty($data['daily_average_num'])){
$content2 .= '项目截止目前';
if(!empty($data['google_indexed_num'])){
$content2 .= '谷歌收录量：'.$data['google_indexed_num'].'条，';
}
if(!empty($data['google_links_num'])){
$content2 .= '外链量：'.$data['google_links_num'].'条，';
}
if(!empty($data['keyword_home_num'])){
$content2 .= '谷歌搜索排名首页关键词数量为：'.$data['keyword_home_num'].'个，';
}
if(!empty($data['keyword_three_num'])){
$content2 .= '前三页关键词数量为：'.$data['keyword_three_num'].'个，';
}
if(!empty($data['keyword_five_num'])){
$content2 .= '前五页关键词数量为：'.$data['keyword_five_num'].'个，';
}
if(!empty($data['keyword_ten_num'])){
$content2 .= '前十页关键词数量为：'.$data['keyword_ten_num'].'个，';
}
if(!empty($data['daily_average_num'])){
$content2 .= '本周日均访客量：'.$data['daily_average_num'].'+。';
}
$content2 .= '全球搜建议用户持续分析、选择、添加企业、产品、服务等相关关键词进行优化和监控，以覆盖更多相关排名和流量；';
}
$content3 = '';
if(!empty($data['product_num']) || !empty($data['news_num']) || !empty($data['week_product_num']) || !empty($data['week_news_num'])){
}
$param = [
'project_id'=>$project_id,
'friend_id'=>$friend_id,
'type'=>MessagePush::TYPE_WEEK,
'content'=>'',
];
//写入一条推送消息 自动消费
$messagePushModel = new MessagePush();
}
}
... ...
... ... @@ -64,7 +64,9 @@ class AiBlogController extends BaseController
if(!empty($lists) && !empty($lists['list'])){
foreach ($lists['list'] as $k => $v){
$v['image'] = getImageUrl($v['image']);
$v['route'] = $this->user['test_domain'] . 'blog/' . $v['route'];
if(!empty($v['route'])){
$v['route'] = $this->user['test_domain'] . 'blog/' . $v['route'];
}
$lists['list'][$k] = $v;
}
}
... ... @@ -171,7 +173,9 @@ class AiBlogController extends BaseController
$lists = $aiBlogList->lists($this->map,$this->page,$this->row,'id',['id','route','created_at','updated_at']);
if(!empty($lists) && !empty($lists['list'])){
foreach ($lists['list'] as $k => $v){
$v['route'] = $this->user['test_domain'] . 'top-blog/' . $v['route'];
if(!empty($v['route'])){
$v['route'] = $this->user['test_domain'] . 'blog/' . $v['route'];
}
$lists['list'][$k] = $v;
}
}
... ...
... ... @@ -60,11 +60,15 @@ class WebSettingTextLogic extends BaseLogic
DB::beginTransaction();
try {
//更新描文本设置
if($this->param['anchor_is_enable'] == 0){
$this->param['anchor_keyword_is_enable'] = 0;
}
$data = [
'anchor_setting'=>$this->param['anchor_setting'],
'anchor_is_enable'=>$this->param['anchor_is_enable'],
'anchor_num'=>$this->param['anchor_num'] ?? 0,
'anchor_page_num'=>$this->param['anchor_page_num'] ?? 0
'anchor_page_num'=>$this->param['anchor_page_num'] ?? 0,
'anchor_keyword_is_enable'=>$this->param['anchor_keyword_is_enable'] ?? 0
];
$web_setting->edit($data,['project_id'=>$this->user['project_id']]);
$this->model->del(['project_id'=>$this->user['project_id']]);
... ...
... ... @@ -25,7 +25,7 @@ class MessagePush extends Base
const STATUS_ERROR = 9;
const TYPE_INQUIRY = 'inquiry';
const TYPE_WEEK = 'week';
//设置关联表名
/**
* @var mixed
... ...