mirror of
https://gitee.com/ulthon/ulthon_admin.git
synced 2026-07-05 17:42:49 +08:00
增加登录跳转到指定页面;发布新版本
This commit is contained in:
@@ -12,16 +12,12 @@ use think\console\Output;
|
||||
|
||||
class VersionBase extends Command
|
||||
{
|
||||
public const VERSION = 'v2.0.53';
|
||||
public const VERSION = 'v2.0.54';
|
||||
|
||||
public const LAYUI_VERSION = '2.8.17';
|
||||
|
||||
public const COMMENT = [
|
||||
'优化首页移动端兼容性',
|
||||
'修改说明文件和版本信息',
|
||||
'清理遗留技术代码',
|
||||
'移除表格转卡片',
|
||||
'新增手机端浏览模式和基本分页查询',
|
||||
'增加登录跳转到指定页面',
|
||||
'发布新版本',
|
||||
];
|
||||
|
||||
|
||||
@@ -398,17 +398,19 @@ class AdminControllerBase extends BaseController
|
||||
|
||||
$currentController = parse_name(app()->request->controller());
|
||||
|
||||
$back_url = $this->request->url();
|
||||
|
||||
// 验证登录
|
||||
if (
|
||||
!in_array($currentController, $adminConfig['no_login_controller']) &&
|
||||
!in_array($currentNode, $adminConfig['no_login_node'])
|
||||
) {
|
||||
empty($adminId) && $this->error('请先登录后台', [], __url('admin/login/index'));
|
||||
empty($adminId) && $this->error('请先登录后台', [], __url('admin/login/index', ['back_url' => $back_url]));
|
||||
|
||||
// 判断是否登录过期
|
||||
if ($expireTime !== true && time() > $expireTime) {
|
||||
session('admin', null);
|
||||
$this->error('登录已过期,请重新登录', [], __url('admin/login/index'));
|
||||
$this->error('登录已过期,请重新登录', [], __url('admin/login/index', ['back_url' => $back_url]));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user