Skip to content

Commit 47ecfb7

Browse files
liaodeityliaodeity
authored
Merge pull request #5 from liaodeity/8.x
8.2.0
2 parents b47aaff + b14f9ff commit 47ecfb7

File tree

16 files changed

+110
-31
lines changed

16 files changed

+110
-31
lines changed

‎CHANGELOG.md

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Release Notes
2+
3+
## [Unreleased](https://github.com/liaodeity/laravel-admin-cms/compare/v8.2.0...8.x)
4+
5+
## [v8.2.0(2021-06-03)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.1.14...8.2.0)
6+
7+
### Added
8+
- 更新用户表结构，将登录次数及登录时间字段加入主表users（[#5](https://github.com/liaodeity/laravel-admin-cms/pull/5)）
9+
- 新增变更日志`CHANGELOG.md`记录
10+
### Changed
11+
- 修改官网和文档地址
12+
- 调整字段长度限制
13+
- 添加演示站点代码判断，防止修改超级权限账号
14+
15+
## [v8.1.4 (2021-05-28)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.1.3...v8.1.4)
16+
17+
### Changed
18+
- 优化菜单管理模块，上级菜单、添加、修改（[#4](https://github.com/liaodeity/laravel-admin-cms/pull/4)）
19+
- 修改已知问题优化
20+
21+
## [v8.1.3 (2021-05-21)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.1.2...v8.1.3)
22+
23+
### Added
24+
-记录浏览来源（[#3](https://github.com/liaodeity/laravel-admin-cms/pull/3)）
25+
26+
### Fixed
27+
-修复资源路径
28+
29+
## [v8.1.2 (2021-05-19)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.1.1...v8.1.2)
30+
31+
### Fixed
32+
- Fixed基础表备份目录不存在，修改说明（[#2](https://github.com/liaodeity/laravel-admin-cms/pull/2)）
33+
34+
## [v8.1.1 (2021-05-14)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.1.0...v8.1.1)
35+
36+
### Changed
37+
- 修改说明、Fixed参数 ([#1](https://github.com/liaodeity/laravel-admin-cms/pull/1))
38+
39+
40+
## [v8.1.0 (2021-05-13)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.0.1...v8.0.2)
41+
42+
### Added
43+
- 添加后台主题单页面模式 ([2d3930b](https://github.com/liaodeity/laravel-admin-cms/commit/2d3930b3b1feca0331f07908f28c82c40c2c16fe),[968d5ae](https://github.com/liaodeity/laravel-admin-cms/commit/968d5ae95cdf6eef37c9974dd896fb3b6acfad04))
44+
45+
### Fixed
46+
- 修改渲染 ([d070358](https://github.com/liaodeity/laravel-admin-cms/commit/d0703586b58cbe59bb7688cfdc5d2d389fa3e5d6))
47+
48+
## [v8.0.1 (2021-05-13)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.0.0...v8.0.1)
49+
50+
### Added
51+
- 用户管理>用户列表添加Tab多列表切换展示 ([cb7c6de](https://github.com/liaodeity/laravel-admin-cms/commit/cb7c6deb861d33f6e8b55b0f659001c7b0eecfff))
52+
- 更新函数助手([e107b3f](https://github.com/liaodeity/laravel-admin-cms/commit/e107b3f9b03915f7fc6f5c0d2256237a004d9410), [54c66ee](https://github.com/liaodeity/laravel-admin-cms/commit/54c66eecc85462d9bd7865073167817eeacdd61d))
53+
54+
55+
## [v8.0.0 (2021-05-13)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.0.0)
56+
版本发布AdminCms基本功能
57+
58+
### Added
59+
- 系统基础框架功能
60+
- 基本信息配置
61+
- 账号管理
62+
- 日志管理
63+
- 菜单管理
64+
- 角色管理
65+
- 用户信息修改
66+
- more...

‎app/Http/Controllers/Admin/UserAdminController.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public function index (Request $request)
5454
if (request ()->wantsJson ()) {
5555
$limit = $request->input ('limit', 15);
5656
QueryWhere::defaultOrderBy ('users.id', 'DESC')->setRequest ($request->all ());
57-
$M = $this->repository->makeModel ()->select ('user_admins.*', 'users.name', 'user_infos.real_name', 'user_infos.gender', 'user_infos.telephone', 'user_infos.address');
57+
$M = $this->repository->makeModel ()->select ('user_admins.*', 'users.name','users.login_count','users.last_login_at',
58+
'user_infos.real_name', 'user_infos.gender', 'user_infos.telephone', 'user_infos.address');
5859
$M->join ('user_admins', 'users.id', '=', 'user_admins.user_id');
5960
$M->leftJoin ('user_infos', 'user_infos.user_id', '=', 'users.id');
6061
QueryWhere::eq ($M, 'user_admins.status');
@@ -248,6 +249,11 @@ public function update (Request $request, UserAdmin $userAdmin)
248249
if ($isSuper && $user->id != get_login_user_id ()) {
249250
throw new BusinessException('无法修改超级管理员信息，需管理员自行修改');
250251
}
252+
//【可删除】演示站点测试专用-start
253+
if ($isSuper && config ('gui.deny_edit_super_admin')) {
254+
throw new BusinessException('演示站点无法修改超级管理员信息');
255+
}
256+
//【可删除】演示站点测试专用-end
251257

252258
if (array_get ($input, 'password')) {
253259
$input['password'] = Hash::make ($input['password']);

‎app/Http/Controllers/Admin/UserMemberController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public function index (Request $request)
5454
if (request ()->wantsJson ()) {
5555
$limit = $request->input ('limit', 15);
5656
QueryWhere::defaultOrderBy ('users.id', 'DESC')->setRequest ($request->all ());
57-
$M = $this->repository->makeModel ()->select ('user_members.*', 'users.name', 'user_infos.real_name', 'user_infos.gender', 'user_infos.telephone', 'user_infos.address');
57+
$M = $this->repository->makeModel ()->select ('user_members.*', 'users.name','users.login_count','users.last_login_at',
58+
'user_infos.real_name', 'user_infos.gender', 'user_infos.telephone', 'user_infos.address');
5859
$M->join ('user_members', 'users.id', '=', 'user_members.user_id');
5960
$M->leftJoin ('user_infos', 'user_infos.user_id', '=', 'users.id');
6061
QueryWhere::eq ($M, 'user_members.status');

‎app/Http/Controllers/Home/PublicController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function webViewBrowsing (Request $request)
3535
}
3636
$insArr = [
3737
'web_user' => $web_user,
38-
'user_agent' => $userAgent,
38+
'user_agent' => str_limit ($userAgent, 500,''),
3939
'client_ip' => $clientIp ?? '',
4040
'referer' => $referer ?? '',
4141
'view_url' => $viewUrl,

‎app/Services/LoginService.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
namespace App\Services;
1414

1515

16+
use App\Enums\UserStatusEnum;
1617
use App\Exceptions\BusinessException;
1718
use App\Models\Company;
1819
use App\Models\CompanyUser;
@@ -115,15 +116,14 @@ private function checkAdmin (string $username, string $password)
115116
throw new BusinessException('非管理员账号，无法进行登录');
116117
}
117118
if ($user->admin->status != 1) {
118-
throw new BusinessException('账号' . $user->statusItem ($user->admin->status) . '，无法进行登录');
119+
throw new BusinessException('账号' . UserStatusEnum::toLabel ($user->admin->status) . '，无法进行登录');
119120
}
120121
$this->setLoginSession ($user->id);
121122
session ()->put ('LOGIN_ADMIN', 'admin');
122-
//登录日志
123-
$userAdmin = $user->admin;
124-
$userAdmin->login_count++;
125-
$userAdmin->last_login_at = now ();
126-
$userAdmin->save ();
123+
//登录次数日志
124+
$user->login_count++;
125+
$user->last_login_at = now ();
126+
$user->save ();
127127

128128
return true;
129129
}

‎config/gui.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,15 @@
2121
| 设置后台默认主题为"iframe"或"onepage".
2222
| 获取当前主题"get_admin_theme()".
2323
*/
24-
'admin_theme' => 'onepage',
24+
'admin_theme' => 'onepage',
25+
26+
/*
27+
|--------------------------------------------------------------------------
28+
| 演示站点测试专用
29+
|--------------------------------------------------------------------------
30+
|
31+
| 防止修改超级管理权限用户【正式上线可以设置为false】
32+
| 可删除判断代码：`app/Http/Controllers/Admin/UserAdminController.php:252`
33+
*/
34+
'deny_edit_super_admin' => true,
2535
];

‎database/dev-backup/user_admins.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
{
33
"id": 1,
44
"user_id": 1,
5-
"login_count": 5,
6-
"last_login_at": "2021-04-14 15:17:19",
75
"status": 1,
86
"created_at": "2021-04-14 10:48:42",
97
"updated_at": "2021-04-14 15:17:19"
108
}
11-
]
9+
]

‎database/dev-backup/users.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
"email_verified_at": null,
88
"password": "$2y$10$IUW7lCfdlIv3k8EMPVR2zeX4DsDAxOmDSSrQ60L6m44P8glqwWXTW",
99
"remember_token": null,
10+
"login_count": 5,
11+
"last_login_at": "2021-04-14 15:17:19",
1012
"created_at": "2021-03-19 15:40:47",
1113
"updated_at": null
1214
}
13-
]
15+
]

‎database/migrations/2014_10_12_000000_create_users_table.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ public function up ()
2121
$table->timestamp ('email_verified_at')->nullable ();
2222
$table->string ('password');
2323
$table->rememberToken ();
24+
$table->unsignedBigInteger ('login_count')->default (0)->comment ('登录次数');
25+
$table->timestamp ('last_login_at')->nullable ()->comment ('最后登录时间');
2426
$table->timestamps ();
2527
});
2628
}

‎database/migrations/2020_03_19_141447_create_user_admins.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ public function up()
1616
Schema::create('user_admins', function (Blueprint $table) {
1717
$table->id();
1818
$table->foreignId ('user_id')->constrained ()->cascadeOnDelete ();
19-
$table->unsignedBigInteger ('login_count')->default (0)->comment ('登录次数');
20-
$table->timestamp ('last_login_at')->nullable ()->comment ('最后登录时间');
2119
$table->tinyInteger ('status')->default (0)->comment ('状态');
2220
$table->timestamps();
2321
});

‎database/migrations/2020_03_19_141525_create_user_agents.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ public function up()
1616
Schema::create('user_agents', function (Blueprint $table) {
1717
$table->id();
1818
$table->foreignId ('user_id')->constrained ()->cascadeOnDelete ();
19-
$table->unsignedBigInteger ('login_count')->default (0)->comment ('登录次数');
20-
$table->timestamp ('last_login_at')->nullable ()->comment ('最后登录时间');
2119
$table->tinyInteger ('status')->default (0)->comment ('状态');
2220
$table->timestamps();
2321
});

‎database/migrations/2020_03_19_141540_create_user_members.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ public function up()
1616
Schema::create('user_members', function (Blueprint $table) {
1717
$table->id();
1818
$table->foreignId ('user_id')->constrained ()->cascadeOnDelete ();
19-
$table->unsignedBigInteger ('login_count')->default (0)->comment ('登录次数');
20-
$table->timestamp ('last_login_at')->nullable ()->comment ('最后登录时间');
2119
$table->tinyInteger ('status')->default (0)->comment ('状态');
2220
$table->timestamps();
2321
});

‎database/migrations/2020_05_27_170357_create_web_views_table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function up ()
1919
$table->string ('referer', 200)->default ('')->comment ('来源');
2020
$table->string ('view_url', 200)->default ('')->comment ('访问链接地址');
2121
$table->ipAddress ('client_ip')->default ('')->comment ('用户IP地址');
22-
$table->string ('user_agent', 250)->default ('')->comment ('浏览器标识');
22+
$table->string ('user_agent', 500)->default ('')->comment ('浏览器标识');
2323
$table->timestamp ('view_at')->nullable ()->comment ('浏览时间');
2424
});
2525
}

‎public/static/layuimini-iframe/js/lay-module/layuimini/miniTheme.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,8 @@ layui.define(["jquery", "layer"], function (exports) {
430430
'<ul>\n' + bgColorHtml + '</ul>\n' +
431431
'</div>\n' +
432432
'<div class="more-menu-list">\n' +
433-
'<a class="more-menu-item" href="https://www.jianbaizhan.com/cmf/doc" target="_blank"><i class="layui-icon layui-icon-read" style="font-size: 19px;"></i> 开发文档</a>\n' +
434-
'<a class="more-menu-item" href="https://www.jianbaizhan.com/cmf" target="_blank"><i class="layui-icon layui-icon-theme"></i> 官方网站</a>\n' +
433+
'<a class="more-menu-item" href="https://www.jianbaizhan.com/docs/cms" target="_blank"><i class="layui-icon layui-icon-read" style="font-size: 19px;"></i> 开发文档</a>\n' +
434+
'<a class="more-menu-item" href="https://www.jianbaizhan.com/cms" target="_blank"><i class="layui-icon layui-icon-theme"></i> 官方网站</a>\n' +
435435
'<a class="more-menu-item" href="https://gitee.com/liaodeiy/laravel-admin-cms" target="_blank"><i class="layui-icon layui-icon-fonts-code"></i> 开源地址</a>\n' +
436436
'</div>' +
437437
'</div>';

‎public/static/layuimini-onepage/js/lay-module/layuimini/miniTheme.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,9 +430,9 @@ layui.define(["jquery", "layer"], function (exports) {
430430
'<ul>\n' + bgColorHtml + '</ul>\n' +
431431
'</div>\n' +
432432
'<div class="more-menu-list">\n' +
433-
'<a class="more-menu-item" href="http://layuimini.99php.cn/docs/index.html" target="_blank"><i class="layui-icon layui-icon-read" style="font-size: 19px;"></i> 开发文档</a>\n' +
434-
'<a class="more-menu-item" href="https://github.com/zhongshaofa/layuimini" target="_blank"><i class="layui-icon layui-icon-tabs" style="font-size: 16px;"></i> 开源地址</a>\n' +
435-
'<a class="more-menu-item" href="http://layuimini.99php.cn" target="_blank"><i class="layui-icon layui-icon-theme"></i> 官方网站</a>\n' +
433+
'<a class="more-menu-item" href="https://www.jianbaizhan.com/docs/cms" target="_blank"><i class="layui-icon layui-icon-read" style="font-size: 19px;"></i> 开发文档</a>\n' +
434+
'<a class="more-menu-item" href="https://www.jianbaizhan.com/cms" target="_blank"><i class="layui-icon layui-icon-theme"></i> 官方网站</a>\n' +
435+
'<a class="more-menu-item" href="https://gitee.com/liaodeiy/laravel-admin-cms" target="_blank"><i class="layui-icon layui-icon-fonts-code"></i> 开源地址</a>\n' +
436436
'</div>' +
437437
'</div>';
438438
layer.open({
@@ -471,4 +471,4 @@ layui.define(["jquery", "layer"], function (exports) {
471471
exports("miniTheme", miniTheme);
472472

473473
})
474-
;
474+
;

‎readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
- 后台系统常用功能
1717

18+
- 支持主题风格设置`单页面`和`iframe多标签`
19+
1820
- 简单上手，快速开发
1921

2022
- 更多插件功能，一键安装扩展
@@ -81,9 +83,7 @@ php artisan serve
8183

8284
### 开发文档
8385

84-
- [https://www.jianbaizhan.com/cmf/docs](https://www.jianbaizhan.com/cmf/docs)
85-
86-
86+
- [https://www.jianbaizhan.com/docs/cms](https://www.jianbaizhan.com/docs/cms)[待完善]
8787

8888
### 基础功能
8989

@@ -119,7 +119,7 @@ php artisan serve
119119

120120
## 其他
121121

122-
`gui-giggle` 基于以下插件或服务（排名不分先后，罗列部分，[更多查看](https://www.jianbaizhan.com/cmf)）：
122+
`gui-giggle` 基于以下插件或服务（排名不分先后，罗列部分，[更多查看](https://www.jianbaizhan.com/cms)）：
123123

124124
- [Laravel](https://laravel.com/)
125125

0 commit comments

Comments
 (0)