gx

@@ -150,7 +150,7 @@ class BaseController extends Controller
         $log = config('logging.operator_log');
         $log = config('logging.operator_log');
         if(isset($log) && $log['log'] == true){
         if(isset($log) && $log['log'] == true){
             if(empty($log['action']) || (strpos($log['action'],$this->request->route()->getName()) === false)){
             if(empty($log['action']) || (strpos($log['action'],$this->request->route()->getName()) === false)){
-                Common::set_user_log(['model'=>$this->request->route()->getName(),'remark'=>'请求的参数：param = '.json_encode($this->param),'operator_id'=>$this->uid,'type'=>isset($this->user['type']) ?? 0]);
+                Common::set_user_log(['model'=>$this->request->route()->getName(),'remark'=>'请求的参数：param = '.json_encode($this->param),'operator_id'=>$this->uid,'type'=>isset($this->user['manager_id']) ? 1 : 0]);
             }
             }
         }
         }
         return true;
         return true;

@@ -92,11 +92,11 @@ class LoginLogic extends BaseLogic
         ];
         ];
         //获取超级管理员登录
         //获取超级管理员登录
         if(isset($this->param['project_id']) && !empty($this->param['project_id'])){
         if(isset($this->param['project_id']) && !empty($this->param['project_id'])){
-            $data['autologin_code'] = $encrypt->lock_url(json_encode(['project_id'=>$this->param['project_id']]),$info['values']);
+            $data['autologin_code'] = $encrypt->lock_url(json_encode(['project_id'=>$this->param['project_id'],'manager_id'=>$this->manager['id']]),$info['values']);
         }
         }
         //使用用户登录
         //使用用户登录
         if(isset($this->param['user_id']) && !empty($this->param['user_id'])){
         if(isset($this->param['user_id']) && !empty($this->param['user_id'])){
-            $data['autologin_code'] = $encrypt->lock_url(json_encode(['user_id'=>$this->param['user_id']]),$info['values']);
+            $data['autologin_code'] = $encrypt->lock_url(json_encode(['user_id'=>$this->param['user_id'],'manager_id'=>$this->manager['id']]),$info['values']);
         }
         }
         //获取当前超级管理员的token
         //获取当前超级管理员的token
         return $this->success($data);
         return $this->success($data);

@@ -82,10 +82,10 @@ class UserLoginLogic
             $token = md5(uniqid().$info['id']);
             $token = md5(uniqid().$info['id']);
             //存储缓存
             //存储缓存
             $info['token'] = $token;
             $info['token'] = $token;
-            $info['type'] = 1;//代表自动登录写入日志
+            $info['manager_id'] = $data['manager_id'];//代表自动登录写入日志
             Cache::add($token,$info,3600);
             Cache::add($token,$info,3600);
         }
         }
-        Common::set_user_login(['user_id'=>$info['id'],'ip'=>request()->ip(),'project_id'=>$info['project_id'], 'remark' => '自动登录']);
+        Common::set_user_login(['user_id'=>$info['id'],'ip'=>request()->ip(),'project_id'=>$info['project_id'], 'type'=>1 ,'remark' => '自动登录,操作管理员为：'.$data['manager_id']]);
         return $info;
         return $info;
     }
     }