This commit is contained in:
zhouyangyang 2020-11-25 11:28:00 +08:00
parent d43ee5a6bd
commit 8224a1f704
6 changed files with 46 additions and 46 deletions

View File

@ -1,14 +1,14 @@
{ {
"name": "dcat/laravel-log-viewer", "name": "zyimm/laravel-log-viewer",
"description": "Laravel Log Viewer", "description": "Laravel Log Viewer",
"type": "library", "type": "library",
"keywords": ["laravel", "log viewer"], "keywords": ["laravel", "log viewer"],
"homepage": "https://github.com/jqhph/laravel-log-viewer", "homepage": "http://gogs.zyimm.com/zyimm/laravel-log-viewer",
"license": "MIT", "license": "MIT",
"authors": [ "authors": [
{ {
"name": "jqh", "name": "zyimm",
"email": "841324345@qq.com" "email": "zyimm@qq.com"
} }
], ],
"require": { "require": {
@ -16,13 +16,13 @@
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Dcat\\LogViewer\\": "src/" "Zyimm\\LogViewer\\": "src/"
} }
}, },
"extra": { "extra": {
"laravel": { "laravel": {
"providers": [ "providers": [
"Dcat\\LogViewer\\DcatLogViewerServiceProvider" "Zyimm\\LogViewer\\LogViewerServiceProvider"
] ]
} }
} }

View File

@ -2,8 +2,8 @@
return [ return [
'route' => [ 'route' => [
'prefix' => 'dcat-logs', 'prefix' => 'zyimm-logs',
'namespace' => 'Dcat\LogViewer', 'namespace' => 'Zyimm\LogViewer',
'middleware' => [], 'middleware' => [],
], ],

View File

@ -1,32 +0,0 @@
<?php
namespace Dcat\LogViewer;
use Illuminate\Support\ServiceProvider;
class DcatLogViewerServiceProvider extends ServiceProvider
{
public function boot()
{
$this->loadViewsFrom(__DIR__.'/../resources/view', 'dcat-log-viewer');
if ($this->app->runningInConsole()) {
$this->publishes([__DIR__.'/../config' => config_path()], 'dcat-log-viewer');
}
$this->registerRoutes();
}
protected function registerRoutes()
{
app('router')->group([
'prefix' => config('dcat-log-viewer.route.prefix', 'dcat-logs'),
'namespace' => config('dcat-log-viewer.route.namespace', 'Dcat\LogViewer'),
'middleware' => config('dcat-log-viewer.route.middleware'),
], function ($router) {
$router->get('/', ['as' => 'dcat-log-viewer', 'uses' => 'LogController@index',]);
$router->get('download', ['as' => 'dcat-log-viewer.download', 'uses' => 'LogController@download',]);
$router->get('{file}', ['as' => 'dcat-log-viewer.file', 'uses' => 'LogController@index',]);
});
}
}

View File

@ -1,6 +1,6 @@
<?php <?php
namespace Dcat\LogViewer; namespace Zyimm\LogViewer;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@ -14,14 +14,14 @@ class LogController
$filename = trim($request->get('filename')); $filename = trim($request->get('filename'));
$offset = $request->get('offset'); $offset = $request->get('offset');
$keyword = trim($request->get('keyword')); $keyword = trim($request->get('keyword'));
$lines = $keyword ? (config('dcat-log-viewer.search_page_items') ?: 500) : (config('dcat-log-viewer.page_items') ?: 30); $lines = $keyword ? (config('zyimm-log-viewer.search_page_items') ?: 500) : (config('zyimm-log-viewer.page_items') ?: 30);
$viewer = new LogViewer($this->getDirectory(), $dir, $file); $viewer = new LogViewer($this->getDirectory(), $dir, $file);
$viewer->setKeyword($keyword); $viewer->setKeyword($keyword);
$viewer->setFilename($filename); $viewer->setFilename($filename);
return view('dcat-log-viewer::log', [ return view('zyimm-log-viewer::log', [
'dir' => $dir, 'dir' => $dir,
'logs' => $viewer->fetch($offset, $lines), 'logs' => $viewer->fetch($offset, $lines),
'logFiles' => $this->formatLogFiles($viewer, $dir), 'logFiles' => $this->formatLogFiles($viewer, $dir),
@ -54,7 +54,7 @@ class LogController
protected function getDirectory() protected function getDirectory()
{ {
return config('dcat-log-viewer.directory') ?: storage_path('logs'); return config('zyimm-log-viewer.directory') ?: storage_path('logs');
} }
protected function formatLogFiles(LogViewer $logViewer, $currentDir) protected function formatLogFiles(LogViewer $logViewer, $currentDir)
@ -73,7 +73,7 @@ class LogController
return [ return [
'file' => $value, 'file' => $value,
'url' => route('dcat-log-viewer.file', ['file' => $file, 'dir' => $dir]), 'url' => route('zyimm-log-viewer.file', ['file' => $file, 'dir' => $dir]),
'active' => $logViewer->isCurrentFile($value), 'active' => $logViewer->isCurrentFile($value),
]; ];
}, $logViewer->getLogFiles()); }, $logViewer->getLogFiles());

View File

@ -1,6 +1,6 @@
<?php <?php
namespace Dcat\LogViewer; namespace Zyimm\LogViewer;
use Illuminate\Filesystem\Filesystem; use Illuminate\Filesystem\Filesystem;
use Illuminate\Support\Str; use Illuminate\Support\Str;

View File

@ -0,0 +1,32 @@
<?php
namespace Zyimm\LogViewer;
use Illuminate\Support\ServiceProvider;
class LogViewerServiceProvider extends ServiceProvider
{
public function boot()
{
$this->loadViewsFrom(__DIR__.'/../resources/view', 'zyimm-log-viewer');
if ($this->app->runningInConsole()) {
$this->publishes([__DIR__.'/../config' => config_path()], 'zyimm-log-viewer');
}
$this->registerRoutes();
}
protected function registerRoutes()
{
app('router')->group([
'prefix' => config('zyimm-log-viewer.route.prefix', 'zyimm-logs'),
'namespace' => config('zyimm-log-viewer.route.namespace', 'zyimm\LogViewer'),
'middleware' => config('zyimm-log-viewer.route.middleware'),
], function ($router) {
$router->get('/', ['as' => 'zyimm-log-viewer', 'uses' => 'LogController@index',]);
$router->get('download', ['as' => 'zyimm-log-viewer.download', 'uses' => 'LogController@download',]);
$router->get('{file}', ['as' => 'zyimm-log-viewer.file', 'uses' => 'LogController@index',]);
});
}
}