Merge remote-tracking branch 'origin/main'

# Conflicts:
#	sql/bns_20240604.sql
This commit is contained in:
paulch 2024-07-08 09:18:43 +08:00
commit fe95c19ec6
2 changed files with 44 additions and 26 deletions

View File

@ -34,8 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="addLogs" parameterType="SysLogsVo">
insert into sys_logs(
log_id,opera_user_name,ip,user_id,
model,opera_time,method,params,
operate_detail,opera_type,opera_uri,
model,oper_time,method,params,
operate_detail,oper_type,oper_uri,
log_type,result,times,
failure_reason,grade,err_type,
method_type,title,result_data

View File

@ -546,7 +546,7 @@ create table sys_config (
) engine=innodb auto_increment=100 comment = '参数配置表';
insert into sys_config values(1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', sysdate(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' );
insert into sys_config values(2, '用户管理-账号初始密码', 'sys.user.initPassword', 'Max@2024!', 'Y', 'admin', sysdate(), '', null, '初始化密码' );
insert into sys_config values(2, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 'admin', sysdate(), '', null, '初始化密码 123456' );
insert into sys_config values(3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', sysdate(), '', null, '深色主题theme-dark浅色主题theme-light' );
insert into sys_config values(4, '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 'admin', sysdate(), '', null, '是否开启注册用户功能true开启false关闭');
insert into sys_config values(5, '用户登录-黑名单列表', 'sys.login.blackIPList', '', 'Y', 'admin', sysdate(), '', null, '设置登录IP黑名单限制多个匹配项以;分隔,支持匹配(*通配、网段)');
@ -697,26 +697,44 @@ create table gen_table_column (
primary key (column_id)
) engine=innodb auto_increment=1 comment = '代码生成业务表字段';
DROP TABLE IF EXISTS `sys_logs`;
CREATE TABLE `sys_logs` (
`log_id` varchar(80) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT '主键',
`opera_user_name` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL,
`ip` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '操作ip',
`user_id` int NULL DEFAULT NULL COMMENT '操作人',
`model` varchar(200) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '操作模块',
`oper_time` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '操作时间',
`method` varchar(200) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '执行方法',
`params` varchar(4000) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '操作参数',
`operate_detail` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '操作详情',
`oper_type` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '操作类型  增删改查 登陆 登出',
`oper_uri` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '操作页面路径(uri',
`log_type` int NULL DEFAULT NULL COMMENT '日志类型 1 业务日志 0 系统日志  2异常日志',
`result` varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '执行结果(成功/失败',
`times` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '执行时间(秒/ms)',
`failure_reason` varchar(3000) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '失败原因',
`grade` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '异常事件等级(高、中、低)',
`err_type` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '异常类型(ip异常/越权)',
`method_type` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '方法类型 POST/个体',
`title` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL,
PRIMARY KEY (`log_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '系统日志表' ROW_FORMAT = Dynamic;
drop table if exists `sys_logs`;
create table `sys_logs` (
`log_id` varchar(80) NOT NULL COMMENT '主键',
`opera_user_name` varchar(30) NULL DEFAULT NULL,
`ip` varchar(30) NULL DEFAULT NULL COMMENT '操作ip',
`user_id` int NULL DEFAULT NULL COMMENT '操作人',
`model` varchar(200) NULL DEFAULT NULL COMMENT '操作模块',
`oper_time` varchar(50) NULL DEFAULT NULL COMMENT '操作时间',
`method` varchar(200) NULL DEFAULT NULL COMMENT '执行方法',
`params` varchar(4000) NULL DEFAULT NULL COMMENT '操作参数',
`operate_detail` varchar(500) NULL DEFAULT NULL COMMENT '操作详情',
`oper_type` varchar(20) NULL DEFAULT NULL COMMENT '操作类型 增删改查 登陆 登出',
`oper_uri` varchar(100) NULL DEFAULT NULL COMMENT '操作页面路径(uri',
`log_type` int NULL DEFAULT NULL COMMENT '日志类型 1 业务日志 0 系统日志 2异常日志',
`result` varchar(20) NULL DEFAULT NULL COMMENT '执行结果(成功/失败',
`times` varchar(30) NULL DEFAULT NULL COMMENT '执行时间(秒/ms)',
`failure_reason` varchar(3000) NULL DEFAULT NULL COMMENT '失败原因',
`grade` varchar(10) NULL DEFAULT NULL COMMENT '异常事件等级(高、中、低)',
`err_type` varchar(30) NULL DEFAULT NULL COMMENT '异常类型(ip异常/越权)',
`method_type` varchar(30) NULL DEFAULT NULL COMMENT '方法类型 POST/个体',
`title` varchar(255) NULL DEFAULT NULL,
`result_data` varchar(3000) NULL DEFAULT NULL COMMENT '返回数据',
PRIMARY KEY (`log_id`) USING BTREE
) engine = innodb comment = '系统日志表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of sys_logs
-- ----------------------------
-- ----------------------------
-- Table structure for sys_logs_set
-- ----------------------------
drop table if exists `sys_logs_set`;
create table `sys_logs_set` (
`capacity` varchar(255) NULL DEFAULT NULL
) engine = innodb comment = '数据库日志容量设置表'; ;
-- ----------------------------
-- Records of sys_logs_set
-- ----------------------------
insert into `sys_logs_set` values ('2048');