周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 1ab1a30bf3848b86814a2c3f21ee4f29ea2bb226 2 个父辈 3ebe2574 0b932961

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

Master server



查看合并请求 !1281
内嵌 并排对比
正在显示 2 个修改的文件 包含 27 行增加 和 16 行删除
@@ -54,7 +54,7 @@ class WeekProject extends Command @@ -54,7 +54,7 @@ class WeekProject extends Command
54 */ 54 */
55 public function handle(){ 55 public function handle(){
56 $projectModel = new Project(); 56 $projectModel = new Project();
57 - $list = $projectModel->list(['delete_status'=>0,'type'=>['in',[1,2,3,4,6]]],'id',['id','title']); 57 + $list = $projectModel->list(['delete_status'=>0,'is_weekly_report'=>1,'type'=>['in',[1,2,3,4,6]]],'id',['id','title']);
58 $domainModel = new DomainInfo(); 58 $domainModel = new DomainInfo();
59 foreach ($list as $k => $v){ 59 foreach ($list as $k => $v){
60 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; 60 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
@@ -158,6 +158,7 @@ class WeekProject extends Command @@ -158,6 +158,7 @@ class WeekProject extends Command
158 echo date('Y-m-d H:i:s') . '没有绑定企微群:'.$project_id . PHP_EOL; 158 echo date('Y-m-d H:i:s') . '没有绑定企微群:'.$project_id . PHP_EOL;
159 return false; 159 return false;
160 } 160 }
  161 + $content = '';
161 $content1 = ''; 162 $content1 = '';
162 if(!empty($data['inquiry_total'])){ 163 if(!empty($data['inquiry_total'])){
163 $content1 .= '项目共计已收到询盘 '.$data['inquiry_total'].'条,'; 164 $content1 .= '项目共计已收到询盘 '.$data['inquiry_total'].'条,';
@@ -165,14 +166,14 @@ class WeekProject extends Command @@ -165,14 +166,14 @@ class WeekProject extends Command
165 $content1 .= '本周新收 '.$data['week_inquiry_total'].' 封询盘。'; 166 $content1 .= '本周新收 '.$data['week_inquiry_total'].' 封询盘。';
166 } 167 }
167 if(!empty($data['inquiry_country'])){ 168 if(!empty($data['inquiry_country'])){
168 - $data['inquiry_country'] = json_decode($data['inquiry_country']);  
169 - arsort($data);  
170 - $data['inquiry_country'] = array_slice($data, 0, 4, true); 169 + $data['inquiry_country'] = json_decode($data['inquiry_country'],true);
  170 + arsort($data['inquiry_country']);
  171 + $data['inquiry_country'] = array_slice($data['inquiry_country'], 0, 4, true);
171 $country = ''; 172 $country = '';
172 foreach ($data['inquiry_country'] as $k => $v){ 173 foreach ($data['inquiry_country'] as $k => $v){
173 - $country .= $k.'、'; 174 + $country .= $k.',';
174 }; 175 };
175 - $country = trim($country,'、'); 176 + $country = trim($country,',');
176 $content1 .= '询盘主要来源于'.$country.'等国家地区'; 177 $content1 .= '询盘主要来源于'.$country.'等国家地区';
177 } 178 }
178 $content1 .= '如有高质量客户，请您密切关注与跟进;'; 179 $content1 .= '如有高质量客户，请您密切关注与跟进;';
@@ -232,10 +233,12 @@ class WeekProject extends Command @@ -232,10 +233,12 @@ class WeekProject extends Command
232 $content3 .= '新闻：'.$data['week_news_num'].'条。'; 233 $content3 .= '新闻：'.$data['week_news_num'].'条。';
233 } 234 }
234 } 235 }
235 - }  
236 $content3 .= '全球搜建议用户保持网站内容的持续更新与完善，可参考谷歌关于创建实用、可靠、以用户为中心的内容的相关建议：https://developers.google.com/search/docs/fundamentals/creating-helpful-content?hl=zh-cn；'; 236 $content3 .= '全球搜建议用户保持网站内容的持续更新与完善，可参考谷歌关于创建实用、可靠、以用户为中心的内容的相关建议：https://developers.google.com/search/docs/fundamentals/creating-helpful-content?hl=zh-cn；';
  237 + }
  238 + if(!empty($content3)){
237 $arr[] = $content3; 239 $arr[] = $content3;
238 - $content4 = '本周主要优化工作包括：TDK、H标签、Img标签等优化设置排查与进一步完善，Sitemap更新与网页收录提交，外链新增与排查。'; 240 + }
  241 + $content4 = '';
