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

Master server



查看合并请求 !1299

@@ -206,7 +206,6 @@ class CopyProject extends Command
         }
         }
         return true;
         return true;
     }
     }
-
     //复制数据库
     //复制数据库
     public function copyMysql($project_id,$new_project_id){
     public function copyMysql($project_id,$new_project_id){
         //切换数据库配置
         //切换数据库配置
@@ -267,7 +266,6 @@ class CopyProject extends Command
         }
         }
         return true;
         return true;
     }
     }
-
     /**
     /**
      * @param $message
      * @param $message
      * @return bool
      * @return bool

@@ -46,12 +46,18 @@ class UserLoginLogic
             $list = $this->model->list(['mobile'=>$this->param['mobile'],
             $list = $this->model->list(['mobile'=>$this->param['mobile'],
                 'status'=>$this->model::STATUS_ZERO],'id',['id','project_id']);
                 'status'=>$this->model::STATUS_ZERO],'id',['id','project_id']);
         }else{
         }else{
-            $password = base64_encode(md5($this->param['password']));
-            $list = $this->model->list(['mobile'=>$this->param['mobile'],
-                'password'=>$password,'status'=>$this->model::STATUS_ZERO],'id',['id','project_id']);
-            if(empty($list)){
+            if($info['is_password'] == $this->model::STATUS_ZERO){//查看是否开启了密码登录：默认未开启
                 //验证code
                 //验证code
                 $list = $this->verifyCode($this->param['mobile'],$this->param['password']);
                 $list = $this->verifyCode($this->param['mobile'],$this->param['password']);
+            }else{
+                //先验证密码是否正确，在验证验证码
+                $password = base64_encode(md5($this->param['password']));
+                $list = $this->model->list(['mobile'=>$this->param['mobile'],
+                    'password'=>$password,'status'=>$this->model::STATUS_ZERO],'id',['id','project_id']);
+                if(empty($list)){
+                    //默认只能使用验证码登录
+                    $list = $this->verifyCode($this->param['mobile'],$this->param['password']);
+                }
             }
             }
         }
         }
         //获取所有项目的项目id
         //获取所有项目的项目id
@@ -143,10 +149,10 @@ class UserLoginLogic
         $smsInfo = $smsModel->formatQuery(['mobile'=>$mobile,'type'=>$smsModel::TYPE_LOGIN])->orderBy('id','desc')->first();
         $smsInfo = $smsModel->formatQuery(['mobile'=>$mobile,'type'=>$smsModel::TYPE_LOGIN])->orderBy('id','desc')->first();
         if(!empty($smsInfo)){
         if(!empty($smsInfo)){
             if(($password != $smsInfo['code']) || ($smsInfo['created_at']  < date('Y-m-d H:i:s',time() - 300))){
             if(($password != $smsInfo['code']) || ($smsInfo['created_at']  < date('Y-m-d H:i:s',time() - 300))){
-                $this->fail('账号密码错误/验证码错误');
+                $this->fail('验证码错误，如需账号密码登录，请联系管理员开启');
             }
             }
         }else{
         }else{
-            $this->fail('账号密码错误/验证码错误');
+            $this->fail('验证码错误，如需账号密码登录，请联系管理员开启');
         }
         }
         $list = $this->model->list(['mobile'=>$this->param['mobile'],'status'=>$this->model::STATUS_ZERO],['id','project_id']);
         $list = $this->model->list(['mobile'=>$this->param['mobile'],'status'=>$this->model::STATUS_ZERO],['id','project_id']);
         return $this->success($list);
         return $this->success($list);