diff --git a/app/Http/Controllers/Admin/AuthController.php b/app/Http/Controllers/Admin/AuthController.php index e360fdc..8a770e4 100644 --- a/app/Http/Controllers/Admin/AuthController.php +++ b/app/Http/Controllers/Admin/AuthController.php @@ -79,7 +79,7 @@ class AuthController extends Controller AdminUsers::query()->where('id', $user->id)->update(['last_login_time' => get_datetime()]); // 记录日志 - $this->logService->log('login', $user->name . '登录系统'); + $this->logService->log('login', 'login'); return $this->responseService->success([ 'user' => [ @@ -112,7 +112,7 @@ class AuthController extends Controller // 清除所有会话数据 session()->flush(); - $this->logService->log('logout', $user['name'] . '退出系统'); + $this->logService->log('logout', 'logout'); } return $this->responseService->success(null, __('admin.logout_successful')); diff --git a/app/Http/Controllers/Admin/ConfigController.php b/app/Http/Controllers/Admin/ConfigController.php index 70abfe9..36d80d3 100644 --- a/app/Http/Controllers/Admin/ConfigController.php +++ b/app/Http/Controllers/Admin/ConfigController.php @@ -123,7 +123,7 @@ class ConfigController extends BaseController 'updated_at' => get_datetime() ]); - $this->logService->logUpdated($model, $oldValue, '系统配置更新'); + $this->logService->logUpdated($model, $oldValue, 'config.update'); return $this->responseService->success( null, __('admin.update_succeeded') diff --git a/app/Http/Controllers/Admin/OperationLogController.php b/app/Http/Controllers/Admin/OperationLogController.php index 5633cdd..cc22b02 100644 --- a/app/Http/Controllers/Admin/OperationLogController.php +++ b/app/Http/Controllers/Admin/OperationLogController.php @@ -132,6 +132,10 @@ class OperationLogController extends Controller $item['operation_name'] = $username ?? ''; $item['action_str'] = $actionArr[$item['action']] ?? $item['action']; + $description = __('log.' . $item['description']); + if (strpos($description, 'log.') === false) { + $item['description'] = $description; + } $item['main_directory'] = ''; if ($item['sub_directory']) { $item['main_directory'] diff --git a/app/Services/AdminFloorService.php b/app/Services/AdminFloorService.php index 1cfe4b6..c1521e8 100644 --- a/app/Services/AdminFloorService.php +++ b/app/Services/AdminFloorService.php @@ -49,7 +49,7 @@ class AdminFloorService 'created_at' => get_datetime() ]); - $this->logService->logCreated($model, '创建楼层'); + $this->logService->logCreated($model, 'admin_floor.create'); if ($region_data) { $this->addAdminFloorRegion($model->id, $region_data); @@ -83,7 +83,7 @@ class AdminFloorService $AdminRoleMenuData = AdminFloorRegion::getFloorRegion($floor_id); $this->logService->logCreatedData( new AdminFloorRegion(), - '创建楼层关联区域', + 'admin_floor.region_create', $AdminRoleMenuData ); } @@ -119,7 +119,7 @@ class AdminFloorService 'updated_at' => get_datetime() ]); - $this->logService->logUpdated($model, $oldValues, '更新楼层'); + $this->logService->logUpdated($model, $oldValues, 'admin_floor.update'); // 删除再创建关联 $nameArr = array_column($region_data, 'name'); @@ -144,7 +144,7 @@ class AdminFloorService ->select()->get()->toArray(); $this->logService->logDeletedData( new AdminFloorRegion(), - '删除角色关联菜单', + 'admin_floor.region_delete', $oldData ); AdminFloorRegion::query()->where('floor_id', $floor_id)->delete(); @@ -162,7 +162,7 @@ class AdminFloorService $model = AdminFloor::query()->findOrFail($id); - $this->logService->logDeleted($model, '删除楼层'); + $this->logService->logDeleted($model, 'admin_floor.delete'); $model->delete(); diff --git a/app/Services/AdminMenuService.php b/app/Services/AdminMenuService.php index ef2be1d..89b55a7 100644 --- a/app/Services/AdminMenuService.php +++ b/app/Services/AdminMenuService.php @@ -12,6 +12,22 @@ use Psr\SimpleCache\InvalidArgumentException; final class AdminMenuService { + + /** + * @var OperationLogService + */ + private OperationLogService $logService; + + /** + * 构造函数 + * @param OperationLogService $logService + */ + public function __construct(OperationLogService $logService) + { + $this->logService = $logService; + $this->logService->menuTitle = 'menu'; + } + /** * 用户权限id数组 * @var array diff --git a/app/Services/AdminRolesService.php b/app/Services/AdminRolesService.php index ee2d567..16030cb 100644 --- a/app/Services/AdminRolesService.php +++ b/app/Services/AdminRolesService.php @@ -60,7 +60,7 @@ final class AdminRolesService 'updated_at' => get_datetime() ]); - $this->logService->logUpdated($model, $oldValues, '更新角色'); + $this->logService->logUpdated($model, $oldValues, 'role.update'); // 删除再创建关联 if (AdminRoleMenu::existsRoleMenu($id, $menu_ids)) { @@ -102,7 +102,7 @@ final class AdminRolesService ->select()->get()->toArray(); $this->logService->logDeletedData( new AdminRoleMenu(), - '删除角色关联菜单', + 'role.menu_delete', $oldAdminRoleMenu ); AdminRoleMenu::query()->where('role_id', $role_id)->delete(); @@ -120,7 +120,7 @@ final class AdminRolesService $AdminRoleMenuData = AdminRoleMenu::getMenuData($role_id); $this->logService->logCreatedData( new AdminRoleMenu(), - '创建角色关联菜单', + 'role.menu_create', $AdminRoleMenuData ); } @@ -150,7 +150,7 @@ final class AdminRolesService 'created_at' => get_datetime() ]); - $this->logService->logCreated($model, '创建角色'); + $this->logService->logCreated($model, 'role.create'); $this->addAdminRoleMenu($model->id, $menu_ids); @@ -175,7 +175,7 @@ final class AdminRolesService $model = AdminRoles::query()->findOrFail($id); - $this->logService->logDeleted($model, '删除角色'); + $this->logService->logDeleted($model, 'role.delete'); $model->delete(); diff --git a/app/Services/AdminTranslationService.php b/app/Services/AdminTranslationService.php index d73007f..af2d966 100644 --- a/app/Services/AdminTranslationService.php +++ b/app/Services/AdminTranslationService.php @@ -49,7 +49,7 @@ class AdminTranslationService $save_data['created_at'] = get_datetime(); $model = AdminTranslation::query()->create($save_data); - $this->logService->logCreated($model, '创建翻译'); + $this->logService->logCreated($model, 'translation.create'); return $model; } catch (Exception $e) { @@ -92,7 +92,7 @@ class AdminTranslationService $update_data['updated_at'] = get_datetime(); $model->update($update_data); - $this->logService->logUpdated($model, $oldValues, '更新翻译'); + $this->logService->logUpdated($model, $oldValues, 'translation.update'); return $model; } catch (Exception $e) { @@ -113,7 +113,7 @@ class AdminTranslationService $model = AdminTranslation::query()->findOrFail($id); - $this->logService->logDeleted($model, '删除翻译'); + $this->logService->logDeleted($model, 'translation.delete'); $model->delete(); diff --git a/app/Services/AdminUsersService.php b/app/Services/AdminUsersService.php index 0235a89..4686d3c 100644 --- a/app/Services/AdminUsersService.php +++ b/app/Services/AdminUsersService.php @@ -58,14 +58,14 @@ final class AdminUsersService $user_id = $model->id; - $this->logService->logCreated($model, '创建用户'); + $this->logService->logCreated($model, 'admin_user.create'); // 角色id $AdminRoleUsers = AdminRoleUsers::query()->create([ 'role_id' => $data['role_id'], 'user_id' => $user_id, 'created_at' => get_datetime() ]); - $this->logService->logCreated($AdminRoleUsers, '创建用户关联角色'); + $this->logService->logCreated($AdminRoleUsers, 'admin_user.role_create'); // 停车场id $packing_id = $data['packing_id']; @@ -127,14 +127,14 @@ final class AdminUsersService $this->logService->logUpdatedData( new AdminRoleUsers(), $oldAdminRoleUsers, - '更新用户关联角色', + 'admin_user.role_update', $newAdminRoleUsers ); } // $packing_id = $data['packing_id']; - $this->logService->logUpdated($model, $oldValue, '更新用户'); + $this->logService->logUpdated($model, $oldValue, 'admin_user.update'); DB::commit(); return $model; @@ -156,7 +156,7 @@ final class AdminUsersService $model = AdminUsers::findOrFail($id); - $this->logService->logDeleted($model, '删除用户'); + $this->logService->logDeleted($model, 'admin_user.delete'); $model->delete(); @@ -167,7 +167,7 @@ final class AdminUsersService AdminRoleUsers::query()->where(['user_id' => $id])->delete(); $this->logService->logDeletedData( new AdminRoleUsers(), - '删除用户关联角色', + 'admin_user.role_delete', $oldAdminRoleUser ); diff --git a/app/Services/ParkingLicensePlateService.php b/app/Services/ParkingLicensePlateService.php index 91bb751..2d15b31 100644 --- a/app/Services/ParkingLicensePlateService.php +++ b/app/Services/ParkingLicensePlateService.php @@ -49,7 +49,7 @@ class ParkingLicensePlateService 'created_at' => get_datetime() ]); - $this->logService->logCreated($model, '创建车牌号码'); + $this->logService->logCreated($model, 'license_plate.create'); DB::commit(); return $model; @@ -88,7 +88,7 @@ class ParkingLicensePlateService 'updated_at' => get_datetime() ]); - $this->logService->logUpdated($model, $oldValues, '更新车牌号码'); + $this->logService->logUpdated($model, $oldValues, 'license_plate.update'); DB::commit(); return $model; @@ -110,7 +110,7 @@ class ParkingLicensePlateService $model = ParkingLicensePlate::query()->findOrFail($id); - $this->logService->logDeleted($model, '删除车牌号码'); + $this->logService->logDeleted($model, 'license_plate.delete'); $model->delete(); @@ -136,7 +136,7 @@ class ParkingLicensePlateService } $this->logService->logDeletedData( new ParkingLicensePlate(), - '删除车牌号码', + 'license_plate.delete', $oldLicensePlate ); diff --git a/app/Services/ParkingSpaceAttributesService.php b/app/Services/ParkingSpaceAttributesService.php index cf0dde9..4f71a83 100644 --- a/app/Services/ParkingSpaceAttributesService.php +++ b/app/Services/ParkingSpaceAttributesService.php @@ -53,7 +53,7 @@ class ParkingSpaceAttributesService 'created_at' => get_datetime() ]); - $this->logService->logCreated($model, '创建车位属性'); + $this->logService->logCreated($model, 'space_attributes.create'); DB::commit(); return $model; @@ -98,7 +98,7 @@ class ParkingSpaceAttributesService 'updated_at' => get_datetime() ]); - $this->logService->logUpdated($model, $oldValues, '更新车位属性'); + $this->logService->logUpdated($model, $oldValues, 'space_attributes.update'); DB::commit(); return $model; @@ -120,7 +120,7 @@ class ParkingSpaceAttributesService $model = ParkingSpaceAttributes::query()->findOrFail($id); - $this->logService->logDeleted($model, '删除车位属性'); + $this->logService->logDeleted($model, 'space_attributes.delete'); $model->delete(); diff --git a/app/Services/ParkingSpaceTypeService.php b/app/Services/ParkingSpaceTypeService.php index f1a039d..c55aed0 100644 --- a/app/Services/ParkingSpaceTypeService.php +++ b/app/Services/ParkingSpaceTypeService.php @@ -75,7 +75,7 @@ class ParkingSpaceTypeService $model = ParkingSpaceType::query()->create($createData); - $this->logService->logCreated($model, '创建车位类型'); + $this->logService->logCreated($model, 'space_type.create'); DB::commit(); return $model; @@ -137,7 +137,7 @@ class ParkingSpaceTypeService $saveData['updated_at'] = get_datetime(); $model->update($saveData); - $this->logService->logUpdated($model, $oldValues, '更新车位类型'); + $this->logService->logUpdated($model, $oldValues, 'space_type.update'); DB::commit(); return $model; @@ -164,7 +164,7 @@ class ParkingSpaceTypeService throw new Exception(__('service.space_type.license_exists')); } - $this->logService->logDeleted($model, '删除车位类型'); + $this->logService->logDeleted($model, 'space_type.delete'); $model->delete(); diff --git a/app/Services/ParkingVipListService.php b/app/Services/ParkingVipListService.php index df209fb..f945ee2 100644 --- a/app/Services/ParkingVipListService.php +++ b/app/Services/ParkingVipListService.php @@ -52,7 +52,7 @@ class ParkingVipListService 'created_at' => get_datetime() ]); - $this->logService->logCreated($model, '创建VIP名单'); + $this->logService->logCreated($model, 'vip_list.create'); DB::commit(); return $model; @@ -94,7 +94,7 @@ class ParkingVipListService 'updated_at' => get_datetime() ]); - $this->logService->logUpdated($model, $oldValues, '更新VIP名单'); + $this->logService->logUpdated($model, $oldValues, 'vip_list.update'); DB::commit(); return $model; @@ -116,7 +116,7 @@ class ParkingVipListService $model = ParkingVipList::query()->findOrFail($id); - $this->logService->logDeleted($model, '删除VIP名单'); + $this->logService->logDeleted($model, 'vip_list.delete'); $model->delete(); diff --git a/resources/lang/zh-CN/log.php b/resources/lang/zh-CN/log.php new file mode 100644 index 0000000..0def177 --- /dev/null +++ b/resources/lang/zh-CN/log.php @@ -0,0 +1,55 @@ + '登录平台', + 'logout' => '注销', + 'config' => [ + 'update' => '系统配置更新' + ], + 'admin_floor' => [ + 'create' => '创建楼层', + 'update' => '更新楼层', + 'delete' => '删除楼层', + 'region_create' => '创建楼层关联区域', + 'region_delete' => '删除角色关联菜单', + ], + 'role' => [ + 'create' => '创建角色', + 'update' => '更新角色', + 'delete' => '删除角色', + 'menu_delete' => '删除角色关联菜单', + 'menu_create' => '创建角色关联菜单' + ], + 'translation' => [ + 'create' => '创建翻译', + 'update' => '更新翻译', + 'delete' => '删除翻译' + ], + 'admin_user' => [ + 'create' => '创建用户', + 'update' => '更新用户', + 'delete' => '更新用户', + 'role_create' => '创建用户关联角色', + 'role_update' => '更新用户关联角色', + 'role_delete' => '删除用户关联角色' + ], + 'license_plate' => [ + 'create' => '创建车牌号码', + 'update' => '更新车牌号码', + 'delete' => '删除车牌号码' + ], + 'space_attributes' => [ + 'create' => '创建车位属性', + 'update' => '更新车位属性', + 'delete' => '删除车位属性' + ], + 'space_type' => [ + 'create' => '创建车位类型', + 'update' => '更新车位类型', + 'delete' => '删除车位类型' + ], + 'vip_list' => [ + 'create' => '创建VIP名单', + 'update' => '更新VIP名单', + 'delete' => '删除VIP名单' + ] +];