From 45ac0f23e12ac2a45c6affe9e39d0897e4fad618 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 16 二月 2023 17:06:10 +0800
Subject: [PATCH] !286 合并 多租户功能 * add 新增 ruoyi-common-tenant 多租户模块 全框架适配多租户改动 * update 优化 隐藏页面主键 * remove 移除 缓存列表功能(多租户缓存功能繁杂多样 没有办法在页面管理) * update 重构 全局缓存KEY 与 常用缓存KEY做区分 * update 重构 OssFactory 加载方式 改为每次比对配置做实例更新 * update 优化 SaTokenDao 改为 Bean 注入 便于扩展 * update 重构 项目初始化数据改为懒加载 不提供热加载 * update 重构 验证码开关使用配置文件(经调查少有动态开启需求) * update 优化 启用 sqlserver 高版本语法 简化sql脚本语法 * update 优化 DataPermissionHelper 增加 开启/关闭 忽略数据权限功能 * update 优化 连接池增加 keepaliveTime 探活参数 * update 优化 调整连接池最长生命周期 防止出现警告 * update 优化 代码生成页面模板 校验不必要的表单数据 * add 新增 StringUtils splitTo 与 splitList 方法 优化业务代码

---
 script/sql/oracle/oracle_ry_vue_5.X.sql |  378 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 252 insertions(+), 126 deletions(-)

diff --git a/script/sql/oracle/oracle_ry_vue_5.X.sql b/script/sql/oracle/oracle_ry_vue_5.X.sql
index 46e3ba1..63b38ef 100644
--- a/script/sql/oracle/oracle_ry_vue_5.X.sql
+++ b/script/sql/oracle/oracle_ry_vue_5.X.sql
@@ -1,8 +1,98 @@
 -- ----------------------------
