system-tenant 多应用多租户支持

ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SaasSensitiveService.java

@@ -0,0 +1,18 @@
+package org.dromara.common.sensitive.core;
+
+/**
+ * 脱敏服务
+ * 默认管理员不过滤
+ * 需自行根据业务重写实现
+ *
+ * @author Lion Li
+ * @version 3.6.0
+ */
+public interface SaasSensitiveService {
+
+    /**
+     * 是否脱敏
+     */
+    boolean isSensitive(String roleKey, String perms);
+
+}

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasPostController.java

@@ -29,7 +29,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system2/post")
+@RequestMapping("/system/saasPost")
 public class SysSaasPostController extends BaseController {
 
     private final ISysSaasPostService postService;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasRoleController.java

@@ -33,7 +33,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system2/role")
+@RequestMapping("/system/saasRole")
 public class SysSaasRoleController extends BaseController {
 
     private final ISysSaasRoleService roleService;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasSocialController.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system2/social")
+@RequestMapping("/system/saasSocial")
 public class SysSaasSocialController extends BaseController {
 
     private final ISysSaasSocialService socialUserService;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantController.java

@@ -38,7 +38,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system2/tenant")
+@RequestMapping("/system/saasTenant")
 @ConditionalOnProperty(value = "tenant.enable", havingValue = "true")
 public class SysSaasTenantController extends BaseController {
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantPackageController.java

@@ -34,7 +34,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system2/tenant/package")
+@RequestMapping("/system/saasTenant/package")
 @ConditionalOnProperty(value = "tenant.enable", havingValue = "true")
 public class SysSaasTenantPackageController extends BaseController {
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasUserController.java

@@ -46,7 +46,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system2/user")
+@RequestMapping("/system/saasUser")
 public class SysSaasUserController extends BaseController {
 
     private final ISysSaasUserService userService;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasPost.java

@@ -7,14 +7,14 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 岗位表 sys2_post
+ * 岗位表 sys_saas_post
  *
  * @author Lion Li
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys2_post")
+@TableName("sys_saas_post")
 public class SysSaasPost extends TenantEntity {
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasRole.java

@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 /**
- * 角色表 sys2_role
+ * 角色表 sys_saas_role
  *
  * @author Lion Li
  */
@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys2_role")
+@TableName("sys_saas_role")
 public class SysSaasRole extends TenantEntity {
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasRoleMenu.java

@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
- * 角色和菜单关联 sys2_role_menu
+ * 角色和菜单关联 sys_saas_role_menu
  *
  * @author Lion Li
  */
 
 @Data
-@TableName("sys2_role_menu")
+@TableName("sys_saas_role_menu")
 public class SysSaasRoleMenu {
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUser.java

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * 用户对象 sys2_user
+ * 用户对象 sys_saas_user
  *
  * @author Lion Li
  */
@@ -18,7 +18,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys2_user")
+@TableName("sys_saas_user")
 public class SysSaasUser extends TenantEntity {
 
     /**
@@ -43,7 +43,7 @@ public class SysSaasUser extends TenantEntity {
     private String nickName;
 
     /**
-     * 用户类型（sys2_user系统用户）
+     * 用户类型（sys_saas_user系统用户）
      */
     private String userType;
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUserPost.java

@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
- * 用户和岗位关联 sys2_user_post
+ * 用户和岗位关联 sys_saas_user_post
  *
  * @author Lion Li
  */
 
 @Data
-@TableName("sys2_user_post")
+@TableName("sys_saas_user_post")
 public class SysSaasUserPost {
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUserRole.java

@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
- * 用户和角色关联 sys2_user_role
+ * 用户和角色关联 sys_saas_user_role
  *
  * @author Lion Li
  */
 
 @Data
-@TableName("sys2_user_role")
+@TableName("sys_saas_user_role")
 public class SysSaasUserRole {
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasPostBo.java

@@ -10,7 +10,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.system.saas.domain.SysSaasPost;
 
 /**
- * 岗位信息业务对象 sys2_post
+ * 岗位信息业务对象 sys_saas_post
  *
  * @author Michelle.Chung
  */

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasRoleBo.java

@@ -12,7 +12,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.system.saas.domain.SysSaasRole;
 
 /**
- * 角色信息业务对象 sys2_role
+ * 角色信息业务对象 sys_saas_role
  *
  * @author Michelle.Chung
  */

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasUserBo.java

@@ -13,7 +13,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.system.saas.domain.SysSaasUser;
 
 /**
- * 用户信息业务对象 sys2_user
+ * 用户信息业务对象 sys_saas_user
  *
  * @author Michelle.Chung
  */
@@ -57,7 +57,7 @@ public class SysSaasUserBo extends BaseEntity {
     private String nickName;
 
     /**
-     * 用户类型（sys2_user系统用户）
+     * 用户类型（sys_saas_user系统用户）
      */
     private String userType;
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasPostVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 岗位信息视图对象 sys2_post
+ * 岗位信息视图对象 sys_saas_post
  *
  * @author Michelle.Chung
  */

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasRoleVo.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 角色信息视图对象 sys2_role
+ * 角色信息视图对象 sys_saas_role
  *
  * @author Michelle.Chung
  */

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserExportVo.java

@@ -57,7 +57,7 @@ public class SysSaasUserExportVo implements Serializable {
      * 用户性别
      */
     @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_user_sex")
+    @ExcelDictFormat(dictType = "sys_saas_user_sex")
     private String sex;
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserImportVo.java

@@ -63,7 +63,7 @@ public class SysSaasUserImportVo implements Serializable {
      * 用户性别
      */
     @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_user_sex")
+    @ExcelDictFormat(dictType = "sys_saas_user_sex")
     private String sex;
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserVo.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 
 /**
- * 用户信息视图对象 sys2_user
+ * 用户信息视图对象 sys_saas_user
  *
  * @author Michelle.Chung
  */
@@ -54,7 +54,7 @@ public class SysSaasUserVo implements Serializable {
     private String nickName;
 
     /**
-     * 用户类型（sys2_user系统用户）
+     * 用户类型（sys_saas_user系统用户）
      */
     private String userType;
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java

@@ -70,7 +70,7 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService {
                     .orderByAsc(SysSaasMenu::getOrderNum));
         } else {
             QueryWrapper<SysSaasMenu> wrapper = Wrappers.query();
-            wrapper.inSql("r.role_id", "select role_id from sys2_user_role where user_id = " + userId)
+            wrapper.inSql("r.role_id", "select role_id from sys_saas_user_role where user_id = " + userId)
                 .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName())
                 .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible())
                 .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus())

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasSensitiveServiceImpl.java

@@ -3,7 +3,7 @@ package org.dromara.system.saas.service.impl;
 import cn.dev33.satoken.stp.StpUtil;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.common.sensitive.core.SensitiveService;
+import org.dromara.common.sensitive.core.SaasSensitiveService;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.springframework.stereotype.Service;
 
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
  * @version 3.6.0
  */
 @Service
-public class SysSaasSensitiveServiceImpl implements SensitiveService {
+public class SysSaasSensitiveServiceImpl implements SaasSensitiveService {
 
     /**
      * 是否脱敏

ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasMenuMapper.xml

@@ -11,8 +11,8 @@
         select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query_param, m.visible, m.status,
         m.perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
         from sys_saas_menu m
-            left join sys2_role_menu rm on m.menu_id = rm.menu_id
+            left join sys_saas_role_menu rm on m.menu_id = rm.menu_id
-            left join sys2_role r on rm.role_id = r.role_id
+            left join sys_saas_role r on rm.role_id = r.role_id
         ${ew.getCustomSqlSegment}
     </select>
 
@@ -33,20 +33,20 @@
                         m.order_num,
                         m.create_time
         from sys_saas_menu m
-                 left join sys2_role_menu rm on m.menu_id = rm.menu_id and m.status = '0'
+                 left join sys_saas_role_menu rm on m.menu_id = rm.menu_id and m.status = '0'
-                 left join sys2_role r on rm.role_id = r.role_id and r.status = '0'
+                 left join sys_saas_role r on rm.role_id = r.role_id and r.status = '0'
         where m.menu_type in ('M', 'C')
-          and r.role_id in (select role_id from sys2_user_role where user_id = #{userId})
+          and r.role_id in (select role_id from sys_saas_user_role where user_id = #{userId})
         order by m.parent_id, m.order_num
     </select>
 
     <select id="selectMenuListByRoleId" resultType="Long">
         select m.menu_id
         from sys_saas_menu m
-        left join sys2_role_menu rm on m.menu_id = rm.menu_id
+        left join sys_saas_role_menu rm on m.menu_id = rm.menu_id
         where rm.role_id = #{roleId}
         <if test="menuCheckStrictly">
-            and m.menu_id not in (select m.parent_id from sys_saas_menu m inner join sys2_role_menu rm on m.menu_id =
+            and m.menu_id not in (select m.parent_id from sys_saas_menu m inner join sys_saas_role_menu rm on m.menu_id =
             rm.menu_id and rm.role_id = #{roleId})
         </if>
         order by m.parent_id, m.order_num
@@ -55,15 +55,15 @@
     <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
         select distinct m.perms
         from sys_saas_menu m
-                 left join sys2_role_menu rm on m.menu_id = rm.menu_id and m.status = '0'
+                 left join sys_saas_role_menu rm on m.menu_id = rm.menu_id and m.status = '0'
-                 left join sys2_role r on r.role_id = rm.role_id and r.status = '0'
+                 left join sys_saas_role r on r.role_id = rm.role_id and r.status = '0'
-        where r.role_id in (select role_id from sys2_user_role where user_id = #{userId})
+        where r.role_id in (select role_id from sys_saas_user_role where user_id = #{userId})
     </select>
 
     <select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
         select distinct m.perms
         from sys_saas_menu m
-                 left join sys2_role_menu rm on m.menu_id = rm.menu_id
+                 left join sys_saas_role_menu rm on m.menu_id = rm.menu_id
         where m.status = '0' and rm.role_id = #{roleId}
     </select>
 

ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasPostMapper.xml

@@ -15,14 +15,14 @@
         <if test="ew.getSqlSelect == null">
             *
         </if>
-        from sys2_post ${ew.getCustomSqlSegment}
+        from sys_saas_post ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectPostsByUserId" parameterType="Long" resultMap="SysPostResult">
         select p.post_id, p.dept_id, p.post_name, p.post_code, p.post_category
-        from sys2_post p
+        from sys_saas_post p
-                 left join sys2_user_post up on up.post_id = p.post_id
+                 left join sys_saas_user_post up on up.post_id = p.post_id
-                 left join sys2_user u on u.user_id = up.user_id
+                 left join sys_saas_user u on u.user_id = up.user_id
         where u.user_id = #{userId}
     </select>
 

ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasRoleMapper.xml

@@ -19,9 +19,9 @@
                         r.del_flag,
                         r.create_time,
                         r.remark
-        from sys2_role r
+        from sys_saas_role r
-                 left join sys2_user_role sur on sur.role_id = r.role_id
+                 left join sys_saas_user_role sur on sur.role_id = r.role_id
-                 left join sys2_user u on u.user_id = sur.user_id
+                 left join sys_saas_user u on u.user_id = sur.user_id
                  left join sys_saas_dept d on u.dept_id = d.dept_id
     </sql>
 
@@ -47,8 +47,8 @@
                r.role_sort,
                r.data_scope,
                r.status
-        from sys2_role r
+        from sys_saas_role r
-        WHERE r.del_flag = '0' and r.role_id in (select role_id from sys2_user_role where user_id = #{userId})
+        WHERE r.del_flag = '0' and r.role_id in (select role_id from sys_saas_user_role where user_id = #{userId})
     </select>
 
     <select id="selectRoleById" resultMap="SysRoleResult">

ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasUserMapper.xml

@@ -20,7 +20,7 @@
             u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
             u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
         </if>
-        from sys2_user u
+        from sys_saas_user u
         ${ew.getCustomSqlSegment}
     </select>
 
@@ -33,7 +33,7 @@
             u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
             u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
         </if>
-        from sys2_user u
+        from sys_saas_user u
         ${ew.getCustomSqlSegment}
     </select>
 
@@ -41,32 +41,32 @@
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
             u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
             d.dept_name, d.leader, u1.user_name as leaderName
-        from sys2_user u
+        from sys_saas_user u
             left join sys_saas_dept d on u.dept_id = d.dept_id
-            left join sys2_user u1 on u1.user_id = d.leader
+            left join sys_saas_user u1 on u1.user_id = d.leader
         ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectAllocatedList" resultMap="SysUserResult">
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-        from sys2_user u
+        from sys_saas_user u
              left join sys_saas_dept d on u.dept_id = d.dept_id
-             left join sys2_user_role sur on u.user_id = sur.user_id
+             left join sys_saas_user_role sur on u.user_id = sur.user_id
-             left join sys2_role r on r.role_id = sur.role_id
+             left join sys_saas_role r on r.role_id = sur.role_id
         ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectUnallocatedList" resultMap="SysUserResult">
         select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
-        from sys2_user u
+        from sys_saas_user u
              left join sys_saas_dept d on u.dept_id = d.dept_id
-             left join sys2_user_role sur on u.user_id = sur.user_id
+             left join sys_saas_user_role sur on u.user_id = sur.user_id
-             left join sys2_role r on r.role_id = sur.role_id
+             left join sys_saas_role r on r.role_id = sur.role_id
         ${ew.getCustomSqlSegment}
     </select>
 
     <select id="countUserById" resultType="Long">
-        select count(*) from sys2_user where del_flag = '0' and user_id = #{userId}
+        select count(*) from sys_saas_user where del_flag = '0' and user_id = #{userId}
     </select>
 
 

ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasUserRoleMapper.xml

@@ -5,8 +5,8 @@
 <mapper namespace="org.dromara.system.saas.mapper.SysSaasUserRoleMapper">
 
     <select id="selectUserIdsByRoleId" resultType="Long">
-        select u.user_id from sys2_user u
+        select u.user_id from sys_saas_user u
-        inner join sys2_user_role sur
+        inner join sys_saas_user_role sur
             on u.user_id = sur.user_id and sur.role_id = #{roleId}
     </select>
 

script/sql/tenant/ry_vue_5.X.sql

@@ -154,13 +154,13 @@ insert into sys_saas_dept values(109, '000000', 102, '0,100,102',  '财务部门
 -- ----------------------------
 -- 2、用户信息表
 -- ----------------------------
-create table sys2_user (
+create table sys_saas_user (
                           user_id           bigint(20)      not null                   comment '用户ID',
                           tenant_id         varchar(20)     default '000000'           comment '租户编号',
                           dept_id           bigint(20)      default null               comment '部门ID',
                           user_name         varchar(30)     not null                   comment '用户账号',
                           nick_name         varchar(30)     not null                   comment '用户昵称',
-                          user_type         varchar(10)     default 'sys2_user'         comment '用户类型（sys2_user系统用户）',
+                          user_type         varchar(10)     default 'sys_saas_user'         comment '用户类型（sys_saas_user系统用户）',
                           email             varchar(50)     default ''                 comment '用户邮箱',
                           phonenumber       varchar(11)     default ''                 comment '手机号码',
                           sex               char(1)         default '0'                comment '用户性别（0男 1女 2未知）',
@@ -182,14 +182,14 @@ create table sys2_user (
 -- ----------------------------
 -- 初始化-用户信息表数据
 -- ----------------------------
-insert into sys2_user values(1, '000000', 103, 'admin', '疯狂的狮子Li', 'sys2_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_saas_user values(1, '000000', 103, 'admin', '疯狂的狮子Li', 'sys_saas_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 sys2_user values(3, '000000', 108, 'test', '本部门及以下 密码666666', 'sys2_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 3, sysdate(), null);
+insert into sys_saas_user values(3, '000000', 108, 'test', '本部门及以下 密码666666', 'sys_saas_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 3, sysdate(), null);
-insert into sys2_user values(4, '000000', 102, 'test1', '仅本人 密码666666', 'sys2_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 4, sysdate(), null);
+insert into sys_saas_user values(4, '000000', 102, 'test1', '仅本人 密码666666', 'sys_saas_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 4, sysdate(), null);
 
 -- ----------------------------
 -- 3、岗位信息表
 -- ----------------------------
-create table sys2_post
+create table sys_saas_post
 (
     post_id       bigint(20)      not null                   comment '岗位ID',
     tenant_id     varchar(20)     default '000000'           comment '租户编号',
@@ -211,16 +211,16 @@ create table sys2_post
 -- ----------------------------
 -- 初始化-岗位信息表数据
 -- ----------------------------
-insert into sys2_post values(1, '000000', 103, 'ceo',  null, '董事长',    1, '0', 103, 1, sysdate(), null, null, '');
+insert into sys_saas_post values(1, '000000', 103, 'ceo',  null, '董事长',    1, '0', 103, 1, sysdate(), null, null, '');
-insert into sys2_post values(2, '000000', 100, 'se',   null, '项目经理',  2, '0', 103, 1, sysdate(), null, null, '');
+insert into sys_saas_post values(2, '000000', 100, 'se',   null, '项目经理',  2, '0', 103, 1, sysdate(), null, null, '');
-insert into sys2_post values(3, '000000', 100, 'hr',   null, '人力资源',  3, '0', 103, 1, sysdate(), null, null, '');
+insert into sys_saas_post values(3, '000000', 100, 'hr',   null, '人力资源',  3, '0', 103, 1, sysdate(), null, null, '');
-insert into sys2_post values(4, '000000', 100, 'user', null, '普通员工',  4, '0', 103, 1, sysdate(), null, null, '');
+insert into sys_saas_post values(4, '000000', 100, 'user', null, '普通员工',  4, '0', 103, 1, sysdate(), null, null, '');
 
 
 -- ----------------------------
 -- 4、角色信息表
 -- ----------------------------
-create table sys2_role (
+create table sys_saas_role (
                           role_id              bigint(20)      not null                   comment '角色ID',
                           tenant_id            varchar(20)     default '000000'           comment '租户编号',
                           role_name            varchar(30)     not null                   comment '角色名称',
@@ -243,9 +243,9 @@ create table sys2_role (
 -- ----------------------------
 -- 初始化-角色信息表数据
 -- ----------------------------
-insert into sys2_role values(1, '000000', '超级管理员',  'superadmin',  1, 1, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '超级管理员');
+insert into sys_saas_role values(1, '000000', '超级管理员',  'superadmin',  1, 1, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '超级管理员');
-insert into sys2_role values(3, '000000', '本部门及以下', 'test1', 3, 4, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '');
+insert into sys_saas_role values(3, '000000', '本部门及以下', 'test1', 3, 4, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '');
-insert into sys2_role values(4, '000000', '仅本人',      'test2', 4, 5, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '');
+insert into sys_saas_role values(4, '000000', '仅本人',      'test2', 4, 5, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '');
 
 -- ----------------------------
 -- 5、菜单权限表
@@ -439,7 +439,7 @@ insert into sys_menu values (1837445872877223943, '多应用菜单删除', '6',
 -- ----------------------------
 -- 6、用户和角色关联表  用户N-1角色
 -- ----------------------------
-create table sys2_user_role (
+create table sys_saas_user_role (
                                user_id   bigint(20) not null comment '用户ID',
                                role_id   bigint(20) not null comment '角色ID',
                                primary key(user_id, role_id)
@@ -448,14 +448,14 @@ create table sys2_user_role (
 -- ----------------------------
 -- 初始化-用户和角色关联表数据
 -- ----------------------------
-insert into sys2_user_role values ('1', '1');
+insert into sys_saas_user_role values ('1', '1');
-insert into sys2_user_role values ('3', '3');
+insert into sys_saas_user_role values ('3', '3');
-insert into sys2_user_role values ('4', '4');
+insert into sys_saas_user_role values ('4', '4');
 
 -- ----------------------------
 -- 7、角色和菜单关联表  角色1-N菜单
 -- ----------------------------
-create table sys2_role_menu (
+create table sys_saas_role_menu (
                                role_id   bigint(20) not null comment '角色ID',
                                menu_id   bigint(20) not null comment '菜单ID',
                                primary key(role_id, menu_id)
@@ -464,89 +464,89 @@ create table sys2_role_menu (
 -- ----------------------------
 -- 初始化-角色和菜单关联表数据
 -- ----------------------------
-insert into sys2_role_menu values ('3', '1');
+insert into sys_saas_role_menu values ('3', '1');
-insert into sys2_role_menu values ('3', '5');
+insert into sys_saas_role_menu values ('3', '5');
-insert into sys2_role_menu values ('3', '100');
+insert into sys_saas_role_menu values ('3', '100');
-insert into sys2_role_menu values ('3', '101');
+insert into sys_saas_role_menu values ('3', '101');
-insert into sys2_role_menu values ('3', '102');
+insert into sys_saas_role_menu values ('3', '102');
-insert into sys2_role_menu values ('3', '103');
+insert into sys_saas_role_menu values ('3', '103');
-insert into sys2_role_menu values ('3', '104');
+insert into sys_saas_role_menu values ('3', '104');
-insert into sys2_role_menu values ('3', '105');
+insert into sys_saas_role_menu values ('3', '105');
-insert into sys2_role_menu values ('3', '106');
+insert into sys_saas_role_menu values ('3', '106');
-insert into sys2_role_menu values ('3', '107');
+insert into sys_saas_role_menu values ('3', '107');
-insert into sys2_role_menu values ('3', '108');
+insert into sys_saas_role_menu values ('3', '108');
-insert into sys2_role_menu values ('3', '500');
+insert into sys_saas_role_menu values ('3', '500');
-insert into sys2_role_menu values ('3', '501');
+insert into sys_saas_role_menu values ('3', '501');
-insert into sys2_role_menu values ('3', '1001');
+insert into sys_saas_role_menu values ('3', '1001');
-insert into sys2_role_menu values ('3', '1002');
+insert into sys_saas_role_menu values ('3', '1002');
-insert into sys2_role_menu values ('3', '1003');
+insert into sys_saas_role_menu values ('3', '1003');
-insert into sys2_role_menu values ('3', '1004');
+insert into sys_saas_role_menu values ('3', '1004');
-insert into sys2_role_menu values ('3', '1005');
+insert into sys_saas_role_menu values ('3', '1005');
-insert into sys2_role_menu values ('3', '1006');
+insert into sys_saas_role_menu values ('3', '1006');
-insert into sys2_role_menu values ('3', '1007');
+insert into sys_saas_role_menu values ('3', '1007');
-insert into sys2_role_menu values ('3', '1008');
+insert into sys_saas_role_menu values ('3', '1008');
-insert into sys2_role_menu values ('3', '1009');
+insert into sys_saas_role_menu values ('3', '1009');
-insert into sys2_role_menu values ('3', '1010');
+insert into sys_saas_role_menu values ('3', '1010');
-insert into sys2_role_menu values ('3', '1011');
+insert into sys_saas_role_menu values ('3', '1011');
-insert into sys2_role_menu values ('3', '1012');
+insert into sys_saas_role_menu values ('3', '1012');
-insert into sys2_role_menu values ('3', '1013');
+insert into sys_saas_role_menu values ('3', '1013');
-insert into sys2_role_menu values ('3', '1014');
+insert into sys_saas_role_menu values ('3', '1014');
-insert into sys2_role_menu values ('3', '1015');
+insert into sys_saas_role_menu values ('3', '1015');
-insert into sys2_role_menu values ('3', '1016');
+insert into sys_saas_role_menu values ('3', '1016');
-insert into sys2_role_menu values ('3', '1017');
+insert into sys_saas_role_menu values ('3', '1017');
-insert into sys2_role_menu values ('3', '1018');
+insert into sys_saas_role_menu values ('3', '1018');
-insert into sys2_role_menu values ('3', '1019');
+insert into sys_saas_role_menu values ('3', '1019');
-insert into sys2_role_menu values ('3', '1020');
+insert into sys_saas_role_menu values ('3', '1020');
-insert into sys2_role_menu values ('3', '1021');
+insert into sys_saas_role_menu values ('3', '1021');
-insert into sys2_role_menu values ('3', '1022');
+insert into sys_saas_role_menu values ('3', '1022');
-insert into sys2_role_menu values ('3', '1023');
+insert into sys_saas_role_menu values ('3', '1023');
-insert into sys2_role_menu values ('3', '1024');
+insert into sys_saas_role_menu values ('3', '1024');
-insert into sys2_role_menu values ('3', '1025');
+insert into sys_saas_role_menu values ('3', '1025');
-insert into sys2_role_menu values ('3', '1026');
+insert into sys_saas_role_menu values ('3', '1026');
-insert into sys2_role_menu values ('3', '1027');
+insert into sys_saas_role_menu values ('3', '1027');
-insert into sys2_role_menu values ('3', '1028');
+insert into sys_saas_role_menu values ('3', '1028');
-insert into sys2_role_menu values ('3', '1029');
+insert into sys_saas_role_menu values ('3', '1029');
-insert into sys2_role_menu values ('3', '1030');
+insert into sys_saas_role_menu values ('3', '1030');
-insert into sys2_role_menu values ('3', '1031');
+insert into sys_saas_role_menu values ('3', '1031');
-insert into sys2_role_menu values ('3', '1032');
+insert into sys_saas_role_menu values ('3', '1032');
-insert into sys2_role_menu values ('3', '1033');
+insert into sys_saas_role_menu values ('3', '1033');
-insert into sys2_role_menu values ('3', '1034');
+insert into sys_saas_role_menu values ('3', '1034');
-insert into sys2_role_menu values ('3', '1035');
+insert into sys_saas_role_menu values ('3', '1035');
-insert into sys2_role_menu values ('3', '1036');
+insert into sys_saas_role_menu values ('3', '1036');
-insert into sys2_role_menu values ('3', '1037');
+insert into sys_saas_role_menu values ('3', '1037');
-insert into sys2_role_menu values ('3', '1038');
+insert into sys_saas_role_menu values ('3', '1038');
-insert into sys2_role_menu values ('3', '1039');
+insert into sys_saas_role_menu values ('3', '1039');
-insert into sys2_role_menu values ('3', '1040');
+insert into sys_saas_role_menu values ('3', '1040');
-insert into sys2_role_menu values ('3', '1041');
+insert into sys_saas_role_menu values ('3', '1041');
-insert into sys2_role_menu values ('3', '1042');
+insert into sys_saas_role_menu values ('3', '1042');
-insert into sys2_role_menu values ('3', '1043');
+insert into sys_saas_role_menu values ('3', '1043');
-insert into sys2_role_menu values ('3', '1044');
+insert into sys_saas_role_menu values ('3', '1044');
-insert into sys2_role_menu values ('3', '1045');
+insert into sys_saas_role_menu values ('3', '1045');
-insert into sys2_role_menu values ('3', '1500');
+insert into sys_saas_role_menu values ('3', '1500');
-insert into sys2_role_menu values ('3', '1501');
+insert into sys_saas_role_menu values ('3', '1501');
-insert into sys2_role_menu values ('3', '1502');
+insert into sys_saas_role_menu values ('3', '1502');
-insert into sys2_role_menu values ('3', '1503');
+insert into sys_saas_role_menu values ('3', '1503');
-insert into sys2_role_menu values ('3', '1504');
+insert into sys_saas_role_menu values ('3', '1504');
-insert into sys2_role_menu values ('3', '1505');
+insert into sys_saas_role_menu values ('3', '1505');
-insert into sys2_role_menu values ('3', '1506');
+insert into sys_saas_role_menu values ('3', '1506');
-insert into sys2_role_menu values ('3', '1507');
+insert into sys_saas_role_menu values ('3', '1507');
-insert into sys2_role_menu values ('3', '1508');
+insert into sys_saas_role_menu values ('3', '1508');
-insert into sys2_role_menu values ('3', '1509');
+insert into sys_saas_role_menu values ('3', '1509');
-insert into sys2_role_menu values ('3', '1510');
+insert into sys_saas_role_menu values ('3', '1510');
-insert into sys2_role_menu values ('3', '1511');
+insert into sys_saas_role_menu values ('3', '1511');
-insert into sys2_role_menu values ('4', '5');
+insert into sys_saas_role_menu values ('4', '5');
-insert into sys2_role_menu values ('4', '1500');
+insert into sys_saas_role_menu values ('4', '1500');
-insert into sys2_role_menu values ('4', '1501');
+insert into sys_saas_role_menu values ('4', '1501');
-insert into sys2_role_menu values ('4', '1502');
+insert into sys_saas_role_menu values ('4', '1502');
-insert into sys2_role_menu values ('4', '1503');
+insert into sys_saas_role_menu values ('4', '1503');
-insert into sys2_role_menu values ('4', '1504');
+insert into sys_saas_role_menu values ('4', '1504');
-insert into sys2_role_menu values ('4', '1505');
+insert into sys_saas_role_menu values ('4', '1505');
-insert into sys2_role_menu values ('4', '1506');
+insert into sys_saas_role_menu values ('4', '1506');
-insert into sys2_role_menu values ('4', '1507');
+insert into sys_saas_role_menu values ('4', '1507');
-insert into sys2_role_menu values ('4', '1508');
+insert into sys_saas_role_menu values ('4', '1508');
-insert into sys2_role_menu values ('4', '1509');
+insert into sys_saas_role_menu values ('4', '1509');
-insert into sys2_role_menu values ('4', '1510');
+insert into sys_saas_role_menu values ('4', '1510');
-insert into sys2_role_menu values ('4', '1511');
+insert into sys_saas_role_menu values ('4', '1511');
 
 -- ----------------------------
 -- 8、角色和部门关联表  角色1-N部门
@@ -560,7 +560,7 @@ create table sys_saas_role_dept (
 -- ----------------------------
 -- 9、用户与岗位关联表  用户1-N岗位
 -- ----------------------------
-create table sys2_user_post
+create table sys_saas_user_post
 (
     user_id   bigint(20) not null comment '用户ID',
     post_id   bigint(20) not null comment '岗位ID',
@@ -570,7 +570,7 @@ create table sys2_user_post
 -- ----------------------------
 -- 初始化-用户与岗位关联表数据
 -- ----------------------------
-insert into sys2_user_post values ('1', '1');
+insert into sys_saas_user_post values ('1', '1');
 
 -- ----------------------------
 -- 10、操作日志记录
@@ -620,7 +620,7 @@ create table sys2_dict_type
     unique (tenant_id, dict_type)
 ) engine=innodb comment = '字典类型表';
 
-insert into sys2_dict_type values(1, '000000', '用户性别', 'sys2_user_sex',        103, 1, sysdate(), null, null, '用户性别列表');
+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, '系统是否列表');
@@ -655,9 +655,9 @@ create table sys2_dict_data
     primary key (dict_code)
 ) engine=innodb comment = '字典数据表';
 
-insert into sys2_dict_data values(1, '000000', 1,  '男',       '0',       'sys2_user_sex',        '',   '',        'Y', 103, 1, sysdate(), null, null, '性别男');
+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',       'sys2_user_sex',        '',   '',        'N', 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',       'sys2_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, '正常状态');