diff --git a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDictType.java b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDictType.java index b9df9858d..5e99817e6 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDictType.java +++ b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDictType.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 字典类型表 sys2_dict_type + * 字典类型表 sys_saas_dict_type * * @author Lion Li */ diff --git a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasLogininfor.java b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasLogininfor.java index 8626c86fc..b81bd7353 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasLogininfor.java +++ b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasLogininfor.java @@ -9,13 +9,13 @@ import java.io.Serializable; import java.util.Date; /** - * 系统访问记录表 sys2_logininfor + * 系统访问记录表 sys_saas_logininfor * * @author Lion Li */ @Data -@TableName("sys2_logininfor") +@TableName("sys_saas_logininfor") public class SysSaasLogininfor implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasNotice.java b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasNotice.java index 23cb7654b..0a3bb6a09 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasNotice.java +++ b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasNotice.java @@ -8,13 +8,13 @@ import lombok.EqualsAndHashCode; /** - * 通知公告表 sys2_notice + * 通知公告表 sys_saas_notice * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys2_notice") +@TableName("sys_saas_notice") public class SysSaasNotice extends TenantEntity { /** diff --git a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOss.java b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOss.java index e8977b587..5acdd4e77 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOss.java +++ b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOss.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys2_oss") +@TableName("sys_saas_oss") public class SysSaasOss extends TenantEntity { /** diff --git a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOssConfig.java b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOssConfig.java index 20a5c2056..bde270eff 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOssConfig.java +++ b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOssConfig.java @@ -7,13 +7,13 @@ import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; /** - * 对象存储配置对象 sys2_oss_config + * 对象存储配置对象 sys_saas_oss_config * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys2_oss_config") +@TableName("sys_saas_oss_config") public class SysSaasOssConfig extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasNoticeBo.java b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasNoticeBo.java index fe910d555..e265a8d88 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasNoticeBo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasNoticeBo.java @@ -10,7 +10,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.saas.domain.SysSaasNotice; /** - * 通知公告业务对象 sys2_notice + * 通知公告业务对象 sys_saas_notice * * @author Michelle.Chung */ diff --git a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssBo.java b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssBo.java index c9aba77bd..6ce275540 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssBo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssBo.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * OSS对象存储分页查询对象 sys2_oss + * OSS对象存储分页查询对象 sys_saas_oss * * @author Lion Li */ diff --git a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssConfigBo.java b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssConfigBo.java index 13d3db058..571f187ee 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssConfigBo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssConfigBo.java @@ -12,7 +12,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 对象存储配置业务对象 sys2_oss_config + * 对象存储配置业务对象 sys_saas_oss_config * * @author Lion Li * @author 孤舟烟雨 diff --git a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasNoticeVo.java b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasNoticeVo.java index c38960d33..95c60de4a 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasNoticeVo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasNoticeVo.java @@ -13,7 +13,7 @@ import java.util.Date; /** - * 通知公告视图对象 sys2_notice + * 通知公告视图对象 sys_saas_notice * * @author Michelle.Chung */ diff --git a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssConfigVo.java b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssConfigVo.java index bc9f89454..1f5fa4c7f 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssConfigVo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssConfigVo.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** - * 对象存储配置视图对象 sys2_oss_config + * 对象存储配置视图对象 sys_saas_oss_config * * @author Lion Li * @author 孤舟烟雨 diff --git a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssVo.java b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssVo.java index 175be4249..fc5540952 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssVo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssVo.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Date; /** - * OSS对象存储视图对象 sys2_oss + * OSS对象存储视图对象 sys_saas_oss * * @author Lion Li */ diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/application.yml b/ruoyi-site/ruoyi-h5/src/main/resources/application.yml index 03637c7f0..b32aa1a94 100644 --- a/ruoyi-site/ruoyi-h5/src/main/resources/application.yml +++ b/ruoyi-site/ruoyi-h5/src/main/resources/application.yml @@ -77,6 +77,25 @@ tenant: - h5_tag - h5_component_category_rel - h5_component_tag_rel + - sys_menu + - sys_tenant + - sys_tenant_package + - sys_application + - sys_role_dept + - sys_role_menu + - sys_user_post + - sys_user_role + - sys_client + - sys_oss_config + - sys_saas_menu + - sys_saas_tenant + - sys_saas_tenant_package + - sys_saas_application + - sys_saas_role_dept + - sys_saas_role_menu + - sys_saas_user_post + - sys_saas_user_role + - sys_saas_oss_config # MyBatisPlus配置 # https://baomidou.com/config/ @@ -104,7 +123,8 @@ minioplus: # 日志配置 logging: - config: classpath:logback-plus.xml level: - com.baomidou.mybatisplus: debug - org.mybatis.spring.mapper: debug + org.dromara: @logging.level@ + org.springframework: warn + org.mybatis.spring.mapper: error + config: classpath:logback-plus.xml diff --git a/ruoyi-site/ruoyi-sso-server/pom.xml b/ruoyi-site/ruoyi-sso-server/pom.xml index 5660ef6b7..1391f9df9 100644 --- a/ruoyi-site/ruoyi-sso-server/pom.xml +++ b/ruoyi-site/ruoyi-sso-server/pom.xml @@ -166,4 +166,4 @@ - \ No newline at end of file + diff --git a/ruoyi-site/ruoyi-sso-server/src/main/resources/application-local.yml b/ruoyi-site/ruoyi-sso-server/src/main/resources/application-local.yml index 88535795c..25d14fd1e 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/resources/application-local.yml +++ b/ruoyi-site/ruoyi-sso-server/src/main/resources/application-local.yml @@ -1,4 +1,47 @@ +# dubbo +dubbo: + config: + protocol: + name: tri + port: 20880 + application: + qos-enable: false + logger: slf4j + name: ${spring.application.name} + # 注册中心配置 + registry: + address: nacos://127.0.0.1:8848 + group: DUBBO_GROUP + parameters: + namespace: c5c00044-93e6-4e66-8060-3f39aa7ab82b + # metadata-report: + # address: redis://${spring.data.redis.host}:${spring.data.redis.port} + # # 集群开关，目前单机 + # cluster: false + # parameters: + # database: 6 + # timeout: ${spring.data.redis.timeout} + # 消费者相关配置 + consumer: + # 结果缓存(LRU算法) + # 会有数据不一致问题 建议在注解局部开启 + cache: false + # 支持校验注解 + validation: jvalidationNew + # 调用重试 不包括第一次 0为不需要重试 + retries: 0 + # 初始化检查 + check: false spring: + cloud: + nacos: + # nacos 服务地址 + server-addr: http://127.0.0.1:8848 + discovery: + # 注册组 + group: DUBBO_GROUP + namespace: c5c00044-93e6-4e66-8060-3f39aa7ab82b + # Redis配置 （SSO模式一和模式二使用Redis来同步会话） data: redis: @@ -100,40 +143,6 @@ security: - /*/api-docs/** - /sso/signout -# dubbo -dubbo: - config: - protocol: - name: tri - port: 20880 - application: - qos-enable: false - logger: slf4j - name: ${spring.application.name} - # 注册中心配置 - registry: - address: nacos://127.0.0.1:8848 - group: DUBBO_GROUP - parameters: - namespace: c5c00044-93e6-4e66-8060-3f39aa7ab82b - # metadata-report: - # address: redis://${spring.data.redis.host}:${spring.data.redis.port} - # # 集群开关，目前单机 - # cluster: false - # parameters: - # database: 6 - # timeout: ${spring.data.redis.timeout} - # 消费者相关配置 - consumer: - # 结果缓存(LRU算法) - # 会有数据不一致问题 建议在注解局部开启 - cache: false - # 支持校验注解 - validation: jvalidationNew - # 调用重试 不包括第一次 0为不需要重试 - retries: 0 - # 初始化检查 - check: false --- # 三方授权 justauth: diff --git a/script/sql/tenant/ry_vue_5.X.sql b/script/sql/tenant/ry_vue_5.X.sql index 55bd51cf2..a849bf562 100644 --- a/script/sql/tenant/ry_vue_5.X.sql +++ b/script/sql/tenant/ry_vue_5.X.sql @@ -19,7 +19,7 @@ create table sys_saas_application -- ---------------------------- -- 第三方平台授权表 -- ---------------------------- -create table sys2_social +create table sys_saas_social ( id bigint not null comment '主键', user_id bigint not null comment '用户ID', @@ -57,7 +57,7 @@ create table sys2_social -- ---------------------------- -- 租户表 -- ---------------------------- -create table sys2_tenant +create table sys_saas_tenant ( id bigint(20) not null comment 'id', tenant_id varchar(20) not null comment '租户编号', @@ -87,13 +87,13 @@ create table sys2_tenant -- 初始化-租户表数据 -- ---------------------------- -insert into sys2_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', null, null, '多租户通用后台管理管理系统', null, null, null, null, -1, '0', '0', 103, 1, sysdate(), null, null); +insert into sys_saas_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', null, null, '多租户通用后台管理管理系统', null, null, null, null, -1, '0', '0', 103, 1, sysdate(), null, null); -- ---------------------------- -- 租户套餐表 -- ---------------------------- -create table sys2_tenant_package ( +create table sys_saas_tenant_package ( package_id bigint(20) not null comment '租户套餐id', package_name varchar(20) comment '套餐名称', menu_ids varchar(3000) comment '关联菜单id', @@ -575,7 +575,7 @@ insert into sys_saas_user_post values ('1', '1'); -- ---------------------------- -- 10、操作日志记录 -- ---------------------------- -create table sys2_oper_log ( +create table sys_saas_oper_log ( oper_id bigint(20) not null comment '日志主键', tenant_id varchar(20) default '000000' comment '租户编号', title varchar(50) default '' comment '模块标题', @@ -595,16 +595,16 @@ create table sys2_oper_log ( oper_time datetime comment '操作时间', cost_time bigint(20) default 0 comment '消耗时间', primary key (oper_id), - key idx_sys2_oper_log_bt (business_type), - key idx_sys2_oper_log_s (status), - key idx_sys2_oper_log_ot (oper_time) + key idx_sys_saas_oper_log_bt (business_type), + key idx_sys_saas_oper_log_s (status), + key idx_sys_saas_oper_log_ot (oper_time) ) engine=innodb comment = '操作日志记录'; -- ---------------------------- -- 11、字典类型表 -- ---------------------------- -create table sys2_dict_type +create table sys_saas_dict_type ( dict_id bigint(20) not null comment '字典主键', tenant_id varchar(20) default '000000' comment '租户编号', @@ -620,22 +620,22 @@ create table sys2_dict_type unique (tenant_id, dict_type) ) engine=innodb comment = '字典类型表'; -insert into sys2_dict_type values(1, '000000', '用户性别', 'sys_saas_user_sex', 103, 1, sysdate(), null, null, '用户性别列表'); -insert into sys2_dict_type values(2, '000000', '菜单状态', 'sys2_show_hide', 103, 1, sysdate(), null, null, '菜单状态列表'); -insert into sys2_dict_type values(3, '000000', '系统开关', 'sys2_normal_disable', 103, 1, sysdate(), null, null, '系统开关列表'); -insert into sys2_dict_type values(6, '000000', '系统是否', 'sys2_yes_no', 103, 1, sysdate(), null, null, '系统是否列表'); -insert into sys2_dict_type values(7, '000000', '通知类型', 'sys2_notice_type', 103, 1, sysdate(), null, null, '通知类型列表'); -insert into sys2_dict_type values(8, '000000', '通知状态', 'sys2_notice_status', 103, 1, sysdate(), null, null, '通知状态列表'); -insert into sys2_dict_type values(9, '000000', '操作类型', 'sys2_oper_type', 103, 1, sysdate(), null, null, '操作类型列表'); -insert into sys2_dict_type values(10, '000000', '系统状态', 'sys2_common_status', 103, 1, sysdate(), null, null, '登录状态列表'); -insert into sys2_dict_type values(11, '000000', '授权类型', 'sys2_grant_type', 103, 1, sysdate(), null, null, '认证授权类型'); -insert into sys2_dict_type values(12, '000000', '设备类型', 'sys2_device_type', 103, 1, sysdate(), null, null, '客户端设备类型'); +insert into sys_saas_dict_type values(1, '000000', '用户性别', 'sys_saas_user_sex', 103, 1, sysdate(), null, null, '用户性别列表'); +insert into sys_saas_dict_type values(2, '000000', '菜单状态', 'sys_saas_show_hide', 103, 1, sysdate(), null, null, '菜单状态列表'); +insert into sys_saas_dict_type values(3, '000000', '系统开关', 'sys_saas_normal_disable', 103, 1, sysdate(), null, null, '系统开关列表'); +insert into sys_saas_dict_type values(6, '000000', '系统是否', 'sys_saas_yes_no', 103, 1, sysdate(), null, null, '系统是否列表'); +insert into sys_saas_dict_type values(7, '000000', '通知类型', 'sys_saas_notice_type', 103, 1, sysdate(), null, null, '通知类型列表'); +insert into sys_saas_dict_type values(8, '000000', '通知状态', 'sys_saas_notice_status', 103, 1, sysdate(), null, null, '通知状态列表'); +insert into sys_saas_dict_type values(9, '000000', '操作类型', 'sys_saas_oper_type', 103, 1, sysdate(), null, null, '操作类型列表'); +insert into sys_saas_dict_type values(10, '000000', '系统状态', 'sys_saas_common_status', 103, 1, sysdate(), null, null, '登录状态列表'); +insert into sys_saas_dict_type values(11, '000000', '授权类型', 'sys_saas_grant_type', 103, 1, sysdate(), null, null, '认证授权类型'); +insert into sys_saas_dict_type values(12, '000000', '设备类型', 'sys_saas_device_type', 103, 1, sysdate(), null, null, '客户端设备类型'); -- ---------------------------- -- 12、字典数据表 -- ---------------------------- -create table sys2_dict_data +create table sys_saas_dict_data ( dict_code bigint(20) not null comment '字典编码', tenant_id varchar(20) default '000000' comment '租户编号', @@ -655,46 +655,46 @@ create table sys2_dict_data primary key (dict_code) ) engine=innodb comment = '字典数据表'; -insert into sys2_dict_data values(1, '000000', 1, '男', '0', 'sys_saas_user_sex', '', '', 'Y', 103, 1, sysdate(), null, null, '性别男'); -insert into sys2_dict_data values(2, '000000', 2, '女', '1', 'sys_saas_user_sex', '', '', 'N', 103, 1, sysdate(), null, null, '性别女'); -insert into sys2_dict_data values(3, '000000', 3, '未知', '2', 'sys_saas_user_sex', '', '', 'N', 103, 1, sysdate(), null, null, '性别未知'); -insert into sys2_dict_data values(4, '000000', 1, '显示', '0', 'sys2_show_hide', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '显示菜单'); -insert into sys2_dict_data values(5, '000000', 2, '隐藏', '1', 'sys2_show_hide', '', 'danger', 'N', 103, 1, sysdate(), null, null, '隐藏菜单'); -insert into sys2_dict_data values(6, '000000', 1, '正常', '0', 'sys2_normal_disable', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态'); -insert into sys2_dict_data values(7, '000000', 2, '停用', '1', 'sys2_normal_disable', '', 'danger', 'N', 103, 1, sysdate(), null, null, '停用状态'); -insert into sys2_dict_data values(12, '000000', 1, '是', 'Y', 'sys2_yes_no', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '系统默认是'); -insert into sys2_dict_data values(13, '000000', 2, '否', 'N', 'sys2_yes_no', '', 'danger', 'N', 103, 1, sysdate(), null, null, '系统默认否'); -insert into sys2_dict_data values(14, '000000', 1, '通知', '1', 'sys2_notice_type', '', 'warning', 'Y', 103, 1, sysdate(), null, null, '通知'); -insert into sys2_dict_data values(15, '000000', 2, '公告', '2', 'sys2_notice_type', '', 'success', 'N', 103, 1, sysdate(), null, null, '公告'); -insert into sys2_dict_data values(16, '000000', 1, '正常', '0', 'sys2_notice_status', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态'); -insert into sys2_dict_data values(17, '000000', 2, '关闭', '1', 'sys2_notice_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, '关闭状态'); -insert into sys2_dict_data values(29, '000000', 99, '其他', '0', 'sys2_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '其他操作'); -insert into sys2_dict_data values(18, '000000', 1, '新增', '1', 'sys2_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '新增操作'); -insert into sys2_dict_data values(19, '000000', 2, '修改', '2', 'sys2_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '修改操作'); -insert into sys2_dict_data values(20, '000000', 3, '删除', '3', 'sys2_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '删除操作'); -insert into sys2_dict_data values(21, '000000', 4, '授权', '4', 'sys2_oper_type', '', 'primary', 'N', 103, 1, sysdate(), null, null, '授权操作'); -insert into sys2_dict_data values(22, '000000', 5, '导出', '5', 'sys2_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '导出操作'); -insert into sys2_dict_data values(23, '000000', 6, '导入', '6', 'sys2_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '导入操作'); -insert into sys2_dict_data values(24, '000000', 7, '强退', '7', 'sys2_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '强退操作'); -insert into sys2_dict_data values(25, '000000', 8, '生成代码', '8', 'sys2_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '生成操作'); -insert into sys2_dict_data values(26, '000000', 9, '清空数据', '9', 'sys2_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '清空操作'); -insert into sys2_dict_data values(27, '000000', 1, '成功', '0', 'sys2_common_status', '', 'primary', 'N', 103, 1, sysdate(), null, null, '正常状态'); -insert into sys2_dict_data values(28, '000000', 2, '失败', '1', 'sys2_common_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, '停用状态'); -insert into sys2_dict_data values(30, '000000', 0, '密码认证', 'password', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '密码认证'); -insert into sys2_dict_data values(31, '000000', 0, '短信认证', 'sms', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '短信认证'); -insert into sys2_dict_data values(32, '000000', 0, '邮件认证', 'email', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '邮件认证'); -insert into sys2_dict_data values(33, '000000', 0, '小程序认证', 'xcx', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '小程序认证'); -insert into sys2_dict_data values(34, '000000', 0, '三方登录认证', 'social', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '三方登录认证'); -insert into sys2_dict_data values(35, '000000', 0, 'PC', 'pc', 'sys2_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'PC'); -insert into sys2_dict_data values(36, '000000', 0, '安卓', 'android', 'sys2_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '安卓'); -insert into sys2_dict_data values(37, '000000', 0, 'iOS', 'ios', 'sys2_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'iOS'); -insert into sys2_dict_data values(38, '000000', 0, '小程序', 'xcx', 'sys2_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '小程序'); +insert into sys_saas_dict_data values(1, '000000', 1, '男', '0', 'sys_saas_user_sex', '', '', 'Y', 103, 1, sysdate(), null, null, '性别男'); +insert into sys_saas_dict_data values(2, '000000', 2, '女', '1', 'sys_saas_user_sex', '', '', 'N', 103, 1, sysdate(), null, null, '性别女'); +insert into sys_saas_dict_data values(3, '000000', 3, '未知', '2', 'sys_saas_user_sex', '', '', 'N', 103, 1, sysdate(), null, null, '性别未知'); +insert into sys_saas_dict_data values(4, '000000', 1, '显示', '0', 'sys_saas_show_hide', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '显示菜单'); +insert into sys_saas_dict_data values(5, '000000', 2, '隐藏', '1', 'sys_saas_show_hide', '', 'danger', 'N', 103, 1, sysdate(), null, null, '隐藏菜单'); +insert into sys_saas_dict_data values(6, '000000', 1, '正常', '0', 'sys_saas_normal_disable', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态'); +insert into sys_saas_dict_data values(7, '000000', 2, '停用', '1', 'sys_saas_normal_disable', '', 'danger', 'N', 103, 1, sysdate(), null, null, '停用状态'); +insert into sys_saas_dict_data values(12, '000000', 1, '是', 'Y', 'sys_saas_yes_no', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '系统默认是'); +insert into sys_saas_dict_data values(13, '000000', 2, '否', 'N', 'sys_saas_yes_no', '', 'danger', 'N', 103, 1, sysdate(), null, null, '系统默认否'); +insert into sys_saas_dict_data values(14, '000000', 1, '通知', '1', 'sys_saas_notice_type', '', 'warning', 'Y', 103, 1, sysdate(), null, null, '通知'); +insert into sys_saas_dict_data values(15, '000000', 2, '公告', '2', 'sys_saas_notice_type', '', 'success', 'N', 103, 1, sysdate(), null, null, '公告'); +insert into sys_saas_dict_data values(16, '000000', 1, '正常', '0', 'sys_saas_notice_status', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态'); +insert into sys_saas_dict_data values(17, '000000', 2, '关闭', '1', 'sys_saas_notice_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, '关闭状态'); +insert into sys_saas_dict_data values(29, '000000', 99, '其他', '0', 'sys_saas_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '其他操作'); +insert into sys_saas_dict_data values(18, '000000', 1, '新增', '1', 'sys_saas_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '新增操作'); +insert into sys_saas_dict_data values(19, '000000', 2, '修改', '2', 'sys_saas_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '修改操作'); +insert into sys_saas_dict_data values(20, '000000', 3, '删除', '3', 'sys_saas_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '删除操作'); +insert into sys_saas_dict_data values(21, '000000', 4, '授权', '4', 'sys_saas_oper_type', '', 'primary', 'N', 103, 1, sysdate(), null, null, '授权操作'); +insert into sys_saas_dict_data values(22, '000000', 5, '导出', '5', 'sys_saas_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '导出操作'); +insert into sys_saas_dict_data values(23, '000000', 6, '导入', '6', 'sys_saas_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '导入操作'); +insert into sys_saas_dict_data values(24, '000000', 7, '强退', '7', 'sys_saas_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '强退操作'); +insert into sys_saas_dict_data values(25, '000000', 8, '生成代码', '8', 'sys_saas_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '生成操作'); +insert into sys_saas_dict_data values(26, '000000', 9, '清空数据', '9', 'sys_saas_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '清空操作'); +insert into sys_saas_dict_data values(27, '000000', 1, '成功', '0', 'sys_saas_common_status', '', 'primary', 'N', 103, 1, sysdate(), null, null, '正常状态'); +insert into sys_saas_dict_data values(28, '000000', 2, '失败', '1', 'sys_saas_common_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, '停用状态'); +insert into sys_saas_dict_data values(30, '000000', 0, '密码认证', 'password', 'sys_saas_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '密码认证'); +insert into sys_saas_dict_data values(31, '000000', 0, '短信认证', 'sms', 'sys_saas_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '短信认证'); +insert into sys_saas_dict_data values(32, '000000', 0, '邮件认证', 'email', 'sys_saas_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '邮件认证'); +insert into sys_saas_dict_data values(33, '000000', 0, '小程序认证', 'xcx', 'sys_saas_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '小程序认证'); +insert into sys_saas_dict_data values(34, '000000', 0, '三方登录认证', 'social', 'sys_saas_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '三方登录认证'); +insert into sys_saas_dict_data values(35, '000000', 0, 'PC', 'pc', 'sys_saas_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'PC'); +insert into sys_saas_dict_data values(36, '000000', 0, '安卓', 'android', 'sys_saas_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '安卓'); +insert into sys_saas_dict_data values(37, '000000', 0, 'iOS', 'ios', 'sys_saas_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'iOS'); +insert into sys_saas_dict_data values(38, '000000', 0, '小程序', 'xcx', 'sys_saas_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '小程序'); -- ---------------------------- -- 13、参数配置表 -- ---------------------------- -create table sys2_config ( +create table sys_saas_config ( config_id bigint(20) not null comment '参数主键', tenant_id varchar(20) default '000000' comment '租户编号', config_name varchar(100) default '' comment '参数名称', @@ -710,17 +710,17 @@ create table sys2_config ( primary key (config_id) ) engine=innodb comment = '参数配置表'; -insert into sys2_config values(1, '000000', '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 103, 1, sysdate(), null, null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); -insert into sys2_config values(2, '000000', '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 103, 1, sysdate(), null, null, '初始化密码 123456' ); -insert into sys2_config values(3, '000000', '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, sysdate(), null, null, '深色主题theme-dark，浅色主题theme-light' ); -insert into sys2_config values(5, '000000', '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 103, 1, sysdate(), null, null, '是否开启注册用户功能（true开启，false关闭）'); -insert into sys2_config values(11, '000000', 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, sysdate(), null, null, 'true:开启, false:关闭'); +insert into sys_saas_config values(1, '000000', '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 103, 1, sysdate(), null, null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); +insert into sys_saas_config values(2, '000000', '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 103, 1, sysdate(), null, null, '初始化密码 123456' ); +insert into sys_saas_config values(3, '000000', '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, sysdate(), null, null, '深色主题theme-dark，浅色主题theme-light' ); +insert into sys_saas_config values(5, '000000', '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 103, 1, sysdate(), null, null, '是否开启注册用户功能（true开启，false关闭）'); +insert into sys_saas_config values(11, '000000', 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, sysdate(), null, null, 'true:开启, false:关闭'); -- ---------------------------- -- 14、系统访问记录 -- ---------------------------- -create table sys2_logininfor ( +create table sys_saas_logininfor ( info_id bigint(20) not null comment '访问ID', tenant_id varchar(20) default '000000' comment '租户编号', user_name varchar(50) default '' comment '用户账号', @@ -734,15 +734,15 @@ create table sys2_logininfor ( msg varchar(255) default '' comment '提示消息', login_time datetime comment '访问时间', primary key (info_id), - key idx_sys2_logininfor_s (status), - key idx_sys2_logininfor_lt (login_time) + key idx_sys_saas_logininfor_s (status), + key idx_sys_saas_logininfor_lt (login_time) ) engine=innodb comment = '系统访问记录'; -- ---------------------------- -- 17、通知公告表 -- ---------------------------- -create table sys2_notice ( +create table sys_saas_notice ( notice_id bigint(20) not null comment '公告ID', tenant_id varchar(20) default '000000' comment '租户编号', notice_title varchar(50) not null comment '公告标题', @@ -761,13 +761,13 @@ create table sys2_notice ( -- ---------------------------- -- 初始化-公告信息表数据 -- ---------------------------- -insert into sys2_notice values('1', '000000', '温馨提醒：2018-07-01 新版本发布啦', '2', '新版本内容', '0', 103, 1, sysdate(), null, null, '管理员'); -insert into sys2_notice values('2', '000000', '维护通知：2018-07-01 系统凌晨维护', '1', '维护内容', '0', 103, 1, sysdate(), null, null, '管理员'); +insert into sys_saas_notice values('1', '000000', '温馨提醒：2018-07-01 新版本发布啦', '2', '新版本内容', '0', 103, 1, sysdate(), null, null, '管理员'); +insert into sys_saas_notice values('2', '000000', '维护通知：2018-07-01 系统凌晨维护', '1', '维护内容', '0', 103, 1, sysdate(), null, null, '管理员'); -- ---------------------------- -- OSS对象存储表 -- ---------------------------- -create table sys2_oss ( +create table sys_saas_oss ( oss_id bigint(20) not null comment '对象存储主键', tenant_id varchar(20) default '000000' comment '租户编号', file_name varchar(255) not null default '' comment '文件名', @@ -786,7 +786,7 @@ create table sys2_oss ( -- ---------------------------- -- OSS对象存储动态配置表 -- ---------------------------- -create table sys2_oss_config ( +create table sys_saas_oss_config ( oss_config_id bigint(20) not null comment '主键', tenant_id varchar(20) default '000000'comment '租户编号', config_key varchar(20) not null default '' comment '配置key', @@ -810,11 +810,11 @@ create table sys2_oss_config ( primary key (oss_config_id) ) engine=innodb comment='对象存储配置表'; -insert into sys2_oss_config values (1, '000000', 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', '127.0.0.1:9000', '','N', '', '1' ,'0', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys2_oss_config values (2, '000000', 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 's3-cn-north-1.qiniucs.com', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys2_oss_config values (3, '000000', 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'oss-cn-beijing.aliyuncs.com', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys2_oss_config values (4, '000000', 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'cos.ap-beijing.myqcloud.com', '','N', 'ap-beijing', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys2_oss_config values (5, '000000', 'image', 'ruoyi', 'ruoyi123', 'ruoyi', 'image', '127.0.0.1:9000', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); +insert into sys_saas_oss_config values (1, '000000', 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', '127.0.0.1:9000', '','N', '', '1' ,'0', '', 103, 1, sysdate(), 1, sysdate(), null); +insert into sys_saas_oss_config values (2, '000000', 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 's3-cn-north-1.qiniucs.com', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); +insert into sys_saas_oss_config values (3, '000000', 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'oss-cn-beijing.aliyuncs.com', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); +insert into sys_saas_oss_config values (4, '000000', 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'cos.ap-beijing.myqcloud.com', '','N', 'ap-beijing', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); +insert into sys_saas_oss_config values (5, '000000', 'image', 'ruoyi', 'ruoyi123', 'ruoyi', 'image', '127.0.0.1:9000', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); -- ---------------------------- -- 系统授权表