gx

@@ -3,10 +3,10 @@
 namespace App\Http\Controllers\Bside;
 namespace App\Http\Controllers\Bside;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
-use App\Http\Logic\Bside\ComLogic;
 use App\Models\Project as ProjectModel;
 use App\Models\Project as ProjectModel;
 use App\Models\ProjectMenu as ProjectMenuModel;
 use App\Models\ProjectMenu as ProjectMenuModel;
 use App\Models\ProjectRole as ProjectRoleModel;
 use App\Models\ProjectRole as ProjectRoleModel;
+use App\Models\User as UserModel;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Validator;
 
 
@@ -38,8 +38,8 @@ class ComController extends BaseController
         if($validate->errors()->first()){
         if($validate->errors()->first()){
             return $this->response($validate->errors()->first(),Code::USER_ERROR,$this->param);
             return $this->response($validate->errors()->first(),Code::USER_ERROR,$this->param);
         }
         }
-        $comLogic = new ComLogic();
-        $res = $comLogic->login($this->param);
+        $userModel = new UserModel();
+        $res = $userModel->login($this->param);
         if($res === false){
         if($res === false){
             $this->response('当前用户不存在或者被禁用,登录失败',Code::USER_ERROR,[]);
             $this->response('当前用户不存在或者被禁用,登录失败',Code::USER_ERROR,[]);
         }
         }

@@ -8,6 +8,11 @@ use Illuminate\Support\Facades\Cache;
 
 
 class ComLogic extends BaseLogic
 class ComLogic extends BaseLogic
 {
 {
+    //统一设置
+    protected $casts = [
+        'created_at' => 'datetime:Y-m-d H:i:s',
+        'updated_at' => 'datetime:Y-m-d H:i:s',
+    ];
     /***
     /***
      * @name :登录
      * @name :登录
      * @return void
      * @return void
@@ -42,16 +47,10 @@ class ComLogic extends BaseLogic
         $token = md5(uniqid().$info['id']);
         $token = md5(uniqid().$info['id']);
         //存储缓存
         //存储缓存
         Cache::add($token,$info);
         Cache::add($token,$info);
-        //更新数据库
-        $data = [
-            'id'=>$info['id'],
-            'mobile'=>$info['mobile'],
-            'name'=>$info['name']
-        ];
         $rs = $userModel->edit(['token'=>$token],['id'=>$info['id']]);
         $rs = $userModel->edit(['token'=>$token],['id'=>$info['id']]);
         if($rs === false){
         if($rs === false){
             return false;
             return false;
         }
         }
-        return $data;
+        return $info;
     }
     }
 }
 }

@@ -3,10 +3,12 @@
 namespace App\Models;
 namespace App\Models;
 
 
 //use Illuminate\Contracts\Auth\MustVerifyEmail;
 //use Illuminate\Contracts\Auth\MustVerifyEmail;
+use App\Models\ProjectRole as ProjectRoleModel;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Model;
 //use Illuminate\Foundation\Auth\User as Authenticatable;
 //use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Cache;
 use Laravel\Sanctum\HasApiTokens;
 use Laravel\Sanctum\HasApiTokens;
 
 
 class User extends Base
 class User extends Base
@@ -43,5 +45,47 @@ class User extends Base
      */
      */
     protected $casts = [
     protected $casts = [
         'email_verified_at' => 'datetime',
         'email_verified_at' => 'datetime',
+        'created_at' => 'datetime:Y-m-d H:i:s',
+        'updated_at' => 'datetime:Y-m-d H:i:s',
     ];
     ];
+
+    /***
+     * @name :登录
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function login($param){
+        if(!isset($param['login_method'])){
+            //密码加密
+            $param['password'] = base64_encode(md5($param['password']));
+            $info = $this->read(['mobile'=>$param['mobile'],'password'=>$param['password'],'status'=>0], ['*']);
+        }else{
+            //TODO::验证验证码是否正确
+            $info = $this->read(['mobile'=>$param['mobile']],['*']);
+        }
+        if(empty($info)){
+            return false;
+        }
+        //当前用户角色是否被禁用
+        $projectRoleModel = new ProjectRoleModel();
+        $role_info = $projectRoleModel->read(['id'=>$info['role_id'],'status'=>0]);
+        if(empty($role_info)){
+            return false;
+        }
+        //验证码登录
+        if(isset($info['token']) && !empty($info['token'])){
+            //清除上一次用户缓存
+            Cache::pull($info['token']);
+        }
+        //生成新token
+        $token = md5(uniqid().$info['id']);
+        //存储缓存
+        Cache::add($token,$info);
+        $rs = $this->edit(['token'=>$token],['id'=>$info['id']]);
+        if($rs === false){
+            return false;
+        }
+        return $info;
+    }
 }
 }