gx

@@ -14,15 +14,52 @@ use Illuminate\Support\Facades\Cache;
 
 class UserLoginLogic
 {
+    protected $model;
+    protected $param;
+
+    public function __construct()
+    {
+        //验证账号密码
+        $this->param = request()->all();
+        $this->model = new User();
+    }
+
     /***
      * @name :登录
      * @author :liyuhang
      * @method
      */
     public function login(){
-        //验证账号密码
-        $this->param = request()->all();
-        $this->model = new User();
+        //验证账号密码是否正确
+        $info = $this->verifyAccount();
+        //验证角色是否被禁用+获取项目详情
+        $info = $this->verifyRole($info);
+        if(isset($info['token']) && !empty($info['token'])){
+            //清除上一次用户缓存
+            Cache::pull($info['token']);
+        }
+        //生成新token
+        $token = md5(uniqid().$info['id']);
+        //存储缓存
+        $info['token'] = $token;
+        Cache::add($token,$info);
+        //更新用户信息
+        $rs = $this->model->edit(['token'=>$token],['id'=>$info['id']]);
+        if($rs === false){
+            $this->fail('系统错误，请联系管理员');
+        }
+        //写入日志
+        Common::set_user_login(['user_id'=>$info['id'],'ip'=>request()->ip()]);
+        return $this->success($info);
+    }
+
+    /**
+     * @name   :(验证账号、密码或验证码是否正确)verifyAccount
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/12 15:31
+     */
+    public function verifyAccount(){
         $password = base64_encode(md5($this->param['password']));
         $info = $this->model->read(['mobile'=>$this->param['mobile'],'password'=>$password,'status'=>0], ['id','mobile','role_id','token','name','project_id']);
         if($info === false){
@@ -37,34 +74,31 @@ class UserLoginLogic
                 $this->fail('账号密码错误',Code::USER_REGISTER_ERROE);
             }
         }
+        return $this->success($info);
+    }
+
+    /**
+     * @name   :(验证角色是否禁用)verifyRole
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/12 15:34
+     */
+    public function verifyRole($info){
         //当前用户角色是否被禁用
         $projectRoleModel = new ProjectRoleModel();
         $role_info = $projectRoleModel->read(['id'=>$info['role_id'],'status'=>0]);
         if($role_info === false){
             $this->fail('当前用户角色被禁用',Code::USER_REGISTER_ERROE);
         }
-        if(isset($info['token']) && !empty($info['token'])){
-            //清除上一次用户缓存
-            Cache::pull($info['token']);
-        }
-        //生成新token
-        $token = md5(uniqid().$info['id']);
-        //存储缓存
-        $info['token'] = $token;
-        Cache::add($token,$info);
-        $rs = $this->model->edit(['token'=>$token],['id'=>$info['id']]);
-        if($rs === false){
-            $this->fail('系统错误，请联系管理员');
-        }
         $project = (new ProjectLogic())->getInfo($info['project_id']);
         $info['company'] = $project['company'] ?? '';
         $info['plan'] = $project['deploy_build']['plan'][0] ?? '';
-        $info['domain'] = !empty($project['deploy_optimize']['domain']) ? $project['deploy_optimize']['domain'] : ($project['deploy_build']['test_domain'] ?? '');
-        //写入日志
-        Common::set_user_login(['user_id'=>$info['id'],'ip'=>request()->ip()]);
+        $info['domain'] = !empty($project['deploy_optimize']['domain']) ?
+            $project['deploy_optimize']['domain'] : ($project['deploy_build']['test_domain'] ?? '');
         return $this->success($info);
     }
 
+
     /**
      * @notes: 请简要描述方法功能
      * @param array $data