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

@@ -156,8 +156,11 @@ class VideoTask extends Command
                 'is_ytb'=>true
                 'is_ytb'=>true
             ];
             ];
             $result = Http::post('http://216.250.255.116:7866/create_task', $data);
             $result = Http::post('http://216.250.255.116:7866/create_task', $data);
+            $res_json = json_decode($result,true);
             $val->task_id = $task_id;
             $val->task_id = $task_id;
-            $val->status = KeywordVideoTaskLog::STATUS_RUNNING;
+            if(isset($res_json['code']) && ($res_json['code'] == 200)){
+                $val->status = KeywordVideoTaskLog::STATUS_RUNNING;
+            }
             $val->result_info = $result;
             $val->result_info = $result;
             $val->save();
             $val->save();
         }
         }

@@ -313,7 +313,8 @@ class NewsController extends BaseController
         ],[
         ],[
             'keyword.required' => 'keyword不能为空',
             'keyword.required' => 'keyword不能为空',
         ]);
         ]);
-        $data = http_get('http://gnews.globalso.com/gnews_news.php?keyword='.$this->param['keyword'],['charset=utf-8']);
+        $data = shell_exec('curl -k "http://gnews.globalso.com/gnews_news.php?keyword='.$this->param['keyword'].'"');
+//        $data = http_get('http://gnews.globalso.com/gnews_news.php?keyword='.$this->param['keyword'],['charset=utf-8']);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -223,19 +223,19 @@ class UserLoginLogic
         $date = date('Y-m-d H:i:s');
         $date = date('Y-m-d H:i:s');
         $scoringSystem = new ScoringSystem();
         $scoringSystem = new ScoringSystem();
         if($date <= $after30Days){
         if($date <= $after30Days){
-            $info = $scoringSystem->read(['type'=>1]);//第一阶段是否有值
+            $info = $scoringSystem->read(['type'=>1,'project_id'=>$projectInfo['id']]);//第一阶段是否有值
             if($info === false){
             if($info === false){
                 return $this->success(1);
                 return $this->success(1);
             }
             }
         }
         }
         if($date >= $afterThreeMonths && $date <= $afterSixMonths){
         if($date >= $afterThreeMonths && $date <= $afterSixMonths){
-            $info = $scoringSystem->read(['type'=>2]);//第一阶段是否有值
+            $info = $scoringSystem->read(['type'=>2,'project_id'=>$projectInfo['id']]);//第一阶段是否有值
             if($info === false){
             if($info === false){
                 return $this->success(2);
                 return $this->success(2);
             }
             }
         }
         }
         if($date >= $afterOneYear){
         if($date >= $afterOneYear){
-            $info = $scoringSystem->read(['type'=>3]);//第一阶段是否有值
+            $info = $scoringSystem->read(['type'=>3,'project_id'=>$projectInfo['id']]);//第一阶段是否有值
             if($info === false){
             if($info === false){
                 return $this->success(3);
                 return $this->success(3);
             }
             }