代码整理

ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml

@@ -4,7 +4,7 @@ sa-token:
   # 允许动态设置 token 有效期
   dynamic-active-timeout: true
   # 允许从 请求参数 读取 token
-  is-read-body: false
+  is-read-body: true
   # 允许从 header 读取 token
   is-read-header: true
   # 关闭 cookie 鉴权 从根源杜绝 csrf 漏洞风险

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasNoticeController.java

@@ -61,7 +61,7 @@ public class SysSaasNoticeController extends BaseController {
         if (rows <= 0) {
             return R.fail();
         }
-        String type = dictService.getDictLabel("sys2_notice_type", notice.getNoticeType());
+        String type = dictService.getDictLabel("sys_saas_notice_type", notice.getNoticeType());
         SseMessageUtils.publishAll("[" + type + "] " + notice.getNoticeTitle());
         return R.ok();
     }

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasConfig.java

@@ -7,14 +7,14 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 参数配置表 sys2_config
+ * 参数配置表 sys_saas_config
  *
  * @author Lion Li
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys2_config")
+@TableName("sys_saas_config")
 public class SysSaasConfig extends TenantEntity {
 
     /**

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasDictData.java

@@ -8,14 +8,14 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 字典数据表 sys2_dict_data
+ * 字典数据表 sys_saas_dict_data
  *
  * @author Lion Li
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys2_dict_data")
+@TableName("sys_saas_dict_data")
 public class SysSaasDictData extends TenantEntity {
 
     /**

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasDictType.java

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys2_dict_type")
+@TableName("sys_saas_dict_type")
 public class SysSaasDictType extends TenantEntity {
 
     /**

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasOperLog.java

@@ -15,7 +15,7 @@ import java.util.Date;
  */
 
 @Data
-@TableName("sys2_oper_log")
+@TableName("sys_saas_oper_log")
 public class SysSaasOperLog implements Serializable {
 
     @Serial

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasSocial.java

@@ -9,13 +9,13 @@ import org.dromara.common.tenant.core.TenantEntity;
 import java.io.Serial;
 
 /**
- * 社会化关系对象 sys2_social
+ * 社会化关系对象 sys_saas_social
  *
  * @author thiszhc
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys2_social")
+@TableName("sys_saas_social")
 public class SysSaasSocial extends TenantEntity {
 
     @Serial

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenant.java

@@ -11,13 +11,13 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 租户对象 sys2_tenant
+ * 租户对象 sys_saas_tenant
  *
  * @author Michelle.Chung
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys2_tenant")
+@TableName("sys_saas_tenant")
 public class SysSaasTenant extends BaseEntity {
 
     @Serial

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenantPackage.java

@@ -8,13 +8,13 @@ import java.io.Serial;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
- * 租户套餐对象 sys2_tenant_package
+ * 租户套餐对象 sys_saas_tenant_package
  *
  * @author Michelle.Chung
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys2_tenant_package")
+@TableName("sys_saas_tenant_package")
 public class SysSaasTenantPackage extends BaseEntity {
 
     @Serial

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasConfigBo.java

@@ -9,7 +9,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.system.saas.domain.SysSaasConfig;
 
 /**
- * 参数配置业务对象 sys2_config
+ * 参数配置业务对象 sys_saas_config
  *
  * @author Michelle.Chung
  */

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasDictDataBo.java

@@ -9,7 +9,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.system.saas.domain.SysSaasDictData;
 
 /**
- * 字典数据业务对象 sys2_dict_data
+ * 字典数据业务对象 sys_saas_dict_data
  *
  * @author Michelle.Chung
  */

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasDictTypeBo.java

@@ -11,7 +11,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.system.saas.domain.SysSaasDictType;
 
 /**
- * 字典类型业务对象 sys2_dict_type
+ * 字典类型业务对象 sys_saas_dict_type
  *
  * @author Michelle.Chung
  */

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasLogininforBo.java

@@ -9,7 +9,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 系统访问记录业务对象 sys2_logininfor
+ * 系统访问记录业务对象 sys_saas_logininfor
  *
  * @author Michelle.Chung
  */

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOperLogBo.java

@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 操作日志记录业务对象 sys2_oper_log
+ * 操作日志记录业务对象 sys_saas_oper_log
  *
  * @author Michelle.Chung
  * @date 2023-02-07

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasSocialBo.java

@@ -12,7 +12,7 @@ import org.dromara.common.tenant.core.TenantEntity;
 import org.dromara.system.saas.domain.SysSaasSocial;
 
 /**
- * 社会化关系业务对象 sys2_social
+ * 社会化关系业务对象 sys_saas_social
  *
  * @author Lion Li
  */

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantBo.java

@@ -13,7 +13,7 @@ import java.util.Date;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
- * 租户业务对象 sys2_tenant
+ * 租户业务对象 sys_saas_tenant
  *
  * @author Michelle.Chung
  */

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantPackageBo.java

@@ -12,7 +12,7 @@ import jakarta.validation.constraints.*;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
- * 租户套餐业务对象 sys2_tenant_package
+ * 租户套餐业务对象 sys_saas_tenant_package
  *
  * @author Michelle.Chung
  */

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasConfigVo.java

@@ -14,7 +14,7 @@ import java.util.Date;
 
 
 /**
- * 参数配置视图对象 sys2_config
+ * 参数配置视图对象 sys_saas_config
  *
  * @author Michelle.Chung
  */
@@ -54,7 +54,7 @@ public class SysSaasConfigVo implements Serializable {
      * 系统内置（Y是 N否）
      */
     @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_yes_no")
+    @ExcelDictFormat(dictType = "sys_saas_yes_no")
     private String configType;
 
     /**

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasDeptVo.java

@@ -90,7 +90,7 @@ public class SysSaasDeptVo implements Serializable {
      * 部门状态（0正常 1停用）
      */
     @ExcelProperty(value = "部门状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_normal_disable")
+    @ExcelDictFormat(dictType = "sys_saas_normal_disable")
     private String status;
 
     /**

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasDictDataVo.java

@@ -14,7 +14,7 @@ import java.util.Date;
 
 
 /**
- * 字典数据视图对象 sys2_dict_data
+ * 字典数据视图对象 sys_saas_dict_data
  *
  * @author Michelle.Chung
  */
@@ -70,7 +70,7 @@ public class SysSaasDictDataVo implements Serializable {
      * 是否默认（Y是 N否）
      */
     @ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_yes_no")
+    @ExcelDictFormat(dictType = "sys_saas_yes_no")
     private String isDefault;
 
     /**

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasDictTypeVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 
 
 /**
- * 字典类型视图对象 sys2_dict_type
+ * 字典类型视图对象 sys_saas_dict_type
  *
  * @author Michelle.Chung
  */

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasLogininforVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 
 
 /**
- * 系统访问记录视图对象 sys2_logininfor
+ * 系统访问记录视图对象 sys_saas_logininfor
  *
  * @author Michelle.Chung
  * @date 2023-02-07
@@ -55,14 +55,14 @@ public class SysSaasLogininforVo implements Serializable {
      * 设备类型
      */
     @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_device_type")
+    @ExcelDictFormat(dictType = "sys_saas_device_type")
     private String deviceType;
 
     /**
      * 登录状态（0成功 1失败）
      */
     @ExcelProperty(value = "登录状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_common_status")
+    @ExcelDictFormat(dictType = "sys_saas_common_status")
     private String status;
 
     /**

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOperLogVo.java

@@ -14,7 +14,7 @@ import java.util.Date;
 
 
 /**
- * 操作日志记录视图对象 sys2_oper_log
+ * 操作日志记录视图对象 sys_saas_oper_log
  *
  * @author Michelle.Chung
  * @date 2023-02-07
@@ -48,7 +48,7 @@ public class SysSaasOperLogVo implements Serializable {
      * 业务类型（0其它 1新增 2修改 3删除）
      */
     @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_oper_type")
+    @ExcelDictFormat(dictType = "sys_saas_oper_type")
     private Integer businessType;
 
     /**
@@ -121,7 +121,7 @@ public class SysSaasOperLogVo implements Serializable {
      * 操作状态（0正常 1异常）
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_common_status")
+    @ExcelDictFormat(dictType = "sys_saas_common_status")
     private Integer status;
 
     /**

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

@@ -67,7 +67,7 @@ public class SysSaasPostVo implements Serializable {
      * 状态（0正常 1停用）
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_normal_disable")
+    @ExcelDictFormat(dictType = "sys_saas_normal_disable")
     private String status;
 
     /**

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

@@ -73,7 +73,7 @@ public class SysSaasRoleVo implements Serializable {
      * 角色状态（0正常 1停用）
      */
     @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_normal_disable")
+    @ExcelDictFormat(dictType = "sys_saas_normal_disable")
     private String status;
 
     /**

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasSocialVo.java

@@ -10,7 +10,7 @@ import java.util.Date;
 
 
 /**
- * 社会化关系视图对象 sys2_social
+ * 社会化关系视图对象 sys_saas_social
  *
  * @author thiszhc
  */

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantPackageVo.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
 
 
 /**
- * 租户套餐视图对象 sys2_tenant_package
+ * 租户套餐视图对象 sys_saas_tenant_package
  *
  * @author Michelle.Chung
  */

ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantVo.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 
 
 /**
- * 租户视图对象 sys2_tenant
+ * 租户视图对象 sys_saas_tenant
  *
  * @author Michelle.Chung
  */

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

@@ -64,7 +64,7 @@ public class SysSaasUserExportVo implements Serializable {
      * 帐号状态（0正常 1停用）
      */
     @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_normal_disable")
+    @ExcelDictFormat(dictType = "sys_saas_normal_disable")
     private String status;
 
     /**

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

@@ -70,7 +70,7 @@ public class SysSaasUserImportVo implements Serializable {
      * 帐号状态（0正常 1停用）
      */
     @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys2_normal_disable")
+    @ExcelDictFormat(dictType = "sys_saas_normal_disable")
     private String status;
 
 }

ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/config/PlusTenantLineHandler.java

@@ -27,7 +27,7 @@ public class PlusTenantLineHandler implements TenantLineHandler {
 
     @Override
     public String getTenantIdColumn() {
-        return "td";
+        return "tenant_id";
     }
 
     @Override