diff --git a/composer.json b/composer.json index aac3e3d..61f8ab3 100644 --- a/composer.json +++ b/composer.json @@ -1,14 +1,14 @@ { - "name": "dcat/laravel-log-viewer", + "name": "zyimm/laravel-log-viewer", "description": "Laravel Log Viewer", "type": "library", "keywords": ["laravel", "log viewer"], - "homepage": "https://github.com/jqhph/laravel-log-viewer", + "homepage": "http://gogs.zyimm.com/zyimm/laravel-log-viewer", "license": "MIT", "authors": [ { - "name": "jqh", - "email": "841324345@qq.com" + "name": "zyimm", + "email": "zyimm@qq.com" } ], "require": { @@ -16,13 +16,13 @@ }, "autoload": { "psr-4": { - "Dcat\\LogViewer\\": "src/" + "Zyimm\\LogViewer\\": "src/" } }, "extra": { "laravel": { "providers": [ - "Dcat\\LogViewer\\DcatLogViewerServiceProvider" + "Zyimm\\LogViewer\\LogViewerServiceProvider" ] } } diff --git a/config/dcat-log-viewer.php b/config/zyimm-log-viewer.php similarity index 67% rename from config/dcat-log-viewer.php rename to config/zyimm-log-viewer.php index dd55dab..00bb821 100644 --- a/config/dcat-log-viewer.php +++ b/config/zyimm-log-viewer.php @@ -2,8 +2,8 @@ return [ 'route' => [ - 'prefix' => 'dcat-logs', - 'namespace' => 'Dcat\LogViewer', + 'prefix' => 'zyimm-logs', + 'namespace' => 'Zyimm\LogViewer', 'middleware' => [], ], diff --git a/src/DcatLogViewerServiceProvider.php b/src/DcatLogViewerServiceProvider.php deleted file mode 100644 index 55f74ed..0000000 --- a/src/DcatLogViewerServiceProvider.php +++ /dev/null @@ -1,32 +0,0 @@ -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',]); - }); - } -} diff --git a/src/LogController.php b/src/LogController.php index 0555e3a..d8645a3 100644 --- a/src/LogController.php +++ b/src/LogController.php @@ -1,6 +1,6 @@ get('filename')); $offset = $request->get('offset'); $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->setKeyword($keyword); $viewer->setFilename($filename); - return view('dcat-log-viewer::log', [ + return view('zyimm-log-viewer::log', [ 'dir' => $dir, 'logs' => $viewer->fetch($offset, $lines), 'logFiles' => $this->formatLogFiles($viewer, $dir), @@ -54,7 +54,7 @@ class LogController 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) @@ -73,7 +73,7 @@ class LogController return [ '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), ]; }, $logViewer->getLogFiles()); diff --git a/src/LogViewer.php b/src/LogViewer.php index b729146..761da9c 100644 --- a/src/LogViewer.php +++ b/src/LogViewer.php @@ -1,6 +1,6 @@ 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',]); + }); + } +}