239 if(!empty($data['main_update_num'])){ 242 if(!empty($data['main_update_num'])){
240 $content4 .= '网站加载速度维护及主站页面更新'.$data['main_update_num'].'次。'; 243 $content4 .= '网站加载速度维护及主站页面更新'.$data['main_update_num'].'次。';
241 } 244 }
@@ -251,28 +254,36 @@ class WeekProject extends Command @@ -251,28 +254,36 @@ class WeekProject extends Command
251 if(!empty($data['aggregation_minor_update_num'])){ 254 if(!empty($data['aggregation_minor_update_num'])){
252 $content4 .= '聚合页小语种站页面'.$data['aggregation_minor_update_num'].'次。'; 255 $content4 .= '聚合页小语种站页面'.$data['aggregation_minor_update_num'].'次。';
253 } 256 }
  257 + if(!empty($content4)){
  258 + $content4 = '本周主要优化工作包括：TDK、H标签、Img标签等优化设置排查与进一步完善，Sitemap更新与网页收录提交，外链新增与排查。'.$content4;
  259 + }
  260 + if(!empty($content4)){
254 $arr[] = $content4; 261 $arr[] = $content4;
255 - $content = ''; 262 + }
  263 + if(empty($arr)){
  264 + return true;
  265 + }
256 foreach ($arr as $key => $val){ 266 foreach ($arr as $key => $val){
257 - $content .= ($key + 1) .','.$val.PHP_EOL; 267 + $content .= ($key+1).','.$val.PHP_EOL;
258 } 268 }
259 $timestamp = strtotime('tomorrow 9:00 AM'); 269 $timestamp = strtotime('tomorrow 9:00 AM');
260 $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp); 270 $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp);
261 - $content = preg_replace('/[\x00-\x1F\x7F]/u', '', $content);  
262 if(empty($content)){ 271 if(empty($content)){
263 return true; 272 return true;
264 } 273 }
  274 + $tips = 'Tips：'.PHP_EOL.'1、全球搜V6.0系统提供网页TDK、H标签、Img标签等用户自定义编辑接口且辅以AI创作工具，用户可进一步对相关优化设置进行精细化优化与调整；'.PHP_EOL.'2、全球搜V6.0系统提供小语种页面精准校对翻译功能，用户可进一步对已翻译小语种页面进行人工翻译校对；'.PHP_EOL.'3、全球搜V6.0系统支持绑定Facebook、LinkedIn、X（原Twitter）等社媒账号，可一键同步转发网站上发布的产品和新闻至社媒账号动态，建议用户用起来哦；'.PHP_EOL.'4、如用户有较丰富的企业、产品、服务相关视频素材，全球搜建议用户及时创建YouTube主页，并在YouTube和网站相关网页上同步发布视频；';
265 $param = [ 275 $param = [
266 'project_id'=>$project_id, 276 'project_id'=>$project_id,
267 'friend_id'=>$friend_id, 277 'friend_id'=>$friend_id,
268 'type'=>MessagePush::TYPE_WEEK, 278 'type'=>MessagePush::TYPE_WEEK,
269 - 'content'=>'【全球搜V6.0周报】'.PHP_EOL.$content, 279 + 'content'=>"【全球搜V6.0周报】".PHP_EOL.$content.PHP_EOL.$tips,
270 'ref_ids'=>'', 280 'ref_ids'=>'',
271 - 'send_time'=>$tomorrowNineAM 281 + 'send_time'=>$tomorrowNineAM,
  282 + 'status'=>0,
272 ]; 283 ];
273 //写入一条推送消息 自动消费 284 //写入一条推送消息 自动消费
274 $messagePushModel = new MessagePush(); 285 $messagePushModel = new MessagePush();
275 - echo date('Y-m-d H:i:s') . '生成推送消息:'.$project_id . PHP_EOL;  
276 - return $messagePushModel->add($param); 286 + $messagePushModel->add($param);
  287 + return true;
277 } 288 }
278 } 289 }
@@ -78,7 +78,7 @@ class ServersController extends BaseController @@ -78,7 +78,7 @@ class ServersController extends BaseController
78 unset($this->map['domain']); 78 unset($this->map['domain']);
79 } 79 }
80 $serversModel = new ServersModel(); 80 $serversModel = new ServersModel();
81 - $data = $serversModel->lists($this->map,$this->page,$this->row,$this->order); 81 + $data = $serversModel->lists($this->map,$this->page,$this->row,$this->order = 'sort');
82 $this->response('success',Code::SUCCESS,$data); 82 $this->response('success',Code::SUCCESS,$data);
83 } 83 }
84 84