diff --git a/agileboot-common/pom.xml b/agileboot-common/pom.xml index aa18d8e..a7576ef 100644 --- a/agileboot-common/pom.xml +++ b/agileboot-common/pom.xml @@ -171,7 +171,7 @@ commons-validator - + it.ozimov embedded-redis diff --git a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/config/redis/RedisConfig.java b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/config/redis/RedisConfig.java index 8cc093a..80d2346 100644 --- a/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/config/redis/RedisConfig.java +++ b/agileboot-infrastructure/src/main/java/com/agileboot/infrastructure/config/redis/RedisConfig.java @@ -67,7 +67,6 @@ public class RedisConfig extends CachingConfigurerSupport { } @Bean - @ConditionalOnExpression("'${agileboot.embedded-test}' != 'true'") public DefaultRedisScript limitScript() { DefaultRedisScript redisScript = new DefaultRedisScript<>(); redisScript.setScriptText(limitScriptText()); diff --git a/agileboot-infrastructure/src/main/resources/h2sql/agileboot_schema.sql b/agileboot-infrastructure/src/main/resources/h2sql/agileboot_schema.sql index aa79646..b2353fc 100644 --- a/agileboot-infrastructure/src/main/resources/h2sql/agileboot_schema.sql +++ b/agileboot-infrastructure/src/main/resources/h2sql/agileboot_schema.sql @@ -3,7 +3,7 @@ create table sys_config ( - config_id int, + config_id int auto_increment, config_name varchar(128) default '' not null comment '配置名称', config_key varchar(128) default '' not null comment '配置键名', config_options varchar(1024) default '' not null comment '可选的选项', @@ -21,7 +21,7 @@ create table sys_config create table sys_dept ( - dept_id int, + dept_id int auto_increment, parent_id bigint default 0 not null comment '父部门id', ancestors text not null comment '祖级列表', dept_name varchar(64) default '' not null comment '部门名称', @@ -42,7 +42,7 @@ create table sys_dept create table sys_login_info ( - info_id bigint, + info_id bigint auto_increment, username varchar(50) default '' not null comment '用户账号', ip_address varchar(128) default '' not null comment '登录IP地址', login_location varchar(255) default '' not null comment '登录地点', @@ -56,7 +56,7 @@ create table sys_login_info create table sys_menu ( - menu_id bigint, + menu_id bigint auto_increment, menu_name varchar(64) not null comment '菜单名称', parent_id bigint default 0 not null comment '父菜单ID', order_num int default 0 not null comment '显示顺序', @@ -82,7 +82,7 @@ create table sys_menu create table sys_notice ( - notice_id int, + notice_id int auto_increment, notice_title varchar(64) not null comment '公告标题', notice_type smallint not null comment '公告类型(1通知 2公告)', notice_content text null comment '公告内容', @@ -99,7 +99,7 @@ create table sys_notice create table sys_operation_log ( - operation_id bigint, + operation_id bigint auto_increment, business_type smallint default 0 not null comment '业务类型(0其它 1新增 2修改 3删除)', request_method smallint default 0 not null comment '请求方式', request_module varchar(64) default '' not null comment '请求模块', @@ -122,7 +122,7 @@ create table sys_operation_log create table sys_post ( - post_id bigint, + post_id bigint auto_increment, post_code varchar(64) not null comment '岗位编码', post_name varchar(64) not null comment '岗位名称', post_sort int not null comment '显示顺序', @@ -139,7 +139,7 @@ create table sys_post create table sys_role ( - role_id bigint, + role_id bigint auto_increment, role_name varchar(32) not null comment '角色名称', role_key varchar(128) not null comment '角色权限字符串', role_sort int not null comment '显示顺序', @@ -158,13 +158,13 @@ create table sys_role create table sys_role_menu ( - role_id bigint not null comment '角色ID', - menu_id bigint not null comment '菜单ID' + role_id bigint auto_increment not null comment '角色ID', + menu_id bigint auto_increment not null comment '菜单ID' ); create table sys_user ( - user_id bigint, + user_id bigint auto_increment, post_id bigint null comment '职位id', role_id bigint null comment '角色id', dept_id bigint null comment '部门ID',