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

@@ -42,7 +42,7 @@ class Count extends Command
     public function handle()
     public function handle()
     {
     {
         $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
         $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
-            ->where('gl_project.type','!=',0)->where('gl_project.delete_status',0)
+            ->where('gl_project.type','!=',0)
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->select($this->selectParam())->get();
             ->select($this->selectParam())->get();

@@ -38,7 +38,7 @@ class InquiryMonthlyCount extends Command
      */
      */
     public function handle(){
     public function handle(){
         $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
         $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
-            ->where('gl_project.type','!=',0)->where('gl_project.delete_status',0)
+            ->where('gl_project.type','!=',0)
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->select($this->selectParam())->get()->toArray();
             ->select($this->selectParam())->get()->toArray();

@@ -100,12 +100,17 @@ if (!function_exists('http_get')) {
         curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch1, CURLOPT_ENCODING, '');
         curl_setopt($ch1, CURLOPT_ENCODING, '');
         curl_setopt($ch1, CURLOPT_MAXREDIRS, 10);
         curl_setopt($ch1, CURLOPT_MAXREDIRS, 10);
+        curl_setopt($ch1, CURLOPT_TIMEOUT, 120);
         curl_setopt($ch1, CURLOPT_HTTPHEADER, $header);
         curl_setopt($ch1, CURLOPT_HTTPHEADER, $header);
         curl_setopt($ch1, CURLOPT_CONNECTTIMEOUT, $timeout);
         curl_setopt($ch1, CURLOPT_CONNECTTIMEOUT, $timeout);
         curl_setopt($ch1, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($ch1, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($ch1, CURLOPT_CUSTOMREQUEST, 'GET');
         curl_setopt($ch1, CURLOPT_CUSTOMREQUEST, 'GET');
         curl_setopt($ch1, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
         curl_setopt($ch1, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
         $access_txt = curl_exec($ch1);
         $access_txt = curl_exec($ch1);
+        if (curl_errno($ch1)) {
+            $error_message = curl_error($ch1);
+            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($error_message, true) . PHP_EOL, FILE_APPEND);
+        }
         curl_close($ch1);
         curl_close($ch1);
         return json_decode($access_txt, true);
         return json_decode($access_txt, true);
     }
     }

@@ -313,7 +313,7 @@ class NewsController extends BaseController
         ],[
         ],[
             'keyword.required' => 'keyword不能为空',
             'keyword.required' => 'keyword不能为空',
         ]);
         ]);
-        $data = http_get('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);
     }
     }
 }
 }

@@ -55,9 +55,9 @@ class UserLogic extends BaseLogic
             $this->param = $this->editPassword($this->param);
             $this->param = $this->editPassword($this->param);
             $rs = $this->model->edit($this->param, ['id' => $this->param['id']]);
             $rs = $this->model->edit($this->param, ['id' => $this->param['id']]);
         } else {
         } else {
-            $mobileModel = new Mobile();
-            //查看当前手机号码是否存在于手机号码库
-            $mobileInfo = $mobileModel->read(['mobile'=>$this->param['mobile']]);
+//            $mobileModel = new Mobile();
+//            //查看当前手机号码是否存在于手机号码库
+//            $mobileInfo = $mobileModel->read(['mobile'=>$this->param['mobile']]);
             $this->param['password'] = base64_encode(md5($this->param['password']));
             $this->param['password'] = base64_encode(md5($this->param['password']));
             $rs = $this->model->add($this->param);
             $rs = $this->model->add($this->param);
         }
         }