diff --git a/app/admin/view/login/index.html b/app/admin/view/login/index.html index 1b6ceb8..2287833 100644 --- a/app/admin/view/login/index.html +++ b/app/admin/view/login/index.html @@ -32,7 +32,8 @@
保持登录 - 忘记密码? + {:event_view_replace('忘记密码?','AdminLoginForget')} +
diff --git a/app/admin/view/login/index.js b/app/admin/view/login/index.js index 1fe61e8..1c7a4fe 100644 --- a/app/admin/view/login/index.js +++ b/app/admin/view/login/index.js @@ -40,6 +40,6 @@ $(function () { $('.forget-password').click(function () { - layer.msg('可以使用重置密码命令设置:
php think admin:resetPassword
参考文档'); + layer.msg('可以使用重置密码命令设置:
php think admin:reset:password
参考文档'); }); }); \ No newline at end of file diff --git a/app/common.php b/app/common.php index 8136ca0..db61ced 100644 --- a/app/common.php +++ b/app/common.php @@ -230,21 +230,50 @@ function build_upload_url($url, $upload_type = null) return Filesystem::disk($upload_type)->url($url); } -function event_view_content($name) +function event_handle_result($name, $key, $type = 'all') { $list_result = Event::trigger($name); - $content = ''; + $result = []; foreach ($list_result as $key_event => $value_event) { - if (!isset($value_event['view_content'])) { + if (!isset($value_event[$key])) { if (Env::get('adminsystem.strict_event')) { - throw new EventException("Event view {$name} trigger a result without a view_content"); + throw new EventException("Event view {$name} trigger a result without a {$key}"); } continue; } - $content .= $value_event['view_content']; + if ($type == 'all') { + $result[] = $value_event[$key]; + } elseif ($type == 'last') { + $result = $value_event[$key]; + } elseif ($type == 'first') { + $result = $value_event[$key]; + break; + } } + return $result; +} + +function event_view_content($name) +{ + $list_result = event_handle_result($name, 'view_content'); + + $content = implode('', $list_result); + return $content; } + +function event_view_replace($content, $name) +{ + $list_result = event_handle_result($name, 'view_replace'); + + $content_event = implode('', $list_result); + + if (empty($content_event)) { + return $content; + } + + return $content_event; +} diff --git a/app/common/command/admin/Version.php b/app/common/command/admin/Version.php index 72c8a39..f7f2692 100644 --- a/app/common/command/admin/Version.php +++ b/app/common/command/admin/Version.php @@ -14,7 +14,7 @@ use think\facade\App; class Version extends Command { - public const VERSION = 'v2.0.36'; + public const VERSION = 'v2.0.37'; public const LAYUI_VERSION = '2.8.16';