周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 159d1e095efd7e23161f5b99f75c4dd1251e05bc 2 个父辈 4b71d19c e0490aa2

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

Lyh server



查看合并请求 !3068
内嵌 并排对比
正在显示 2 个修改的文件 包含 12 行增加 和 6 行删除
@@ -53,6 +53,7 @@ class SendProduct extends Command @@ -53,6 +53,7 @@ class SendProduct extends Command
53 if(empty($domain)){ 53 if(empty($domain)){
54 continue; 54 continue;
55 } 55 }
  56 + try {
56 $arr1 = $this->sendProduct(); 57 $arr1 = $this->sendProduct();
57 $arr2 = $this->sendBlog(); 58 $arr2 = $this->sendBlog();
58 $arr3 = $this->sendNews(); 59 $arr3 = $this->sendNews();
@@ -67,10 +68,13 @@ class SendProduct extends Command @@ -67,10 +68,13 @@ class SendProduct extends Command
67 'language'=> [], 68 'language'=> [],
68 'is_sitemap' => 0 69 'is_sitemap' => 0
69 ]; 70 ];
  71 + //TODO::通知C端生成界面
70 http_post($c_url, json_encode($param)); 72 http_post($c_url, json_encode($param));
71 } 73 }
72 - //TODO::通知C端生成界面 74 + }catch (\Exception $e){
73 DB::disconnect('custom_mysql'); 75 DB::disconnect('custom_mysql');
  76 + continue;
  77 + }
74 } 78 }
75 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL; 79 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
76 } 80 }
@@ -31,13 +31,15 @@ class GeoController extends BaseController @@ -31,13 +31,15 @@ class GeoController extends BaseController
31 try { 31 try {
32 $token = trim($this->param['token']); 32 $token = trim($this->param['token']);
33 $param = Crypt::decrypt($token); 33 $param = Crypt::decrypt($token);
34 - if ($param['send_at'] + 86400 < time()) {}  
35 - $project_id = $param['project_id'];  
36 - } catch (\Exception $e) {  
37 - return $this->error('非法请求'); 34 + }catch (\Exception $e){
  35 + $this->response('非法请求',Code::SYSTEM_ERROR);
38 } 36 }
  37 + if ($param['send_at'] + 86400 < time()) {
  38 + $this->response('非法请求，已过期',Code::SYSTEM_ERROR);
  39 + }
  40 + $project_id = $param['project_id'];
39 $projectModel = new Project(); 41 $projectModel = new Project();
40 - $projectInfo = $projectModel->read(['project_id' => $project_id],['title','version']); 42 + $projectInfo = $projectModel->read(['id' => $project_id],['title','version']);
41 $geoWritingsModel = new GeoWritings(); 43 $geoWritingsModel = new GeoWritings();
42 $lists = $geoWritingsModel->list(['project_id' => $project_id, 'status' => 2 ,'is_del' => GeoWritings::IS_DEL_FALSE],'id',['title', 'status', 'uniqid', 'confirm_at']); 44 $lists = $geoWritingsModel->list(['project_id' => $project_id, 'status' => 2 ,'is_del' => GeoWritings::IS_DEL_FALSE],'id',['title', 'status', 'uniqid', 'confirm_at']);
43 $result = [ 45 $result = [