合并分支 'develop' 到 'master'

Develop



查看合并请求 !412

@@ -55,15 +55,16 @@ class RecommendedSuppliers extends Command
         foreach ($project_list as $k => $v){
         foreach ($project_list as $k => $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['project_id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['project_id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
-            $keywordInfo = Keyword::inRandomOrder()->first();
-            if(empty($keywordInfo)){
+            $info = Keyword::inRandomOrder()->first();
+            if(empty($info)){
                continue;
                continue;
             }
             }
-            $keywordInfo = $this->getPurchaser($keywordInfo['title']);
+            $keywordInfo = $this->getPurchaser($info['title'] = 'led');
             if($keywordInfo !== false){
             if($keywordInfo !== false){
                 continue;
                 continue;
             }
             }
-            $this->savePurchaser($v['id'],$keywordInfo['title']);
+            echo date('Y-m-d H:i:s') . '开始:'.$v['project_id'] . PHP_EOL;
+            $this->savePurchaser($v['id'],$info['title']);
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         return true;
         return true;
@@ -95,6 +96,7 @@ class RecommendedSuppliers extends Command
             'total'=>$this->param['row'] ?? 10,
             'total'=>$this->param['row'] ?? 10,
         ];
         ];
         $res = http_post($url,json_encode($param));
         $res = http_post($url,json_encode($param));
+        echo date('Y-m-d H:i:s') . '开始:'.json_encode($res) . PHP_EOL;
         if(!empty($res) && $res['code'] == 200){
         if(!empty($res) && $res['code'] == 200){
             $saveData = [
             $saveData = [
                 'project_id'=>$project_id,
                 'project_id'=>$project_id,

@@ -39,12 +39,11 @@ class LoginController extends BaseController
      */
      */
     public function login(){
     public function login(){
         $this->request->validate([
         $this->request->validate([
-            'mobile'=>['required', 'regex:/^1[3-9]\d{9}$/'],
+            'mobile'=>['required'],
             'password'=>['required'],
             'password'=>['required'],
         ],[
         ],[
             'mobile.required'=>'电话号码必须填写',
             'mobile.required'=>'电话号码必须填写',
             'password.required'=>'内容必须填写',
             'password.required'=>'内容必须填写',
-            'mobile.regex' => '请输入正确的手机号码',
         ]);
         ]);
         $userLogic = new UserLoginLogic();
         $userLogic = new UserLoginLogic();
         $project = $userLogic->login();
         $project = $userLogic->login();