Merge remote-tracking branch 'origin/master' into master

sql/bak/cust_bak_2024_12_25.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80026 (8.0.26)
  File Encoding         : 65001
 
- Date: 25/12/2024 10:57:15
+ Date: 25/12/2024 16:06:46
 */
 
 SET NAMES utf8mb4;
@@ -202,6 +202,8 @@ CREATE TABLE `mem_info`  (
   `mem_nick_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '昵称',
   `avatar` int NULL DEFAULT NULL COMMENT '头像地址',
   `wx_openid` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信ID',
+  `sort` int NULL DEFAULT NULL COMMENT '排序',
+  `is_recommended` int NULL DEFAULT NULL COMMENT '是否为推荐（1是、0否）',
   `flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '1' COMMENT '状态（0停用 1正常）',
   `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（1删除 0未删除 2审核中）',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -394,7 +396,7 @@ CREATE TABLE `opm_article_comment`  (
   `parent_id` bigint NULL DEFAULT NULL COMMENT '父级id',
   `exam_status` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核状态，1已审核，0未审核',
   PRIMARY KEY (`business_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '评论表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '评论表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of opm_article_comment
@@ -418,7 +420,7 @@ CREATE TABLE `opm_topic`  (
   `weight` int NULL DEFAULT NULL COMMENT '权重，用于排序',
   `article_count` int NULL DEFAULT NULL COMMENT '话题下的动态数',
   PRIMARY KEY (`business_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '话题表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '话题表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of opm_topic
@@ -434,7 +436,7 @@ CREATE TABLE `opm_user_like`  (
   `user_id` bigint NULL DEFAULT NULL COMMENT '用户ID',
   `article_id` bigint NULL DEFAULT NULL COMMENT '动态ID',
   PRIMARY KEY (`business_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '点赞表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '点赞表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of opm_user_like
@@ -666,12 +668,14 @@ CREATE TABLE `sys_login_info_2024`  (
   `msg` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '提示消息',
   `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间',
   PRIMARY KEY (`business_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 135 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '登录日志表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 137 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '登录日志表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_login_info_2024
 -- ----------------------------
 INSERT INTO `sys_login_info_2024` VALUES (134, 'admin', '127.0.0.1', '内网IP', NULL, NULL, '1', 0, NULL, '2024-12-25 10:54:29');
+INSERT INTO `sys_login_info_2024` VALUES (135, 'guanliyuan', '127.0.0.1', '内网IP', NULL, NULL, '0', 0, '用户名或密码错误,请稍后重试', '2024-12-25 14:14:36');
+INSERT INTO `sys_login_info_2024` VALUES (136, 'admin', '127.0.0.1', '内网IP', NULL, NULL, '1', 0, NULL, '2024-12-25 14:14:41');
 
 -- ----------------------------
 -- Table structure for sys_login_info_2025
@@ -795,7 +799,7 @@ CREATE TABLE `sys_oper_log_2024`  (
   `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间',
   `oper_url` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '操作url',
   PRIMARY KEY (`business_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 5903 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '操作日志表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 5910 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '操作日志表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_oper_log_2024
@@ -813,6 +817,13 @@ INSERT INTO `sys_oper_log_2024` VALUES (5899, '91isoft-banner管理管理-查询
 INSERT INTO `sys_oper_log_2024` VALUES (5900, '91isoft-公告管理-查询公告', 9, 'org.rcisoft.business.cmsNotice.controller.CmsNoticeController.listByPagination()', 'GET', 1, 'admin', '127.0.0.1', '内网IP', '{\n    \"flag\": \"\"\n}  ;', '', 0, 0, NULL, '2024-12-25 10:56:28', '/cmsNotice/queryCmsNoticeByPagination');
 INSERT INTO `sys_oper_log_2024` VALUES (5901, '91isoft-活动管理-查询活动', 9, 'org.rcisoft.business.cmsActivity.controller.CmsActivityController.listByPagination()', 'GET', 1, 'admin', '127.0.0.1', '内网IP', '{\n    \"flag\": \"\"\n}  ;', '', 0, 0, NULL, '2024-12-25 10:56:30', '/cmsActivity/queryCmsActivityByPagination');
 INSERT INTO `sys_oper_log_2024` VALUES (5902, '91isoft-活动管理-查询活动', 9, 'org.rcisoft.business.cmsActivity.controller.CmsActivityController.listByPagination()', 'GET', 1, 'admin', '127.0.0.1', '内网IP', '{\n    \"flag\": \"\"\n}  ;', '', 0, 0, NULL, '2024-12-25 10:56:47', '/cmsActivity/queryCmsActivityByPagination');
+INSERT INTO `sys_oper_log_2024` VALUES (5903, '91isoft-用户管理-查询用户', 9, 'org.rcisoft.sys.rbac.user.controller.SysUserRbacController.getInfo()', 'GET', 1, 'admin', '127.0.0.1', '内网IP', '', '', 0, 0, NULL, '2024-12-25 14:14:41', '/system/user/getInfo');
+INSERT INTO `sys_oper_log_2024` VALUES (5904, '91isoft-用户管理-查询用户', 9, 'org.rcisoft.sys.rbac.user.controller.SysUserRbacController.listByPagination()', 'GET', 1, 'admin', '127.0.0.1', '内网IP', '{\n    \"childrenList\": [\n    ]\n}  ;', '', 0, 0, NULL, '2024-12-25 14:14:56', '/system/user/list');
+INSERT INTO `sys_oper_log_2024` VALUES (5905, '91isoft-角色管理-查询角色', 9, 'org.rcisoft.sys.rbac.role.controller.SysRoleRbacController.listAll()', 'GET', 1, 'admin', '127.0.0.1', '内网IP', '', '', 0, 0, NULL, '2024-12-25 14:14:56', '/system/role/listAll');
+INSERT INTO `sys_oper_log_2024` VALUES (5906, '91isoft-部门管理-查询部门', 9, 'org.rcisoft.sys.rbac.dept.controller.SysDeptRbacController.listAll()', 'GET', 1, 'admin', '127.0.0.1', '内网IP', '{\n    \"delFlag\": \"0\"\n}  ;', '', 0, 0, NULL, '2024-12-25 14:14:56', '/system/dept/listAll');
+INSERT INTO `sys_oper_log_2024` VALUES (5907, '91isoft-用户管理-查询用户', 9, 'org.rcisoft.sys.rbac.user.controller.SysUserRbacController.detail()', 'GET', 1, 'admin', '127.0.0.1', '内网IP', '{\n}  ;', '', 0, 0, NULL, '2024-12-25 14:15:00', '/system/user/335');
+INSERT INTO `sys_oper_log_2024` VALUES (5908, '91isoft-用户管理-查询用户', 9, 'org.rcisoft.sys.rbac.user.controller.SysUserRbacController.detail()', 'GET', 1, 'admin', '127.0.0.1', '内网IP', '{\n}  ;', '', 0, 0, NULL, '2024-12-25 14:15:08', '/system/user/335');
+INSERT INTO `sys_oper_log_2024` VALUES (5909, '91isoft-用户管理-查询用户', 9, 'org.rcisoft.sys.rbac.user.controller.SysUserRbacController.detail()', 'GET', 1, 'admin', '127.0.0.1', '内网IP', '{\n}  ;', '', 0, 0, NULL, '2024-12-25 14:15:23', '/system/user/335');
 
 -- ----------------------------
 -- Table structure for sys_oper_log_2025
@@ -975,13 +986,13 @@ CREATE TABLE `sys_user`  (
   `update_date` datetime NULL DEFAULT NULL COMMENT '更新时间',
   `remarks` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`business_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 334 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 341 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
 INSERT INTO `sys_user` VALUES (1, 'admin', '管理员', '0', '管理员', '33@qq.com', '15888888888', '0', '$2a$10$BJqBZUZp5DtyolO02RePheZZ/hQRMS83yE2s6/OcOqfLAXVdjZ1G2', '111111111111111111', 0, '127.0.0.1', '2020-10-09 09:33:00', NULL, '1', NULL, NULL, NULL, NULL, NULL, NULL, '1', '0', 'admin', '2020-10-09 09:33:00', 'admin', '2020-10-09 09:33:00', NULL);
-INSERT INTO `sys_user` VALUES (333, '19922633664', NULL, '1', NULL, NULL, 'ZHcFCeNHSAJlGbWnloDtOg==', '0', NULL, NULL, NULL, NULL, NULL, NULL, '1', 'oA5xx6YOeL2dof1f8TakY6-4nN-U', NULL, NULL, NULL, NULL, NULL, '1', '0', NULL, '2024-12-25 10:38:27', NULL, '2024-12-25 10:38:27', NULL);
+INSERT INTO `sys_user` VALUES (340, '19922633664', NULL, '1', NULL, NULL, 'ZHcFCeNHSAJlGbWnloDtOg==', '0', NULL, NULL, NULL, NULL, NULL, NULL, '1', 'oA5xx6YOeL2dof1f8TakY6-4nN-U', NULL, NULL, NULL, NULL, NULL, '1', '0', NULL, '2024-12-25 15:52:45', NULL, '2024-12-25 15:52:45', NULL);
 
 -- ----------------------------
 -- Table structure for sys_user_role