gx

@@ -4,6 +4,7 @@ namespace App\Console\Commands\YesterdayCount;
 
 
 use App\Helper\Common;
 use App\Helper\Common;
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
+use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Models\CustomerVisit\CustomerVisitItem;
 use App\Models\CustomerVisit\CustomerVisitItem;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use Carbon\Carbon;
 use Carbon\Carbon;

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Bside;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Logic\Bside\User\UserLogic;
 use App\Http\Logic\Bside\User\UserLogic;
+use App\Http\Logic\Bside\User\UserLoginLogic;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Project\Project as ProjectModel;
 use App\Models\Project\Project as ProjectModel;
 use App\Models\SmsLog;
 use App\Models\SmsLog;
@@ -33,7 +34,7 @@ class ComController extends BaseController
             'password.required'=>'内容必须填写',
             'password.required'=>'内容必须填写',
             'mobile.regex' => '请输入正确的手机号码',
             'mobile.regex' => '请输入正确的手机号码',
         ]);
         ]);
-        $userLogic = new UserLogic();
+        $userLogic = new UserLoginLogic();
         $res = $userLogic->login();
         $res = $userLogic->login();
         $this->response('请求成功',Code::SUCCESS,$res);
         $this->response('请求成功',Code::SUCCESS,$res);
     }
     }

@@ -35,9 +35,7 @@ class BaseLogic extends Logic
         $this->request = request();
         $this->request = request();
         $this->requestAll = request()->all();
         $this->requestAll = request()->all();
         $this->user = Cache::get(request()->header('token'));
         $this->user = Cache::get(request()->header('token'));
-        if(!empty($this->user)){
-            $this->project = (new ProjectLogic())->getInfo($this->user['project_id']);
-        }
+        $this->project = (new ProjectLogic())->getInfo($this->user['project_id']);
     }
     }
 
 
 
 

@@ -16,7 +16,6 @@ class UserLogic extends BaseLogic
     public function __construct()
     public function __construct()
     {
     {
         parent::__construct();
         parent::__construct();
-
         $this->model = new User();
         $this->model = new User();
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
     }
     }
@@ -106,57 +105,6 @@ class UserLogic extends BaseLogic
         return $this->success();
         return $this->success();
     }
     }
 
 
-    /***
-     * @name :登录
-     * @return void
-     * @author :liyuhang
-     * @method
-     */
-    public function login(){
-        //验证账号密码
-        $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){
-            //账号密码没通过时，验证验证码
-            $info = $this->model->read(['mobile'=>$this->param['mobile'],'status'=>0], ['id','mobile','role_id','token','name','project_id']);
-            if($info === false){
-                $this->fail('账号密码错误',Code::USER_REGISTER_ERROE);
-            }
-            //验证验证码是否准备
-            $last_sms = SmsLog::getLastLog($this->param['mobile'], SmsLog::TYPE_LOGIN);
-            if($this->param['password'] != $last_sms->code){
-                $this->fail('账号密码错误',Code::USER_REGISTER_ERROE);
-            }
-        }
-        //当前用户角色是否被禁用
-        $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()]);
-        return $this->success($info);
-    }
-
-
     /**
     /**
      * @param $param
      * @param $param
      * @name :编辑管理员
      * @name :编辑管理员

+<?php
+
+namespace App\Http\Logic\Bside\User;
+
+use App\Enums\Common\Code;
+use App\Helper\Common;
+use App\Http\Logic\Aside\Project\ProjectLogic;
+use App\Models\SmsLog;
+use App\Models\User\ProjectRole as ProjectRoleModel;
+use Illuminate\Support\Facades\Cache;
+
+class UserLoginLogic
+{
+    /***
+     * @name :登录
+     * @author :liyuhang
+     * @method
+     */
+    public function login(){
+        //验证账号密码
+        $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){
+            //账号密码没通过时，验证验证码
+            $info = $this->model->read(['mobile'=>$this->param['mobile'],'status'=>0], ['id','mobile','role_id','token','name','project_id']);
+            if($info === false){
+                $this->fail('账号密码错误',Code::USER_REGISTER_ERROE);
+            }
+            //验证验证码是否准备
+            $last_sms = SmsLog::getLastLog($this->param['mobile'], SmsLog::TYPE_LOGIN);
+            if($this->param['password'] != $last_sms->code){
+                $this->fail('账号密码错误',Code::USER_REGISTER_ERROE);
+            }
+        }
+        //当前用户角色是否被禁用
+        $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()]);
+        return $this->success($info);
+    }
+}