diff --git a/doc/mysql.sql b/doc/mysql.sql index 71650ea..552a21e 100644 --- a/doc/mysql.sql +++ b/doc/mysql.sql @@ -1,311 +1,468 @@ --- 部门 -DROP TABLE IF EXISTS sys_dept; -CREATE TABLE sys_dept ( - id varchar(64) NOT NULL COMMENT '主键', - dept_no varchar(18) DEFAULT NULL COMMENT '部门编号(规则：父级关系编码+自己的编码)', - name varchar(300) DEFAULT NULL COMMENT '部门名称', - pid varchar(64) NOT NULL COMMENT '父级id', - status tinyint(4) COMMENT '状态(1:正常；0:弃用)', - relation_code varchar(3000) DEFAULT NULL COMMENT '为了维护更深层级关系', - dept_manager_id varchar(64) DEFAULT NULL COMMENT '部门经理user_id', - manager_name varchar(255) DEFAULT NULL COMMENT '部门经理名称', - phone varchar(20) DEFAULT NULL COMMENT '部门经理联系电话', - create_time datetime DEFAULT NULL COMMENT '创建时间', - update_time datetime DEFAULT NULL COMMENT '更新时间', - deleted tinyint(4) COMMENT '是否删除(1未删除；0已删除)', - PRIMARY KEY (id) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统部门'; +/* + Navicat Premium Data Transfer --- 系统日志 -DROP TABLE IF EXISTS sys_log; -CREATE TABLE sys_log ( - id varchar(64) NOT NULL, - user_id varchar(64) DEFAULT NULL COMMENT '用户id', - username varchar(50) DEFAULT NULL COMMENT '用户名', - operation varchar(50) DEFAULT NULL COMMENT '用户操作', - time int(11) DEFAULT NULL COMMENT '响应时间', - method varchar(200) DEFAULT NULL COMMENT '请求方法', - params varchar(5000) DEFAULT NULL COMMENT '请求参数', - ip varchar(64) DEFAULT NULL COMMENT 'IP地址', - create_time datetime DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (id) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统日志'; + Source Server : localhost_3306 + Source Server Type : MySQL + Source Server Version : 80028 + Source Host : localhost:3306 + Source Schema : company_project --- 菜单权限 -DROP TABLE IF EXISTS sys_permission; -CREATE TABLE sys_permission ( - id varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键', - name varchar(300) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单权限名称', - perms varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '授权(多个用逗号分隔，如：sys:user:add,sys:user:edit)', - icon varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图标', - url varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '访问地址URL', - target varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'a target属性:_self _blank', - pid varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '父级菜单权限名称', - order_num int(11) NULL COMMENT '排序', - type tinyint(4) NULL DEFAULT NULL COMMENT '菜单权限类型(1:目录;2:菜单;3:按钮)', - status tinyint(4) NULL COMMENT '状态1:正常 0：禁用', - create_time datetime NULL DEFAULT NULL COMMENT '创建时间', - update_time datetime NULL DEFAULT NULL COMMENT '更新时间', - deleted tinyint(4) NULL COMMENT '是否删除(1未删除；0已删除)', - PRIMARY KEY (id) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '系统权限' ROW_FORMAT = Compact; + Target Server Type : MySQL + Target Server Version : 80028 + File Encoding : 65001 --- 角色 -DROP TABLE IF EXISTS sys_role; -CREATE TABLE sys_role ( - id varchar(64) NOT NULL COMMENT '主键', - name varchar(255) DEFAULT NULL COMMENT '角色名称', - description varchar(300) DEFAULT NULL, - status tinyint(4) COMMENT '状态(1:正常0:弃用)', - create_time datetime DEFAULT NULL COMMENT '创建时间', - update_time datetime DEFAULT NULL COMMENT '更新时间', - deleted tinyint(4) COMMENT '是否删除(1未删除；0已删除)', - data_scope int COMMENT '数据范围（1：所有 2：自定义 3： 本部门及以下部门 4：仅本部门 5:自己）', - PRIMARY KEY (id) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统角色'; + Date: 24/03/2025 12:02:41 +*/ --- 角色部门 -DROP TABLE IF EXISTS sys_role_dept; -CREATE TABLE sys_role_dept ( - id varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键', - role_id varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色id', - dept_id varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '部门id', - create_time datetime NULL DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (id) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色部门' ROW_FORMAT = Compact; +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; -SET FOREIGN_KEY_CHECKS = 1; +-- ---------------------------- +-- Table structure for auto_table_execute_sql_log +-- ---------------------------- +DROP TABLE IF EXISTS `auto_table_execute_sql_log`; +CREATE TABLE `auto_table_execute_sql_log` ( + `table_schema` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `table_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `sql_statement` varchar(5000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `execution_time` bigint(0) NULL DEFAULT NULL, + `execution_end_time` bigint(0) NULL DEFAULT NULL +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +-- ---------------------------- +-- Records of auto_table_execute_sql_log +-- ---------------------------- +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_dict_detail', 'ALTER TABLE `sys_dict_detail` MODIFY COLUMN `id` bigint NOT NULL AUTO_INCREMENT ,MODIFY COLUMN `label` varchar(255) NULL ,MODIFY COLUMN `value` varchar(255) NULL ,MODIFY COLUMN `sort` int NULL ,MODIFY COLUMN `dict_id` bigint NULL ,MODIFY COLUMN `create_time` datetime NULL ;', NULL, 1742787107221, 1742787107358); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_user_role', 'ALTER TABLE `sys_user_role` MODIFY COLUMN `id` bigint NOT NULL AUTO_INCREMENT ,MODIFY COLUMN `user_id` bigint NULL ,MODIFY COLUMN `role_id` bigint NULL ,MODIFY COLUMN `create_time` datetime NULL ;', NULL, 1742787107450, 1742787107528); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_role_permission', 'ALTER TABLE `sys_role_permission` MODIFY COLUMN `id` bigint NOT NULL AUTO_INCREMENT ,MODIFY COLUMN `role_id` bigint NULL ,MODIFY COLUMN `permission_id` bigint NULL ,MODIFY COLUMN `create_time` datetime NULL ;', NULL, 1742787107597, 1742787107687); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_dept', 'ALTER TABLE `sys_dept` MODIFY COLUMN `id` bigint NOT NULL AUTO_INCREMENT ,MODIFY COLUMN `dept_no` varchar(255) NULL ,MODIFY COLUMN `name` varchar(255) NULL ,MODIFY COLUMN `pid` bigint NULL ,MODIFY COLUMN `status` int NULL ,MODIFY COLUMN `relation_code` varchar(255) NULL ,MODIFY COLUMN `dept_manager_id` varchar(255) NULL ,MODIFY COLUMN `manager_name` varchar(255) NULL ,MODIFY COLUMN `phone` varchar(255) NULL ,MODIFY COLUMN `create_time` datetime NULL ,MODIFY COLUMN `update_time` datetime NULL ,MODIFY COLUMN `deleted` int NULL DEFAULT 0 ;', NULL, 1742787107780, 1742787107885); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_user', 'ALTER TABLE `sys_user` MODIFY COLUMN `id` bigint NOT NULL AUTO_INCREMENT ,MODIFY COLUMN `username` varchar(255) NULL ,MODIFY COLUMN `salt` varchar(255) NULL ,MODIFY COLUMN `password` varchar(255) NULL ,MODIFY COLUMN `phone` varchar(255) NULL ,MODIFY COLUMN `dept_id` bigint NULL ,MODIFY COLUMN `real_name` varchar(255) NULL ,MODIFY COLUMN `nick_name` varchar(255) NULL ,MODIFY COLUMN `email` varchar(255) NULL ,MODIFY COLUMN `status` int NULL ,MODIFY COLUMN `sex` int NULL ,MODIFY COLUMN `deleted` int NULL DEFAULT 0 ,MODIFY COLUMN `create_id` varchar(255) NULL ,MODIFY COLUMN `update_id` varchar(255) NULL ,MODIFY COLUMN `create_where` int NULL ,MODIFY COLUMN `create_time` datetime NULL ;', NULL, 1742787107936, 1742787108041); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_files', 'ALTER TABLE `sys_files` MODIFY COLUMN `id` bigint NOT NULL AUTO_INCREMENT ,MODIFY COLUMN `url` varchar(255) NULL ,ADD COLUMN `file_size` bigint NULL AFTER `url`,MODIFY COLUMN `create_date` datetime NULL ,MODIFY COLUMN `file_name` varchar(255) NULL ;', NULL, 1742787108094, 1742787108181); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_content', 'ALTER TABLE `sys_content` MODIFY COLUMN `id` bigint NOT NULL AUTO_INCREMENT ,MODIFY COLUMN `title` varchar(255) NULL ,MODIFY COLUMN `content` varchar(255) NULL AFTER `title`,MODIFY COLUMN `one_img` varchar(255) NULL ,MODIFY COLUMN `multiple_img` varchar(255) NULL ,MODIFY COLUMN `keywords` varchar(255) NULL ,MODIFY COLUMN `type` varchar(255) NULL ,MODIFY COLUMN `create_id` varchar(255) NULL AFTER `type`,MODIFY COLUMN `create_time` datetime NULL ;', NULL, 1742787108208, 1742787108255); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_role', 'ALTER TABLE `sys_role` MODIFY COLUMN `id` bigint NOT NULL AUTO_INCREMENT ,MODIFY COLUMN `name` varchar(255) NULL ,MODIFY COLUMN `description` varchar(255) NULL ,MODIFY COLUMN `status` int NULL ,MODIFY COLUMN `data_scope` int NULL AFTER `status`,MODIFY COLUMN `create_time` datetime NULL ,MODIFY COLUMN `update_time` datetime NULL ,MODIFY COLUMN `deleted` int NULL DEFAULT 0 ;', NULL, 1742787108308, 1742787108362); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_role_dept', 'ALTER TABLE `sys_role_dept` MODIFY COLUMN `id` bigint NOT NULL AUTO_INCREMENT ,MODIFY COLUMN `role_id` bigint NULL ,MODIFY COLUMN `dept_id` bigint NULL ,MODIFY COLUMN `create_time` datetime NULL ;', NULL, 1742787108391, 1742787108440); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_log', 'ALTER TABLE `sys_log` MODIFY COLUMN `id` bigint NOT NULL AUTO_INCREMENT ,MODIFY COLUMN `user_id` varchar(255) NULL ,MODIFY COLUMN `username` varchar(255) NULL ,MODIFY COLUMN `operation` varchar(255) NULL ,MODIFY COLUMN `time` int NULL ,MODIFY COLUMN `method` varchar(255) NULL ,MODIFY COLUMN `params` varchar(255) NULL ,MODIFY COLUMN `ip` varchar(255) NULL ,MODIFY COLUMN `create_time` datetime NULL ;', NULL, 1742787108465, 1742787108516); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_dict', 'ALTER TABLE `sys_dict` MODIFY COLUMN `id` bigint NOT NULL AUTO_INCREMENT ,MODIFY COLUMN `name` varchar(255) NULL ,MODIFY COLUMN `remark` varchar(255) NULL ,MODIFY COLUMN `create_time` datetime NULL ;', NULL, 1742787108545, 1742787108607); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_permission', 'ALTER TABLE `sys_permission` MODIFY COLUMN `id` bigint NOT NULL AUTO_INCREMENT ,MODIFY COLUMN `name` varchar(255) NULL ,MODIFY COLUMN `perms` varchar(255) NULL ,MODIFY COLUMN `url` varchar(255) NULL AFTER `perms`,MODIFY COLUMN `icon` varchar(255) NULL ,MODIFY COLUMN `target` varchar(255) NULL ,MODIFY COLUMN `pid` bigint NULL ,MODIFY COLUMN `order_num` int NULL ,MODIFY COLUMN `type` int NULL ,MODIFY COLUMN `status` int NULL ,MODIFY COLUMN `create_time` datetime NULL ,MODIFY COLUMN `update_time` datetime NULL ,MODIFY COLUMN `deleted` int NULL DEFAULT 0 ;', NULL, 1742787108673, 1742787108746); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_user', 'ALTER TABLE `sys_user` MODIFY COLUMN `create_id` bigint NULL ,MODIFY COLUMN `update_id` bigint NULL ;', NULL, 1742788217700, 1742788217808); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_content', 'ALTER TABLE `sys_content` MODIFY COLUMN `create_id` bigint NULL ;', NULL, 1742788217953, 1742788218030); +INSERT INTO `auto_table_execute_sql_log` VALUES ('', 'sys_log', 'ALTER TABLE `sys_log` MODIFY COLUMN `user_id` bigint NULL ;', NULL, 1742788218217, 1742788218323); --- 角色权限关联 -DROP TABLE IF EXISTS sys_role_permission; -CREATE TABLE sys_role_permission ( - id varchar(64) NOT NULL COMMENT '主键', - role_id varchar(64) DEFAULT NULL COMMENT '角色id', - permission_id varchar(64) DEFAULT NULL COMMENT '菜单权限id', - create_time datetime DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (id) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - --- 用户表 -DROP TABLE IF EXISTS sys_user; -CREATE TABLE sys_user ( - id varchar(64) NOT NULL COMMENT '用户id', - username varchar(50) NOT NULL COMMENT '账户名称', - salt varchar(20) DEFAULT NULL COMMENT '加密盐值', - password varchar(200) NOT NULL COMMENT '用户密码密文', - phone varchar(20) DEFAULT NULL COMMENT '手机号码', - dept_id varchar(64) DEFAULT NULL COMMENT '部门id', - real_name varchar(60) DEFAULT NULL COMMENT '真实名称', - nick_name varchar(60) DEFAULT NULL COMMENT '昵称', - email varchar(50) DEFAULT NULL COMMENT '邮箱(唯一)', - status tinyint(4) COMMENT '账户状态(1.正常 0.锁定 )', - sex tinyint(4) COMMENT '性别(1.男 2.女)', - deleted tinyint(4) COMMENT '是否删除(1未删除；0已删除)', - create_id varchar(64) DEFAULT NULL COMMENT '创建人', - update_id varchar(64) DEFAULT NULL COMMENT '更新人', - create_where tinyint(4) COMMENT '创建来源(1.web 2.android 3.ios )', - create_time datetime DEFAULT NULL COMMENT '创建时间', - update_time datetime DEFAULT NULL, - PRIMARY KEY (id) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统用户'; - --- 用户角色关联表 -DROP TABLE IF EXISTS sys_user_role; -CREATE TABLE sys_user_role ( - id varchar(64) NOT NULL COMMENT '用户id', - user_id varchar(64) DEFAULT NULL, - role_id varchar(64) DEFAULT NULL COMMENT '角色id', - create_time datetime DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (id) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统用户角色'; - --- 数据字典表 -DROP TABLE IF EXISTS sys_dict; -CREATE TABLE sys_dict ( - id varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, - name varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典名称', - remark varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '描述', - create_time datetime NULL DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (id) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据字典表' ROW_FORMAT = Compact; - -SET FOREIGN_KEY_CHECKS = 1; - - - --- 数据字典详情 -DROP TABLE IF EXISTS sys_dict_detail; -CREATE TABLE sys_dict_detail ( - id varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, - label varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典标签', - value varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典值', - sort smallint(6) NULL DEFAULT NULL COMMENT '排序', - dict_id varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '字典id', - create_time datetime NULL DEFAULT NULL COMMENT '创建日期', - PRIMARY KEY (id) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据字典详情' ROW_FORMAT = Compact; - -SET FOREIGN_KEY_CHECKS = 1; - - --- 2020.5.27添加文章管理 -DROP TABLE IF EXISTS sys_content; -CREATE TABLE sys_content ( - id varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '主键', - title varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '标题', - one_img varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '单图url', - multiple_img varchar(500) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '多图url', - keywords varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '关键字', - type int(11) DEFAULT NULL COMMENT '文章类型', - content longtext CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT '内容', - create_time datetime NULL DEFAULT NULL COMMENT '创建时间', - create_id varchar(50) NULL DEFAULT NULL COMMENT '创建人', - PRIMARY KEY (id) USING BTREE +-- ---------------------------- +-- Table structure for sys_content +-- ---------------------------- +DROP TABLE IF EXISTS `sys_content`; +CREATE TABLE `sys_content` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `title` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, + `content` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, + `one_img` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, + `multiple_img` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, + `keywords` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, + `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, + `create_id` bigint(0) NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '文章管理' ROW_FORMAT = Compact; --- 2020.6.15添加文件管理 -DROP TABLE IF EXISTS sys_files; -CREATE TABLE sys_files ( - id varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, - url varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'URL地址', - create_date datetime NULL DEFAULT NULL COMMENT '创建时间', - file_name varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件名称', - file_path varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - PRIMARY KEY (id) USING BTREE +-- ---------------------------- +-- Records of sys_content +-- ---------------------------- + +-- ---------------------------- +-- Table structure for sys_dept +-- ---------------------------- +DROP TABLE IF EXISTS `sys_dept`; +CREATE TABLE `sys_dept` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `dept_no` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `pid` bigint(0) NULL DEFAULT NULL, + `status` int(0) NULL DEFAULT NULL, + `relation_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `dept_manager_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `manager_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `phone` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + `update_time` datetime(0) NULL DEFAULT NULL, + `deleted` int(0) NULL DEFAULT 0, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '系统部门' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of sys_dept +-- ---------------------------- +INSERT INTO `sys_dept` VALUES (1, 'D000001', '总公司', 0, 1, 'D000001', NULL, '小李', '13888888888', NULL, NULL, 0); + +-- ---------------------------- +-- Table structure for sys_dict +-- ---------------------------- +DROP TABLE IF EXISTS `sys_dict`; +CREATE TABLE `sys_dict` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据字典表' ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of sys_dict +-- ---------------------------- +INSERT INTO `sys_dict` VALUES (1255790029680242690, 'sex', '性别', '2020-04-30 17:24:09'); +INSERT INTO `sys_dict` VALUES (1255790029680242691, 'content_keyword', '关键字', '2020-04-30 17:24:09'); +INSERT INTO `sys_dict` VALUES (1282504369620430849, 'content_type', '文章类型略略略', '2020-07-13 10:37:24'); + +-- ---------------------------- +-- Table structure for sys_dict_detail +-- ---------------------------- +DROP TABLE IF EXISTS `sys_dict_detail`; +CREATE TABLE `sys_dict_detail` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `label` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `sort` int(0) NULL DEFAULT NULL, + `dict_id` bigint(0) NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据字典详情' ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of sys_dict_detail +-- ---------------------------- +INSERT INTO `sys_dict_detail` VALUES (1255790073535885314, '男', '1', 1, 1255790029680242690, '2020-04-30 17:24:19'); +INSERT INTO `sys_dict_detail` VALUES (1255790100115189761, '女', '2', 2, 1255790029680242690, '2020-04-30 17:24:25'); +INSERT INTO `sys_dict_detail` VALUES (1282504475715350530, '诗词', '1', 1, 1282504369620430849, '2020-07-13 10:37:49'); +INSERT INTO `sys_dict_detail` VALUES (1282504651729317889, '散文', '2', 2, 1282504369620430849, '2020-07-13 10:38:31'); +INSERT INTO `sys_dict_detail` VALUES (1282846022950842369, '剧本', '3', 3, 1282504369620430849, '2020-07-14 09:15:01'); +INSERT INTO `sys_dict_detail` VALUES (1282846022950842370, 'java', '1', 1, 1255790029680242691, '2020-07-14 09:15:01'); +INSERT INTO `sys_dict_detail` VALUES (1282846022950842371, 'mysql', '2', 2, 1255790029680242691, '2020-07-14 09:15:01'); + +-- ---------------------------- +-- Table structure for sys_files +-- ---------------------------- +DROP TABLE IF EXISTS `sys_files`; +CREATE TABLE `sys_files` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `file_size` bigint(0) NULL DEFAULT NULL, + `create_date` datetime(0) NULL DEFAULT NULL, + `file_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `file_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '文件上传' ROW_FORMAT = Compact; +-- ---------------------------- +-- Records of sys_files +-- ---------------------------- --- 初始数据 -INSERT INTO sys_dept(id, dept_no, name, pid, status, relation_code, dept_manager_id, manager_name, phone, deleted) VALUES ('1', 'D000001', '总公司', '0', 1, 'D000001', NULL, '小李', '13888888888', 1); -INSERT INTO sys_permission VALUES ('1', '删除', 'sysGenerator:delete', NULL, 'sysGenerator/delete', NULL, '15', 1, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('10', '赋予角色', 'sys:user:role:update', NULL, 'sys/user/roles/*', NULL, '24', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('11', '菜单权限管理', NULL, NULL, 'index/menus', '_self', '51', 98, 2, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('12', '列表', 'sys:dept:list', NULL, 'sys/depts', NULL, '41', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('13', '删除', 'sys:role:deleted', NULL, 'sys/role/*', NULL, '53', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('1311115974068449281', '数据权限', 'sys:role:bindDept', '', 'sys/role/bindDept', '_self', '53', 5, 3, 1, '2020-09-30 09:29:42', NULL, 1); -INSERT INTO sys_permission VALUES ('15', '代码生成', NULL, NULL, 'index/sysGenerator', '_self', '54', 1, 2, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('16', '列表', 'sysGenerator:list', NULL, 'sysGenerator/listByPage', NULL, '15', 1, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('17', '详情', 'sys:permission:detail', NULL, 'sys/permission/*', NULL, '11', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('19', '列表', 'sys:role:list', NULL, 'sys/roles', NULL, '53', 0, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('2', 'SQL 监控', '', '', 'druid/sql.html', '_self', '21', 98, 2, 1, '2020-03-19 13:29:40', '2020-05-07 13:36:59', 1); -INSERT INTO sys_permission VALUES ('20', '修改', 'sysGenerator:update', NULL, 'sysGenerator/update', NULL, '15', 1, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('21', '其他', NULL, 'layui-icon-list', NULL, NULL, '0', 200, 1, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('22', '详情', 'sys:dept:detail', NULL, 'sys/dept/*', NULL, '41', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('23', '列表', 'sys:user:list', NULL, 'sys/users', NULL, '24', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('24', '用户管理', NULL, NULL, 'index/users', '_self', '51', 100, 2, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('25', '详情', 'sys:user:detail', NULL, 'sys/user/*', NULL, '24', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('26', '删除', 'sys:permission:deleted', NULL, 'sys/permission/*', NULL, '11', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('27', '文件管理', '', '', 'index/sysFiles', '_self', '54', 10, 2, 1, NULL, '2020-06-15 16:00:29', 1); -INSERT INTO sys_permission VALUES ('28', '列表', 'sysFiles:list', NULL, 'sysFiles/listByPage', NULL, '27', 0, 3, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('29', '新增', 'sysFiles:add', NULL, 'sysFiles/add', NULL, '27', 0, 3, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('3', '新增', 'sys:role:add', NULL, 'sys/role', NULL, '53', 0, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('30', '删除', 'sysFiles:delete', NULL, 'sysFiles/delete', NULL, '27', 0, 3, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('31', '文章管理', NULL, NULL, 'index/sysContent', '_self', '54', 10, 2, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('32', '列表', 'sysContent:list', NULL, 'sysContent/listByPage', NULL, '31', 0, 3, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('33', '新增', 'sysContent:add', NULL, 'sysContent/add', NULL, '31', 0, 3, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('34', '修改', 'sysContent:update', NULL, 'sysContent/update', NULL, '31', 0, 3, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('35', '删除', 'sysContent:delete', NULL, 'sysContent/delete', NULL, '31', 0, 3, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('36', '更新', 'sys:role:update', NULL, 'sys/role', NULL, '53', 0, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('38', '更新', 'sys:dept:update', NULL, 'sys/dept', NULL, '41', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('39', '详情', 'sys:role:detail', NULL, 'sys/role/*', NULL, '53', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('4', '添加', 'sysGenerator:add', NULL, 'sysGenerator/add', NULL, '15', 1, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('40', '编辑', 'sys:permission:update', NULL, 'sys/permission', NULL, '11', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('41', '部门管理', NULL, NULL, 'index/depts', '_self', '51', 100, 2, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('42', '新增', 'sys:user:add', NULL, 'sys/user', NULL, '24', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('43', '列表', 'sys:permission:list', NULL, 'sys/permissions', NULL, '11', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('44', '新增', 'sys:permission:add', NULL, 'sys/permission', NULL, '11', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('45', '字典管理', NULL, '', 'index/sysDict', NULL, '54', 10, 2, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('46', '列表', 'sysDict:list', NULL, 'sysDict/listByPage', NULL, '45', 0, 3, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('47', '新增', 'sysDict:add', NULL, 'sysDict/add', NULL, '45', 0, 3, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('48', '修改', 'sysDict:update', NULL, 'sysDict/update', NULL, '45', 0, 3, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('49', '删除', 'sysDict:delete', NULL, 'sysDict/delete', NULL, '45', 0, 3, 1, NULL, NULL, 1); -INSERT INTO sys_permission VALUES ('5', '删除', 'sys:dept:deleted', NULL, 'sys/dept/*', NULL, '41', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('50', '表单构建', '', '', 'index/build', '_self', '21', 1, 2, 1, '2020-04-22 13:09:41', '2020-05-07 13:36:47', 1); -INSERT INTO sys_permission VALUES ('51', '组织管理', NULL, 'layui-icon-user', NULL, NULL, '0', 1, 1, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('52', '拥有角色', 'sys:user:role:detail', NULL, 'sys/user/roles/*', NULL, '24', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('53', '角色管理', NULL, NULL, 'index/roles', '_self', '51', 99, 2, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('54', '系统管理', NULL, 'layui-icon-set-fill', NULL, NULL, '0', 98, 1, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('56', '更新', 'sys:user:update', NULL, 'sys/user', NULL, '24', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('57', '删除', 'sys:user:deleted', NULL, 'sys/user', NULL, '24', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('58', '删除', 'sys:log:deleted', NULL, 'sys/logs', NULL, '8', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('6', '接口管理', '', '', 'doc.html', '_blank', '21', 100, 2, 1, '2020-03-19 13:29:40', '2020-05-07 13:36:02', 1); -INSERT INTO sys_permission VALUES ('7', '列表', 'sys:log:list', NULL, 'sys/logs', NULL, '8', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('8', '日志管理', NULL, NULL, 'index/logs', '_self', '54', 97, 2, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_permission VALUES ('9', '新增', 'sys:dept:add', NULL, 'sys/dept', NULL, '41', 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 1); -INSERT INTO sys_role(id, name, description, status, create_time, update_time, deleted) VALUES ('1', '超级管理员', '拥有所有权限-不能删除', 1, '2019-11-01 19:26:29', '2020-03-19 13:29:51', 1); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('1', '1', '1', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('10', '1', '10', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('11', '1', '11', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('12', '1', '12', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('13', '1', '13', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('14', '1', '14', '2020-05-26 17:04:21'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('15', '1', '15', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('16', '1', '16', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('17', '1', '17', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('18', '1', '18', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('19', '1', '19', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('2', '1', '2', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('20', '1', '20', '2020-05-26 17:04:21'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('21', '1', '21', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('22', '1', '22', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('23', '1', '23', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('24', '1', '24', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('25', '1', '25', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('26', '1', '26', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('27', '1', '27', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('28', '1', '28', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('29', '1', '29', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('3', '1', '3', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('30', '1', '30', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('31', '1', '31', '2020-05-26 17:04:21'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('32', '1', '32', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('33', '1', '33', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('34', '1', '34', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('35', '1', '35', '2020-05-26 17:04:21'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('36', '1', '36', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('38', '1', '38', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('39', '1', '39', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('4', '1', '4', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('40', '1', '40', '2020-06-15 15:21:17'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('41', '1', '41', '2020-06-15 15:21:17'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('42', '1', '42', '2020-06-15 15:21:17'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('43', '1', '43', '2020-06-15 15:21:17'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('44', '1', '44', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('45', '1', '45', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('46', '1', '46', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('47', '1', '47', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('48', '1', '48', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('49', '1', '49', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('5', '1', '5', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('50', '1', '50', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('51', '1', '51', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('52', '1', '52', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('53', '1', '53', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('54', '1', '54', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('55', '1', '55', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('56', '1', '56', '2020-05-26 17:04:21'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('57', '1', '57', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('58', '1', '58', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('6', '1', '6', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('60', '1', '60', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('61', '1', '61', '2020-05-26 14:21:56'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('62', '1', '62', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('63', '1', '63', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('7', '1', '7', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('8', '1', '8', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('9', '1', '9', '2020-04-22 15:48:47'); -INSERT INTO sys_role_permission(id, role_id, permission_id, create_time) VALUES ('1311116066716430339', '1', '1311115974068449281', '2020-09-30 09:30:04'); +-- ---------------------------- +-- Table structure for sys_generator +-- ---------------------------- +DROP TABLE IF EXISTS `sys_generator`; +CREATE TABLE `sys_generator` ( + `table_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + `table_comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -INSERT INTO sys_user(id, username, salt, password, phone, dept_id, real_name, nick_name, email, status, sex, deleted, create_id, update_id, create_where, create_time, update_time) VALUES ('1', 'admin', '324ce32d86224b00a02b', '2102b59a75ab87616b62d0b9432569d0', '13888888888', '1', '爱糖宝', '爱糖宝', 'xxxxxx@163.com', 1, 2, 1, '1', '1', 3, '2019-09-22 19:38:05', '2020-03-18 09:15:22'); -INSERT INTO sys_user_role(id, user_id, role_id, create_time) VALUES ('1', '1', '1', '2020-03-19 02:23:13'); -INSERT INTO sys_dict(id, name, remark, create_time) VALUES ('1255790029680242690', 'sex', '性别', '2020-04-30 17:24:09'); -INSERT INTO sys_dict(id, name, remark, create_time) VALUES ('1255790029680242691', 'content_keyword', '关键字', '2020-04-30 17:24:09'); -INSERT INTO sys_dict(id, name, remark, create_time) VALUES ('1282504369620430849', 'content_type', '文章类型略略略', '2020-07-13 10:37:24'); -INSERT INTO sys_dict_detail(id, label, value, sort, dict_id, create_time) VALUES ('1255790073535885314', '男', '1', 1, '1255790029680242690', '2020-04-30 17:24:19'); -INSERT INTO sys_dict_detail(id, label, value, sort, dict_id, create_time) VALUES ('1255790100115189761', '女', '2', 2, '1255790029680242690', '2020-04-30 17:24:25'); -INSERT INTO sys_dict_detail(id, label, value, sort, dict_id, create_time) VALUES ('1282504475715350530', '诗词', '1', 1, '1282504369620430849', '2020-07-13 10:37:49'); -INSERT INTO sys_dict_detail(id, label, value, sort, dict_id, create_time) VALUES ('1282504651729317889', '散文', '2', 2, '1282504369620430849', '2020-07-13 10:38:31'); -INSERT INTO sys_dict_detail(id, label, value, sort, dict_id, create_time) VALUES ('1282846022950842369', '剧本', '3', 3, '1282504369620430849', '2020-07-14 09:15:01'); -INSERT INTO sys_dict_detail(id, label, value, sort, dict_id, create_time) VALUES ('1282846022950842370', 'java', '1', 1, '1255790029680242691', '2020-07-14 09:15:01'); -INSERT INTO sys_dict_detail(id, label, value, sort, dict_id, create_time) VALUES ('1282846022950842371', 'mysql', '2', 2, '1255790029680242691', '2020-07-14 09:15:01'); +-- ---------------------------- +-- Records of sys_generator +-- ---------------------------- + +-- ---------------------------- +-- Table structure for sys_log +-- ---------------------------- +DROP TABLE IF EXISTS `sys_log`; +CREATE TABLE `sys_log` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `user_id` bigint(0) NULL DEFAULT NULL, + `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `operation` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `time` int(0) NULL DEFAULT NULL, + `method` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `params` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '系统日志' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of sys_log +-- ---------------------------- +INSERT INTO `sys_log` VALUES (1, 1, '', '菜单权限管理-获取所有菜单权限', 204, 'vip.fuck.sm.controller.PermissionController.getAllMenusPermission()', '{\"params\":[{\"key\":\"_\",\"values\":[\"1742788222215\"]}]}', NULL, '2025-03-24 11:50:22'); +INSERT INTO `sys_log` VALUES (2, 1, '', '角色管理-分页获取角色信息', 81, 'vip.fuck.sm.controller.RoleController.pageInfo()', '{\"body\":{\"page\":1,\"limit\":10},\"params\":[]}', NULL, '2025-03-24 11:50:23'); +INSERT INTO `sys_log` VALUES (3, 1, '', '机构管理-树型组织列表', 12, 'vip.fuck.sm.controller.DeptController.getTree()', '{\"params\":[{\"key\":\"_\",\"values\":[\"1742788223877\"]}]}', NULL, '2025-03-24 11:50:24'); +INSERT INTO `sys_log` VALUES (4, 1, '', '用户管理-分页获取用户列表', 33, 'vip.fuck.sm.controller.UserController.pageInfo()', '{\"body\":{\"page\":1,\"limit\":10},\"params\":[]}', NULL, '2025-03-24 11:50:24'); +INSERT INTO `sys_log` VALUES (5, 1, '', '系统操作日志管理-分页查询系统操作日志', 21, 'vip.fuck.sm.controller.SysLogController.pageInfo()', '{\"body\":{\"page\":1,\"limit\":10},\"params\":[]}', NULL, '2025-03-24 11:50:29'); +INSERT INTO `sys_log` VALUES (6, 1, 'admin', '系统操作日志管理-分页查询系统操作日志', 73, 'vip.fuck.sm.controller.SysLogController.pageInfo()', '{\"body\":{\"page\":1,\"limit\":10},\"params\":[]}', NULL, '2025-03-24 12:01:47'); +INSERT INTO `sys_log` VALUES (7, 1, 'admin', '系统操作日志管理-分页查询系统操作日志', 12, 'vip.fuck.sm.controller.SysLogController.pageInfo()', '{\"body\":{\"page\":1,\"limit\":10,\"username\":\"\",\"operation\":\"\",\"createTimeBegin\":\"\",\"createTimeEnd\":\"\"},\"params\":[]}', NULL, '2025-03-24 12:01:49'); +INSERT INTO `sys_log` VALUES (8, 1, 'admin', '系统操作日志管理-分页查询系统操作日志', 18, 'vip.fuck.sm.controller.SysLogController.pageInfo()', '{\"body\":{\"page\":1,\"limit\":10,\"username\":\"\",\"operation\":\"\",\"createTimeBegin\":\"\",\"createTimeEnd\":\"\"},\"params\":[]}', NULL, '2025-03-24 12:01:50'); +INSERT INTO `sys_log` VALUES (9, 1, 'admin', '系统操作日志管理-分页查询系统操作日志', 17, 'vip.fuck.sm.controller.SysLogController.pageInfo()', '{\"body\":{\"page\":1,\"limit\":10,\"username\":\"\",\"operation\":\"\",\"createTimeBegin\":\"\",\"createTimeEnd\":\"\"},\"params\":[]}', NULL, '2025-03-24 12:01:50'); + +-- ---------------------------- +-- Table structure for sys_permission +-- ---------------------------- +DROP TABLE IF EXISTS `sys_permission`; +CREATE TABLE `sys_permission` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `perms` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `icon` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `target` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `pid` bigint(0) NULL DEFAULT NULL, + `order_num` int(0) NULL DEFAULT NULL, + `type` int(0) NULL DEFAULT NULL, + `status` int(0) NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + `update_time` datetime(0) NULL DEFAULT NULL, + `deleted` int(0) NULL DEFAULT 0, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '系统权限' ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of sys_permission +-- ---------------------------- +INSERT INTO `sys_permission` VALUES (1, '删除', 'sysGenerator:delete', 'sysGenerator/delete', NULL, NULL, 15, 1, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (2, 'SQL 监控', '', 'druid/sql.html', '', '_self', 21, 98, 2, 1, '2020-03-19 13:29:40', '2020-05-07 13:36:59', 0); +INSERT INTO `sys_permission` VALUES (3, '新增', 'sys:role:add', 'sys/role', NULL, NULL, 53, 0, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (4, '添加', 'sysGenerator:add', 'sysGenerator/add', NULL, NULL, 15, 1, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (5, '删除', 'sys:dept:deleted', 'sys/dept/*', NULL, NULL, 41, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (6, '接口管理', '', 'doc.html', '', '_blank', 21, 100, 2, 1, '2020-03-19 13:29:40', '2020-05-07 13:36:02', 0); +INSERT INTO `sys_permission` VALUES (7, '列表', 'sys:log:list', 'sys/logs', NULL, NULL, 8, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (8, '日志管理', NULL, 'index/logs', NULL, '_self', 54, 97, 2, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (9, '新增', 'sys:dept:add', 'sys/dept', NULL, NULL, 41, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (10, '赋予角色', 'sys:user:role:update', 'sys/user/roles/*', NULL, NULL, 24, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (11, '菜单权限管理', NULL, 'index/menus', NULL, '_self', 51, 98, 2, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (12, '列表', 'sys:dept:list', 'sys/depts', NULL, NULL, 41, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (13, '删除', 'sys:role:deleted', 'sys/role/*', NULL, NULL, 53, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (15, '代码生成', NULL, 'index/sysGenerator', NULL, '_self', 54, 1, 2, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (16, '列表', 'sysGenerator:list', 'sysGenerator/listByPage', NULL, NULL, 15, 1, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (17, '详情', 'sys:permission:detail', 'sys/permission/*', NULL, NULL, 11, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (19, '列表', 'sys:role:list', 'sys/roles', NULL, NULL, 53, 0, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (20, '修改', 'sysGenerator:update', 'sysGenerator/update', NULL, NULL, 15, 1, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (21, '其他', NULL, NULL, 'layui-icon-list', NULL, 0, 200, 1, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (22, '详情', 'sys:dept:detail', 'sys/dept/*', NULL, NULL, 41, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (23, '列表', 'sys:user:list', 'sys/users', NULL, NULL, 24, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (24, '用户管理', NULL, 'index/users', NULL, '_self', 51, 100, 2, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (25, '详情', 'sys:user:detail', 'sys/user/*', NULL, NULL, 24, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (26, '删除', 'sys:permission:deleted', 'sys/permission/*', NULL, NULL, 11, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (27, '文件管理', '', 'index/sysFiles', '', '_self', 54, 10, 2, 1, NULL, '2020-06-15 16:00:29', 0); +INSERT INTO `sys_permission` VALUES (28, '列表', 'sysFiles:list', 'sysFiles/listByPage', NULL, NULL, 27, 0, 3, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (29, '新增', 'sysFiles:add', 'sysFiles/add', NULL, NULL, 27, 0, 3, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (30, '删除', 'sysFiles:delete', 'sysFiles/delete', NULL, NULL, 27, 0, 3, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (31, '文章管理', NULL, 'index/sysContent', NULL, '_self', 54, 10, 2, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (32, '列表', 'sysContent:list', 'sysContent/listByPage', NULL, NULL, 31, 0, 3, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (33, '新增', 'sysContent:add', 'sysContent/add', NULL, NULL, 31, 0, 3, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (34, '修改', 'sysContent:update', 'sysContent/update', NULL, NULL, 31, 0, 3, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (35, '删除', 'sysContent:delete', 'sysContent/delete', NULL, NULL, 31, 0, 3, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (36, '更新', 'sys:role:update', 'sys/role', NULL, NULL, 53, 0, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (38, '更新', 'sys:dept:update', 'sys/dept', NULL, NULL, 41, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (39, '详情', 'sys:role:detail', 'sys/role/*', NULL, NULL, 53, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (40, '编辑', 'sys:permission:update', 'sys/permission', NULL, NULL, 11, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (41, '部门管理', NULL, 'index/depts', NULL, '_self', 51, 100, 2, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (42, '新增', 'sys:user:add', 'sys/user', NULL, NULL, 24, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (43, '列表', 'sys:permission:list', 'sys/permissions', NULL, NULL, 11, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (44, '新增', 'sys:permission:add', 'sys/permission', NULL, NULL, 11, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (45, '字典管理', NULL, 'index/sysDict', '', NULL, 54, 10, 2, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (46, '列表', 'sysDict:list', 'sysDict/listByPage', NULL, NULL, 45, 0, 3, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (47, '新增', 'sysDict:add', 'sysDict/add', NULL, NULL, 45, 0, 3, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (48, '修改', 'sysDict:update', 'sysDict/update', NULL, NULL, 45, 0, 3, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (49, '删除', 'sysDict:delete', 'sysDict/delete', NULL, NULL, 45, 0, 3, 1, NULL, NULL, 0); +INSERT INTO `sys_permission` VALUES (50, '表单构建', '', 'index/build', '', '_self', 21, 1, 2, 1, '2020-04-22 13:09:41', '2020-05-07 13:36:47', 0); +INSERT INTO `sys_permission` VALUES (51, '组织管理', NULL, NULL, 'layui-icon-user', NULL, 0, 1, 1, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (52, '拥有角色', 'sys:user:role:detail', 'sys/user/roles/*', NULL, NULL, 24, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (53, '角色管理', NULL, 'index/roles', NULL, '_self', 51, 99, 2, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (54, '系统管理', NULL, NULL, 'layui-icon-set-fill', NULL, 0, 98, 1, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (56, '更新', 'sys:user:update', 'sys/user', NULL, NULL, 24, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (57, '删除', 'sys:user:deleted', 'sys/user', NULL, NULL, 24, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (58, '删除', 'sys:log:deleted', 'sys/logs', NULL, NULL, 8, 100, 3, 1, '2020-03-19 13:29:40', '2020-03-19 13:29:40', 0); +INSERT INTO `sys_permission` VALUES (1311115974068449281, '数据权限', 'sys:role:bindDept', 'sys/role/bindDept', '', '_self', 53, 5, 3, 1, '2020-09-30 09:29:42', NULL, 0); + +-- ---------------------------- +-- Table structure for sys_plugs +-- ---------------------------- +DROP TABLE IF EXISTS `sys_plugs`; +CREATE TABLE `sys_plugs` ( + `qualified_version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `author` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `site_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `doc_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `jar_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `jar_size` bigint(0) NULL DEFAULT NULL, + `status` int(0) NULL DEFAULT NULL, + `upload_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`qualified_version`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of sys_plugs +-- ---------------------------- + +-- ---------------------------- +-- Table structure for sys_role +-- ---------------------------- +DROP TABLE IF EXISTS `sys_role`; +CREATE TABLE `sys_role` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `status` int(0) NULL DEFAULT NULL, + `data_scope` int(0) NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + `update_time` datetime(0) NULL DEFAULT NULL, + `deleted` int(0) NULL DEFAULT 0, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '系统角色' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of sys_role +-- ---------------------------- +INSERT INTO `sys_role` VALUES (1, '超级管理员', '拥有所有权限-不能删除', 1, NULL, '2019-11-01 19:26:29', '2020-03-19 13:29:51', 0); + +-- ---------------------------- +-- Table structure for sys_role_dept +-- ---------------------------- +DROP TABLE IF EXISTS `sys_role_dept`; +CREATE TABLE `sys_role_dept` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `role_id` bigint(0) NULL DEFAULT NULL, + `dept_id` bigint(0) NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色部门' ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of sys_role_dept +-- ---------------------------- + +-- ---------------------------- +-- Table structure for sys_role_permission +-- ---------------------------- +DROP TABLE IF EXISTS `sys_role_permission`; +CREATE TABLE `sys_role_permission` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `role_id` bigint(0) NULL DEFAULT NULL, + `permission_id` bigint(0) NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of sys_role_permission +-- ---------------------------- +INSERT INTO `sys_role_permission` VALUES (1, 1, 1, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (2, 1, 2, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (3, 1, 3, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (4, 1, 4, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (5, 1, 5, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (6, 1, 6, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (7, 1, 7, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (8, 1, 8, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (9, 1, 9, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (10, 1, 10, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (11, 1, 11, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (12, 1, 12, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (13, 1, 13, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (14, 1, 14, '2020-05-26 17:04:21'); +INSERT INTO `sys_role_permission` VALUES (15, 1, 15, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (16, 1, 16, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (17, 1, 17, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (18, 1, 18, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (19, 1, 19, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (20, 1, 20, '2020-05-26 17:04:21'); +INSERT INTO `sys_role_permission` VALUES (21, 1, 21, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (22, 1, 22, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (23, 1, 23, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (24, 1, 24, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (25, 1, 25, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (26, 1, 26, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (27, 1, 27, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (28, 1, 28, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (29, 1, 29, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (30, 1, 30, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (31, 1, 31, '2020-05-26 17:04:21'); +INSERT INTO `sys_role_permission` VALUES (32, 1, 32, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (33, 1, 33, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (34, 1, 34, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (35, 1, 35, '2020-05-26 17:04:21'); +INSERT INTO `sys_role_permission` VALUES (36, 1, 36, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (38, 1, 38, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (39, 1, 39, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (40, 1, 40, '2020-06-15 15:21:17'); +INSERT INTO `sys_role_permission` VALUES (41, 1, 41, '2020-06-15 15:21:17'); +INSERT INTO `sys_role_permission` VALUES (42, 1, 42, '2020-06-15 15:21:17'); +INSERT INTO `sys_role_permission` VALUES (43, 1, 43, '2020-06-15 15:21:17'); +INSERT INTO `sys_role_permission` VALUES (44, 1, 44, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (45, 1, 45, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (46, 1, 46, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (47, 1, 47, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (48, 1, 48, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (49, 1, 49, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (50, 1, 50, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (51, 1, 51, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (52, 1, 52, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (53, 1, 53, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (54, 1, 54, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (55, 1, 55, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (56, 1, 56, '2020-05-26 17:04:21'); +INSERT INTO `sys_role_permission` VALUES (57, 1, 57, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (58, 1, 58, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (60, 1, 60, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (61, 1, 61, '2020-05-26 14:21:56'); +INSERT INTO `sys_role_permission` VALUES (62, 1, 62, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (63, 1, 63, '2020-04-22 15:48:47'); +INSERT INTO `sys_role_permission` VALUES (1311116066716430339, 1, 1311115974068449281, '2020-09-30 09:30:04'); + +-- ---------------------------- +-- Table structure for sys_user +-- ---------------------------- +DROP TABLE IF EXISTS `sys_user`; +CREATE TABLE `sys_user` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `salt` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `phone` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `dept_id` bigint(0) NULL DEFAULT NULL, + `real_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `nick_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `email` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `status` int(0) NULL DEFAULT NULL, + `sex` int(0) NULL DEFAULT NULL, + `deleted` int(0) NULL DEFAULT 0, + `create_id` bigint(0) NULL DEFAULT NULL, + `update_id` bigint(0) NULL DEFAULT NULL, + `create_where` int(0) NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + `update_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '系统用户' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of sys_user +-- ---------------------------- +INSERT INTO `sys_user` VALUES (1, 'admin', '324ce32d86224b00a02b', '2102b59a75ab87616b62d0b9432569d0', '13888888888', 1, '爱糖宝', '爱糖宝', 'xxxxxx@163.com', 1, 2, 0, 1, 1, 3, '2019-09-22 19:38:05', '2020-03-18 09:15:22'); + +-- ---------------------------- +-- Table structure for sys_user_role +-- ---------------------------- +DROP TABLE IF EXISTS `sys_user_role`; +CREATE TABLE `sys_user_role` ( + `id` bigint(0) NOT NULL AUTO_INCREMENT, + `user_id` bigint(0) NULL DEFAULT NULL, + `role_id` bigint(0) NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '系统用户角色' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of sys_user_role +-- ---------------------------- +INSERT INTO `sys_user_role` VALUES (1, 1, 1, '2020-03-19 02:23:13'); + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/pom.xml b/pom.xml index 90b0103..8de65bb 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,19 @@ solon-web + + org.dromara.autotable + auto-table + 2.3.1 + + + + org.dromara.autotable + auto-table-solon-plugin + 2.3.1 + + + org.noear solon-view-thymeleaf @@ -170,14 +183,22 @@ tencent https://mirrors.cloud.tencent.com/nexus/repository/maven-public/ - false + true aliyun-repos http://maven.aliyun.com/nexus/content/groups/public/ - false + true + + + + + aliyun-central + https://maven.aliyun.com/repository/central + + true diff --git a/src/main/java/vip/fuck/sm/SolonManagerApplication.java b/src/main/java/vip/fuck/sm/SolonManagerApplication.java index da5cf2f..efac741 100644 --- a/src/main/java/vip/fuck/sm/SolonManagerApplication.java +++ b/src/main/java/vip/fuck/sm/SolonManagerApplication.java @@ -1,6 +1,7 @@ package vip.fuck.sm; import lombok.extern.slf4j.Slf4j; +import org.dromara.autotable.solon.annotation.EnableAutoTable; import org.noear.solon.Solon; import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.SolonMain; @@ -18,6 +19,7 @@ import vip.fuck.sm.common.utils.FileConfig; */ @Slf4j @SolonMain +@EnableAutoTable public class SolonManagerApplication { diff --git a/src/main/java/vip/fuck/sm/common/aop/aspect/LoggingRouterInterceptor.java b/src/main/java/vip/fuck/sm/common/aop/aspect/LoggingRouterInterceptor.java index 9e5b125..7ec8561 100644 --- a/src/main/java/vip/fuck/sm/common/aop/aspect/LoggingRouterInterceptor.java +++ b/src/main/java/vip/fuck/sm/common/aop/aspect/LoggingRouterInterceptor.java @@ -1,10 +1,14 @@ package vip.fuck.sm.common.aop.aspect; import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import org.noear.solon.annotation.Inject; +import org.noear.solon.data.cache.CacheService; import vip.fuck.sm.common.aop.annotation.LogAnnotation; import vip.fuck.sm.entity.SysLog; +import vip.fuck.sm.entity.SysUser; import vip.fuck.sm.mapper.SysLogMapper; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.solon.annotation.Db; @@ -27,6 +31,9 @@ public class LoggingRouterInterceptor implements RouterInterceptor { @Db private SysLogMapper sysLogMapper; + @Inject + private CacheService cacheService; + @Override public void doIntercept(Context ctx, Handler mainHandler, RouterInterceptorChain chain) throws Throwable { LogAnnotation logAnnotation = null; @@ -62,13 +69,17 @@ public class LoggingRouterInterceptor implements RouterInterceptor { //3.记日志 SysLog sysLog = new SysLog(); sysLog.setParams(param.toJSONString(0)); - sysLog.setUsername(ctx.sessionOrDefault("currentUserName","")); + Long userId = StpUtil.getLoginIdAsLong(); + SysUser sysUser = cacheService.get("sa-token:user:" + userId, SysUser.class); + if(ObjectUtil.isNotEmpty(sysUser)){ + sysLog.setUsername(sysUser.getUsername()); + } //注解上的描述 sysLog.setOperation(logAnnotation.title() + "-" + logAnnotation.action()); String className = action.controller().clz().getName(); String methodName = action.method().getName(); sysLog.setMethod(className + "." + methodName + "()"); - String userId = StpUtil.getLoginIdAsString(); + sysLog.setUserId(userId); sysLog.setTime((int) timespan); log.info(sysLog.toString()); diff --git a/src/main/java/vip/fuck/sm/common/config/StpInterfaceImpl.java b/src/main/java/vip/fuck/sm/common/config/StpInterfaceImpl.java index 448fc73..61c9288 100644 --- a/src/main/java/vip/fuck/sm/common/config/StpInterfaceImpl.java +++ b/src/main/java/vip/fuck/sm/common/config/StpInterfaceImpl.java @@ -26,7 +26,7 @@ public class StpInterfaceImpl implements StpInterface { @Override public List getPermissionList(Object loginId, String loginType) { if (loginType.equals(StpUtil.TYPE)) { - return permissionService.getPermissionsByUserId(String.valueOf(loginId)); + return permissionService.getPermissionsByUserId(Long.parseLong(loginId.toString())); } return null; } diff --git a/src/main/java/vip/fuck/sm/common/utils/AssertUtil.java b/src/main/java/vip/fuck/sm/common/utils/AssertUtil.java index ddb3c4b..9ddef06 100644 --- a/src/main/java/vip/fuck/sm/common/utils/AssertUtil.java +++ b/src/main/java/vip/fuck/sm/common/utils/AssertUtil.java @@ -1,5 +1,6 @@ package vip.fuck.sm.common.utils; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import vip.fuck.sm.common.exception.BusinessException; @@ -107,4 +108,7 @@ public class AssertUtil { } + public static void isNotEmpty(Object id, String errorMessage) { + isTrue(ObjectUtil.isNotEmpty(id), errorMessage); + } } \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/controller/DeptController.java b/src/main/java/vip/fuck/sm/controller/DeptController.java index 97c8262..a9a046f 100644 --- a/src/main/java/vip/fuck/sm/controller/DeptController.java +++ b/src/main/java/vip/fuck/sm/controller/DeptController.java @@ -2,6 +2,8 @@ package vip.fuck.sm.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import vip.fuck.sm.common.aop.annotation.LogAnnotation; import vip.fuck.sm.common.exception.BusinessException; import vip.fuck.sm.common.utils.AssertUtil; @@ -15,7 +17,6 @@ import org.noear.solon.validation.annotation.Valid; import org.noear.solon.validation.annotation.Validated; -import javax.annotation.Resource; import java.util.List; /** @@ -57,7 +58,7 @@ public class DeptController { @LogAnnotation(title = "机构管理", action = "更新组织信息") @SaCheckPermission("sys:dept:update") public void updateDept( SysDept vo) { - AssertUtil.isStringNotBlank(vo.getId(), "id不能为空"); + AssertUtil.isTrue(ObjectUtil.isNotEmpty(vo.getId()), "id不能为空"); deptService.updateDept(vo); } diff --git a/src/main/java/vip/fuck/sm/controller/PermissionController.java b/src/main/java/vip/fuck/sm/controller/PermissionController.java index 4f1cd08..433fb3f 100644 --- a/src/main/java/vip/fuck/sm/controller/PermissionController.java +++ b/src/main/java/vip/fuck/sm/controller/PermissionController.java @@ -48,7 +48,7 @@ public class PermissionController { @ApiOperation(value = "删除菜单权限接口") @LogAnnotation(title = "菜单权限管理", action = "删除菜单权限") @SaCheckPermission("sys:permission:deleted") - public void deleted(@Path("id") String id) { + public void deleted(@Path("id") Long id) { permissionService.deleted(id); } @@ -58,7 +58,7 @@ public class PermissionController { @LogAnnotation(title = "菜单权限管理", action = "更新菜单权限") @SaCheckPermission("sys:permission:update") public void updatePermission( @Validated SysPermission vo) { - AssertUtil.isStringNotBlank(vo.getId(), "id不能为空"); + AssertUtil.isNotEmpty(vo.getId(), "id不能为空"); SysPermission sysPermission = permissionService.getById(vo.getId()); if (null == sysPermission) { throw new BusinessException(BaseResponseCode.DATA_ERROR); @@ -92,7 +92,7 @@ public class PermissionController { @ApiOperation(value = "获取所有目录菜单树接口") @LogAnnotation(title = "菜单权限管理", action = "获取所有目录菜单树") @SaCheckPermission(value = {"sys:permission:update", "sys:permission:add"}, mode = SaMode.OR) - public List getAllMenusPermissionTree( String permissionId) { + public List getAllMenusPermissionTree( Long permissionId) { return permissionService.selectAllMenuByTree(permissionId); } diff --git a/src/main/java/vip/fuck/sm/controller/RoleController.java b/src/main/java/vip/fuck/sm/controller/RoleController.java index 127335d..f029f3b 100644 --- a/src/main/java/vip/fuck/sm/controller/RoleController.java +++ b/src/main/java/vip/fuck/sm/controller/RoleController.java @@ -68,7 +68,7 @@ public class RoleController { @LogAnnotation(title = "角色管理", action = "更新角色信息") @SaCheckPermission("sys:role:update") public void updateDept( SysRole vo) { - AssertUtil.isStringNotBlank(vo.getId(), "id不能为空"); + AssertUtil.isNotEmpty(vo.getId(), "id不能为空"); roleService.updateRole(vo); } @@ -77,7 +77,7 @@ public class RoleController { @LogAnnotation(title = "角色管理", action = "绑定角色部门信息") @SaCheckPermission("sys:role:bindDept") public void bindDept( SysRole vo) { - AssertUtil.isStringNotBlank(vo.getId(), "id不能为空"); + AssertUtil.isNotEmpty(vo.getId(), "id不能为空"); AssertUtil.isExists(vo.getId(), "获取角色失败"); //先删除所有绑定 @@ -88,7 +88,7 @@ public class RoleController { } if (!ObjectUtil.isEmpty(vo.getDepts())) { List list = new ArrayList<>(); - for (String deptId : vo.getDepts()) { + for (Long deptId : vo.getDepts()) { SysRoleDeptEntity sysRoleDeptEntity = new SysRoleDeptEntity(); sysRoleDeptEntity.setDeptId(deptId); sysRoleDeptEntity.setRoleId(vo.getId()); diff --git a/src/main/java/vip/fuck/sm/controller/SysContentController.java b/src/main/java/vip/fuck/sm/controller/SysContentController.java index 1454915..889bb5b 100644 --- a/src/main/java/vip/fuck/sm/controller/SysContentController.java +++ b/src/main/java/vip/fuck/sm/controller/SysContentController.java @@ -17,8 +17,6 @@ import org.noear.solon.annotation.*; import org.noear.solon.validation.annotation.Valid; - -import javax.annotation.Resource; import java.util.List; @@ -57,7 +55,7 @@ public class SysContentController { @Mapping ("/update") @SaCheckPermission("sysContent:update") public void update( SysContentEntity sysContent) { - AssertUtil.isStringNotBlank(sysContent.getId(), "id不能为空"); + AssertUtil.isNotEmpty(sysContent.getId(), "id不能为空"); sysContentService.updateById(sysContent); } diff --git a/src/main/java/vip/fuck/sm/controller/SysDictController.java b/src/main/java/vip/fuck/sm/controller/SysDictController.java index d17fbda..f864f04 100644 --- a/src/main/java/vip/fuck/sm/controller/SysDictController.java +++ b/src/main/java/vip/fuck/sm/controller/SysDictController.java @@ -21,7 +21,7 @@ import org.noear.solon.validation.annotation.Valid; -import javax.annotation.Resource; + import java.util.List; diff --git a/src/main/java/vip/fuck/sm/controller/SysDictDetailController.java b/src/main/java/vip/fuck/sm/controller/SysDictDetailController.java index 23b033c..1b0d58a 100644 --- a/src/main/java/vip/fuck/sm/controller/SysDictDetailController.java +++ b/src/main/java/vip/fuck/sm/controller/SysDictDetailController.java @@ -1,6 +1,7 @@ package vip.fuck.sm.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -21,7 +22,7 @@ import org.noear.solon.validation.annotation.Valid; -import javax.annotation.Resource; + import java.util.List; @@ -79,7 +80,7 @@ public class SysDictDetailController { @Post @Mapping ("/listByPage") @SaCheckPermission("sysDict:list") public IPage findListByPage( SysDictDetailEntity sysDictDetail) { - if (StrUtil.isEmpty(sysDictDetail.getDictId())) { + if (ObjectUtil.isEmpty(sysDictDetail.getDictId())) { return new Page<>(); } return sysDictDetailService.listByPage(sysDictDetail.getQueryPage(), sysDictDetail.getDictId()); diff --git a/src/main/java/vip/fuck/sm/controller/SysLogController.java b/src/main/java/vip/fuck/sm/controller/SysLogController.java index 5bf0139..ff1459b 100644 --- a/src/main/java/vip/fuck/sm/controller/SysLogController.java +++ b/src/main/java/vip/fuck/sm/controller/SysLogController.java @@ -14,7 +14,7 @@ import org.noear.solon.annotation.*; import org.noear.solon.validation.annotation.Valid; -import javax.annotation.Resource; + import java.util.List; /** diff --git a/src/main/java/vip/fuck/sm/controller/UserController.java b/src/main/java/vip/fuck/sm/controller/UserController.java index 285b371..a63ab39 100644 --- a/src/main/java/vip/fuck/sm/controller/UserController.java +++ b/src/main/java/vip/fuck/sm/controller/UserController.java @@ -84,9 +84,7 @@ public class UserController { ctx.sessionRemove("captcha"); throw new BusinessException("验证码错误！"); } - LoginRespVO login = userService.login(vo); - ctx.sessionSet("currentUserName",login.getUsername()); - return login; + return userService.login(vo); } @Get @@ -94,8 +92,7 @@ public class UserController { @ApiOperation(value = "获取首页数据接口") public HomeRespVO getHomeInfo() { //通过access_token拿userId - String userId = StpUtil.getLoginIdAsString(); - DataResult result = DataResult.success(); + Long userId = StpUtil.getLoginIdAsLong(); return homeService.getHomeInfo(userId); } @@ -117,7 +114,7 @@ public class UserController { @LogAnnotation(title = "用户管理", action = "更新用户信息") @SaCheckPermission("sys:user:update") public void updateUserInfo( SysUser vo) { - AssertUtil.isStringNotBlank(vo.getId(), "id不能为空"); + AssertUtil.isNotEmpty(vo.getId(), "id不能为空"); userService.updateUserInfo(vo); } @@ -141,7 +138,7 @@ public class UserController { @ApiOperation(value = "查询用户详情接口") @LogAnnotation(title = "用户管理", action = "查询用户详情") public SysUser youSelfInfo() { - String userId = StpUtil.getLoginIdAsString(); + Long userId = StpUtil.getLoginIdAsLong(); return userService.getById(userId); } @@ -174,7 +171,7 @@ public class UserController { if (StrUtil.isEmpty(vo.getOldPwd()) || StrUtil.isEmpty(vo.getNewPwd())) { throw new BusinessException("旧密码与新密码不能为空"); } - vo.setId(StpUtil.getLoginIdAsString()); + vo.setId(StpUtil.getLoginIdAsLong()); userService.updatePwd(vo); } @@ -193,7 +190,7 @@ public class UserController { @ApiOperation(value = "赋予角色-获取所有角色接口") @LogAnnotation(title = "用户管理", action = "赋予角色-获取所有角色接口") @SaCheckPermission("sys:user:role:detail") - public UserOwnRoleRespVO getUserOwnRole(@Path("userId") String userId) { + public UserOwnRoleRespVO getUserOwnRole(@Path("userId") Long userId) { DataResult result = DataResult.success(); return userService.getUserOwnRole(userId); } @@ -202,7 +199,7 @@ public class UserController { @ApiOperation(value = "赋予角色-用户赋予角色接口") @LogAnnotation(title = "用户管理", action = "赋予角色-用户赋予角色接口") @SaCheckPermission("sys:user:role:update") - public void setUserOwnRole(@Path("userId") String userId, List roleIds) { + public void setUserOwnRole(@Path("userId") Long userId, List roleIds) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); queryWrapper.eq(SysUserRole::getUserId, userId); diff --git a/src/main/java/vip/fuck/sm/entity/BasePageEntity.java b/src/main/java/vip/fuck/sm/entity/BasePageEntity.java index d6004a4..9542479 100644 --- a/src/main/java/vip/fuck/sm/entity/BasePageEntity.java +++ b/src/main/java/vip/fuck/sm/entity/BasePageEntity.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; +import org.dromara.autotable.annotation.Ignore; /** * BaseEntity @@ -18,10 +19,12 @@ import lombok.Data; @JsonIgnoreProperties(value = { "getQueryPage"}) public class BasePageEntity { @TableField(exist = false) + @Ignore @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private Integer page; @TableField(exist = false) + @Ignore @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private Integer limit; diff --git a/src/main/java/vip/fuck/sm/entity/SysContentEntity.java b/src/main/java/vip/fuck/sm/entity/SysContentEntity.java index 65deaef..c319b02 100644 --- a/src/main/java/vip/fuck/sm/entity/SysContentEntity.java +++ b/src/main/java/vip/fuck/sm/entity/SysContentEntity.java @@ -1,11 +1,10 @@ package vip.fuck.sm.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.PrimaryKey; import java.io.Serializable; import java.util.Date; @@ -20,14 +19,16 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data @TableName("sys_content") +@AutoTable("sys_content") public class SysContentEntity extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; /** * 主键id */ - @TableId("id") - private String id; + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; /** * 主题 @@ -66,7 +67,7 @@ public class SysContentEntity extends BasePageEntity implements Serializable { * 创建人 */ @TableField(value = "create_id", fill = FieldFill.INSERT) - private String createId; + private Long createId; /** * 创建时间 diff --git a/src/main/java/vip/fuck/sm/entity/SysDept.java b/src/main/java/vip/fuck/sm/entity/SysDept.java index 7262073..14004f2 100644 --- a/src/main/java/vip/fuck/sm/entity/SysDept.java +++ b/src/main/java/vip/fuck/sm/entity/SysDept.java @@ -1,9 +1,8 @@ package vip.fuck.sm.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; +import org.dromara.autotable.annotation.*; import org.noear.solon.validation.annotation.NotBlank; import java.io.Serializable; @@ -17,9 +16,12 @@ import java.util.Date; * @date 2020年3月18日 */ @Data +@TableName("sys_dept") +@AutoTable("sys_dept") public class SysDept implements Serializable { - @TableId - private String id; + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; private String deptNo; @@ -27,9 +29,10 @@ public class SysDept implements Serializable { private String name; @NotBlank(message = "父级不能为空") - private String pid; + private Long pid; @TableField(exist = false) + @Ignore private String pidName; private Integer status; @@ -49,6 +52,7 @@ public class SysDept implements Serializable { private Date updateTime; @TableField(fill = FieldFill.INSERT) + @ColumnDefault(value = "0") private Integer deleted; } \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java b/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java index 94497de..300431f 100644 --- a/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java +++ b/src/main/java/vip/fuck/sm/entity/SysDictDetailEntity.java @@ -1,11 +1,11 @@ package vip.fuck.sm.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.Ignore; +import org.dromara.autotable.annotation.PrimaryKey; import java.io.Serializable; import java.util.Date; @@ -20,14 +20,16 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data @TableName("sys_dict_detail") +@AutoTable("sys_dict_detail") public class SysDictDetailEntity extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; /** * 主键 */ - @TableId("id") - private String id; + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; /** * 字典标签 @@ -51,7 +53,7 @@ public class SysDictDetailEntity extends BasePageEntity implements Serializable * 字典id */ @TableField("dict_id") - private String dictId; + private Long dictId; /** * 创建日期 @@ -63,6 +65,7 @@ public class SysDictDetailEntity extends BasePageEntity implements Serializable * 字典name */ @TableField(exist = false) + @Ignore private String dictName; } diff --git a/src/main/java/vip/fuck/sm/entity/SysDictEntity.java b/src/main/java/vip/fuck/sm/entity/SysDictEntity.java index 59ff5e9..05a0209 100644 --- a/src/main/java/vip/fuck/sm/entity/SysDictEntity.java +++ b/src/main/java/vip/fuck/sm/entity/SysDictEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.PrimaryKey; import java.io.Serializable; import java.util.Date; @@ -20,6 +22,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data @TableName("sys_dict") +@AutoTable("sys_dict") public class SysDictEntity extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -27,7 +30,8 @@ public class SysDictEntity extends BasePageEntity implements Serializable { * 主键 */ @TableId("id") - private String id; + @PrimaryKey(autoIncrement = true) + private Long id; /** * 字典名称 diff --git a/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java b/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java index 1e43a79..f71407d 100644 --- a/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java +++ b/src/main/java/vip/fuck/sm/entity/SysFilesEntity.java @@ -3,6 +3,8 @@ package vip.fuck.sm.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.PrimaryKey; import java.io.Serializable; import java.util.Date; @@ -17,6 +19,7 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data @TableName("sys_files") +@AutoTable("sys_files") public class SysFilesEntity extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -24,6 +27,7 @@ public class SysFilesEntity extends BasePageEntity implements Serializable { * 主键 */ @TableId(value = "id",type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) private Long id; /** diff --git a/src/main/java/vip/fuck/sm/entity/SysGenerator.java b/src/main/java/vip/fuck/sm/entity/SysGenerator.java index cfc75c0..c3abb05 100644 --- a/src/main/java/vip/fuck/sm/entity/SysGenerator.java +++ b/src/main/java/vip/fuck/sm/entity/SysGenerator.java @@ -1,8 +1,10 @@ package vip.fuck.sm.entity; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.dromara.autotable.annotation.AutoTable; import java.io.Serializable; import java.util.Date; @@ -17,6 +19,8 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) +@TableName("sys_generator") +@AutoTable("sys_generator") public class SysGenerator extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/vip/fuck/sm/entity/SysLog.java b/src/main/java/vip/fuck/sm/entity/SysLog.java index d444de1..fff89e1 100644 --- a/src/main/java/vip/fuck/sm/entity/SysLog.java +++ b/src/main/java/vip/fuck/sm/entity/SysLog.java @@ -1,10 +1,11 @@ package vip.fuck.sm.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.Ignore; +import org.dromara.autotable.annotation.PrimaryKey; import java.io.Serializable; import java.util.Date; @@ -18,11 +19,14 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data +@TableName("sys_log") +@AutoTable("sys_log") public class SysLog extends BasePageEntity implements Serializable { - @TableId - private String id; + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; - private String userId; + private Long userId; private String username; @@ -40,9 +44,11 @@ public class SysLog extends BasePageEntity implements Serializable { private Date createTime; @TableField(exist = false) + @Ignore private String startTime; @TableField(exist = false) + @Ignore private String endTime; } \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysPermission.java b/src/main/java/vip/fuck/sm/entity/SysPermission.java index 3127fa9..ab833a2 100644 --- a/src/main/java/vip/fuck/sm/entity/SysPermission.java +++ b/src/main/java/vip/fuck/sm/entity/SysPermission.java @@ -1,9 +1,11 @@ package vip.fuck.sm.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.ColumnDefault; +import org.dromara.autotable.annotation.Ignore; +import org.dromara.autotable.annotation.PrimaryKey; import org.noear.solon.validation.annotation.NotBlank; import org.noear.solon.validation.annotation.NotNull; @@ -18,11 +20,14 @@ import java.util.Date; * @date 2020年3月18日 */ @Data +@TableName("sys_permission") +@AutoTable("sys_permission") public class SysPermission implements Serializable { - @TableId - private String id; + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; @NotBlank(message = "菜单权限名称不能为空") private String name; @@ -36,7 +41,7 @@ public class SysPermission implements Serializable { private String target; @NotNull(message = "所属菜单不能为空") - private String pid; + private Long pid; private Integer orderNum; @@ -55,9 +60,11 @@ public class SysPermission implements Serializable { private Date updateTime; @TableField(fill = FieldFill.INSERT) + @ColumnDefault(value = "0") private Integer deleted; @TableField(exist = false) + @Ignore private String pidName; } \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java b/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java index f777312..d36bba3 100644 --- a/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java +++ b/src/main/java/vip/fuck/sm/entity/SysPlugsEntity.java @@ -1,6 +1,8 @@ package vip.fuck.sm.entity; import com.baomidou.mybatisplus.annotation.*; +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.PrimaryKey; import vip.fuck.sm.entity.BasePageEntity; import java.util.Date; @@ -17,6 +19,7 @@ import lombok.Data; */ @Data @TableName("sys_plugs") +@AutoTable("sys_plugs") public class SysPlugsEntity extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -24,6 +27,7 @@ public class SysPlugsEntity extends BasePageEntity implements Serializable { * 全限版本 */ @TableId(value = "qualified_version",type = IdType.INPUT) + @PrimaryKey() private String qualifiedVersion; /** diff --git a/src/main/java/vip/fuck/sm/entity/SysRole.java b/src/main/java/vip/fuck/sm/entity/SysRole.java index 5c1eff9..7d8ef9c 100644 --- a/src/main/java/vip/fuck/sm/entity/SysRole.java +++ b/src/main/java/vip/fuck/sm/entity/SysRole.java @@ -1,8 +1,7 @@ package vip.fuck.sm.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.*; +import org.dromara.autotable.annotation.*; import vip.fuck.sm.vo.resp.DeptRespNodeVO; import vip.fuck.sm.vo.resp.PermissionRespNode; import lombok.Data; @@ -24,9 +23,12 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data @Accessors(chain = true) +@TableName("sys_role") +@AutoTable("sys_role") public class SysRole extends BasePageEntity implements Serializable { - @TableId - private String id; + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; @NotBlank(message = "名称不能为空") private String name; @@ -44,23 +46,31 @@ public class SysRole extends BasePageEntity implements Serializable { private Date updateTime; @TableField(fill = FieldFill.INSERT) + @ColumnDefault(value = "0") private Integer deleted; @TableField(exist = false) + @Ignore private List permissionRespNodes; + @TableField(exist = false) + @Ignore private List deptRespNodes; @TableField(exist = false) + @Ignore private String startTime; @TableField(exist = false) + @Ignore private String endTime; @TableField(exist = false) - private List permissions; + @Ignore + private List permissions; @TableField(exist = false) - private List depts; + @Ignore + private List depts; } \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java b/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java index 5f2c854..06b4f4b 100644 --- a/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java +++ b/src/main/java/vip/fuck/sm/entity/SysRoleDeptEntity.java @@ -1,10 +1,10 @@ package vip.fuck.sm.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.PrimaryKey; import java.io.Serializable; import java.util.Date; @@ -16,28 +16,31 @@ import java.util.Date; * @email *****@mail.com * @date 2020-09-27 17:30:15 */ +@EqualsAndHashCode(callSuper = true) @Data @TableName("sys_role_dept") +@AutoTable("sys_role_dept") public class SysRoleDeptEntity extends BasePageEntity implements Serializable { private static final long serialVersionUID = 1L; /** * 主键 */ - @TableId("id") - private String id; + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; /** * 角色id */ @TableField("role_id") - private String roleId; + private Long roleId; /** * 菜单权限id */ @TableField("dept_id") - private String deptId; + private Long deptId; /** * 创建时间 diff --git a/src/main/java/vip/fuck/sm/entity/SysRolePermission.java b/src/main/java/vip/fuck/sm/entity/SysRolePermission.java index 6e76d9f..07232df 100644 --- a/src/main/java/vip/fuck/sm/entity/SysRolePermission.java +++ b/src/main/java/vip/fuck/sm/entity/SysRolePermission.java @@ -1,9 +1,9 @@ package vip.fuck.sm.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.PrimaryKey; import java.io.Serializable; import java.util.Date; @@ -16,13 +16,16 @@ import java.util.Date; * @date 2020年3月18日 */ @Data +@TableName("sys_role_permission") +@AutoTable("sys_role_permission") public class SysRolePermission implements Serializable { - @TableId - private String id; + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; - private String roleId; + private Long roleId; - private String permissionId; + private Long permissionId; @TableField(fill = FieldFill.INSERT) private Date createTime; diff --git a/src/main/java/vip/fuck/sm/entity/SysUser.java b/src/main/java/vip/fuck/sm/entity/SysUser.java index 44194a0..816dbb8 100644 --- a/src/main/java/vip/fuck/sm/entity/SysUser.java +++ b/src/main/java/vip/fuck/sm/entity/SysUser.java @@ -1,10 +1,12 @@ package vip.fuck.sm.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.ColumnDefault; +import org.dromara.autotable.annotation.Ignore; +import org.dromara.autotable.annotation.PrimaryKey; import org.noear.solon.validation.annotation.NotBlank; import java.io.Serializable; @@ -20,9 +22,12 @@ import java.util.List; */ @EqualsAndHashCode(callSuper = true) @Data +@TableName("sys_user") +@AutoTable("sys_user") public class SysUser extends BasePageEntity implements Serializable { - @TableId - private String id; + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; @NotBlank(message = "账号不能为空") private String username; @@ -33,19 +38,23 @@ public class SysUser extends BasePageEntity implements Serializable { private String password; @TableField(exist = false) + @Ignore private String oldPwd; @TableField(exist = false) + @Ignore private String newPwd; private String phone; - private String deptId; + private Long deptId; @TableField(exist = false) + @Ignore private String deptName; @TableField(exist = false) + @Ignore private String deptNo; @@ -60,11 +69,12 @@ public class SysUser extends BasePageEntity implements Serializable { private Integer sex; @TableField(fill = FieldFill.INSERT) + @ColumnDefault(value = "0") private Integer deleted; - private String createId; + private Long createId; - private String updateId; + private Long updateId; private Integer createWhere; @@ -75,14 +85,18 @@ public class SysUser extends BasePageEntity implements Serializable { private Date updateTime; @TableField(exist = false) + @Ignore private String startTime; @TableField(exist = false) + @Ignore private String endTime; @TableField(exist = false) - private List roleIds; + @Ignore + private List roleIds; @TableField(exist = false) + @Ignore private String captcha; } \ No newline at end of file diff --git a/src/main/java/vip/fuck/sm/entity/SysUserRole.java b/src/main/java/vip/fuck/sm/entity/SysUserRole.java index 8f5a752..8fb193e 100644 --- a/src/main/java/vip/fuck/sm/entity/SysUserRole.java +++ b/src/main/java/vip/fuck/sm/entity/SysUserRole.java @@ -1,9 +1,9 @@ package vip.fuck.sm.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; +import org.dromara.autotable.annotation.AutoTable; +import org.dromara.autotable.annotation.PrimaryKey; import java.io.Serializable; import java.util.Date; @@ -16,13 +16,16 @@ import java.util.Date; * @date 2020年3月18日 */ @Data +@TableName("sys_user_role") +@AutoTable("sys_user_role") public class SysUserRole implements Serializable { - @TableId - private String id; + @TableId(type = IdType.AUTO) + @PrimaryKey(autoIncrement = true) + private Long id; - private String userId; + private Long userId; - private String roleId; + private Long roleId; @TableField(fill = FieldFill.INSERT) private Date createTime; diff --git a/src/main/java/vip/fuck/sm/service/HomeService.java b/src/main/java/vip/fuck/sm/service/HomeService.java index 7a83cbf..6d8e0bf 100644 --- a/src/main/java/vip/fuck/sm/service/HomeService.java +++ b/src/main/java/vip/fuck/sm/service/HomeService.java @@ -17,5 +17,5 @@ public interface HomeService { * @param userId userId * @return HomeRespVO */ - HomeRespVO getHomeInfo(String userId); + HomeRespVO getHomeInfo(Long userId); } diff --git a/src/main/java/vip/fuck/sm/service/PermissionService.java b/src/main/java/vip/fuck/sm/service/PermissionService.java index 05c1196..6ba9d5c 100644 --- a/src/main/java/vip/fuck/sm/service/PermissionService.java +++ b/src/main/java/vip/fuck/sm/service/PermissionService.java @@ -21,14 +21,14 @@ public interface PermissionService extends IService { * @param userId userId * @return 权限 */ - List getPermission(String userId); + List getPermission(Long userId); /** * 删除权限 * * @param permissionId 权限id */ - void deleted(String permissionId); + void deleted(Long permissionId); /** * 获取所有 @@ -43,7 +43,7 @@ public interface PermissionService extends IService { * @param userId userId * @return Set */ - List getPermissionsByUserId(String userId); + List getPermissionsByUserId(Long userId); /** * 根据userId获取权限树 @@ -51,7 +51,7 @@ public interface PermissionService extends IService { * @param userId * @return List */ - List permissionTreeList(String userId); + List permissionTreeList(Long userId); /** * 根据权限树 @@ -66,7 +66,7 @@ public interface PermissionService extends IService { * @param permissionId permissionId * @return List */ - List selectAllMenuByTree(String permissionId); + List selectAllMenuByTree(Long permissionId); /** @@ -75,7 +75,7 @@ public interface PermissionService extends IService { * @param permissionId permissionId * @return List */ - List getUserIdsById(String permissionId); + List getUserIdsById(Long permissionId); /** * 更新 diff --git a/src/main/java/vip/fuck/sm/service/RoleService.java b/src/main/java/vip/fuck/sm/service/RoleService.java index 05f0427..5e53d1c 100644 --- a/src/main/java/vip/fuck/sm/service/RoleService.java +++ b/src/main/java/vip/fuck/sm/service/RoleService.java @@ -49,5 +49,5 @@ public interface RoleService extends IService { * @param userId userId * @return List */ - List getRoleInfoByUserId(String userId); + List getRoleInfoByUserId(Long userId); } diff --git a/src/main/java/vip/fuck/sm/service/SysDictDetailService.java b/src/main/java/vip/fuck/sm/service/SysDictDetailService.java index a7f3f1e..6205190 100644 --- a/src/main/java/vip/fuck/sm/service/SysDictDetailService.java +++ b/src/main/java/vip/fuck/sm/service/SysDictDetailService.java @@ -21,6 +21,6 @@ public interface SysDictDetailService extends IService { * @param dictId dictId * @return IPage */ - IPage listByPage(Page page, String dictId); + IPage listByPage(Page page, Long dictId); } diff --git a/src/main/java/vip/fuck/sm/service/UserRoleService.java b/src/main/java/vip/fuck/sm/service/UserRoleService.java index 7ca2b14..bcfae96 100644 --- a/src/main/java/vip/fuck/sm/service/UserRoleService.java +++ b/src/main/java/vip/fuck/sm/service/UserRoleService.java @@ -21,7 +21,7 @@ public interface UserRoleService extends IService { * @param userId userId * @return List */ - List getRoleIdsByUserId(String userId); + List getRoleIdsByUserId(Long userId); /** * 用户绑定角色 diff --git a/src/main/java/vip/fuck/sm/service/UserService.java b/src/main/java/vip/fuck/sm/service/UserService.java index fc09156..c31c838 100644 --- a/src/main/java/vip/fuck/sm/service/UserService.java +++ b/src/main/java/vip/fuck/sm/service/UserService.java @@ -65,7 +65,7 @@ public interface UserService extends IService { * @param userId userId * @return UserOwnRoleRespVO */ - UserOwnRoleRespVO getUserOwnRole(String userId); + UserOwnRoleRespVO getUserOwnRole(Long userId); /** * 修改自己信息 diff --git a/src/main/java/vip/fuck/sm/service/impl/DeptServiceImpl.java b/src/main/java/vip/fuck/sm/service/impl/DeptServiceImpl.java index 375cfba..5a431f6 100644 --- a/src/main/java/vip/fuck/sm/service/impl/DeptServiceImpl.java +++ b/src/main/java/vip/fuck/sm/service/impl/DeptServiceImpl.java @@ -21,7 +21,7 @@ import org.noear.solon.annotation.Component; import org.noear.solon.data.annotation.Tran; -import javax.annotation.Resource; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicReference; @@ -69,7 +69,7 @@ public class DeptServiceImpl extends ServiceImpl impleme } sysDeptMapper.updateById(vo); //说明层级发生了变化 - if (!StrUtil.isEmpty(vo.getPid()) && !vo.getPid().equals(sysDept.getPid())) { + if (!ObjectUtil.isEmpty(vo.getPid()) && !vo.getPid().equals(sysDept.getPid())) { SysDept parent = sysDeptMapper.selectById(vo.getPid()); if (!"0".equals(vo.getPid()) && null == parent) { throw new BusinessException(BaseResponseCode.DATA_ERROR); @@ -130,7 +130,7 @@ public class DeptServiceImpl extends ServiceImpl impleme // 默认加一个顶级方便新增顶级部门 DeptRespNodeVO respNodeVO = new DeptRespNodeVO(); respNodeVO.setTitle("默认顶级部门"); - respNodeVO.setId("0"); + respNodeVO.setId(0L); respNodeVO.setSpread(true); respNodeVO.setDisabled(disabled); respNodeVO.setChildren(getTree(list)); @@ -154,7 +154,7 @@ public class DeptServiceImpl extends ServiceImpl impleme return list; } - private List getChild(String id, List all) { + private List getChild(Long id, List all) { List list = new ArrayList<>(); for (SysDept sysDept : all) { if (sysDept.getPid().equals(id)) { diff --git a/src/main/java/vip/fuck/sm/service/impl/HomeServiceImpl.java b/src/main/java/vip/fuck/sm/service/impl/HomeServiceImpl.java index a53eb69..4eae2e0 100644 --- a/src/main/java/vip/fuck/sm/service/impl/HomeServiceImpl.java +++ b/src/main/java/vip/fuck/sm/service/impl/HomeServiceImpl.java @@ -13,7 +13,7 @@ import vip.fuck.sm.vo.resp.UserInfoRespVO; import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.Component; -import javax.annotation.Resource; + import java.util.List; /** @@ -33,7 +33,7 @@ public class HomeServiceImpl implements HomeService { private PermissionService permissionService; @Override - public HomeRespVO getHomeInfo(String userId) { + public HomeRespVO getHomeInfo(Long userId) { SysUser sysUser = userService.getById(userId); diff --git a/src/main/java/vip/fuck/sm/service/impl/PermissionServiceImpl.java b/src/main/java/vip/fuck/sm/service/impl/PermissionServiceImpl.java index a59dc5a..69567d5 100644 --- a/src/main/java/vip/fuck/sm/service/impl/PermissionServiceImpl.java +++ b/src/main/java/vip/fuck/sm/service/impl/PermissionServiceImpl.java @@ -22,7 +22,7 @@ import org.noear.solon.annotation.Component; import org.noear.solon.data.annotation.Tran; -import javax.annotation.Resource; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -52,8 +52,8 @@ public class PermissionServiceImpl extends ServiceImpl getPermission(String userId) { - List roleIds = userRoleService.getRoleIdsByUserId(userId); + public List getPermission(Long userId) { + List roleIds = userRoleService.getRoleIdsByUserId(userId); if (ObjectUtil.isEmpty(roleIds)) { return null; } @@ -73,9 +73,9 @@ public class PermissionServiceImpl extends ServiceImpl userIds = getUserIdsById(permissionId); + List userIds = getUserIdsById(permissionId); SysPermission sysPermission = sysPermissionMapper.selectById(permissionId); if (null == sysPermission) { log.error("传入 的 id:{}不合法", permissionId); @@ -119,7 +119,7 @@ public class PermissionServiceImpl extends ServiceImpl getPermissionsByUserId(String userId) { + public List getPermissionsByUserId(Long userId) { List list = getPermission(userId); Set permissions = new HashSet<>(); @@ -139,7 +139,7 @@ public class PermissionServiceImpl extends ServiceImpl permissionTreeList(String userId) { + public List permissionTreeList(Long userId) { List list = getPermission(userId); return getTree(list, true); } @@ -154,7 +154,7 @@ public class PermissionServiceImpl extends ServiceImpl getChildAll(String id, List all) { + private List getChildAll(Long id, List all) { List list = new ArrayList<>(); for (SysPermission sysPermission : all) { - if (sysPermission.getPid().equals(id)) { + if (ObjectUtil.equals(sysPermission.getPid(),id)) { PermissionRespNode permissionRespNode = new PermissionRespNode(); BeanUtil.copyProperties(sysPermission, permissionRespNode); permissionRespNode.setTitle(sysPermission.getName()); @@ -191,11 +191,11 @@ public class PermissionServiceImpl extends ServiceImpl getChildExcBtn(String id, List all) { + private List getChildExcBtn(Long id, List all) { List list = new ArrayList<>(); for (SysPermission sysPermission : all) { - if (sysPermission.getPid().equals(id) && sysPermission.getType() != 3) { + if ( ObjectUtil.equals(sysPermission.getPid(),id) && sysPermission.getType() != 3) { PermissionRespNode permissionRespNode = new PermissionRespNode(); BeanUtil.copyProperties(sysPermission, permissionRespNode); permissionRespNode.setTitle(sysPermission.getName()); @@ -225,12 +225,12 @@ public class PermissionServiceImpl extends ServiceImpl selectAllMenuByTree(String permissionId) { + public List selectAllMenuByTree(Long permissionId) { List list = selectAll(1); if (!ObjectUtil.isEmpty(list) && !ObjectUtil.isEmpty(permissionId)) { for (SysPermission sysPermission : list) { - if (sysPermission.getId().equals(permissionId)) { + if (ObjectUtil.equals(sysPermission.getId(),permissionId)) { list.remove(sysPermission); break; } @@ -239,7 +239,7 @@ public class PermissionServiceImpl extends ServiceImpl result = new ArrayList<>(); //新增顶级目录是为了方便添加一级目录 PermissionRespNode respNode = new PermissionRespNode(); - respNode.setId("0"); + respNode.setId(0L); respNode.setTitle("默认顶级菜单"); respNode.setSpread(true); respNode.setChildren(getTree(list, true)); @@ -248,10 +248,10 @@ public class PermissionServiceImpl extends ServiceImpl getUserIdsById(Long id) { //根据权限id，获取所有角色id //根据权限id，获取所有角色id - List roleIds = rolePermissionService.listObjs(Wrappers.lambdaQuery().select(SysRolePermission::getRoleId).eq(SysRolePermission::getPermissionId, id)); + List roleIds = rolePermissionService.listObjs(Wrappers.lambdaQuery().select(SysRolePermission::getRoleId).eq(SysRolePermission::getPermissionId, id)); if (!ObjectUtil.isEmpty(roleIds)) { //根据角色id， 获取关联用户 return userRoleService.listObjs(Wrappers.lambdaQuery().select(SysUserRole::getUserId).in(SysUserRole::getRoleId, roleIds)); diff --git a/src/main/java/vip/fuck/sm/service/impl/RolePermissionServiceImpl.java b/src/main/java/vip/fuck/sm/service/impl/RolePermissionServiceImpl.java index 2f034c9..dc74ac5 100644 --- a/src/main/java/vip/fuck/sm/service/impl/RolePermissionServiceImpl.java +++ b/src/main/java/vip/fuck/sm/service/impl/RolePermissionServiceImpl.java @@ -23,7 +23,7 @@ public class RolePermissionServiceImpl extends ServiceImpl list = new ArrayList<>(); - for (String permissionId : vo.getPermissionIds()) { + for (Long permissionId : vo.getPermissionIds()) { SysRolePermission sysRolePermission = new SysRolePermission(); sysRolePermission.setPermissionId(permissionId); sysRolePermission.setRoleId(vo.getRoleId()); diff --git a/src/main/java/vip/fuck/sm/service/impl/RoleServiceImpl.java b/src/main/java/vip/fuck/sm/service/impl/RoleServiceImpl.java index dcb115d..6625a69 100644 --- a/src/main/java/vip/fuck/sm/service/impl/RoleServiceImpl.java +++ b/src/main/java/vip/fuck/sm/service/impl/RoleServiceImpl.java @@ -21,7 +21,7 @@ import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; import org.noear.solon.data.annotation.Tran; -import javax.annotation.Resource; + import java.util.HashSet; import java.util.List; import java.util.Set; @@ -136,9 +136,9 @@ public class RoleServiceImpl extends ServiceImpl impleme } @Override - public List getRoleInfoByUserId(String userId) { + public List getRoleInfoByUserId(Long userId) { - List roleIds = userRoleService.getRoleIdsByUserId(userId); + List roleIds = userRoleService.getRoleIdsByUserId(userId); if (ObjectUtil.isEmpty(roleIds)) { return null; } diff --git a/src/main/java/vip/fuck/sm/service/impl/SysDictDetailServiceImpl.java b/src/main/java/vip/fuck/sm/service/impl/SysDictDetailServiceImpl.java index fa6315c..6b5c99a 100644 --- a/src/main/java/vip/fuck/sm/service/impl/SysDictDetailServiceImpl.java +++ b/src/main/java/vip/fuck/sm/service/impl/SysDictDetailServiceImpl.java @@ -16,7 +16,6 @@ import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; -import javax.annotation.Resource; /** * 数据字典 服务类 @@ -34,7 +33,7 @@ public class SysDictDetailServiceImpl extends ServiceImpl listByPage(Page page, String dictId) { + public IPage listByPage(Page page, Long dictId) { SysDictEntity sysDictEntity = sysDictMapper.selectById(dictId); if (sysDictEntity == null) { @@ -46,7 +45,7 @@ public class SysDictDetailServiceImpl extends ServiceImpl result = sysDictDetailMapper.selectPage(page, wrapper); if (!ObjectUtil.isEmpty(result.getRecords())) { - result.getRecords().stream().forEach(entity -> entity.setDictName(sysDictEntity.getName())); + result.getRecords().forEach(entity -> entity.setDictName(sysDictEntity.getName())); } return result; } diff --git a/src/main/java/vip/fuck/sm/service/impl/SysDictServiceImpl.java b/src/main/java/vip/fuck/sm/service/impl/SysDictServiceImpl.java index 0e4fbd4..3e088bd 100644 --- a/src/main/java/vip/fuck/sm/service/impl/SysDictServiceImpl.java +++ b/src/main/java/vip/fuck/sm/service/impl/SysDictServiceImpl.java @@ -18,7 +18,7 @@ import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; -import javax.annotation.Resource; + import java.util.List; /** diff --git a/src/main/java/vip/fuck/sm/service/impl/UserRoleServiceImpl.java b/src/main/java/vip/fuck/sm/service/impl/UserRoleServiceImpl.java index ff3d07e..d2cf579 100644 --- a/src/main/java/vip/fuck/sm/service/impl/UserRoleServiceImpl.java +++ b/src/main/java/vip/fuck/sm/service/impl/UserRoleServiceImpl.java @@ -13,7 +13,7 @@ import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; import org.noear.solon.data.annotation.Tran; -import javax.annotation.Resource; + import java.util.ArrayList; import java.util.List; @@ -30,7 +30,7 @@ public class UserRoleServiceImpl extends ServiceImpl getRoleIdsByUserId(Long userId) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery().select(SysUserRole::getRoleId).eq(SysUserRole::getUserId, userId); return sysUserRoleMapper.selectObjs(queryWrapper); } @@ -42,7 +42,7 @@ public class UserRoleServiceImpl extends ServiceImpl list = new ArrayList<>(); - for (String roleId : vo.getRoleIds()) { + for (Long roleId : vo.getRoleIds()) { SysUserRole sysUserRole = new SysUserRole(); sysUserRole.setUserId(vo.getUserId()); sysUserRole.setRoleId(roleId); diff --git a/src/main/java/vip/fuck/sm/service/impl/UserServiceImpl.java b/src/main/java/vip/fuck/sm/service/impl/UserServiceImpl.java index a757cce..867c0dd 100644 --- a/src/main/java/vip/fuck/sm/service/impl/UserServiceImpl.java +++ b/src/main/java/vip/fuck/sm/service/impl/UserServiceImpl.java @@ -2,11 +2,13 @@ package vip.fuck.sm.service.impl; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.noear.solon.data.cache.CacheService; import vip.fuck.sm.common.exception.BusinessException; import vip.fuck.sm.common.exception.code.BaseResponseCode; import vip.fuck.sm.common.utils.PasswordUtils; @@ -28,7 +30,7 @@ import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.Component; -import javax.annotation.Resource; + import java.util.List; /** @@ -56,6 +58,12 @@ public class UserServiceImpl extends ServiceImpl impleme @Inject("${solon.env}") private String env; + @Inject + private CacheService cacheService; + + @Inject("${sa-token.timeout:2592000}") + private int SA_TOKEN_TIMEOUT = 2592000; + @Override public void register(SysUser sysUser) { SysUser sysUserOne = sysUserMapper.selectOne(Wrappers.lambdaQuery().eq(SysUser::getUsername, sysUser.getUsername())); @@ -83,7 +91,7 @@ public class UserServiceImpl extends ServiceImpl impleme LoginRespVO respVO = new LoginRespVO(); BeanUtil.copyProperties(sysUser, respVO); - if (StringUtils.isNotBlank(sysUser.getDeptId())) { + if (ObjectUtil.isNotEmpty(sysUser.getDeptId())) { SysDept sysDept = sysDeptMapper.selectById(sysUser.getDeptId()); if (sysDept != null) { sysUser.setDeptNo(sysDept.getDeptNo()); @@ -91,7 +99,7 @@ public class UserServiceImpl extends ServiceImpl impleme } //saToken StpUtil.login(sysUser.getId()); - + cacheService.store("sa-token:user:"+sysUser.getId(),sysUser,SA_TOKEN_TIMEOUT); return respVO; } @@ -131,7 +139,7 @@ public class UserServiceImpl extends ServiceImpl impleme @Override public void updateUserInfoMy(SysUser vo) { - SysUser user = sysUserMapper.selectById(StpUtil.getLoginIdAsString()); + SysUser user = sysUserMapper.selectById(StpUtil.getLoginIdAsLong()); if (null == user) { throw new BusinessException(BaseResponseCode.DATA_ERROR); } @@ -141,7 +149,7 @@ public class UserServiceImpl extends ServiceImpl impleme } else { vo.setPassword(null); } - vo.setUpdateId(StpUtil.getLoginIdAsString()); + vo.setUpdateId(StpUtil.getLoginIdAsLong()); sysUserMapper.updateById(vo); } @@ -226,8 +234,8 @@ public class UserServiceImpl extends ServiceImpl impleme } @Override - public UserOwnRoleRespVO getUserOwnRole(String userId) { - List roleIdsByUserId = userRoleService.getRoleIdsByUserId(userId); + public UserOwnRoleRespVO getUserOwnRole(Long userId) { + List roleIdsByUserId = userRoleService.getRoleIdsByUserId(userId); List list = roleService.list(); UserOwnRoleRespVO vo = new UserOwnRoleRespVO(); vo.setAllRole(list); diff --git a/src/main/java/vip/fuck/sm/vo/req/RolePermissionOperationReqVO.java b/src/main/java/vip/fuck/sm/vo/req/RolePermissionOperationReqVO.java index 3bbafb4..75bc0ec 100644 --- a/src/main/java/vip/fuck/sm/vo/req/RolePermissionOperationReqVO.java +++ b/src/main/java/vip/fuck/sm/vo/req/RolePermissionOperationReqVO.java @@ -18,8 +18,8 @@ import java.util.List; public class RolePermissionOperationReqVO { @ApiModelProperty(value = "角色id") @NotBlank(message = "角色id不能为空") - private String roleId; + private Long roleId; @ApiModelProperty(value = "菜单权限集合") @NotEmpty(message = "菜单权限集合不能为空") - private List permissionIds; + private List permissionIds; } diff --git a/src/main/java/vip/fuck/sm/vo/req/UserRoleOperationReqVO.java b/src/main/java/vip/fuck/sm/vo/req/UserRoleOperationReqVO.java index 8837be3..2b2aa8b 100644 --- a/src/main/java/vip/fuck/sm/vo/req/UserRoleOperationReqVO.java +++ b/src/main/java/vip/fuck/sm/vo/req/UserRoleOperationReqVO.java @@ -18,8 +18,8 @@ import java.util.List; public class UserRoleOperationReqVO { @ApiModelProperty(value = "用户id") @NotBlank(message = "用户id不能为空") - private String userId; + private Long userId; @ApiModelProperty(value = "角色id集合") @NotEmpty(message = "角色id集合不能为空") - private List roleIds; + private List roleIds; } diff --git a/src/main/java/vip/fuck/sm/vo/resp/DeptRespNodeVO.java b/src/main/java/vip/fuck/sm/vo/resp/DeptRespNodeVO.java index 708f2f1..6dead65 100644 --- a/src/main/java/vip/fuck/sm/vo/resp/DeptRespNodeVO.java +++ b/src/main/java/vip/fuck/sm/vo/resp/DeptRespNodeVO.java @@ -15,7 +15,7 @@ import java.util.List; @Data public class DeptRespNodeVO { @ApiModelProperty(value = "组织id") - private String id; + private Long id; @ApiModelProperty(value = "组织编码") private String deptNo; @@ -27,7 +27,7 @@ public class DeptRespNodeVO { private String label; @ApiModelProperty(value = "组织父级id") - private String pid; + private Long pid; @ApiModelProperty(value = "组织状态") private Integer status; diff --git a/src/main/java/vip/fuck/sm/vo/resp/LoginRespVO.java b/src/main/java/vip/fuck/sm/vo/resp/LoginRespVO.java index 23f07ce..8e489c2 100644 --- a/src/main/java/vip/fuck/sm/vo/resp/LoginRespVO.java +++ b/src/main/java/vip/fuck/sm/vo/resp/LoginRespVO.java @@ -19,7 +19,7 @@ public class LoginRespVO { @ApiModelProperty(value = "用户名") private String username; @ApiModelProperty(value = "用户id") - private String id; + private Long id; @ApiModelProperty(value = "电话") private String phone; @ApiModelProperty(value = "用户所拥有的菜单权限(前后端分离返回给前端控制菜单和按钮的显示和隐藏)") diff --git a/src/main/java/vip/fuck/sm/vo/resp/PermissionRespNode.java b/src/main/java/vip/fuck/sm/vo/resp/PermissionRespNode.java index a96cd19..184cee5 100644 --- a/src/main/java/vip/fuck/sm/vo/resp/PermissionRespNode.java +++ b/src/main/java/vip/fuck/sm/vo/resp/PermissionRespNode.java @@ -15,7 +15,7 @@ import java.util.List; @Data public class PermissionRespNode { @ApiModelProperty(value = "id") - private String id; + private Long id; @ApiModelProperty(value = "菜单权限名称") private String title; @@ -31,7 +31,7 @@ public class PermissionRespNode { private String target; @ApiModelProperty(value = "父级id") - private String pid; + private Long pid; @ApiModelProperty(value = "父级名称") private String pidName; diff --git a/src/main/java/vip/fuck/sm/vo/resp/UserInfoRespVO.java b/src/main/java/vip/fuck/sm/vo/resp/UserInfoRespVO.java index daea99d..a68aeec 100644 --- a/src/main/java/vip/fuck/sm/vo/resp/UserInfoRespVO.java +++ b/src/main/java/vip/fuck/sm/vo/resp/UserInfoRespVO.java @@ -13,7 +13,7 @@ import lombok.Data; @Data public class UserInfoRespVO { @ApiModelProperty(value = "用户id") - private String id; + private Long id; @ApiModelProperty(value = "账号") private String username; @ApiModelProperty(value = "手机号") @@ -23,7 +23,7 @@ public class UserInfoRespVO { @ApiModelProperty(value = "真实姓名") private String realName; @ApiModelProperty(value = "所属机构id") - private String deptId; + private Long deptId; @ApiModelProperty(value = "所属机构名称") private String deptName; diff --git a/src/main/java/vip/fuck/sm/vo/resp/UserOwnRoleRespVO.java b/src/main/java/vip/fuck/sm/vo/resp/UserOwnRoleRespVO.java index 2c227bf..a06dfa0 100644 --- a/src/main/java/vip/fuck/sm/vo/resp/UserOwnRoleRespVO.java +++ b/src/main/java/vip/fuck/sm/vo/resp/UserOwnRoleRespVO.java @@ -18,5 +18,5 @@ public class UserOwnRoleRespVO { @ApiModelProperty("所有角色集合") private List allRole; @ApiModelProperty(value = "用户所拥有角色集合") - private List ownRoles; + private List ownRoles; } diff --git a/src/main/resources/app.yml b/src/main/resources/app.yml index 6109112..8d356c1 100644 --- a/src/main/resources/app.yml +++ b/src/main/resources/app.yml @@ -6,6 +6,8 @@ server: project: database: mysql + + solon: env: 'dev' app: @@ -84,6 +86,24 @@ knife4j.setting.enableSwaggerModels: false knife4j.setting.enableFooter: false +auto-table: + enable: true + mode: 'update' + super-insert-position: 'after' + model-package: 'vip.fuck.sm.entity' + index-prefix: 'auto_table_' + auto-drop-column: false + strict-extends: true + recordSql: + enable: true + recordType: 'db' + tableName: 'auto_table_execute_sql_log' + mysql: + table-default-charset: 'utf8mb4' + table-default-collation: 'utf8mb4_general_ci' + column-default-charset: 'utf8mb4' + column-default-collation: 'utf8mb4_general_ci' + file: schema: 'http'