Merge pull request #5 from liaodeity/8.x

8.2.0

Author: liaodeity

CHANGELOG.md

@@ -0,0 +1,66 @@
+# Release Notes
+
+## [Unreleased](https://github.com/liaodeity/laravel-admin-cms/compare/v8.2.0...8.x)
+
+## [v8.2.0(2021-06-03)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.1.14...8.2.0)
+
+### Added
+- 更新用户表结构，将登录次数及登录时间字段加入主表users（[#5](https://github.com/liaodeity/laravel-admin-cms/pull/5)）
+- 新增变更日志`CHANGELOG.md`记录
+### Changed
+- 修改官网和文档地址
+- 调整字段长度限制
+- 添加演示站点代码判断，防止修改超级权限账号
+
+## [v8.1.4 (2021-05-28)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.1.3...v8.1.4)
+
+### Changed
+- 优化菜单管理模块，上级菜单、添加、修改（[#4](https://github.com/liaodeity/laravel-admin-cms/pull/4)）
+- 修改已知问题优化
+
+## [v8.1.3 (2021-05-21)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.1.2...v8.1.3)
+
+### Added
+-记录浏览来源（[#3](https://github.com/liaodeity/laravel-admin-cms/pull/3)）
+
+### Fixed
+-修复资源路径
+
+## [v8.1.2 (2021-05-19)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.1.1...v8.1.2)
+
+### Fixed
+- Fixed基础表备份目录不存在，修改说明（[#2](https://github.com/liaodeity/laravel-admin-cms/pull/2)）
+
+## [v8.1.1 (2021-05-14)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.1.0...v8.1.1)
+
+### Changed
+- 修改说明、Fixed参数 ([#1](https://github.com/liaodeity/laravel-admin-cms/pull/1))
+
+
+## [v8.1.0 (2021-05-13)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.0.1...v8.0.2)
+
+### Added
+- 添加后台主题单页面模式 ([2d3930b](https://github.com/liaodeity/laravel-admin-cms/commit/2d3930b3b1feca0331f07908f28c82c40c2c16fe),[968d5ae](https://github.com/liaodeity/laravel-admin-cms/commit/968d5ae95cdf6eef37c9974dd896fb3b6acfad04))
+
+### Fixed
+- 修改渲染 ([d070358](https://github.com/liaodeity/laravel-admin-cms/commit/d0703586b58cbe59bb7688cfdc5d2d389fa3e5d6))
+
+## [v8.0.1 (2021-05-13)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.0.0...v8.0.1)
+
+### Added
+- 用户管理>用户列表添加Tab多列表切换展示 ([cb7c6de](https://github.com/liaodeity/laravel-admin-cms/commit/cb7c6deb861d33f6e8b55b0f659001c7b0eecfff))
+- 更新函数助手([e107b3f](https://github.com/liaodeity/laravel-admin-cms/commit/e107b3f9b03915f7fc6f5c0d2256237a004d9410), [54c66ee](https://github.com/liaodeity/laravel-admin-cms/commit/54c66eecc85462d9bd7865073167817eeacdd61d))
+
+
+## [v8.0.0 (2021-05-13)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.0.0)
+版本发布AdminCms基本功能
+
+### Added
+- 系统基础框架功能
+- 基本信息配置
+- 账号管理
+- 日志管理
+- 菜单管理
+- 角色管理
+- 用户信息修改
+- more...

app/Http/Controllers/Admin/UserAdminController.php

@@ -54,7 +54,8 @@ public function index (Request $request)
         if (request ()->wantsJson ()) {
             $limit = $request->input ('limit', 15);
             QueryWhere::defaultOrderBy ('users.id', 'DESC')->setRequest ($request->all ());
-            $M = $this->repository->makeModel ()->select ('user_admins.*', 'users.name', 'user_infos.real_name', 'user_infos.gender', 'user_infos.telephone', 'user_infos.address');
+            $M = $this->repository->makeModel ()->select ('user_admins.*', 'users.name','users.login_count','users.last_login_at',
+                'user_infos.real_name', 'user_infos.gender', 'user_infos.telephone', 'user_infos.address');
             $M->join ('user_admins', 'users.id', '=', 'user_admins.user_id');
             $M->leftJoin ('user_infos', 'user_infos.user_id', '=', 'users.id');
             QueryWhere::eq ($M, 'user_admins.status');
@@ -248,6 +249,11 @@ public function update (Request $request, UserAdmin $userAdmin)
             if ($isSuper && $user->id != get_login_user_id ()) {
                 throw new BusinessException('无法修改超级管理员信息，需管理员自行修改');
             }
+            //【可删除】演示站点测试专用-start
+            if ($isSuper && config ('gui.deny_edit_super_admin')) {
+                throw new BusinessException('演示站点无法修改超级管理员信息');
+            }
+            //【可删除】演示站点测试专用-end
 
             if (array_get ($input, 'password')) {
                 $input['password'] = Hash::make ($input['password']);

app/Http/Controllers/Admin/UserMemberController.php

@@ -54,7 +54,8 @@ public function index (Request $request)
         if (request ()->wantsJson ()) {
             $limit = $request->input ('limit', 15);
             QueryWhere::defaultOrderBy ('users.id', 'DESC')->setRequest ($request->all ());
-            $M = $this->repository->makeModel ()->select ('user_members.*', 'users.name', 'user_infos.real_name', 'user_infos.gender', 'user_infos.telephone', 'user_infos.address');
+            $M = $this->repository->makeModel ()->select ('user_members.*', 'users.name','users.login_count','users.last_login_at',
+                'user_infos.real_name', 'user_infos.gender', 'user_infos.telephone', 'user_infos.address');
             $M->join ('user_members', 'users.id', '=', 'user_members.user_id');
             $M->leftJoin ('user_infos', 'user_infos.user_id', '=', 'users.id');
             QueryWhere::eq ($M, 'user_members.status');

app/Http/Controllers/Home/PublicController.php

@@ -35,7 +35,7 @@ public function webViewBrowsing (Request $request)
         }
         $insArr = [
             'web_user'   => $web_user,
-            'user_agent' => $userAgent,
+            'user_agent' => str_limit ($userAgent, 500,''),
             'client_ip'  => $clientIp ?? '',
             'referer'    => $referer ?? '',
             'view_url'   => $viewUrl,

app/Services/LoginService.php

@@ -13,6 +13,7 @@
 namespace App\Services;
 
 
+use App\Enums\UserStatusEnum;
 use App\Exceptions\BusinessException;
 use App\Models\Company;
 use App\Models\CompanyUser;
@@ -115,15 +116,14 @@ private function checkAdmin (string $username, string $password)
             throw new BusinessException('非管理员账号，无法进行登录');
         }
         if ($user->admin->status != 1) {
-            throw new BusinessException('账号' . $user->statusItem ($user->admin->status) . '，无法进行登录');
+            throw new BusinessException('账号' . UserStatusEnum::toLabel ($user->admin->status) . '，无法进行登录');
         }
         $this->setLoginSession ($user->id);
         session ()->put ('LOGIN_ADMIN', 'admin');
-        //登录日志
-        $userAdmin = $user->admin;
-        $userAdmin->login_count++;
-        $userAdmin->last_login_at = now ();
-        $userAdmin->save ();
+        //登录次数日志
+        $user->login_count++;
+        $user->last_login_at = now ();
+        $user->save ();
 
         return true;
     }

config/gui.php

@@ -21,5 +21,15 @@
       | 设置后台默认主题为"iframe"或"onepage".
       | 获取当前主题"get_admin_theme()".
       */
-    'admin_theme' => 'onepage',
+    'admin_theme'           => 'onepage',
+
+    /*
+      |--------------------------------------------------------------------------
+      | 演示站点测试专用
+      |--------------------------------------------------------------------------
+      |
+      | 防止修改超级管理权限用户【正式上线可以设置为false】
+      | 可删除判断代码：`app/Http/Controllers/Admin/UserAdminController.php:252`
+      */
+    'deny_edit_super_admin' => true,
 ];

database/dev-backup/user_admins.json

@@ -2,10 +2,8 @@
     {
         "id": 1,
         "user_id": 1,
-        "login_count": 5,
-        "last_login_at": "2021-04-14 15:17:19",
         "status": 1,
         "created_at": "2021-04-14 10:48:42",
         "updated_at": "2021-04-14 15:17:19"
     }
-]
+]

database/dev-backup/users.json

@@ -7,7 +7,9 @@
         "email_verified_at": null,
         "password": "$2y$10$IUW7lCfdlIv3k8EMPVR2zeX4DsDAxOmDSSrQ60L6m44P8glqwWXTW",
         "remember_token": null,
+        "login_count": 5,
+        "last_login_at": "2021-04-14 15:17:19",
         "created_at": "2021-03-19 15:40:47",
         "updated_at": null
     }
-]
+]

database/migrations/2014_10_12_000000_create_users_table.php

@@ -21,6 +21,8 @@ public function up ()
             $table->timestamp ('email_verified_at')->nullable ();
             $table->string ('password');
             $table->rememberToken ();
+            $table->unsignedBigInteger ('login_count')->default (0)->comment ('登录次数');
+            $table->timestamp ('last_login_at')->nullable ()->comment ('最后登录时间');
             $table->timestamps ();
         });
     }

database/migrations/2020_03_19_141447_create_user_admins.php

@@ -16,8 +16,6 @@ public function up()
         Schema::create('user_admins', function (Blueprint $table) {
             $table->id();
             $table->foreignId ('user_id')->constrained ()->cascadeOnDelete ();
-            $table->unsignedBigInteger ('login_count')->default (0)->comment ('登录次数');
-            $table->timestamp ('last_login_at')->nullable ()->comment ('最后登录时间');
             $table->tinyInteger ('status')->default (0)->comment ('状态');
             $table->timestamps();
         });