+-- 绉熸埛琛�
+-- ----------------------------
+create table sys_tenant (
+    id                number(20)    not null,
+    tenant_id         varchar2(20)  not null,
+    contact_user_name varchar2(20)  default '',
+    contact_phone     varchar2(20)  default '',
+    company_name      varchar2(50)  default '',
+    license_number    varchar2(30)  default '',
+    address           varchar2(200) default '',
+    intro             varchar2(200) default '',
+    domain            varchar2(200) default '',
+    remark            varchar2(200) default '',
+    package_id        number(20)    default null,
+    expire_time       date          default null,
+    account_count     number(4)     default -1,
+    status            char(1)       default '0',
+    del_flag          char(1)       default '0',
+    create_dept       number(20)    default null,
+    create_by         number(20)    default null,
+    create_time       date,
+    update_by         number(20)    default null,
+    update_time       date
+);
+
+alter table sys_tenant add constraint pk_sys_tenant primary key (id);
+
+comment on table   sys_tenant                    is '绉熸埛琛�';
+comment on column  sys_tenant.tenant_id          is '绉熸埛缂栧彿';
+comment on column  sys_tenant.contact_phone      is '鑱旂郴鐢佃瘽';
+comment on column  sys_tenant.company_name       is '浼佷笟鍚嶇О';
+comment on column  sys_tenant.company_name       is '鑱旂郴浜�';
+comment on column  sys_tenant.license_number     is '缁熶竴绀句細淇$敤浠g爜';
+comment on column  sys_tenant.address            is '鍦板潃';
+comment on column  sys_tenant.intro              is '浼佷笟绠�浠�';
+comment on column  sys_tenant.remark             is '澶囨敞';
+comment on column  sys_tenant.package_id         is '绉熸埛濂楅缂栧彿';
+comment on column  sys_tenant.expire_time        is '杩囨湡鏃堕棿';
+comment on column  sys_tenant.account_count      is '鐢ㄦ埛鏁伴噺锛�-1涓嶉檺鍒讹級';
+comment on column  sys_tenant.status             is '绉熸埛鐘舵�侊紙0姝e父 1鍋滅敤锛�';
+comment on column  sys_tenant.del_flag           is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛�';
+comment on column  sys_tenant.create_dept        is '鍒涘缓閮ㄩ棬';
+comment on column  sys_tenant.create_by          is '鍒涘缓鑰�';
+comment on column  sys_tenant.create_time        is '鍒涘缓鏃堕棿';
+comment on column  sys_tenant.update_by          is '鏇存柊鑰�';
+comment on column  sys_tenant.update_time        is '鏇存柊鏃堕棿';
+
+-- ----------------------------
+-- 鍒濆鍖�-绉熸埛琛ㄦ暟鎹�
+-- ----------------------------
+
+insert into sys_tenant values(1, '000000', '绠$悊缁�', '15888888888', 'XXX鏈夐檺鍏徃', null, null, '澶氱鎴烽�氱敤鍚庡彴绠$悊绠$悊绯荤粺', null, null, null, null, -1, '0', '0', 103, 1, sysdate, null, null);
+
+
+-- ----------------------------
+-- 绉熸埛濂楅琛�
+-- ----------------------------
+create table sys_tenant_package (
+    package_id              number(20)      not null,
+    package_name            varchar2(20)    default '',
+    menu_ids                varchar2(3000)  default '',
+    remark                  varchar2(200)   default '',
+    menu_check_strictly     number(1)       default 1,
+    status                  char(1)         default '0',
+    del_flag                char(1)         default '0',
+    create_dept             number(20)      default null,
+    create_by               number(20)      default null,
+    create_time             date,
+    update_by               number(20)      default null,
+    update_time             date
+);
+
+alter table sys_tenant_package add constraint pk_sys_tenant_package primary key (package_id);
+
+comment on table   sys_tenant_package                    is '绉熸埛濂楅琛�';
+comment on column  sys_tenant_package.package_id         is '绉熸埛濂楅id';
+comment on column  sys_tenant_package.package_name       is '濂楅鍚嶇О';
+comment on column  sys_tenant_package.menu_ids           is '鍏宠仈鑿滃崟id';
+comment on column  sys_tenant_package.remark             is '澶囨敞';
+comment on column  sys_tenant_package.status             is '鐘舵�侊紙0姝e父 1鍋滅敤锛�';
+comment on column  sys_tenant_package.del_flag           is '鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛�';
+comment on column  sys_tenant_package.create_dept        is '鍒涘缓閮ㄩ棬';
+comment on column  sys_tenant_package.create_by          is '鍒涘缓鑰�';
+comment on column  sys_tenant_package.create_time        is '鍒涘缓鏃堕棿';
+comment on column  sys_tenant_package.update_by          is '鏇存柊鑰�';
+comment on column  sys_tenant_package.update_time        is '鏇存柊鏃堕棿';
+
+
+-- ----------------------------
 -- 1銆侀儴闂ㄨ〃
 -- ----------------------------
 create table sys_dept (
   dept_id           number(20)      not null,
+  tenant_id         varchar2(20)    not null,
   parent_id         number(20)      default 0,
   ancestors         varchar2(500)   default '',
   dept_name         varchar2(30)    default '',
@@ -23,6 +113,7 @@
 
 comment on table  sys_dept              is '閮ㄩ棬琛�';
 comment on column sys_dept.dept_id      is '閮ㄩ棬id';
+comment on column sys_dept.tenant_id    is '绉熸埛缂栧彿';
 comment on column sys_dept.parent_id    is '鐖堕儴闂╥d';
 comment on column sys_dept.ancestors    is '绁栫骇鍒楄〃';
 comment on column sys_dept.dept_name    is '閮ㄩ棬鍚嶇О';
@@ -41,16 +132,16 @@
 -- ----------------------------
 -- 鍒濆鍖�-閮ㄩ棬琛ㄦ暟鎹�
 -- ----------------------------
-insert into sys_dept values(100,  0,   '0',          '鑻ヤ緷绉戞妧',   0, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(101,  100, '0,100',      '娣卞湷鎬诲叕鍙�', 1, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(102,  100, '0,100',      '闀挎矙鍒嗗叕鍙�', 2, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(103,  101, '0,100,101',  '鐮斿彂閮ㄩ棬',   1, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(104,  101, '0,100,101',  '甯傚満閮ㄩ棬',   2, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(105,  101, '0,100,101',  '娴嬭瘯閮ㄩ棬',   3, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(106,  101, '0,100,101',  '璐㈠姟閮ㄩ棬',   4, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(107,  101, '0,100,101',  '杩愮淮閮ㄩ棬',   5, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(108,  102, '0,100,102',  '甯傚満閮ㄩ棬',   1, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 103, 1, sysdate, null, null);
-insert into sys_dept values(109,  102, '0,100,102',  '璐㈠姟閮ㄩ棬',   2, '鑻ヤ緷', '15888888888', 'ry@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(100, '000000', 0,   '0',          'XXX绉戞妧',   0, '鐤媯鐨勭嫯瀛怢i', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(101, '000000', 100, '0,100',      '娣卞湷鎬诲叕鍙�', 1, '鐤媯鐨勭嫯瀛怢i', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(102, '000000', 100, '0,100',      '闀挎矙鍒嗗叕鍙�', 2, '鐤媯鐨勭嫯瀛怢i', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(103, '000000', 101, '0,100,101',  '鐮斿彂閮ㄩ棬',   1, '鐤媯鐨勭嫯瀛怢i', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(104, '000000', 101, '0,100,101',  '甯傚満閮ㄩ棬',   2, '鐤媯鐨勭嫯瀛怢i', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(105, '000000', 101, '0,100,101',  '娴嬭瘯閮ㄩ棬',   3, '鐤媯鐨勭嫯瀛怢i', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(106, '000000', 101, '0,100,101',  '璐㈠姟閮ㄩ棬',   4, '鐤媯鐨勭嫯瀛怢i', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(107, '000000', 101, '0,100,101',  '杩愮淮閮ㄩ棬',   5, '鐤媯鐨勭嫯瀛怢i', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(108, '000000', 102, '0,100,102',  '甯傚満閮ㄩ棬',   1, '鐤媯鐨勭嫯瀛怢i', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(109, '000000', 102, '0,100,102',  '璐㈠姟閮ㄩ棬',   2, '鐤媯鐨勭嫯瀛怢i', '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
 
 
 -- ----------------------------
@@ -58,6 +149,7 @@
 -- ----------------------------
 create table sys_user (
   user_id           number(20)      not null,
+  tenant_id         varchar2(20)    not null,
   dept_id           number(20)      default null,
   user_name         varchar2(40)    not null,
   nick_name         varchar2(40)    not null,
@@ -83,6 +175,7 @@
 
 comment on table  sys_user              is '鐢ㄦ埛淇℃伅琛�';
 comment on column sys_user.user_id      is '鐢ㄦ埛ID';
+comment on column sys_user.tenant_id    is '绉熸埛缂栧彿';
 comment on column sys_user.dept_id      is '閮ㄩ棬ID';
 comment on column sys_user.user_name    is '鐢ㄦ埛璐﹀彿';
 comment on column sys_user.nick_name    is '鐢ㄦ埛鏄电О';
@@ -106,8 +199,8 @@
 -- ----------------------------
 -- 鍒濆鍖�-鐢ㄦ埛淇℃伅琛ㄦ暟鎹�
 -- ----------------------------
-insert into sys_user values(1,  103, 'admin', '鐤媯鐨勭嫯瀛怢i', 'sys_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate, 103, 1, sysdate, null, null, '绠$悊鍛�');
-insert into sys_user values(2,  105, 'lionli', '鐤媯鐨勭嫯瀛怢i', 'sys_user', 'crazyLionLi@qq.com',  '15666666666', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate, 103, 1, sysdate, null, null, '娴嬭瘯鍛�');
+insert into sys_user values(1, '000000', 103, 'admin', '鐤媯鐨勭嫯瀛怢i', 'sys_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate, 103, 1, sysdate, null, null, '绠$悊鍛�');
+insert into sys_user values(2, '000000', 105, 'lionli', '鐤媯鐨勭嫯瀛怢i', 'sys_user', 'crazyLionLi@qq.com',  '15666666666', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate, 103, 1, sysdate, null, null, '娴嬭瘯鍛�');
 
 
 -- ----------------------------
@@ -115,6 +208,7 @@
 -- ----------------------------
 create table sys_post (
   post_id           number(20)      not null,
+  tenant_id         varchar2(20)    not null,
   post_code         varchar2(64)    not null,
   post_name         varchar2(50)    not null,
   post_sort         number(4)       not null,
@@ -131,6 +225,7 @@
 
 comment on table  sys_post              is '宀椾綅淇℃伅琛�';
 comment on column sys_post.post_id      is '宀椾綅ID';
+comment on column sys_post.tenant_id    is '绉熸埛缂栧彿';
 comment on column sys_post.post_code    is '宀椾綅缂栫爜';
 comment on column sys_post.post_name    is '宀椾綅鍚嶇О';
 comment on column sys_post.post_sort    is '鏄剧ず椤哄簭';
@@ -145,10 +240,10 @@
 -- ----------------------------
 -- 鍒濆鍖�-宀椾綅淇℃伅琛ㄦ暟鎹�
 -- ----------------------------
-insert into sys_post values(1, 'ceo',  '钁d簨闀�',    1, '0', 103, 1, sysdate, null, null, '');
-insert into sys_post values(2, 'se',   '椤圭洰缁忕悊',  2, '0', 103, 1, sysdate, null, null, '');
-insert into sys_post values(3, 'hr',   '浜哄姏璧勬簮',  3, '0', 103, 1, sysdate, null, null, '');
-insert into sys_post values(4, 'user', '鏅�氬憳宸�',  4, '0', 103, 1, sysdate, null, null, '');
+insert into sys_post values(1, '000000', 'ceo',  '钁d簨闀�',    1, '0', 103, 1, sysdate, null, null, '');
+insert into sys_post values(2, '000000', 'se',   '椤圭洰缁忕悊',  2, '0', 103, 1, sysdate, null, null, '');
+insert into sys_post values(3, '000000', 'hr',   '浜哄姏璧勬簮',  3, '0', 103, 1, sysdate, null, null, '');
+insert into sys_post values(4, '000000', 'user', '鏅�氬憳宸�',  4, '0', 103, 1, sysdate, null, null, '');
 
 
 -- ----------------------------
@@ -156,6 +251,7 @@
 -- ----------------------------
 create table sys_role (
   role_id              number(20)      not null,
+  tenant_id            varchar2(20)    not null,
   role_name            varchar2(30)    not null,
   role_key             varchar2(100)   not null,
   role_sort            number(4)       not null,
@@ -176,6 +272,7 @@
 
 comment on table  sys_role                       is '瑙掕壊淇℃伅琛�';
 comment on column sys_role.role_id               is '瑙掕壊ID';
+comment on column sys_role.tenant_id             is '绉熸埛缂栧彿';
 comment on column sys_role.role_name             is '瑙掕壊鍚嶇О';
 comment on column sys_role.role_key              is '瑙掕壊鏉冮檺瀛楃涓�';
 comment on column sys_role.role_sort             is '鏄剧ず椤哄簭';
@@ -194,8 +291,8 @@
 -- ----------------------------
 -- 鍒濆鍖�-瑙掕壊淇℃伅琛ㄦ暟鎹�
 -- ----------------------------
-insert into sys_role values('1', '瓒呯骇绠$悊鍛�',  'admin',  1, 1, 1, 1, '0', '0', 103, 1, sysdate, null, null, '瓒呯骇绠$悊鍛�');
-insert into sys_role values('2', '鏅�氳鑹�',    'common', 2, 2, 1, 1, '0', '0', 103, 1, sysdate, null, null, '鏅�氳鑹�');
+insert into sys_role values('1', '000000', '瓒呯骇绠$悊鍛�',  'superadmin',  1, 1, 1, 1, '0', '0', 103, 1, sysdate, null, null, '瓒呯骇绠$悊鍛�');
+insert into sys_role values('2', '000000', '鏅�氳鑹�',    'common', 2, 2, 1, 1, '0', '0', 103, 1, sysdate, null, null, '鏅�氳鑹�');
 
 
 -- ----------------------------
@@ -253,30 +350,32 @@
 -- ----------------------------
 -- 涓�绾ц彍鍗�
 insert into sys_menu values('1', '绯荤粺绠$悊', '0', '1', 'system',           null, '', 1, 0, 'M', '0', '0', '', 'system',   103, 1, sysdate, null, null, '绯荤粺绠$悊鐩綍');
-insert into sys_menu values('2', '绯荤粺鐩戞帶', '0', '2', 'monitor',          null, '', 1, 0, 'M', '0', '0', '', 'monitor',  103, 1, sysdate, null, null, '绯荤粺鐩戞帶鐩綍');
-insert into sys_menu values('3', '绯荤粺宸ュ叿', '0', '3', 'tool',             null, '', 1, 0, 'M', '0', '0', '', 'tool',     103, 1, sysdate, null, null, '绯荤粺宸ュ叿鐩綍');
-insert into sys_menu values('4', 'PLUS瀹樼綉', '0', '4', 'https://gitee.com/JavaLionLi/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide',    103, 1, sysdate, null, null, 'RuoYi-Vue-Plus瀹樼綉鍦板潃');
+insert into sys_menu values('6', '绉熸埛绠$悊', '0', '2', 'tenant',           null, '', 1, 0, 'M', '0', '0', '', 'chart',    103, 1, sysdate, null, null, '绉熸埛绠$悊鐩綍');
+insert into sys_menu values('2', '绯荤粺鐩戞帶', '0', '3', 'monitor',          null, '', 1, 0, 'M', '0', '0', '', 'monitor',  103, 1, sysdate, null, null, '绯荤粺鐩戞帶鐩綍');
+insert into sys_menu values('3', '绯荤粺宸ュ叿', '0', '4', 'tool',             null, '', 1, 0, 'M', '0', '0', '', 'tool',     103, 1, sysdate, null, null, '绯荤粺宸ュ叿鐩綍');
+insert into sys_menu values('4', 'PLUS瀹樼綉', '0', '5', 'https://gitee.com/JavaLionLi/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide',    103, 1, sysdate, null, null, 'RuoYi-Vue-Plus瀹樼綉鍦板潃');
 -- 浜岀骇鑿滃崟
-insert into sys_menu values('100',  '鐢ㄦ埛绠$悊', '1',   '1', 'user',       'system/user/index',        '', 1, 0, 'C', '0', '0', 'system:user:list',        'user',          103, 1, sysdate, null, null, '鐢ㄦ埛绠$悊鑿滃崟');
-insert into sys_menu values('101',  '瑙掕壊绠$悊', '1',   '2', 'role',       'system/role/index',        '', 1, 0, 'C', '0', '0', 'system:role:list',        'peoples',       103, 1, sysdate, null, null, '瑙掕壊绠$悊鑿滃崟');
-insert into sys_menu values('102',  '鑿滃崟绠$悊', '1',   '3', 'menu',       'system/menu/index',        '', 1, 0, 'C', '0', '0', 'system:menu:list',        'tree-table',    103, 1, sysdate, null, null, '鑿滃崟绠$悊鑿滃崟');
-insert into sys_menu values('103',  '閮ㄩ棬绠$悊', '1',   '4', 'dept',       'system/dept/index',        '', 1, 0, 'C', '0', '0', 'system:dept:list',        'tree',          103, 1, sysdate, null, null, '閮ㄩ棬绠$悊鑿滃崟');
-insert into sys_menu values('104',  '宀椾綅绠$悊', '1',   '5', 'post',       'system/post/index',        '', 1, 0, 'C', '0', '0', 'system:post:list',        'post',          103, 1, sysdate, null, null, '宀椾綅绠$悊鑿滃崟');
-insert into sys_menu values('105',  '瀛楀吀绠$悊', '1',   '6', 'dict',       'system/dict/index',        '', 1, 0, 'C', '0', '0', 'system:dict:list',        'dict',          103, 1, sysdate, null, null, '瀛楀吀绠$悊鑿滃崟');
-insert into sys_menu values('106',  '鍙傛暟璁剧疆', '1',   '7', 'config',     'system/config/index',      '', 1, 0, 'C', '0', '0', 'system:config:list',      'edit',          103, 1, sysdate, null, null, '鍙傛暟璁剧疆鑿滃崟');
-insert into sys_menu values('107',  '閫氱煡鍏憡', '1',   '8', 'notice',     'system/notice/index',      '', 1, 0, 'C', '0', '0', 'system:notice:list',      'message',       103, 1, sysdate, null, null, '閫氱煡鍏憡鑿滃崟');
-insert into sys_menu values('108',  '鏃ュ織绠$悊', '1',   '9', 'log',        '',                         '', 1, 0, 'M', '0', '0', '',                        'log',           103, 1, sysdate, null, null, '鏃ュ織绠$悊鑿滃崟');
-insert into sys_menu values('109',  '鍦ㄧ嚎鐢ㄦ埛', '2',   '1', 'online',     'monitor/online/index',     '', 1, 0, 'C', '0', '0', 'monitor:online:list',     'online',        103, 1, sysdate, null, null, '鍦ㄧ嚎鐢ㄦ埛鑿滃崟');
-insert into sys_menu values('112',  '缂撳瓨鍒楄〃', '2',   '6', 'cacheList',  'monitor/cache/list',       '', 1, 0, 'C', '0', '0', 'monitor:cache:list',      'redis-list',    103, 1, sysdate, null, null, '缂撳瓨鍒楄〃鑿滃崟');
-insert into sys_menu values('113',  '缂撳瓨鐩戞帶', '2',   '5', 'cache',      'monitor/cache/index',      '', 1, 0, 'C', '0', '0', 'monitor:cache:list',      'redis',         103, 1, sysdate, null, null, '缂撳瓨鐩戞帶鑿滃崟');
-insert into sys_menu values('114',  '琛ㄥ崟鏋勫缓', '3',   '1', 'build',      'tool/build/index',         '', 1, 0, 'C', '0', '0', 'tool:build:list',         'build',         103, 1, sysdate, null, null, '琛ㄥ崟鏋勫缓鑿滃崟');
-insert into sys_menu values('115',  '浠g爜鐢熸垚', '3',   '2', 'gen',        'tool/gen/index',           '', 1, 0, 'C', '0', '0', 'tool:gen:list',           'code',          103, 1, sysdate, null, null, '浠g爜鐢熸垚鑿滃崟');
+insert into sys_menu values('100',  '鐢ㄦ埛绠$悊',     '1',   '1', 'user',             'system/user/index',            '', 1, 0, 'C', '0', '0', 'system:user:list',            'user',          103, 1, sysdate, null, null, '鐢ㄦ埛绠$悊鑿滃崟');
+insert into sys_menu values('101',  '瑙掕壊绠$悊',     '1',   '2', 'role',             'system/role/index',            '', 1, 0, 'C', '0', '0', 'system:role:list',            'peoples',       103, 1, sysdate, null, null, '瑙掕壊绠$悊鑿滃崟');
+insert into sys_menu values('102',  '鑿滃崟绠$悊',     '1',   '3', 'menu',             'system/menu/index',            '', 1, 0, 'C', '0', '0', 'system:menu:list',            'tree-table',    103, 1, sysdate, null, null, '鑿滃崟绠$悊鑿滃崟');
+insert into sys_menu values('103',  '閮ㄩ棬绠$悊',     '1',   '4', 'dept',             'system/dept/index',            '', 1, 0, 'C', '0', '0', 'system:dept:list',            'tree',          103, 1, sysdate, null, null, '閮ㄩ棬绠$悊鑿滃崟');
+insert into sys_menu values('104',  '宀椾綅绠$悊',     '1',   '5', 'post',             'system/post/index',            '', 1, 0, 'C', '0', '0', 'system:post:list',            'post',          103, 1, sysdate, null, null, '宀椾綅绠$悊鑿滃崟');
+insert into sys_menu values('105',  '瀛楀吀绠$悊',     '1',   '6', 'dict',             'system/dict/index',            '', 1, 0, 'C', '0', '0', 'system:dict:list',            'dict',          103, 1, sysdate, null, null, '瀛楀吀绠$悊鑿滃崟');
+insert into sys_menu values('106',  '鍙傛暟璁剧疆',     '1',   '7', 'config',           'system/config/index',          '', 1, 0, 'C', '0', '0', 'system:config:list',          'edit',          103, 1, sysdate, null, null, '鍙傛暟璁剧疆鑿滃崟');
+insert into sys_menu values('107',  '閫氱煡鍏憡',     '1',   '8', 'notice',           'system/notice/index',          '', 1, 0, 'C', '0', '0', 'system:notice:list',          'message',       103, 1, sysdate, null, null, '閫氱煡鍏憡鑿滃崟');
+insert into sys_menu values('108',  '鏃ュ織绠$悊',     '1',   '9', 'log',              '',                             '', 1, 0, 'M', '0', '0', '',                            'log',           103, 1, sysdate, null, null, '鏃ュ織绠$悊鑿滃崟');
+insert into sys_menu values('109',  '鍦ㄧ嚎鐢ㄦ埛',     '2',   '1', 'online',           'monitor/online/index',         '', 1, 0, 'C', '0', '0', 'monitor:online:list',         'online',        103, 1, sysdate, null, null, '鍦ㄧ嚎鐢ㄦ埛鑿滃崟');
+insert into sys_menu values('113',  '缂撳瓨鐩戞帶',     '2',   '5', 'cache',            'monitor/cache/index',          '', 1, 0, 'C', '0', '0', 'monitor:cache:list',          'redis',         103, 1, sysdate, null, null, '缂撳瓨鐩戞帶鑿滃崟');
+insert into sys_menu values('114',  '琛ㄥ崟鏋勫缓',     '3',   '1', 'build',            'tool/build/index',             '', 1, 0, 'C', '0', '0', 'tool:build:list',             'build',         103, 1, sysdate, null, null, '琛ㄥ崟鏋勫缓鑿滃崟');
+insert into sys_menu values('115',  '浠g爜鐢熸垚',     '3',   '2', 'gen',              'tool/gen/index',               '', 1, 0, 'C', '0', '0', 'tool:gen:list',               'code',          103, 1, sysdate, null, null, '浠g爜鐢熸垚鑿滃崟');
+insert into sys_menu values('121',  '绉熸埛绠$悊',     '6',   '1', 'tenant',           'system/tenant/index',          '', 1, 0, 'C', '0', '0', 'system:tenant:list',          'list',          103, 1, sysdate, null, null, '绉熸埛绠$悊鑿滃崟');
+insert into sys_menu values('122',  '绉熸埛濂楅绠$悊',  '6',   '2', 'tenantPackage',    'system/tenantPackage/index',   '', 1, 0, 'C', '0', '0', 'system:tenantPackage:list',   'form',          103, 1, sysdate, null, null, '绉熸埛濂楅绠$悊鑿滃崟');
 -- springboot-admin鐩戞帶
-insert into sys_menu values('117',  'Admin鐩戞帶', '2',  '5', 'Admin',      'monitor/admin/index',      '', 1, 0, 'C', '0', '0', 'monitor:admin:list',      'dashboard',     103, 1, sysdate, null, null, 'Admin鐩戞帶鑿滃崟');
+insert into sys_menu values('117',  'Admin鐩戞帶',   '2',    '5', 'Admin',            'monitor/admin/index',         '', 1, 0, 'C', '0', '0', 'monitor:admin:list',          'dashboard',     103, 1, sysdate, null, null, 'Admin鐩戞帶鑿滃崟');
 -- oss鑿滃崟
-insert into sys_menu values('118',  '鏂囦欢绠$悊', '1', '10', 'oss', 'system/oss/index', '', 1, 0, 'C', '0', '0', 'system:oss:list', 'upload', 103, 1, sysdate, null, null, '鏂囦欢绠$悊鑿滃崟');
+insert into sys_menu values('118',  '鏂囦欢绠$悊',     '1',    '10', 'oss',             'system/oss/index',            '', 1, 0, 'C', '0', '0', 'system:oss:list',             'upload',        103, 1, sysdate, null, null, '鏂囦欢绠$悊鑿滃崟');
 -- xxl-job-admin鎺у埗鍙�
-insert into sys_menu values('120',  '浠诲姟璋冨害涓績', '2',  '5', 'XxlJob',      'monitor/xxljob/index',      '', 1, 0, 'C', '0', '0', 'monitor:xxljob:list',      'job',     103, 1, sysdate, null, null, 'Xxl-Job鎺у埗鍙拌彍鍗�');
+insert into sys_menu values('120',  '浠诲姟璋冨害涓績',  '2',    '5', 'XxlJob',           'monitor/xxljob/index',        '', 1, 0, 'C', '0', '0', 'monitor:xxljob:list',         'job',           103, 1, sysdate, null, null, 'Xxl-Job鎺у埗鍙拌彍鍗�');
 
 -- 涓夌骇鑿滃崟
 insert into sys_menu values('500',  '鎿嶄綔鏃ュ織', '108', '1', 'operlog',    'monitor/operlog/index',    '', 1, 0, 'C', '0', '0', 'monitor:operlog:list',    'form',          103, 1, sysdate, null, null, '鎿嶄綔鏃ュ織鑿滃崟');
@@ -355,6 +454,18 @@
 insert into sys_menu values('1603', '鏂囦欢鍒犻櫎', '118', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:remove',       '#', 103, 1, sysdate, null, null, '');
 insert into sys_menu values('1604', '閰嶇疆娣诲姞', '118', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:add',          '#', 103, 1, sysdate, null, null, '');
 insert into sys_menu values('1605', '閰嶇疆缂栬緫', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:edit',         '#', 103, 1, sysdate, null, null, '');
+-- 绉熸埛绠$悊鐩稿叧鎸夐挳
+insert into sys_menu values('1606', '绉熸埛鏌ヨ', '121', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:query',   '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1607', '绉熸埛鏂板', '121', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:add',     '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1608', '绉熸埛淇敼', '121', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:edit',    '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1609', '绉熸埛鍒犻櫎', '121', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:remove',  '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1610', '绉熸埛瀵煎嚭', '121', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:export',  '#', 103, 1, sysdate, null, null, '');
+-- 绉熸埛濂楅绠$悊鐩稿叧鎸夐挳
+insert into sys_menu values('1611', '绉熸埛濂楅鏌ヨ', '122', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:query',   '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1612', '绉熸埛濂楅鏂板', '122', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:add',     '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1613', '绉熸埛濂楅淇敼', '122', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:edit',    '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1614', '绉熸埛濂楅鍒犻櫎', '122', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:remove',  '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1615', '绉熸埛濂楅瀵煎嚭', '122', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:export',  '#', 103, 1, sysdate, null, null, '');
 
 
 -- ----------------------------
@@ -522,7 +633,8 @@
 -- 10銆佹搷浣滄棩蹇楄褰�
 -- ----------------------------
 create table sys_oper_log (
-  oper_id           number(20)      not null ,
+  oper_id           number(20)      not null,
+  tenant_id         varchar2(20)    not null,
   title             varchar2(50)    default '',
   business_type     number(2)       default 0,
   method            varchar2(100)   default '',
@@ -536,7 +648,7 @@
   oper_param        varchar2(2100)  default '',
   json_result       varchar2(2100)  default '',
   status            number(1)       default 0,
-  error_msg         varchar2(2100)  default '' ,
+  error_msg         varchar2(2100)  default '',
   oper_time         date
 );
 
@@ -544,6 +656,7 @@
 
 comment on table  sys_oper_log                is '鎿嶄綔鏃ュ織璁板綍';
 comment on column sys_oper_log.oper_id        is '鏃ュ織涓婚敭';
+comment on column sys_oper_log.tenant_id      is '绉熸埛缂栧彿';
 comment on column sys_oper_log.title          is '妯″潡鏍囬';
 comment on column sys_oper_log.business_type  is '涓氬姟绫诲瀷锛�0鍏跺畠 1鏂板 2淇敼 3鍒犻櫎锛�';
 comment on column sys_oper_log.method         is '鏂规硶鍚嶇О';
@@ -566,6 +679,7 @@
 -- ----------------------------
 create table sys_dict_type (
   dict_id           number(20)      not null,
+  tenant_id         varchar2(20)    not null,
   dict_name         varchar2(100)   default '',
   dict_type         varchar2(100)   default '',
   status            char(1)         default '0',
@@ -578,10 +692,11 @@
 );
 
 alter table sys_dict_type add constraint pk_sys_dict_type primary key (dict_id);
-create unique index sys_dict_type_index1 on sys_dict_type (dict_type);
+create unique index sys_dict_type_index1 on sys_dict_type (tenant_id, dict_type);
 
 comment on table  sys_dict_type               is '瀛楀吀绫诲瀷琛�';
 comment on column sys_dict_type.dict_id       is '瀛楀吀涓婚敭';
+comment on column sys_dict_type.tenant_id     is '绉熸埛缂栧彿';
 comment on column sys_dict_type.dict_name     is '瀛楀吀鍚嶇О';
 comment on column sys_dict_type.dict_type     is '瀛楀吀绫诲瀷';
 comment on column sys_dict_type.status        is '鐘舵�侊紙0姝e父 1鍋滅敤锛�';
@@ -592,14 +707,14 @@
 comment on column sys_dict_type.update_time   is '鏇存柊鏃堕棿';
 comment on column sys_dict_type.remark        is '澶囨敞';
 
-insert into sys_dict_type values(1,  '鐢ㄦ埛鎬у埆', 'sys_user_sex',        '0', 103, 1, sysdate, null, null, '鐢ㄦ埛鎬у埆鍒楄〃');
-insert into sys_dict_type values(2,  '鑿滃崟鐘舵��', 'sys_show_hide',       '0', 103, 1, sysdate, null, null, '鑿滃崟鐘舵�佸垪琛�');
-insert into sys_dict_type values(3,  '绯荤粺寮�鍏�', 'sys_normal_disable',  '0', 103, 1, sysdate, null, null, '绯荤粺寮�鍏冲垪琛�');
-insert into sys_dict_type values(6,  '绯荤粺鏄惁', 'sys_yes_no',          '0', 103, 1, sysdate, null, null, '绯荤粺鏄惁鍒楄〃');
-insert into sys_dict_type values(7,  '閫氱煡绫诲瀷', 'sys_notice_type',     '0', 103, 1, sysdate, null, null, '閫氱煡绫诲瀷鍒楄〃');
-insert into sys_dict_type values(8,  '閫氱煡鐘舵��', 'sys_notice_status',   '0', 103, 1, sysdate, null, null, '閫氱煡鐘舵�佸垪琛�');
-insert into sys_dict_type values(9,  '鎿嶄綔绫诲瀷', 'sys_oper_type',       '0', 103, 1, sysdate, null, null, '鎿嶄綔绫诲瀷鍒楄〃');
-insert into sys_dict_type values(10, '绯荤粺鐘舵��', 'sys_common_status',   '0', 103, 1, sysdate, null, null, '鐧诲綍鐘舵�佸垪琛�');
+insert into sys_dict_type values(1, '000000', '鐢ㄦ埛鎬у埆', 'sys_user_sex',        '0', 103, 1, sysdate, null, null, '鐢ㄦ埛鎬у埆鍒楄〃');
+insert into sys_dict_type values(2, '000000', '鑿滃崟鐘舵��', 'sys_show_hide',       '0', 103, 1, sysdate, null, null, '鑿滃崟鐘舵�佸垪琛�');
+insert into sys_dict_type values(3, '000000', '绯荤粺寮�鍏�', 'sys_normal_disable',  '0', 103, 1, sysdate, null, null, '绯荤粺寮�鍏冲垪琛�');
+insert into sys_dict_type values(6, '000000', '绯荤粺鏄惁', 'sys_yes_no',          '0', 103, 1, sysdate, null, null, '绯荤粺鏄惁鍒楄〃');
+insert into sys_dict_type values(7, '000000', '閫氱煡绫诲瀷', 'sys_notice_type',     '0', 103, 1, sysdate, null, null, '閫氱煡绫诲瀷鍒楄〃');
+insert into sys_dict_type values(8, '000000', '閫氱煡鐘舵��', 'sys_notice_status',   '0', 103, 1, sysdate, null, null, '閫氱煡鐘舵�佸垪琛�');
+insert into sys_dict_type values(9, '000000', '鎿嶄綔绫诲瀷', 'sys_oper_type',       '0', 103, 1, sysdate, null, null, '鎿嶄綔绫诲瀷鍒楄〃');
+insert into sys_dict_type values(10, '000000', '绯荤粺鐘舵��', 'sys_common_status',   '0', 103, 1, sysdate, null, null, '鐧诲綍鐘舵�佸垪琛�');
 
 
 -- ----------------------------
@@ -607,6 +722,7 @@
 -- ----------------------------
 create table sys_dict_data (
   dict_code        number(20)      not null,
+  tenant_id        varchar2(20)    not null,
   dict_sort        number(4)       default 0,
   dict_label       varchar2(100)   default '',
   dict_value       varchar2(100)   default '',
@@ -627,6 +743,7 @@
 
 comment on table  sys_dict_data               is '瀛楀吀鏁版嵁琛�';
 comment on column sys_dict_data.dict_code     is '瀛楀吀涓婚敭';
+comment on column sys_dict_data.tenant_id     is '绉熸埛缂栧彿';
 comment on column sys_dict_data.dict_sort     is '瀛楀吀鎺掑簭';
 comment on column sys_dict_data.dict_label    is '瀛楀吀鏍囩';
 comment on column sys_dict_data.dict_value    is '瀛楀吀閿��';
@@ -642,31 +759,31 @@
 comment on column sys_dict_data.update_time   is '鏇存柊鏃堕棿';
 comment on column sys_dict_data.remark        is '澶囨敞';
 
-insert into sys_dict_data values(1,  1,  '鐢�',       '0',       'sys_user_sex',        '',   '',        'Y', '0', 103, 1, sysdate, null, null, '鎬у埆鐢�');
-insert into sys_dict_data values(2,  2,  '濂�',       '1',       'sys_user_sex',        '',   '',        'N', '0', 103, 1, sysdate, null, null, '鎬у埆濂�');
-insert into sys_dict_data values(3,  3,  '鏈煡',     '2',       'sys_user_sex',        '',   '',        'N', '0', 103, 1, sysdate, null, null, '鎬у埆鏈煡');
-insert into sys_dict_data values(4,  1,  '鏄剧ず',     '0',       'sys_show_hide',       '',   'primary', 'Y', '0', 103, 1, sysdate, null, null, '鏄剧ず鑿滃崟');
-insert into sys_dict_data values(5,  2,  '闅愯棌',     '1',       'sys_show_hide',       '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '闅愯棌鑿滃崟');
-insert into sys_dict_data values(6,  1,  '姝e父',     '0',       'sys_normal_disable',  '',   'primary', 'Y', '0', 103, 1, sysdate, null, null, '姝e父鐘舵��');
-insert into sys_dict_data values(7,  2,  '鍋滅敤',     '1',       'sys_normal_disable',  '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '鍋滅敤鐘舵��');
-insert into sys_dict_data values(12, 1,  '鏄�',       'Y',       'sys_yes_no',          '',   'primary', 'Y', '0', 103, 1, sysdate, null, null, '绯荤粺榛樿鏄�');
-insert into sys_dict_data values(13, 2,  '鍚�',       'N',       'sys_yes_no',          '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '绯荤粺榛樿鍚�');
-insert into sys_dict_data values(14, 1,  '閫氱煡',     '1',       'sys_notice_type',     '',   'warning', 'Y', '0', 103, 1, sysdate, null, null, '閫氱煡');
-insert into sys_dict_data values(15, 2,  '鍏憡',     '2',       'sys_notice_type',     '',   'success', 'N', '0', 103, 1, sysdate, null, null, '鍏憡');
-insert into sys_dict_data values(16, 1,  '姝e父',     '0',       'sys_notice_status',   '',   'primary', 'Y', '0', 103, 1, sysdate, null, null, '姝e父鐘舵��');
-insert into sys_dict_data values(17, 2,  '鍏抽棴',     '1',       'sys_notice_status',   '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '鍏抽棴鐘舵��');
-insert into sys_dict_data values(29, 99, '鍏朵粬',     '0',       'sys_oper_type',       '',   'info',    'N', '0', 103, 1, sysdate, null, null, '鍏朵粬鎿嶄綔');
-insert into sys_dict_data values(18, 1,  '鏂板',     '1',       'sys_oper_type',       '',   'info',    'N', '0', 103, 1, sysdate, null, null, '鏂板鎿嶄綔');
-insert into sys_dict_data values(19, 2,  '淇敼',     '2',       'sys_oper_type',       '',   'info',    'N', '0', 103, 1, sysdate, null, null, '淇敼鎿嶄綔');
-insert into sys_dict_data values(20, 3,  '鍒犻櫎',     '3',       'sys_oper_type',       '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '鍒犻櫎鎿嶄綔');
-insert into sys_dict_data values(21, 4,  '鎺堟潈',     '4',       'sys_oper_type',       '',   'primary', 'N', '0', 103, 1, sysdate, null, null, '鎺堟潈鎿嶄綔');
-insert into sys_dict_data values(22, 5,  '瀵煎嚭',     '5',       'sys_oper_type',       '',   'warning', 'N', '0', 103, 1, sysdate, null, null, '瀵煎嚭鎿嶄綔');
-insert into sys_dict_data values(23, 6,  '瀵煎叆',     '6',       'sys_oper_type',       '',   'warning', 'N', '0', 103, 1, sysdate, null, null, '瀵煎叆鎿嶄綔');
-insert into sys_dict_data values(24, 7,  '寮洪��',     '7',       'sys_oper_type',       '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '寮洪��鎿嶄綔');
-insert into sys_dict_data values(25, 8,  '鐢熸垚浠g爜', '8',       'sys_oper_type',       '',   'warning', 'N', '0', 103, 1, sysdate, null, null, '鐢熸垚鎿嶄綔');
-insert into sys_dict_data values(26, 9,  '娓呯┖鏁版嵁', '9',       'sys_oper_type',       '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '娓呯┖鎿嶄綔');
-insert into sys_dict_data values(27, 1,  '鎴愬姛',     '0',       'sys_common_status',   '',   'primary', 'N', '0', 103, 1, sysdate, null, null, '姝e父鐘舵��');
-insert into sys_dict_data values(28, 2,  '澶辫触',     '1',       'sys_common_status',   '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '鍋滅敤鐘舵��');
+insert into sys_dict_data values(1, '000000', 1,  '鐢�',       '0',       'sys_user_sex',        '',   '',        'Y', '0', 103, 1, sysdate, null, null, '鎬у埆鐢�');
+insert into sys_dict_data values(2, '000000', 2,  '濂�',       '1',       'sys_user_sex',        '',   '',        'N', '0', 103, 1, sysdate, null, null, '鎬у埆濂�');
+insert into sys_dict_data values(3, '000000', 3,  '鏈煡',     '2',       'sys_user_sex',        '',   '',        'N', '0', 103, 1, sysdate, null, null, '鎬у埆鏈煡');
+insert into sys_dict_data values(4, '000000', 1,  '鏄剧ず',     '0',       'sys_show_hide',       '',   'primary', 'Y', '0', 103, 1, sysdate, null, null, '鏄剧ず鑿滃崟');
+insert into sys_dict_data values(5, '000000', 2,  '闅愯棌',     '1',       'sys_show_hide',       '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '闅愯棌鑿滃崟');
+insert into sys_dict_data values(6, '000000', 1,  '姝e父',     '0',       'sys_normal_disable',  '',   'primary', 'Y', '0', 103, 1, sysdate, null, null, '姝e父鐘舵��');
+insert into sys_dict_data values(7, '000000', 2,  '鍋滅敤',     '1',       'sys_normal_disable',  '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '鍋滅敤鐘舵��');
+insert into sys_dict_data values(12, '000000', 1,  '鏄�',       'Y',       'sys_yes_no',          '',   'primary', 'Y', '0', 103, 1, sysdate, null, null, '绯荤粺榛樿鏄�');
+insert into sys_dict_data values(13, '000000', 2,  '鍚�',       'N',       'sys_yes_no',          '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '绯荤粺榛樿鍚�');
+insert into sys_dict_data values(14, '000000', 1,  '閫氱煡',     '1',       'sys_notice_type',     '',   'warning', 'Y', '0', 103, 1, sysdate, null, null, '閫氱煡');
+insert into sys_dict_data values(15, '000000', 2,  '鍏憡',     '2',       'sys_notice_type',     '',   'success', 'N', '0', 103, 1, sysdate, null, null, '鍏憡');
+insert into sys_dict_data values(16, '000000', 1,  '姝e父',     '0',       'sys_notice_status',   '',   'primary', 'Y', '0', 103, 1, sysdate, null, null, '姝e父鐘舵��');
+insert into sys_dict_data values(17, '000000', 2,  '鍏抽棴',     '1',       'sys_notice_status',   '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '鍏抽棴鐘舵��');
+insert into sys_dict_data values(29, '000000', 99, '鍏朵粬',     '0',       'sys_oper_type',       '',   'info',    'N', '0', 103, 1, sysdate, null, null, '鍏朵粬鎿嶄綔');
+insert into sys_dict_data values(18, '000000', 1,  '鏂板',     '1',       'sys_oper_type',       '',   'info',    'N', '0', 103, 1, sysdate, null, null, '鏂板鎿嶄綔');
+insert into sys_dict_data values(19, '000000', 2,  '淇敼',     '2',       'sys_oper_type',       '',   'info',    'N', '0', 103, 1, sysdate, null, null, '淇敼鎿嶄綔');
+insert into sys_dict_data values(20, '000000', 3,  '鍒犻櫎',     '3',       'sys_oper_type',       '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '鍒犻櫎鎿嶄綔');
+insert into sys_dict_data values(21, '000000', 4,  '鎺堟潈',     '4',       'sys_oper_type',       '',   'primary', 'N', '0', 103, 1, sysdate, null, null, '鎺堟潈鎿嶄綔');
+insert into sys_dict_data values(22, '000000', 5,  '瀵煎嚭',     '5',       'sys_oper_type',       '',   'warning', 'N', '0', 103, 1, sysdate, null, null, '瀵煎嚭鎿嶄綔');
+insert into sys_dict_data values(23, '000000', 6,  '瀵煎叆',     '6',       'sys_oper_type',       '',   'warning', 'N', '0', 103, 1, sysdate, null, null, '瀵煎叆鎿嶄綔');
+insert into sys_dict_data values(24, '000000', 7,  '寮洪��',     '7',       'sys_oper_type',       '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '寮洪��鎿嶄綔');
+insert into sys_dict_data values(25, '000000', 8,  '鐢熸垚浠g爜', '8',       'sys_oper_type',       '',   'warning', 'N', '0', 103, 1, sysdate, null, null, '鐢熸垚鎿嶄綔');
+insert into sys_dict_data values(26, '000000', 9,  '娓呯┖鏁版嵁', '9',       'sys_oper_type',       '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '娓呯┖鎿嶄綔');
+insert into sys_dict_data values(27, '000000', 1,  '鎴愬姛',     '0',       'sys_common_status',   '',   'primary', 'N', '0', 103, 1, sysdate, null, null, '姝e父鐘舵��');
+insert into sys_dict_data values(28, '000000', 2,  '澶辫触',     '1',       'sys_common_status',   '',   'danger',  'N', '0', 103, 1, sysdate, null, null, '鍋滅敤鐘舵��');
 
 
 -- ----------------------------
@@ -674,6 +791,7 @@
 -- ----------------------------
 create table sys_config (
   config_id         number(20)     not null,
+  tenant_id         varchar2(20)   not null,
   config_name       varchar2(100)  default '',
   config_key        varchar2(100)  default '',
   config_value      varchar2(100)  default '',
@@ -689,6 +807,7 @@
 
 comment on table  sys_config               is '鍙傛暟閰嶇疆琛�';
 comment on column sys_config.config_id     is '鍙傛暟涓婚敭';
+comment on column sys_config.tenant_id     is '绉熸埛缂栧彿';
 comment on column sys_config.config_name   is '鍙傛暟鍚嶇О';
 comment on column sys_config.config_key    is '鍙傛暟閿悕';
 comment on column sys_config.config_value  is '鍙傛暟閿��';
@@ -700,12 +819,11 @@
 comment on column sys_config.update_time   is '鏇存柊鏃堕棿';
 comment on column sys_config.remark        is '澶囨敞';
 
-insert into sys_config values(1, '涓绘鏋堕〉-榛樿鐨偆鏍峰紡鍚嶇О',      'sys.index.skinName',            'skin-blue',     'Y', 103, 1, sysdate, null, null, '钃濊壊 skin-blue銆佺豢鑹� skin-green銆佺传鑹� skin-purple銆佺孩鑹� skin-red銆侀粍鑹� skin-yellow' );
-insert into sys_config values(2, '鐢ㄦ埛绠$悊-璐﹀彿鍒濆瀵嗙爜',         'sys.user.initPassword',         '123456',        'Y', 103, 1, sysdate, null, null, '鍒濆鍖栧瘑鐮� 123456' );
-insert into sys_config values(3, '涓绘鏋堕〉-渚ц竟鏍忎富棰�',           'sys.index.sideTheme',           'theme-dark',    'Y', 103, 1, sysdate, null, null, '娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light' );
-insert into sys_config values(4, '璐﹀彿鑷姪-楠岃瘉鐮佸紑鍏�',           'sys.account.captchaEnabled',    'true',          'Y', 103, 1, sysdate, null, null, '鏄惁寮�鍚獙璇佺爜鍔熻兘锛坱rue寮�鍚紝false鍏抽棴锛�');
-insert into sys_config values(5, '璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�',   'sys.account.registerUser',      'false',         'Y', 103, 1, sysdate, null, null, '鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
-insert into sys_config values(11, 'OSS棰勮鍒楄〃璧勬簮寮�鍏�',          'sys.oss.previewListResource',   'true',          'Y', 103, 1, sysdate, null, null, 'true:寮�鍚�, false:鍏抽棴');
+insert into sys_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_config values(2, '000000', '鐢ㄦ埛绠$悊-璐﹀彿鍒濆瀵嗙爜',         'sys.user.initPassword',         '123456',        'Y', 103, 1, sysdate, null, null, '鍒濆鍖栧瘑鐮� 123456' );
+insert into sys_config values(3, '000000', '涓绘鏋堕〉-渚ц竟鏍忎富棰�',           'sys.index.sideTheme',           'theme-dark',    'Y', 103, 1, sysdate, null, null, '娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light' );
+insert into sys_config values(5, '000000', '璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�',   'sys.account.registerUser',      'false',         'Y', 103, 1, sysdate, null, null, '鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
+insert into sys_config values(11, '000000', 'OSS棰勮鍒楄〃璧勬簮寮�鍏�',          'sys.oss.previewListResource',   'true',          'Y', 103, 1, sysdate, null, null, 'true:寮�鍚�, false:鍏抽棴');
 
 
 -- ----------------------------
@@ -713,6 +831,7 @@
 -- ----------------------------
 create table sys_logininfor (
   info_id         number(20)     not null,
+  tenant_id       varchar2(20)   not null,
   user_name       varchar2(50)   default '',
   ipaddr          varchar2(128)  default '',
   login_location  varchar2(255)  default '',
@@ -727,6 +846,7 @@
 
 comment on table  sys_logininfor                is '绯荤粺璁块棶璁板綍';
 comment on column sys_logininfor.info_id        is '璁块棶ID';
+comment on column sys_logininfor.tenant_id      is '绉熸埛缂栧彿';
 comment on column sys_logininfor.user_name      is '鐧诲綍璐﹀彿';
 comment on column sys_logininfor.ipaddr         is '鐧诲綍IP鍦板潃';
 comment on column sys_logininfor.login_location is '鐧诲綍鍦扮偣';
@@ -742,6 +862,7 @@
 -- ----------------------------
 create table sys_notice (
   notice_id         number(20)      not null,
+  tenant_id         varchar2(20)    not null,
   notice_title      varchar2(50)    not null,
   notice_type       char(1)         not null,
   notice_content    clob            default null,
@@ -758,6 +879,7 @@
 
 comment on table  sys_notice                   is '閫氱煡鍏憡琛�';
 comment on column sys_notice.notice_id         is '鍏憡涓婚敭';
+comment on column sys_notice.tenant_id         is '绉熸埛缂栧彿';
 comment on column sys_notice.notice_title      is '鍏憡鏍囬';
 comment on column sys_notice.notice_type       is '鍏憡绫诲瀷锛�1閫氱煡 2鍏憡锛�';
 comment on column sys_notice.notice_content    is '鍏憡鍐呭';
@@ -772,8 +894,8 @@
 -- ----------------------------
 -- 鍒濆鍖�-鍏憡淇℃伅琛ㄦ暟鎹�
 -- ----------------------------
-insert into sys_notice values('1', '娓╅Θ鎻愰啋锛�2018-07-01 鏂扮増鏈彂甯冨暒', '2', '鏂扮増鏈唴瀹�', '0', 103, 1, sysdate, null, null, '绠$悊鍛�');
-insert into sys_notice values('2', '缁存姢閫氱煡锛�2018-07-01 绯荤粺鍑屾櫒缁存姢', '1', '缁存姢鍐呭',   '0', 103, 1, sysdate, null, null, '绠$悊鍛�');
+insert into sys_notice values('1', '000000', '娓╅Θ鎻愰啋锛�2018-07-01 鏂扮増鏈彂甯冨暒', '2', '鏂扮増鏈唴瀹�', '0', 103, 1, sysdate, null, null, '绠$悊鍛�');
+insert into sys_notice values('2', '000000', '缁存姢閫氱煡锛�2018-07-01 绯荤粺鍑屾櫒缁存姢', '1', '缁存姢鍐呭',   '0', 103, 1, sysdate, null, null, '绠$悊鍛�');
 
 
 -- ----------------------------
@@ -890,33 +1012,35 @@
 -- OSS瀵硅薄瀛樺偍琛�
 -- ----------------------------
 create table sys_oss (
-  oss_id          number(20)   not null,
+  oss_id          number(20)    not null,
+  tenant_id       varchar2(20)  not null,
   file_name       varchar(255)  not null,
   original_name   varchar(255)  not null,
-  file_suffix     varchar(10)  not null,
-  url             varchar(500) not null,
-  service         varchar(20)  default 'minio' not null,
-  create_dept     number(20)   default null,
-  create_by       number(20)   default null,
+  file_suffix     varchar(10)   not null,
+  url             varchar(500)  not null,
+  service         varchar(20)   default 'minio' not null,
+  create_dept     number(20)    default null,
+  create_by       number(20)    default null,
   create_time     date,
-  update_by       number(20)   default null,
+  update_by       number(20)    default null,
   update_time     date
 );
 
 alter table sys_oss add constraint pk_sys_oss primary key (oss_id);
 
-comment on table sys_oss is 'OSS瀵硅薄瀛樺偍琛�';
-comment on column sys_oss.oss_id is '瀵硅薄瀛樺偍涓婚敭';
-comment on column sys_oss.file_name is '鏂囦欢鍚�';
-comment on column sys_oss.original_name is '鍘熷悕';
-comment on column sys_oss.file_suffix is '鏂囦欢鍚庣紑鍚�';
-comment on column sys_oss.url is 'URL鍦板潃';
-comment on column sys_oss.service is '鏈嶅姟鍟�';
-comment on column sys_oss.create_dept  is '鍒涘缓閮ㄩ棬';
-comment on column sys_oss.create_time is '鍒涘缓鏃堕棿';
-comment on column sys_oss.create_by is '涓婁紶鑰�';
-comment on column sys_oss.update_time is '鏇存柊鏃堕棿';
-comment on column sys_oss.update_by is '鏇存柊鑰�';
+comment on table sys_oss                    is 'OSS瀵硅薄瀛樺偍琛�';
+comment on column sys_oss.oss_id            is '瀵硅薄瀛樺偍涓婚敭';
+comment on column sys_oss.tenant_id         is '绉熸埛缂栫爜';
+comment on column sys_oss.file_name         is '鏂囦欢鍚�';
+comment on column sys_oss.original_name     is '鍘熷悕';
+comment on column sys_oss.file_suffix       is '鏂囦欢鍚庣紑鍚�';
+comment on column sys_oss.url               is 'URL鍦板潃';
+comment on column sys_oss.service           is '鏈嶅姟鍟�';
+comment on column sys_oss.create_dept       is '鍒涘缓閮ㄩ棬';
+comment on column sys_oss.create_time       is '鍒涘缓鏃堕棿';
+comment on column sys_oss.create_by         is '涓婁紶鑰�';
+comment on column sys_oss.update_time       is '鏇存柊鏃堕棿';
+comment on column sys_oss.update_by         is '鏇存柊鑰�';
 
 
 -- ----------------------------
@@ -924,6 +1048,7 @@
 -- ----------------------------
 create table sys_oss_config (
   oss_config_id   number(20)    not null,
+  tenant_id       varchar2(20)  not null,
   config_key      varchar(20)   not null,
   access_key      varchar(255)  default '',
   secret_key      varchar(255)  default '',
@@ -946,32 +1071,33 @@
 
 alter table sys_oss_config add constraint pk_sys_oss_config primary key (oss_config_id);
 
-comment on table sys_oss_config is '瀵硅薄瀛樺偍閰嶇疆琛�';
-comment on column sys_oss_config.oss_config_id is '涓诲缓';
-comment on column sys_oss_config.config_key is '閰嶇疆key';
-comment on column sys_oss_config.access_key is 'accesskey';
-comment on column sys_oss_config.secret_key is '绉橀挜';
-comment on column sys_oss_config.bucket_name is '妗跺悕绉�';
-comment on column sys_oss_config.prefix is '鍓嶇紑';
-comment on column sys_oss_config.endpoint is '璁块棶绔欑偣';
-comment on column sys_oss_config.domain is '鑷畾涔夊煙鍚�';
-comment on column sys_oss_config.is_https is '鏄惁https锛圷=鏄�,N=鍚︼級';
-comment on column sys_oss_config.region is '鍩�';
-comment on column sys_oss_config.access_policy is '妗舵潈闄愮被鍨�(0=private 1=public 2=custom)';
-comment on column sys_oss_config.status is '鐘舵�侊紙0=姝e父,1=鍋滅敤锛�';
-comment on column sys_oss_config.ext1 is '鎵╁睍瀛楁';
-comment on column sys_oss_config.remark is '澶囨敞';
-comment on column sys_oss_config.create_dept  is '鍒涘缓閮ㄩ棬';
-comment on column sys_oss_config.create_by is '鍒涘缓鑰�';
-comment on column sys_oss_config.create_time is '鍒涘缓鏃堕棿';
-comment on column sys_oss_config.update_by is '鏇存柊鑰�';
-comment on column sys_oss_config.update_time is '鏇存柊鏃堕棿';
+comment on table sys_oss_config                 is '瀵硅薄瀛樺偍閰嶇疆琛�';
+comment on column sys_oss_config.oss_config_id  is '涓诲缓';
+comment on column sys_oss_config.tenant_id      is '绉熸埛缂栫爜';
+comment on column sys_oss_config.config_key     is '閰嶇疆key';
+comment on column sys_oss_config.access_key     is 'accesskey';
+comment on column sys_oss_config.secret_key     is '绉橀挜';
+comment on column sys_oss_config.bucket_name    is '妗跺悕绉�';
+comment on column sys_oss_config.prefix         is '鍓嶇紑';
+comment on column sys_oss_config.endpoint       is '璁块棶绔欑偣';
+comment on column sys_oss_config.domain         is '鑷畾涔夊煙鍚�';
+comment on column sys_oss_config.is_https       is '鏄惁https锛圷=鏄�,N=鍚︼級';
+comment on column sys_oss_config.region         is '鍩�';
+comment on column sys_oss_config.access_policy  is '妗舵潈闄愮被鍨�(0=private 1=public 2=custom)';
+comment on column sys_oss_config.status         is '鐘舵�侊紙0=姝e父,1=鍋滅敤锛�';
+comment on column sys_oss_config.ext1           is '鎵╁睍瀛楁';
+comment on column sys_oss_config.remark         is '澶囨敞';
+comment on column sys_oss_config.create_dept    is '鍒涘缓閮ㄩ棬';
+comment on column sys_oss_config.create_by      is '鍒涘缓鑰�';
+comment on column sys_oss_config.create_time    is '鍒涘缓鏃堕棿';
+comment on column sys_oss_config.update_by      is '鏇存柊鑰�';
+comment on column sys_oss_config.update_time    is '鏇存柊鏃堕棿';
 
-insert into sys_oss_config values (1, 'minio',  'ruoyi',            'ruoyi123',        'ruoyi',             '', '127.0.0.1:9000',                '','N', '',            '1', '0', '', NULL, 103, 1, sysdate, 1, sysdate);
-insert into sys_oss_config values (2, 'qiniu',  'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi',             '', 's3-cn-north-1.qiniucs.com',     '','N', '',            '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate);
-insert into sys_oss_config values (3, 'aliyun', 'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi',             '', 'oss-cn-beijing.aliyuncs.com',   '','N', '',            '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate);
-insert into sys_oss_config values (4, 'qcloud', 'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi-1250000000',  '', 'cos.ap-beijing.myqcloud.com',   '','N', 'ap-beijing',  '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate);
-insert into sys_oss_config values (5, 'image',  'ruoyi',            'ruoyi123',        'ruoyi',             'image', '127.0.0.1:9000',           '','N', '',            '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate);
+insert into sys_oss_config values (1, '000000', 'minio',  'ruoyi',            'ruoyi123',        'ruoyi',             '', '127.0.0.1:9000',                '','N', '',            '1', '0', '', NULL, 103, 1, sysdate, 1, sysdate);
+insert into sys_oss_config values (2, '000000', 'qiniu',  'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi',             '', 's3-cn-north-1.qiniucs.com',     '','N', '',            '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate);
+insert into sys_oss_config values (3, '000000', 'aliyun', 'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi',             '', 'oss-cn-beijing.aliyuncs.com',   '','N', '',            '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate);
+insert into sys_oss_config values (4, '000000', 'qcloud', 'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi-1250000000',  '', 'cos.ap-beijing.myqcloud.com',   '','N', 'ap-beijing',  '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate);
+insert into sys_oss_config values (5, '000000', 'image',  'ruoyi',            'ruoyi123',        'ruoyi',             'image', '127.0.0.1:9000',           '','N', '',            '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate);
 
 
 -- ----------------------------

--
Gitblit v1.9.3