diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/LineMarker.vue b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/LineMarker.vue
index f8dd2a71cfa270d80da6e633a55a7731c82c1539..7a62594fc0e5bd39bdff4ae4da4907535c6e10ee 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/LineMarker.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/LineMarker.vue
@@ -47,10 +47,10 @@
console.log('initChart');
this.logsStatistics();
- // 定时60秒触发一次
+ // 定时多少秒触发一次:默认3分钟
window.setInterval(() => {
setTimeout(this.logsStatistics, 0);
- }, 60000);
+ }, 1000 * 60 * 3);
},
async logsStatistics() {
console.log('load - logsStatistics');
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/index.vue
index 56a21395cd17ee52f5abe1e06331fc76b2e172a0..cbd00645eebb0014b7a4a4b9b5dee272c49d1aa5 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/index.vue
@@ -4,11 +4,15 @@
-
-
+
+
+
+
+
+
-
+
@@ -21,12 +25,8 @@
-
-
-
-
-
-
+
+
diff --git a/app/Modules/Admin/Services/AdminRoleService.php b/app/Modules/Admin/Services/AdminRoleService.php
index 46e3bd926ebc289371d5823c17c78771a9b39bfc..d39de37981da970b889c965e762bb730ea93de9d 100644
--- a/app/Modules/Admin/Services/AdminRoleService.php
+++ b/app/Modules/Admin/Services/AdminRoleService.php
@@ -12,6 +12,7 @@ class AdminRoleService extends BaseService
public function __construct(AdminRole $adminRole)
{
$this->model = $adminRole;
+ $this->with = ['menus'];
}
public function lists(array $params) : array
diff --git a/laravel-vue-admin.sql b/laravel-vue-admin.sql
index c263b84b6b36fe96622c07f4fcfe6a2ab9d63e69..d3780c431c2c1c626f4f1ab36cf63d5d256aad34 100644
--- a/laravel-vue-admin.sql
+++ b/laravel-vue-admin.sql
@@ -11,7 +11,7 @@
Target Server Version : 50728
File Encoding : 65001
- Date: 05/01/2021 16:24:34
+ Date: 05/01/2021 16:43:16
*/
SET NAMES utf8mb4;
@@ -249,7 +249,7 @@ CREATE TABLE `cnpscy_admin_login_logs_2021_01` (
INDEX `admin_id`(`admin_id`) USING BTREE,
INDEX `log_status`(`log_status`) USING BTREE,
INDEX `is_delete`(`is_delete`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 27 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '管理员登录日志表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 32 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '管理员登录日志表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of cnpscy_admin_login_logs_2021_01
@@ -280,6 +280,11 @@ INSERT INTO `cnpscy_admin_login_logs_2021_01` VALUES (23, 1, '127.0.0.1', 'Mozil
INSERT INTO `cnpscy_admin_login_logs_2021_01` VALUES (24, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 0, 1609830411, 1609830411, 0.500273942947);
INSERT INTO `cnpscy_admin_login_logs_2021_01` VALUES (25, 0, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 0, '认证失败!', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin123456\",\"password\":\"123456\"}', 0, 1609830429, 1609830429, 0.285838842392);
INSERT INTO `cnpscy_admin_login_logs_2021_01` VALUES (26, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 0, 1609830433, 1609830433, 0.318809986115);
+INSERT INTO `cnpscy_admin_login_logs_2021_01` VALUES (27, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 0, 1609835524, 1609835524, 1.217608928680);
+INSERT INTO `cnpscy_admin_login_logs_2021_01` VALUES (28, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 UBrowser/5.7.16400.12 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 0, 1609835917, 1609835917, 0.429695844650);
+INSERT INTO `cnpscy_admin_login_logs_2021_01` VALUES (29, 0, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 UBrowser/5.7.16400.12 Safari/537.36', 0, '认证失败!', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"demo\",\"password\":\"123456\"}', 0, 1609835944, 1609835944, 0.422803878784);
+INSERT INTO `cnpscy_admin_login_logs_2021_01` VALUES (30, 0, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 UBrowser/5.7.16400.12 Safari/537.36', 0, '认证失败!', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"demo\",\"password\":\"123456\"}', 0, 1609835949, 1609835949, 0.334978103638);
+INSERT INTO `cnpscy_admin_login_logs_2021_01` VALUES (31, 123, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 UBrowser/5.7.16400.12 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"demo\",\"password\":\"123456\"}', 0, 1609835964, 1609835964, 0.339658021927);
-- ----------------------------
-- Table structure for cnpscy_admin_login_logs_2021_02
@@ -573,7 +578,7 @@ CREATE TABLE `cnpscy_admin_logs_2021_01` (
INDEX `admin_id`(`admin_id`) USING BTREE,
INDEX `log_status`(`log_status`) USING BTREE,
INDEX `is_delete`(`is_delete`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 286 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '管理员操作日志表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 296 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '管理员操作日志表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of cnpscy_admin_logs_2021_01
@@ -863,6 +868,16 @@ INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (282, 1, '127.0.0.1', 'Mozilla/5.
INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (283, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminRoleController@create', 'POST', '{\"isTrusted\":true,\"role_name\":\"\\u5168\\u90e8\\u6743\\u9650\\u7684\\u89d2\\u8272\",\"is_check\":1,\"menu_ids\":[1,2,6,15,18,16,17,14,58,7,19]}', 0, 1609832355, 1609832355, 00000008.143148899078, 'http://laravel-admin.cnpscy.com/admin/admin_roles/create');
INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (284, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminRoleController@create', 'POST', '{\"isTrusted\":true,\"role_name\":\"\\u5168\\u90e8\\u6743\\u9650\\u7684\\u89d2\\u8272\",\"is_check\":1,\"menu_ids\":[1,2,6,15,18,16,17,14,58,7,19]}', 0, 1609832355, 1609832355, 00000001.058243989945, 'http://laravel-admin.cnpscy.com/admin/admin_roles/create');
INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (285, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminRoleController@delete', 'DELETE', '{\"role_id\":14,\"is_batch\":0}', 0, 1609832468, 1609832468, 00000000.327038049698, 'http://laravel-admin.cnpscy.com/admin/admin_roles/delete');
+INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (286, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminRoleController@update', 'PUT', '{\"role_id\":15,\"role_name\":\"\\u5168\\u90e8\\u6743\\u9650\\u7684\\u89d2\\u8272\",\"role_remarks\":null,\"is_check\":1,\"is_delete\":0,\"created_time\":1609832355,\"updated_time\":1609832355,\"menus\":[{\"menu_id\":6,\"parent_id\":2,\"menu_name\":\"\\u83dc\\u5355\\u7ba1\\u7406\",\"vue_name\":\"MenuPermission\",\"vue_path\":\"menus\",\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":\"admin_menus\\/index\",\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/admin_menus\",\"api_method\":\"GET\",\"menu_sort\":1,\"is_hidden\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":1609127616,\"updated_time\":1609127616,\"pivot\":{\"role_id\":15,\"menu_id\":6}},{\"menu_id\":19,\"parent_id\":7,\"menu_name\":\"\\u65b0\\u589e\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/admin_roles\\/create\",\"api_method\":\"POST\",\"menu_sort\":1,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":1609127616,\"updated_time\":1609127616,\"pivot\":{\"role_id\":15,\"menu_id\":19}},{\"menu_id\":15,\"parent_id\":6,\"menu_name\":\"\\u65b0\\u589e\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/admin_menus\\/create\",\"api_method\":\"POST\",\"menu_sort\":1,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":1609127616,\"updated_time\":1609127616,\"pivot\":{\"role_id\":15,\"menu_id\":15}},{\"menu_id\":1,\"parent_id\":0,\"menu_name\":\"\\u9996\\u9875\",\"vue_name\":\"Dashboard\",\"vue_path\":\"\\/\",\"vue_redirect\":\"\\/dashboard\",\"vue_icon\":\"dashboard\",\"vue_component\":\"Layout\",\"vue_meta\":null,\"external_links\":null,\"api_url\":null,\"api_method\":null,\"menu_sort\":1,\"is_hidden\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":1601434917,\"updated_time\":1601437649,\"pivot\":{\"role_id\":15,\"menu_id\":1}},{\"menu_id\":2,\"parent_id\":0,\"menu_name\":\"\\u6743\\u9650\\u7ba1\\u7406\",\"vue_name\":\"Permission\",\"vue_path\":\"\\/rabc\",\"vue_redirect\":\"\\/rabc\\/menus\",\"vue_icon\":\"el-icon-lock\",\"vue_component\":\"Layout\",\"vue_meta\":null,\"external_links\":null,\"api_url\":null,\"api_method\":null,\"menu_sort\":2,\"is_hidden\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":1609127616,\"updated_time\":1609127616,\"pivot\":{\"role_id\":15,\"menu_id\":2}},{\"menu_id\":18,\"parent_id\":6,\"menu_name\":\"\\u8be6\\u60c5\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/admin_menus\\/detail\",\"api_method\":\"GET\",\"menu_sort\":2,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":1609127616,\"updated_time\":1609127616,\"pivot\":{\"role_id\":15,\"menu_id\":18}},{\"menu_id\":7,\"parent_id\":2,\"menu_name\":\"\\u89d2\\u8272\\u7ba1\\u7406\",\"vue_name\":\"RolePermission\",\"vue_path\":\"roles\",\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":\"admin_roles\\/index\",\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/admin_roles\",\"api_method\":\"GET\",\"menu_sort\":2,\"is_hidden\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":1609127616,\"updated_time\":1609127616,\"pivot\":{\"role_id\":15,\"menu_id\":7}},{\"menu_id\":16,\"parent_id\":6,\"menu_name\":\"\\u66f4\\u65b0\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/admin_menus\\/update\",\"api_method\":\"PUT\",\"menu_sort\":3,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":1609127616,\"updated_time\":1609127616,\"pivot\":{\"role_id\":15,\"menu_id\":16}},{\"menu_id\":17,\"parent_id\":6,\"menu_name\":\"\\u5220\\u9664\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/admin_menus\\/delete\",\"api_method\":\"DELETE\",\"menu_sort\":4,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":1609127616,\"updated_time\":1609127616,\"pivot\":{\"role_id\":15,\"menu_id\":17}},{\"menu_id\":58,\"parent_id\":6,\"menu_name\":\"\\u72b6\\u6001\\u53d8\\u66f4\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/admin_menus\\/changeFiledStatus\",\"api_method\":\"PUT\",\"menu_sort\":5,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":1609127616,\"updated_time\":1609127616,\"pivot\":{\"role_id\":15,\"menu_id\":58}},{\"menu_id\":14,\"parent_id\":6,\"menu_name\":\"\\u4e0b\\u62c9\\u5217\\u8868\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/admin_menus\\/getSelectLists\",\"api_method\":\"GET\",\"menu_sort\":5,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":1609127616,\"updated_time\":1609127616,\"pivot\":{\"role_id\":15,\"menu_id\":14}}],\"menu_ids\":[1,2,6,15,18,16,17,14,58,7,19,20,21,22,23,57,8,24,25,26,27,28,59,3,9,29,30,31,32,33,65,10,34,35,36,37,38,64,11,39,40,41,42,43,63,4,12,44,45,46,47,48,62,13,49,51,52,53,66,50,54,55,60,56,61]}', 0, 1609835641, 1609835641, 00000000.571377038956, 'http://laravel-admin.cnpscy.com/admin/admin_roles/update');
+INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (287, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminController@delete', 'DELETE', '{\"admin_id\":118,\"is_batch\":0}', 0, 1609835723, 1609835723, 00000000.378115177155, 'http://laravel-admin.cnpscy.com/admin/admins/delete');
+INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (288, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminController@delete', 'DELETE', '{\"admin_id\":114,\"is_batch\":0}', 0, 1609835726, 1609835726, 00000000.356705904007, 'http://laravel-admin.cnpscy.com/admin/admins/delete');
+INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (289, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminController@delete', 'DELETE', '{\"admin_id\":117,\"is_batch\":0}', 0, 1609835730, 1609835730, 00000000.400866985321, 'http://laravel-admin.cnpscy.com/admin/admins/delete');
+INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (290, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminController@delete', 'DELETE', '{\"admin_id\":111,\"is_batch\":0}', 0, 1609835733, 1609835733, 00000000.534990072250, 'http://laravel-admin.cnpscy.com/admin/admins/delete');
+INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (291, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminController@changeFiledStatus', 'PUT', '{\"admin_id\":108,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609835746, 1609835746, 00000000.264262914658, 'http://laravel-admin.cnpscy.com/admin/admins/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (292, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminController@update', 'PUT', '{\"admin_name\":\"test\",\"admin_email\":\"43243242@qq.com\",\"admin_head\":\"http:\\/\\/laravel-admin.cnpscy.com\\/storage\\/202012\\/3yNDfZMiAV0rmOR0mhqkbmk3GWUgSOySgB6OCGVw.png\",\"password\":\"123456\",\"role_id\":null,\"is_check\":1,\"role_ids\":[1],\"admin_id\":123,\"login_token\":null,\"kick_out\":2,\"use_role\":0,\"is_delete\":0,\"admin_info\":{\"admin_id\":123,\"login_num\":0,\"created_ip\":\"127.0.0.1\",\"browser_type\":\"Mozilla\\/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit\\/537.36 (KHTML, like Gecko) Chrome\\/86.0.4240.193 Safari\\/537.36\",\"created_time\":1608798983,\"updated_time\":1608798983},\"roles\":[{\"role_id\":1,\"role_name\":\"\\u8d85\\u7ea7\\u7ba1\\u7406\\u5458\",\"role_remarks\":\"\\u6743\\u9650\\u6700\\u5927\\u7684\\u4eba\",\"is_check\":1,\"is_delete\":0,\"created_time\":1577671704,\"updated_time\":1601293601,\"pivot\":{\"admin_id\":123,\"role_id\":1}},{\"role_id\":2,\"role_name\":\"test\",\"role_remarks\":\"\\u5907\\u6ce8\\u4fe1\\u606f\",\"is_check\":0,\"is_delete\":0,\"created_time\":1598348975,\"updated_time\":1609318749,\"pivot\":{\"admin_id\":123,\"role_id\":2}},{\"role_id\":7,\"role_name\":\"31232\",\"role_remarks\":\"12321\",\"is_check\":0,\"is_delete\":0,\"created_time\":1608795106,\"updated_time\":1609817076,\"pivot\":{\"admin_id\":123,\"role_id\":7}},{\"role_id\":10,\"role_name\":\"42342432\",\"role_remarks\":\"42423\",\"is_check\":0,\"is_delete\":0,\"created_time\":1608795181,\"updated_time\":1609817901,\"pivot\":{\"admin_id\":123,\"role_id\":10}}]}', 0, 1609835765, 1609835765, 00000000.425644874573, 'http://laravel-admin.cnpscy.com/admin/admins/update');
+INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (293, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminController@update', 'PUT', '{\"admin_name\":\"test\",\"admin_email\":\"43243242@qq.com\",\"admin_head\":\"http:\\/\\/laravel-admin.cnpscy.com\\/storage\\/202012\\/3yNDfZMiAV0rmOR0mhqkbmk3GWUgSOySgB6OCGVw.png\",\"password\":\"123456\",\"role_id\":null,\"is_check\":1,\"role_ids\":[1],\"admin_id\":123,\"login_token\":null,\"kick_out\":2,\"use_role\":0,\"is_delete\":0,\"admin_info\":{\"admin_id\":123,\"login_num\":0,\"created_ip\":\"127.0.0.1\",\"browser_type\":\"Mozilla\\/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit\\/537.36 (KHTML, like Gecko) Chrome\\/86.0.4240.193 Safari\\/537.36\",\"created_time\":1608798983,\"updated_time\":1608798983},\"roles\":[{\"role_id\":1,\"role_name\":\"\\u8d85\\u7ea7\\u7ba1\\u7406\\u5458\",\"role_remarks\":\"\\u6743\\u9650\\u6700\\u5927\\u7684\\u4eba\",\"is_check\":1,\"is_delete\":0,\"created_time\":1577671704,\"updated_time\":1601293601,\"pivot\":{\"admin_id\":123,\"role_id\":1}},{\"role_id\":2,\"role_name\":\"test\",\"role_remarks\":\"\\u5907\\u6ce8\\u4fe1\\u606f\",\"is_check\":0,\"is_delete\":0,\"created_time\":1598348975,\"updated_time\":1609318749,\"pivot\":{\"admin_id\":123,\"role_id\":2}},{\"role_id\":7,\"role_name\":\"31232\",\"role_remarks\":\"12321\",\"is_check\":0,\"is_delete\":0,\"created_time\":1608795106,\"updated_time\":1609817076,\"pivot\":{\"admin_id\":123,\"role_id\":7}},{\"role_id\":10,\"role_name\":\"42342432\",\"role_remarks\":\"42423\",\"is_check\":0,\"is_delete\":0,\"created_time\":1608795181,\"updated_time\":1609817901,\"pivot\":{\"admin_id\":123,\"role_id\":10}}]}', 0, 1609835794, 1609835794, 00000000.290331125259, 'http://laravel-admin.cnpscy.com/admin/admins/update');
+INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (294, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminController@update', 'PUT', '{\"admin_name\":\"demo\",\"admin_email\":\"43243242@qq.com\",\"admin_head\":\"http:\\/\\/laravel-admin.cnpscy.com\\/storage\\/202012\\/3yNDfZMiAV0rmOR0mhqkbmk3GWUgSOySgB6OCGVw.png\",\"password\":null,\"role_id\":null,\"is_check\":1,\"role_ids\":[1,2,7,10],\"admin_id\":123,\"login_token\":null,\"kick_out\":2,\"use_role\":0,\"is_delete\":0,\"admin_info\":{\"admin_id\":123,\"login_num\":0,\"created_ip\":\"127.0.0.1\",\"browser_type\":\"Mozilla\\/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit\\/537.36 (KHTML, like Gecko) Chrome\\/86.0.4240.193 Safari\\/537.36\",\"created_time\":1608798983,\"updated_time\":1608798983},\"roles\":[{\"role_id\":1,\"role_name\":\"\\u8d85\\u7ea7\\u7ba1\\u7406\\u5458\",\"role_remarks\":\"\\u6743\\u9650\\u6700\\u5927\\u7684\\u4eba\",\"is_check\":1,\"is_delete\":0,\"created_time\":1577671704,\"updated_time\":1601293601,\"pivot\":{\"admin_id\":123,\"role_id\":1}},{\"role_id\":2,\"role_name\":\"test\",\"role_remarks\":\"\\u5907\\u6ce8\\u4fe1\\u606f\",\"is_check\":0,\"is_delete\":0,\"created_time\":1598348975,\"updated_time\":1609318749,\"pivot\":{\"admin_id\":123,\"role_id\":2}},{\"role_id\":7,\"role_name\":\"31232\",\"role_remarks\":\"12321\",\"is_check\":0,\"is_delete\":0,\"created_time\":1608795106,\"updated_time\":1609817076,\"pivot\":{\"admin_id\":123,\"role_id\":7}},{\"role_id\":10,\"role_name\":\"42342432\",\"role_remarks\":\"42423\",\"is_check\":0,\"is_delete\":0,\"created_time\":1608795181,\"updated_time\":1609817901,\"pivot\":{\"admin_id\":123,\"role_id\":10}}]}', 0, 1609835837, 1609835837, 00000000.292026042938, 'http://laravel-admin.cnpscy.com/admin/admins/update');
+INSERT INTO `cnpscy_admin_logs_2021_01` VALUES (295, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminController@update', 'PUT', '{\"admin_name\":\"demo\",\"admin_email\":\"43243242@qq.com\",\"admin_head\":\"http:\\/\\/laravel-admin.cnpscy.com\\/storage\\/202012\\/3yNDfZMiAV0rmOR0mhqkbmk3GWUgSOySgB6OCGVw.png\",\"password\":\"123456\",\"role_id\":null,\"is_check\":1,\"role_ids\":[1,2,7,10],\"admin_id\":123,\"login_token\":null,\"kick_out\":2,\"use_role\":0,\"is_delete\":0,\"admin_info\":{\"admin_id\":123,\"login_num\":0,\"created_ip\":\"127.0.0.1\",\"browser_type\":\"Mozilla\\/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit\\/537.36 (KHTML, like Gecko) Chrome\\/86.0.4240.193 Safari\\/537.36\",\"created_time\":1608798983,\"updated_time\":1608798983},\"roles\":[{\"role_id\":1,\"role_name\":\"\\u8d85\\u7ea7\\u7ba1\\u7406\\u5458\",\"role_remarks\":\"\\u6743\\u9650\\u6700\\u5927\\u7684\\u4eba\",\"is_check\":1,\"is_delete\":0,\"created_time\":1577671704,\"updated_time\":1601293601,\"pivot\":{\"admin_id\":123,\"role_id\":1}},{\"role_id\":2,\"role_name\":\"test\",\"role_remarks\":\"\\u5907\\u6ce8\\u4fe1\\u606f\",\"is_check\":0,\"is_delete\":0,\"created_time\":1598348975,\"updated_time\":1609318749,\"pivot\":{\"admin_id\":123,\"role_id\":2}},{\"role_id\":7,\"role_name\":\"31232\",\"role_remarks\":\"12321\",\"is_check\":0,\"is_delete\":0,\"created_time\":1608795106,\"updated_time\":1609817076,\"pivot\":{\"admin_id\":123,\"role_id\":7}},{\"role_id\":10,\"role_name\":\"42342432\",\"role_remarks\":\"42423\",\"is_check\":0,\"is_delete\":0,\"created_time\":1608795181,\"updated_time\":1609817901,\"pivot\":{\"admin_id\":123,\"role_id\":10}}]}', 0, 1609835959, 1609835959, 00000001.062355995178, 'http://laravel-admin.cnpscy.com/admin/admins/update');
-- ----------------------------
-- Table structure for cnpscy_admin_logs_2021_02
@@ -929,7 +944,7 @@ INSERT INTO `cnpscy_admin_menus` VALUES (5, 1, 'Dashboard', 'Dashboard', 'dashbo
INSERT INTO `cnpscy_admin_menus` VALUES (6, 2, '菜单管理', 'MenuPermission', 'menus', '', '', 'admin_menus/index', '', '', 'admin/admin_menus', 'GET', 1, 0, 1, 0, 1609127616, 1609127616);
INSERT INTO `cnpscy_admin_menus` VALUES (7, 2, '角色管理', 'RolePermission', 'roles', '', '', 'admin_roles/index', '', '', 'admin/admin_roles', 'GET', 2, 0, 1, 0, 1609127616, 1609127616);
INSERT INTO `cnpscy_admin_menus` VALUES (8, 2, '管理员管理', 'AdminPermission', 'admins', '', '', 'admins/index', '', '', 'admin/admins', 'GET', 3, 0, 1, 0, 1609127616, 1609127616);
-INSERT INTO `cnpscy_admin_menus` VALUES (9, 3, '配置管理', 'configs', 'configs', '', '', 'setting/configs/index', '', '', 'admin/configs', 'GET', 1, 0, 1, 0, 1609126826, 1609126826);
+INSERT INTO `cnpscy_admin_menus` VALUES (9, 3, '配置管理', 'configs', 'configs', '', '', 'setting/configs/index', '', '', 'admin/configs', 'GET', 1, 0, 1, 1, 1609126826, 1609126826);
INSERT INTO `cnpscy_admin_menus` VALUES (10, 3, '友情链接', 'friendlinks', 'friendlinks', '', '', 'setting/friendlinks/index', '', '', 'admin/friendlinks', 'GET', 2, 0, 1, 0, 1609127616, 1609127616);
INSERT INTO `cnpscy_admin_menus` VALUES (11, 3, 'Banner管理', 'banners', 'banners', '', '', 'setting/banners/index', '', '', 'admin/banners', 'GET', 3, 0, 1, 0, 1609127616, 1609127616);
INSERT INTO `cnpscy_admin_menus` VALUES (12, 4, '文章分类', '', 'categories', '', '', 'article_categories/index', '', '', 'admin/article_categories', 'GET', 1, 0, 1, 0, 1609127616, 1609127616);
@@ -1297,7 +1312,7 @@ CREATE TABLE `cnpscy_admin_role_with_menus` (
`menu_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '菜单Id',
PRIMARY KEY (`with_id`) USING BTREE,
INDEX `role_with_menus_role_id_index`(`role_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 153 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 207 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of cnpscy_admin_role_with_menus
@@ -1398,6 +1413,60 @@ INSERT INTO `cnpscy_admin_role_with_menus` VALUES (149, 14, 18);
INSERT INTO `cnpscy_admin_role_with_menus` VALUES (150, 15, 58);
INSERT INTO `cnpscy_admin_role_with_menus` VALUES (151, 14, 19);
INSERT INTO `cnpscy_admin_role_with_menus` VALUES (152, 14, 58);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (153, 15, 3);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (154, 15, 4);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (155, 15, 8);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (156, 15, 9);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (157, 15, 10);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (158, 15, 11);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (159, 15, 12);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (160, 15, 13);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (161, 15, 20);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (162, 15, 21);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (163, 15, 22);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (164, 15, 23);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (165, 15, 24);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (166, 15, 25);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (167, 15, 26);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (168, 15, 27);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (169, 15, 28);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (170, 15, 29);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (171, 15, 30);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (172, 15, 31);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (173, 15, 32);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (174, 15, 33);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (175, 15, 34);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (176, 15, 35);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (177, 15, 36);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (178, 15, 37);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (179, 15, 38);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (180, 15, 39);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (181, 15, 40);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (182, 15, 41);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (183, 15, 42);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (184, 15, 43);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (185, 15, 44);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (186, 15, 45);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (187, 15, 46);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (188, 15, 47);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (189, 15, 48);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (190, 15, 49);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (191, 15, 50);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (192, 15, 51);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (193, 15, 52);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (194, 15, 53);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (195, 15, 54);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (196, 15, 55);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (197, 15, 56);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (198, 15, 57);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (199, 15, 59);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (200, 15, 60);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (201, 15, 61);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (202, 15, 62);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (203, 15, 63);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (204, 15, 64);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (205, 15, 65);
+INSERT INTO `cnpscy_admin_role_with_menus` VALUES (206, 15, 66);
-- ----------------------------
-- Table structure for cnpscy_admin_roles
@@ -1491,17 +1560,17 @@ CREATE TABLE `cnpscy_admins` (
-- ----------------------------
INSERT INTO `cnpscy_admins` VALUES (1, 'admin', '$2y$10$HyOTnVzzX3RhoCXlQ88qfumA81elPAPnBaORTWBSZT8Xg0s68ttKm', '202012/2r8hEvdSVBQa1s3sBCdcXt6fI57nVebNoaFaluQK.png', '123456@qq.com', '', 1, 2, 0, 0);
INSERT INTO `cnpscy_admins` VALUES (107, 'test', '$2y$10$gcgnFEWG47jf2JqM8onRp.OJrnB6JiMOP0.pClO0T1MbQPoo7ZB2C', '1', 'test@qq.com', '', 0, 2, 0, 0);
-INSERT INTO `cnpscy_admins` VALUES (108, 'test1', '$2y$10$t6rC29.BfNtQc.s8DB8UkeNIQ3ZxjOP0u231oiTtiA2qQLdeOuumm', '86', '123@qq.com', '', 1, 2, 0, 0);
+INSERT INTO `cnpscy_admins` VALUES (108, 'test1', '$2y$10$t6rC29.BfNtQc.s8DB8UkeNIQ3ZxjOP0u231oiTtiA2qQLdeOuumm', '86', '123@qq.com', '', 0, 2, 0, 0);
INSERT INTO `cnpscy_admins` VALUES (109, 'test1', '$2y$10$t6rC29.BfNtQc.s8DB8UkeNIQ3ZxjOP0u231oiTtiA2qQLdeOuumm', '86', '123@qq.com', '', 0, 2, 0, 0);
INSERT INTO `cnpscy_admins` VALUES (110, 'test1', '$2y$10$t6rC29.BfNtQc.s8DB8UkeNIQ3ZxjOP0u231oiTtiA2qQLdeOuumm', '86', '123@qq.com', '', 0, 2, 0, 0);
-INSERT INTO `cnpscy_admins` VALUES (111, 'test1', '$2y$10$t6rC29.BfNtQc.s8DB8UkeNIQ3ZxjOP0u231oiTtiA2qQLdeOuumm', '86', '123@qq.com', '', 0, 2, 0, 0);
+INSERT INTO `cnpscy_admins` VALUES (111, 'test1', '$2y$10$t6rC29.BfNtQc.s8DB8UkeNIQ3ZxjOP0u231oiTtiA2qQLdeOuumm', '86', '123@qq.com', '', 0, 2, 0, 1);
INSERT INTO `cnpscy_admins` VALUES (112, 'test1', '$2y$10$t6rC29.BfNtQc.s8DB8UkeNIQ3ZxjOP0u231oiTtiA2qQLdeOuumm', '86', '123@qq.com', '', 0, 2, 0, 0);
INSERT INTO `cnpscy_admins` VALUES (113, 'test', 'test1', '86', 'test@qq.com', '', 0, 2, 0, 1);
-INSERT INTO `cnpscy_admins` VALUES (114, 'test1', '$2y$10$AeU9vwBx0d4KttM6yKcdWu8mgy2qgcTVK/v.I4MJuEzNlqz.Li9GG', '86', '123@qq.com', '', 0, 2, 0, 0);
-INSERT INTO `cnpscy_admins` VALUES (117, 'test123', '$2y$10$lvVejUPm/lypn8Xr1YNHdOYdy7rrjqiv6DWsYlYAR4R4yidnLBg8e', '1', '123@qq.com', '', 0, 2, 0, 0);
-INSERT INTO `cnpscy_admins` VALUES (118, 'test12311111', '$2y$10$5hSULbXycOJGQgU2p9ZGaepyIW9qG5DvG1BvyipESM.8WUf3rNKvy', '1', '123@qq.com', '', 0, 2, 0, 0);
+INSERT INTO `cnpscy_admins` VALUES (114, 'test1', '$2y$10$AeU9vwBx0d4KttM6yKcdWu8mgy2qgcTVK/v.I4MJuEzNlqz.Li9GG', '86', '123@qq.com', '', 0, 2, 0, 1);
+INSERT INTO `cnpscy_admins` VALUES (117, 'test123', '$2y$10$lvVejUPm/lypn8Xr1YNHdOYdy7rrjqiv6DWsYlYAR4R4yidnLBg8e', '1', '123@qq.com', '', 0, 2, 0, 1);
+INSERT INTO `cnpscy_admins` VALUES (118, 'test12311111', '$2y$10$5hSULbXycOJGQgU2p9ZGaepyIW9qG5DvG1BvyipESM.8WUf3rNKvy', '1', '123@qq.com', '', 0, 2, 0, 1);
INSERT INTO `cnpscy_admins` VALUES (119, 'test1232', '$2y$10$tnqyaBCn7HMwuellMuaH2OQq9ax1S1Wmnp7MAtBQ5Tf.dQ6a1fyeu', '1', '123@qq.com', '', 1, 2, 0, 1);
-INSERT INTO `cnpscy_admins` VALUES (123, '342432', '$2y$10$ngPK3KlzqnI7fLmcNUFgIOsDQSnUKpjSHTnBkYq.bSkDJkrKQIh22', '202012/3yNDfZMiAV0rmOR0mhqkbmk3GWUgSOySgB6OCGVw.png', '43243242@qq.com', '', 1, 2, 0, 0);
+INSERT INTO `cnpscy_admins` VALUES (123, 'demo', '$2y$10$BSCJxQYvJAvfbQK2uOQNT.0SdzPvWc8GOBl09HADOYzo17hgW/rti', '202012/3yNDfZMiAV0rmOR0mhqkbmk3GWUgSOySgB6OCGVw.png', '43243242@qq.com', '', 1, 2, 0, 0);
-- ----------------------------
-- Table structure for cnpscy_adverts