diff --git a/app/admin/controller/system/Log.php b/app/admin/controller/system/Log.php
index 3797a0a..95fc0c6 100644
--- a/app/admin/controller/system/Log.php
+++ b/app/admin/controller/system/Log.php
@@ -95,4 +95,12 @@ class Log extends AdminController
return Excel::exportData($list, $header, $fileName, 'xlsx');
}
+ /**
+ * @NodeAnnotation(title="框架日志")
+ */
+ public function record(): string
+ {
+ return (new \Wolfcode\PhpLogviewer\thinkphp\LogViewer())->fetch();
+ }
+
}
\ No newline at end of file
diff --git a/app/admin/view/system/log/index.html b/app/admin/view/system/log/index.html
index fb1b2cc..db7edce 100644
--- a/app/admin/view/system/log/index.html
+++ b/app/admin/view/system/log/index.html
@@ -1,6 +1,7 @@
diff --git a/composer.json b/composer.json
index 76e6d40..3f28188 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,8 @@
"ext-json": "*",
"qiniu/php-sdk": "v7.11.0",
"ext-mysqli": "*",
- "ext-pdo": "*"
+ "ext-pdo": "*",
+ "wolf-leo/phplogviewer": "^0.05.0"
},
"require-dev": {
"symfony/var-dumper": ">=4.2",
diff --git a/config/logviewer.php b/config/logviewer.php
new file mode 100644
index 0000000..5b40ac1
--- /dev/null
+++ b/config/logviewer.php
@@ -0,0 +1,13 @@
+ 'admin',
+
+ // 常用的日志应用模块
+ 'modules' => [
+ 'admin',
+ 'home',
+ 'index',
+ 'api'
+ ],
+];
\ No newline at end of file
diff --git a/public/static/admin/js/system/log.js b/public/static/admin/js/system/log.js
index da61d52..7c24b6e 100644
--- a/public/static/admin/js/system/log.js
+++ b/public/static/admin/js/system/log.js
@@ -14,7 +14,18 @@ define(["jquery", "easy-admin"], function ($, ea) {
ea.table.render({
init: init,
lineStyle: 'height: auto;word-break: break-all;',
- toolbar: ['refresh', 'export'],
+ toolbar: ['refresh', 'export',
+ [{
+ text: '框架日志',
+ url: 'system.log/record',
+ method: 'open',
+ auth: 'record',
+ class: 'layui-btn layui-btn-sm',
+ icon: 'fa fa-book',
+ extend: 'data-width="95%" data-height="95%"'
+ },
+ ]
+ ],
cols: [[
{field: 'id', width: 80, title: 'ID', search: false},
{field: 'month', width: 80, title: '日志月份', hide: true, search: 'time', timeType: 'month', searchValue: util.toDateString(new Date(), 'yyyy-MM')},