gx

+<?php
+/**
+ * @remark :
+ * @name   :ManagerLogController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2023/9/5 16:09
+ */
+
+namespace App\Http\Controllers\Aside\Manage;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Models\Manage\Manage;
+use App\Models\Manage\ManageLog;
+
+class ManagerLogController extends BaseController
+{
+    /**
+     * @remark :管理员日志列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/5 16:10
+     */
+    public function lists(ManageLog $manageLog){
+        $lists = $manageLog->lists($this->map,$this->page,$this->row,$this->order);
+        if(!empty($lists) && !empty($lists['list'])){
+            $managerModel = new Manage();
+            foreach ($lists['list'] as $k => $v){
+                $info = $managerModel->read(['id'=>$v['manager_id']]);
+                $v['mobile'] = $info['mobile'] ?? '';
+                $v['type'] = (isset($v['type']) && $v['type'] == 1) ? '账号密码登录' : '验证码登录';
+                $lists['list'][$k] = $v;
+            }
+        }
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+}

+<?php
+/**
+ * @remark :
+ * @name   :UserLoginController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2023/9/5 16:07
+ */
+
+namespace App\Http\Controllers\Aside\User;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Models\Manage\Manage;
+use App\Models\User\User;
+use App\Models\User\UserLogin;
+
+class UserLoginController extends BaseController
+{
+    /**
+     * @remark :用户日志
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/5 16:10
+     */
+    public function lists(UserLogin $user){
+        $lists = $user->lists($this->map,$this->page,$this->row,$this->order);
+        if(!empty($lists) && !empty($lists['list'])){
+            $userModel = new User();
+            $managerModel = new Manage();
+            foreach ($lists['list'] as $k => $v){
+                $info = $userModel->read(['id'=>$v['manager_id']]);
+                $v['mobile'] = $info['mobile'] ?? '';
+                $v['type'] = ($v['type'] == 0) ? '用户登录' : '管理员登录';
+                if(!empty($v['remark'])){
+                    $arr = explode(':',$v['remark']);
+                    $managerInfo = $managerModel->read(['id'=>$arr[1]]);
+                    if($managerInfo !== false){
+                        $v['remark'] = $arr[0].':'.$managerInfo['name'];
+                    }
+                }
+            }
+        }
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+}

@@ -40,8 +40,11 @@ class LoginLogic extends BaseLogic
         if (Manage::STATUS_DISABLE == $manage->status) {
         if (Manage::STATUS_DISABLE == $manage->status) {
             $this->fail('帐号已被禁用');
             $this->fail('帐号已被禁用');
         }
         }
+        $type = 1;//账号密码登录
         if (!Hash::check($this->param['password'], $manage->password)) {
         if (!Hash::check($this->param['password'], $manage->password)) {
+            //验证验证码
             $this->verifyCode($this->param['mobile'],$this->param['password']);
             $this->verifyCode($this->param['mobile'],$this->param['password']);
+            $type = 2;//验证码登录
         }
         }
         if(!empty($manage['token'])){
         if(!empty($manage['token'])){
             //清除上一次用户缓存
             //清除上一次用户缓存
@@ -58,7 +61,7 @@ class LoginLogic extends BaseLogic
         if(!$res){
         if(!$res){
             $this->fail('系统错误，请联系管理员');
             $this->fail('系统错误，请联系管理员');
         }
         }
-        LoginLog::addLog($manage->id);
+        LoginLog::addLog($manage->id,$type);
         //获取当前用户特殊模块权限
         //获取当前用户特殊模块权限
         $manage['special'] = $this->getSpecialMenu($manage['id']);
         $manage['special'] = $this->getSpecialMenu($manage['id']);
         return $this->success($manage->makeVisible('token')->toArray());
         return $this->success($manage->makeVisible('token')->toArray());

@@ -18,10 +18,11 @@ class LoginLog extends Base
      * @author zbj
      * @author zbj
      * @date 2023/4/20
      * @date 2023/4/20
      */
      */
-    public static function addLog($manage_id){
+    public static function addLog($manage_id,$type){
         $log = new self();
         $log = new self();
         $log->manage_id = $manage_id;
         $log->manage_id = $manage_id;
         $log->ip = request()->ip();
         $log->ip = request()->ip();
+        $log->type = $type;
         $log->save();
         $log->save();
     }
     }
 }
 }

@@ -127,6 +127,11 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::post('/save', [Aside\Manage\HrController::class, 'save'])->name('admin.hr_save');
             Route::post('/save', [Aside\Manage\HrController::class, 'save'])->name('admin.hr_save');
             Route::get('/getSearchParamsList', [Aside\Manage\HrController::class, 'getSearchParamsList'])->name('admin.hr_getSearchParamsList');
             Route::get('/getSearchParamsList', [Aside\Manage\HrController::class, 'getSearchParamsList'])->name('admin.hr_getSearchParamsList');
         });
         });
+
+        //人事管理
+        Route::prefix('log')->group(function () {
+            Route::get('/manager', [Aside\Manage\ManagerLogController::class, 'lists'])->name('admin.manager_log_lists');
+        });
     });
     });
 
 
     //企业服务配置信息
     //企业服务配置信息