!84 迁移vue版本5.x部分功能更新

Merge pull request !84 from Yjoioooo/2.X

config/nacos/application-common.yml

@@ -55,7 +55,7 @@ dubbo:
     check: false
   scan:
     # 接口实现类扫描
-    base-packages: com.ruoyi.**.dubbo
+    base-packages: org.dromara.**.dubbo
   # 自定义配置
   custom:
     # 全局请求log
@@ -195,11 +195,11 @@ sa-token:
 mybatis-plus:
   # 不支持多包, 如有需要可在注解配置 或 提升扫包等级
   # 例如 com.**.**.mapper
-  mapperPackage: com.ruoyi.**.mapper
+  mapperPackage: org.dromara.**.mapper
   # 对应的 XML 文件位置
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.ruoyi.**.domain
+  typeAliasesPackage: org.dromara.**.domain
   # 启动时是否检查 MyBatis XML 文件的存在，默认不检查
   checkConfigLocation: false
   configuration:
@@ -207,7 +207,7 @@ mybatis-plus:
     mapUnderscoreToCamelCase: true
     # MyBatis 自动映射策略
     # NONE：不启用 PARTIAL：只对非嵌套 resultMap 自动映射 FULL：对所有 resultMap 自动映射
-    autoMappingBehavior: PARTIAL
+    autoMappingBehavior: FULL
     # MyBatis 自动映射时未知列或未知属性处理策
     # NONE：不做处理 WARNING：打印相关警告 FAILING：抛出异常和详细信息
     autoMappingUnknownColumnBehavior: NONE
@@ -300,3 +300,17 @@ seata:
       server-addr: ${spring.cloud.nacos.server-addr}
       group: ${spring.cloud.nacos.discovery.group}
       namespace: ${spring.profiles.active}
+
+# 多租户配置
+tenant:
+  # 是否开启
+  enable: true
+  # 排除表
+  excludes:
+    - sys_menu
+    - sys_tenant
+    - sys_tenant_package
+    - sys_role_dept
+    - sys_role_menu
+    - sys_user_post
+    - sys_user_role

config/nacos/ruoyi-gateway.yml

@@ -26,6 +26,7 @@ security:
       - /auth/smsLogin
       - /auth/xcxLogin
       - /auth/register
+      - /auth/tenant/list
       - /resource/sms/code
       - /*/v3/api-docs
       - /csrf
@@ -54,7 +55,7 @@ spring:
         - id: ruoyi-gen
           uri: lb://ruoyi-gen
           predicates:
-            - Path=/code/**
+            - Path=/tool/**
           filters:
             - StripPrefix=1
         # 系统模块
@@ -64,6 +65,13 @@ spring:
             - Path=/system/**
           filters:
             - StripPrefix=1
+        # 监控模块
+        - id: ruoyi-monitor
+          uri: lb://ruoyi-system
+          predicates:
+            - Path=/monitor/**
+          filters:
+            - StripPrefix=1
         # 资源服务
         - id: ruoyi-resource
           uri: lb://ruoyi-resource

config/nacos/ruoyi-gen.yml

@@ -31,7 +31,7 @@ gen:
   # 作者
   author: ruoyi
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.system
+  packageName: org.dromara.system
   # 自动去除表前缀，默认是false
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）

pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.ruoyi</groupId>
+    <groupId>org.dromara</groupId>
     <artifactId>ruoyi-cloud-plus</artifactId>
     <version>1.6.0</version>
 
@@ -41,6 +41,9 @@
         <elasticsearch.version>7.14.0</elasticsearch.version>
         <skywalking-toolkit.version>8.14.0</skywalking-toolkit.version>
         <bouncycastle.version>1.72</bouncycastle.version>
+        <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
+        <mapstruct-plus.version>1.2.1</mapstruct-plus.version>
+        <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
         <!-- 离线IP地址定位库 -->
         <ip2region.version>2.7.0</ip2region.version>
 
@@ -101,7 +104,7 @@
 
             <!-- SpringCloud Alibaba 微服务 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-alibaba-bom</artifactId>
                 <version>${ruoyi.version}</version>
                 <type>pom</type>
@@ -128,7 +131,7 @@
 
             <!-- common 的依赖配置-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-bom</artifactId>
                 <version>${ruoyi.version}</version>
                 <type>pom</type>
@@ -137,7 +140,7 @@
 
             <!-- api 的依赖配置-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-api-bom</artifactId>
                 <version>${ruoyi.version}</version>
                 <type>pom</type>
@@ -357,6 +360,20 @@
                 <version>${fastjson.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>transmittable-thread-local</artifactId>
+                <version>${alibaba-ttl.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.github.linpeilie</groupId>
+                <artifactId>mapstruct-plus-spring-boot-starter</artifactId>
+                <version>${mapstruct-plus.version}</version>
+            </dependency>
+
+
+
         </dependencies>
     </dependencyManagement>
 
@@ -401,6 +418,16 @@
                             <artifactId>spring-boot-configuration-processor</artifactId>
                             <version>${spring-boot.version}</version>
                         </path>
+                        <path>
+                            <groupId>io.github.linpeilie</groupId>
+                            <artifactId>mapstruct-plus-processor</artifactId>
+                            <version>${mapstruct-plus.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok-mapstruct-binding</artifactId>
+                            <version>${mapstruct-plus.lombok.version}</version>
+                        </path>
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>

ruoyi-api/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
+        <groupId>org.dromara</groupId>
         <artifactId>ruoyi-cloud-plus</artifactId>
         <version>1.6.0</version>
     </parent>

ruoyi-api/ruoyi-api-bom/pom.xml

@@ -5,7 +5,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.ruoyi</groupId>
+    <groupId>org.dromara</groupId>
     <artifactId>ruoyi-api-bom</artifactId>
     <packaging>pom</packaging>
     <version>1.6.0</version>
@@ -18,14 +18,14 @@
         <dependencies>
             <!-- 系统接口 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-api-system</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <!-- 资源服务接口 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-api-resource</artifactId>
                 <version>${project.version}</version>
             </dependency>

ruoyi-api/ruoyi-api-resource/pom.xml

@@ -3,7 +3,7 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
+        <groupId>org.dromara</groupId>
         <artifactId>ruoyi-api</artifactId>
         <version>1.6.0</version>
     </parent>
@@ -19,7 +19,7 @@
 
         <!-- RuoYi Common Core-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 

ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteFileService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.resource.api;
+package org.dromara.resource.api;
 
-import com.ruoyi.common.core.exception.ServiceException;
+import org.dromara.common.core.exception.ServiceException;
-import com.ruoyi.resource.api.domain.SysFile;
+import org.dromara.resource.api.domain.RemoteFile;
 
 /**
  * 文件服务
@@ -16,7 +16,7 @@ public interface RemoteFileService {
      * @param file 文件信息
      * @return 结果
      */
-    SysFile upload(String name, String originalFilename, String contentType, byte[] file) throws ServiceException;
+    RemoteFile upload(String name, String originalFilename, String contentType, byte[] file) throws ServiceException;
 
     /**
      * 通过ossId查询对应的url

ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMailService.java

@@ -1,6 +1,6 @@
-package com.ruoyi.resource.api;
+package org.dromara.resource.api;
 
-import com.ruoyi.common.core.exception.ServiceException;
+import org.dromara.common.core.exception.ServiceException;
 
 import java.io.File;
 import java.util.List;

ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteSmsService.java

@@ -1,8 +1,7 @@
-package com.ruoyi.resource.api;
+package org.dromara.resource.api;
 
-import com.ruoyi.common.core.exception.ServiceException;
+import org.dromara.common.core.exception.ServiceException;
-import com.ruoyi.resource.api.domain.SysFile;
+import org.dromara.resource.api.domain.RemoteSms;
-import com.ruoyi.resource.api.domain.SysSms;
 
 import java.util.Map;
 
@@ -20,6 +19,6 @@ public interface RemoteSmsService {
      * @param templateId 模板id
      * @param param      模板对应参数
      */
-    SysSms send(String phones, String templateId, Map<String, String> param) throws ServiceException;
+    RemoteSms send(String phones, String templateId, Map<String, String> param) throws ServiceException;
 
 }

ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java

@@ -1,4 +1,4 @@
-package com.ruoyi.resource.api.domain;
+package org.dromara.resource.api.domain;
 
 import lombok.Data;
 
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @author ruoyi
  */
 @Data
-public class SysFile implements Serializable {
+public class RemoteFile implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteSms.java

@@ -1,4 +1,4 @@
-package com.ruoyi.resource.api.domain;
+package org.dromara.resource.api.domain;
 
 import lombok.Data;
 
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @author ruoyi
  */
 @Data
-public class SysSms implements Serializable {
+public class RemoteSms implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

ruoyi-api/ruoyi-api-system/pom.xml

@@ -3,7 +3,7 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
+        <groupId>org.dromara</groupId>
         <artifactId>ruoyi-api</artifactId>
         <version>1.6.0</version>
     </parent>
@@ -19,12 +19,12 @@
 
         <!-- RuoYi Common Core-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-excel</artifactId>
         </dependency>
 

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java

@@ -1,102 +0,0 @@
-package com.ruoyi.system.api.domain;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.excel.annotation.ExcelDictFormat;
-import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-/**
- * 字典数据表 sys_dict_data
- *
- * @author Lion Li
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@TableName("sys_dict_data")
-@ExcelIgnoreUnannotated
-public class SysDictData extends BaseEntity {
-
-    /**
-     * 字典编码
-     */
-    @ExcelProperty(value = "字典编码")
-    @TableId(value = "dict_code")
-    private Long dictCode;
-
-    /**
-     * 字典排序
-     */
-    @ExcelProperty(value = "字典排序")
-    private Integer dictSort;
-
-    /**
-     * 字典标签
-     */
-    @ExcelProperty(value = "字典标签")
-    @NotBlank(message = "字典标签不能为空")
-    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
-    private String dictLabel;
-
-    /**
-     * 字典键值
-     */
-    @ExcelProperty(value = "字典键值")
-    @NotBlank(message = "字典键值不能为空")
-    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-    private String dictValue;
-
-    /**
-     * 字典类型
-     */
-    @ExcelProperty(value = "字典类型")
-    @NotBlank(message = "字典类型不能为空")
-    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-    private String dictType;
-
-    /**
-     * 样式属性（其他样式扩展）
-     */
-    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-    private String cssClass;
-
-    /**
-     * 表格字典样式
-     */
-    private String listClass;
-
-    /**
-     * 是否默认（Y是 N否）
-     */
-    @ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_yes_no")
-    private String isDefault;
-
-    /**
-     * 状态（0正常 1停用）
-     */
-    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_normal_disable")
-    private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public boolean getDefault() {
-        return UserConstants.YES.equals(this.isDefault);
-    }
-
-}

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java

@@ -1,67 +0,0 @@
-package com.ruoyi.system.api.domain;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.excel.annotation.ExcelDictFormat;
-import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
-/**
- * 字典类型表 sys_dict_type
- *
- * @author Lion Li
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@TableName("sys_dict_type")
-@ExcelIgnoreUnannotated
-public class SysDictType extends BaseEntity {
-
-    /**
-     * 字典主键
-     */
-    @ExcelProperty(value = "字典主键")
-    @TableId(value = "dict_id")
-    private Long dictId;
-
-    /**
-     * 字典名称
-     */
-    @ExcelProperty(value = "字典名称")
-    @NotBlank(message = "字典名称不能为空")
-    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
-    private String dictName;
-
-    /**
-     * 字典类型
-     */
-    @ExcelProperty(value = "字典类型")
-    @NotBlank(message = "字典类型不能为空")
-    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
-    private String dictType;
-
-    /**
-     * 状态（0正常 1停用）
-     */
-    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_normal_disable")
-    private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-}

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java

@@ -1,129 +0,0 @@
-package com.ruoyi.system.api.domain;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.excel.annotation.ExcelDictFormat;
-import com.ruoyi.common.excel.convert.ExcelDictConvert;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.util.Set;
-
-/**
- * 角色表 sys_role
- *
- * @author Lion Li
- */
-
-@Data
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@TableName("sys_role")
-@ExcelIgnoreUnannotated
-public class SysRole extends BaseEntity {
-
-    /**
-     * 角色ID
-     */
-    @ExcelProperty(value = "角色序号")
-    @TableId(value = "role_id")
-    private Long roleId;
-
-    /**
-     * 角色名称
-     */
-    @ExcelProperty(value = "角色名称")
-    @NotBlank(message = "角色名称不能为空")
-    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
-    private String roleName;
-
-    /**
-     * 角色权限
-     */
-    @ExcelProperty(value = "角色权限")
-    @NotBlank(message = "权限字符不能为空")
-    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
-    private String roleKey;
-
-    /**
-     * 角色排序
-     */
-    @ExcelProperty(value = "角色排序")
-    @NotNull(message = "显示顺序不能为空")
-    private Integer roleSort;
-
-    /**
-     * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
-     */
-    @ExcelProperty(value = "数据范围", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
-    private String dataScope;
-
-    /**
-     * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
-     */
-    private Boolean menuCheckStrictly;
-
-    /**
-     * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
-     */
-    private Boolean deptCheckStrictly;
-
-    /**
-     * 角色状态（0正常 1停用）
-     */
-    @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_normal_disable")
-    private String status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    @TableLogic
-    private String delFlag;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 用户是否存在此角色标识 默认不存在
-     */
-    @TableField(exist = false)
-    private boolean flag = false;
-
-    /**
-     * 菜单组
-     */
-    @TableField(exist = false)
-    private Long[] menuIds;
-
-    /**
-     * 部门组（数据权限）
-     */
-    @TableField(exist = false)
-    private Long[] deptIds;
-
-    public SysRole(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    /**
-     * 是否管理员
-     */
-    public boolean isAdmin() {
-        return UserConstants.ADMIN_ID.equals(this.roleId);
-    }
-
-}

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDataScopeService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.api;
+package org.dromara.system.api;
 
 /**
  * 数据权限服务

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDeptService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.api;
+package org.dromara.system.api;
 
 /**
  * 部门服务

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDictService.java

@@ -1,6 +1,6 @@
-package com.ruoyi.system.api;
+package org.dromara.system.api;
 
-import com.ruoyi.system.api.domain.SysDictData;
+import org.dromara.system.api.domain.vo.RemoteDictDataVo;
 
 import java.util.List;
 
@@ -17,5 +17,5 @@ public interface RemoteDictService {
      * @param dictType 字典类型
      * @return 字典数据集合信息
      */
-    List<SysDictData> selectDictDataByType(String dictType);
+    List<RemoteDictDataVo> selectDictDataByType(String dictType);
 }

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.system.api;
+package org.dromara.system.api;
 
-import com.ruoyi.system.api.domain.SysLogininfor;
+import org.dromara.system.api.domain.bo.RemoteLogininforBo;
-import com.ruoyi.system.api.domain.SysOperLog;
+import org.dromara.system.api.domain.bo.RemoteOperLogBo;
 
 /**
  * 日志服务
@@ -16,7 +16,7 @@ public interface RemoteLogService {
      * @param sysOperLog 日志实体
      * @return 结果
      */
-    Boolean saveLog(SysOperLog sysOperLog);
+    void saveLog(RemoteOperLogBo sysOperLog);
 
     /**
      * 保存访问记录
@@ -24,5 +24,5 @@ public interface RemoteLogService {
      * @param sysLogininfor 访问实体
      * @return 结果
      */
-    Boolean saveLogininfor(SysLogininfor sysLogininfor);
+    void saveLogininfor(RemoteLogininforBo sysLogininfor);
 }

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteTenantService.java

@@ -0,0 +1,26 @@
+package org.dromara.system.api;
+
+
+import org.dromara.system.api.domain.vo.RemoteTenantVo;
+
+import java.util.List;
+
+/**
+ * @author zhujie
+ */
+public interface RemoteTenantService {
+
+    /**
+     * 根据租户id获取租户详情
+     * @param tenantId 租户id
+     * @return 结果
+     */
+    RemoteTenantVo queryByTenantId(String tenantId);
+
+    /**
+     * 获取租户列表
+     * @return 结果
+     */
+    List<RemoteTenantVo> queryList();
+
+}

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java

@@ -1,9 +1,9 @@
-package com.ruoyi.system.api;
+package org.dromara.system.api;
 
-import com.ruoyi.common.core.exception.user.UserException;
+import org.dromara.common.core.exception.user.UserException;
-import com.ruoyi.system.api.domain.SysUser;
+import org.dromara.system.api.domain.bo.RemoteUserBo;
-import com.ruoyi.system.api.model.LoginUser;
+import org.dromara.system.api.model.LoginUser;
-import com.ruoyi.system.api.model.XcxLoginUser;
+import org.dromara.system.api.model.XcxLoginUser;
 
 /**
  * 用户服务
@@ -47,10 +47,10 @@ public interface RemoteUserService {
     /**
      * 注册用户信息
      *
-     * @param sysUser 用户信息
+     * @param remoteUserBo 用户信息
      * @return 结果
      */
-    Boolean registerUserInfo(SysUser sysUser);
+    Boolean registerUserInfo(RemoteUserBo remoteUserBo);
 
     /**
      * 通过userId查询用户账户

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.api.domain;
+package org.dromara.system.api.domain;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java

@@ -0,0 +1,75 @@
+package org.dromara.system.api.domain.bo;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 系统访问记录表 sys_logininfor
+ *
+ * @author Lion Li
+ */
+
+@Data
+@NoArgsConstructor
+public class RemoteLogininforBo implements Serializable {
+    /**
+     * 访问ID
+     */
+    private Long infoId;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 登录状态（0成功 1失败）
+     */
+    private String status;
+
+    /**
+     * 提示消息
+     */
+    private String msg;
+
+    /**
+     * 访问时间
+     */
+    private Date loginTime;
+
+    /**
+     * 请求参数
+     */
+    private Map<String, Object> params = new HashMap<>();
+
+}

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java

@@ -0,0 +1,115 @@
+package org.dromara.system.api.domain.bo;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 操作日志记录表 oper_log
+ *
+ * @author Lion Li
+ */
+
+@Data
+@NoArgsConstructor
+public class RemoteOperLogBo implements Serializable {
+    /**
+     * 日志主键
+     */
+    private Long operId;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 模块标题
+     */
+    private String title;
+
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    private Integer businessType;
+
+    /**
+     * 方法名称
+     */
+    private String method;
+
+    /**
+     * 请求方式
+     */
+    private String requestMethod;
+
+    /**
+     * 操作类别（0其它 1后台用户 2手机端用户）
+     */
+    private Integer operatorType;
+
+    /**
+     * 操作人员
+     */
+    private String operName;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 请求URL
+     */
+    private String operUrl;
+
+    /**
+     * 主机地址
+     */
+    private String operIp;
+
+    /**
+     * 操作地点
+     */
+    private String operLocation;
+
+    /**
+     * 请求参数
+     */
+    private String operParam;
+
+    /**
+     * 返回参数
+     */
+    private String jsonResult;
+
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    private Integer status;
+
+    /**
+     * 错误消息
+     */
+    private String errorMsg;
+
+    /**
+     * 操作时间
+     */
+    private Date operTime;
+
+    /**
+     * 消耗时间
+     */
+    private Long costTime;
+
+    /**
+     * 请求参数
+     */
+    private Map<String, Object> params = new HashMap<>();
+
+}

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java

@@ -0,0 +1,126 @@
+package org.dromara.system.api.domain.bo;
+
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.annotation.Sensitive;
+import org.dromara.common.core.constant.UserConstants;
+import org.dromara.common.core.enums.SensitiveStrategy;
+import org.dromara.common.core.web.domain.BaseEntity;
+import org.dromara.common.core.xss.Xss;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+
+/**
+ * 用户信息业务对象 sys_user
+ *
+ * @author Michelle.Chung
+ */
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class RemoteUserBo extends BaseEntity {
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    @Xss(message = "用户账号不能包含脚本字符")
+    @NotBlank(message = "用户账号不能为空")
+    @Size(min = 0, max = 30, message = "用户账号长度不能超过{max}个字符")
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    @Xss(message = "用户昵称不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符")
+    private String nickName;
+
+    /**
+     * 用户类型（sys_user系统用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    @Sensitive(strategy = SensitiveStrategy.EMAIL)
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符")
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    @Sensitive(strategy = SensitiveStrategy.PHONE)
+    private String phonenumber;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+    /**
+     * 头像地址
+     */
+    private Long avatar;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private Date loginDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 数据权限 当前角色ID
+     */
+    private Long roleId;
+
+    public RemoteUserBo(Long userId) {
+        this.userId = userId;
+    }
+
+    public boolean isSuperAdmin() {
+        return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
+    }
+
+}

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java

@@ -0,0 +1,74 @@
+package org.dromara.system.api.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 字典数据视图对象 sys_dict_data
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class RemoteDictDataVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 字典编码
+     */
+    private Long dictCode;
+
+    /**
+     * 字典排序
+     */
+    private Integer dictSort;
+
+    /**
+     * 字典标签
+     */
+    private String dictLabel;
+
+    /**
+     * 字典键值
+     */
+    private String dictValue;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 样式属性（其他样式扩展）
+     */
+    private String cssClass;
+
+    /**
+     * 表格回显样式
+     */
+    private String listClass;
+
+    /**
+     * 是否默认（Y是 N否）
+     */
+    private String isDefault;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java

@@ -0,0 +1,89 @@
+package org.dromara.system.api.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 租户视图对象
+ *
+ * @author zhujie
+ */
+@Data
+public class RemoteTenantVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 联系人
+     */
+    private String contactUserName;
+
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
+
+    /**
+     * 企业名称
+     */
+    private String companyName;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String licenseNumber;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 域名
+     */
+    private String domain;
+
+    /**
+     * 企业简介
+     */
+    private String intro;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 租户套餐编号
+     */
+    private Long packageId;
+
+    /**
+     * 过期时间
+     */
+    private Date expireTime;
+
+    /**
+     * 用户数量（-1不限制）
+     */
+    private Long accountCount;
+
+    /**
+     * 租户状态（0正常 1停用）
+     */
+    private String status;
+
+}

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java

@@ -1,7 +1,7 @@
-package com.ruoyi.system.api.model;
+package org.dromara.system.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ruoyi.common.core.constant.CacheConstants;
+import org.dromara.common.core.constant.CacheConstants;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -19,6 +19,11 @@ import java.util.Set;
 public class LoginUser implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
     /**
      * 用户ID
      */

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/RoleDTO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.api.model;
+package org.dromara.system.api.model;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/XcxLoginUser.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.api.model;
+package org.dromara.system.api.model;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

ruoyi-auth/pom.xml

@@ -2,7 +2,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
+        <groupId>org.dromara</groupId>
         <artifactId>ruoyi-cloud-plus</artifactId>
         <version>1.6.0</version>
     </parent>
@@ -29,63 +29,73 @@
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-sentinel</artifactId>
         </dependency>
 
         <!-- RuoYi Common Security-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-security</artifactId>
         </dependency>
 
         <!-- RuoYi Common Log -->
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-log</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-doc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-web</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-dubbo</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-seata</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-tenant</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.dromara</groupId>
+                    <artifactId>ruoyi-common-mybatis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
         <!-- 自定义负载均衡(多团队开发使用) -->
 <!--        <dependency>-->
-<!--            <groupId>com.ruoyi</groupId>-->
+<!--            <groupId>org.dromara</groupId>-->
 <!--            <artifactId>ruoyi-common-loadbalancer</artifactId>-->
 <!--        </dependency>-->
 
         <!-- ELK 日志收集 -->
 <!--        <dependency>-->
-<!--            <groupId>com.ruoyi</groupId>-->
+<!--            <groupId>org.dromara</groupId>-->
 <!--            <artifactId>ruoyi-common-logstash</artifactId>-->
 <!--        </dependency>-->
 
         <!-- skywalking 日志收集 -->
 <!--        <dependency>-->
-<!--            <groupId>com.ruoyi</groupId>-->
+<!--            <groupId>org.dromara</groupId>-->
 <!--            <artifactId>ruoyi-common-skylog</artifactId>-->
 <!--        </dependency>-->
 
         <!-- prometheus 监控 -->
 <!--        <dependency>-->
-<!--            <groupId>com.ruoyi</groupId>-->
+<!--            <groupId>org.dromara</groupId>-->
 <!--            <artifactId>ruoyi-common-prometheus</artifactId>-->
 <!--        </dependency>-->
 

ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -1,111 +0,0 @@
-package com.ruoyi.auth.controller;
-
-import com.ruoyi.auth.form.EmailLoginBody;
-import com.ruoyi.auth.form.LoginBody;
-import com.ruoyi.auth.form.RegisterBody;
-import com.ruoyi.auth.form.SmsLoginBody;
-import com.ruoyi.auth.service.SysLoginService;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.domain.R;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.constraints.NotBlank;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * token 控制
- *
- * @author Lion Li
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-public class TokenController {
-
-    private final SysLoginService sysLoginService;
-
-    /**
-     * 登录方法
-     */
-    @PostMapping("login")
-    public R<Map<String, Object>> login(@Validated @RequestBody LoginBody form) {
-        // 用户登录
-        String accessToken = sysLoginService.login(form.getUsername(), form.getPassword());
-
-        // 接口返回信息
-        Map<String, Object> rspMap = new HashMap<>();
-        rspMap.put(Constants.ACCESS_TOKEN, accessToken);
-        return R.ok(rspMap);
-    }
-
-    /**
-     * 短信登录
-     *
-     * @param smsLoginBody 登录信息
-     * @return 结果
-     */
-    @PostMapping("/smsLogin")
-    public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
-        Map<String, Object> ajax = new HashMap<>();
-        // 生成令牌
-        String token = sysLoginService.smsLogin(smsLoginBody.getPhonenumber(), smsLoginBody.getSmsCode());
-        ajax.put(Constants.ACCESS_TOKEN, token);
-        return R.ok(ajax);
-    }
-
-    /**
-     * 邮件登录
-     *
-     * @param body 登录信息
-     * @return 结果
-     */
-    @PostMapping("/emailLogin")
-    public R<Map<String, Object>> emailLogin(@Validated @RequestBody EmailLoginBody body) {
-        Map<String, Object> ajax = new HashMap<>();
-        // 生成令牌
-        String token = sysLoginService.emailLogin(body.getEmail(), body.getEmailCode());
-        ajax.put(Constants.ACCESS_TOKEN, token);
-        return R.ok(ajax);
-    }
-
-    /**
-     * 小程序登录(示例)
-     *
-     * @param xcxCode 小程序code
-     * @return 结果
-     */
-    @PostMapping("/xcxLogin")
-    public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
-        Map<String, Object> ajax = new HashMap<>();
-        // 生成令牌
-        String token = sysLoginService.xcxLogin(xcxCode);
-        ajax.put(Constants.ACCESS_TOKEN, token);
-        return R.ok(ajax);
-    }
-
-    /**
-     * 登出方法
-     */
-    @DeleteMapping("logout")
-    public R<Void> logout() {
-        sysLoginService.logout();
-        return R.ok();
-    }
-
-    /**
-     * 用户注册
-     */
-    @PostMapping("register")
-    public R<Void> register(@RequestBody RegisterBody registerBody) {
-        // 用户注册
-        sysLoginService.register(registerBody);
-        return R.ok();
-    }
-
-}

ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -1,233 +0,0 @@
-package com.ruoyi.auth.service;
-
-import cn.dev33.satoken.exception.NotLoginException;
-import cn.dev33.satoken.secure.BCrypt;
-import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.http.useragent.UserAgent;
-import cn.hutool.http.useragent.UserAgentUtil;
-import com.ruoyi.auth.form.RegisterBody;
-import com.ruoyi.auth.properties.UserPasswordProperties;
-import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.enums.DeviceType;
-import com.ruoyi.common.core.enums.LoginType;
-import com.ruoyi.common.core.enums.UserType;
-import com.ruoyi.common.core.exception.user.CaptchaExpireException;
-import com.ruoyi.common.core.exception.user.UserException;
-import com.ruoyi.common.core.utils.MessageUtils;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.ip.AddressUtils;
-import com.ruoyi.common.log.event.LogininforEvent;
-import com.ruoyi.common.redis.utils.RedisUtils;
-import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.system.api.RemoteLogService;
-import com.ruoyi.system.api.RemoteUserService;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.api.model.XcxLoginUser;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import java.time.Duration;
-import java.util.function.Supplier;
-
-/**
- * 登录校验方法
- *
- * @author ruoyi
- */
-@Service
-public class SysLoginService {
-
-    @DubboReference
-    private RemoteLogService remoteLogService;
-    @DubboReference
-    private RemoteUserService remoteUserService;
-
-    @Autowired
-    private UserPasswordProperties userPasswordProperties;
-
-    /**
-     * 登录
-     */
-    public String login(String username, String password) {
-        LoginUser userInfo = remoteUserService.getUserInfo(username);
-
-        checkLogin(LoginType.PASSWORD, username, () -> !BCrypt.checkpw(password, userInfo.getPassword()));
-        // 获取登录token
-        LoginHelper.loginByDevice(userInfo, DeviceType.PC);
-
-        recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
-        return StpUtil.getTokenValue();
-    }
-
-    public String smsLogin(String phonenumber, String smsCode) {
-        // 通过手机号查找用户
-        LoginUser userInfo = remoteUserService.getUserInfoByPhonenumber(phonenumber);
-
-        checkLogin(LoginType.SMS, userInfo.getUsername(), () -> !validateSmsCode(phonenumber, smsCode));
-        // 生成token
-        LoginHelper.loginByDevice(userInfo, DeviceType.APP);
-
-        recordLogininfor(userInfo.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
-        return StpUtil.getTokenValue();
-    }
-
-    public String emailLogin(String email, String emailCode) {
-        // 通过邮箱查找用户
-        LoginUser userInfo = remoteUserService.getUserInfoByEmail(email);
-
-        checkLogin(LoginType.EMAIL, userInfo.getUsername(), () -> !validateEmailCode(email, emailCode));
-        // 生成token
-        LoginHelper.loginByDevice(userInfo, DeviceType.APP);
-
-        recordLogininfor(userInfo.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
-        return StpUtil.getTokenValue();
-    }
-
-    public String xcxLogin(String xcxCode) {
-        // xcxCode 为 小程序调用 wx.login 授权后获取
-        // todo 自行实现 校验 appid + appsrcret + xcxCode 调用登录凭证校验接口 获取 session_key 与 openid
-        String openid = "";
-        XcxLoginUser userInfo = remoteUserService.getUserInfoByOpenid(openid);
-        // 生成token
-        LoginHelper.loginByDevice(userInfo, DeviceType.XCX);
-
-        recordLogininfor(userInfo.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
-        return StpUtil.getTokenValue();
-    }
-
-    /**
-     * 退出登录
-     */
-    public void logout() {
-        try {
-            LoginUser loginUser = LoginHelper.getLoginUser();
-            StpUtil.logout();
-            recordLogininfor(loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
-        } catch (NotLoginException ignored) {
-        }
-    }
-
-    /**
-     * 注册
-     */
-    public void register(RegisterBody registerBody) {
-        String username = registerBody.getUsername();
-        String password = registerBody.getPassword();
-        // 校验用户类型是否存在
-        String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
-
-        // 注册用户信息
-        SysUser sysUser = new SysUser();
-        sysUser.setUserName(username);
-        sysUser.setNickName(username);
-        sysUser.setPassword(BCrypt.hashpw(password));
-        sysUser.setUserType(userType);
-        boolean regFlag = remoteUserService.registerUserInfo(sysUser);
-        if (!regFlag) {
-            throw new UserException("user.register.error");
-        }
-        recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success"));
-    }
-
-    /**
-     * 记录登录信息
-     *
-     * @param username 用户名
-     * @param status   状态
-     * @param message  消息内容
-     * @return
-     */
-    public void recordLogininfor(String username, String status, String message) {
-        HttpServletRequest request = ServletUtils.getRequest();
-        final UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent"));
-        final String ip = ServletUtils.getClientIP(request);
-
-        String address = AddressUtils.getRealAddressByIP(ip);
-        // 获取客户端操作系统
-        String os = userAgent.getOs().getName();
-        // 获取客户端浏览器
-        String browser = userAgent.getBrowser().getName();
-        // 封装对象
-        LogininforEvent logininfor = new LogininforEvent();
-        logininfor.setUserName(username);
-        logininfor.setIpaddr(ip);
-        logininfor.setLoginLocation(address);
-        logininfor.setBrowser(browser);
-        logininfor.setOs(os);
-        logininfor.setMsg(message);
-        // 日志状态
-        if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {
-            logininfor.setStatus(Constants.LOGIN_SUCCESS_STATUS);
-        } else if (Constants.LOGIN_FAIL.equals(status)) {
-            logininfor.setStatus(Constants.LOGIN_FAIL_STATUS);
-        }
-        SpringUtils.context().publishEvent(logininfor);
-    }
-
-    /**
-     * 校验短信验证码
-     */
-    private boolean validateSmsCode(String phonenumber, String smsCode) {
-        String code = RedisUtils.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + phonenumber);
-        if (StringUtils.isBlank(code)) {
-            recordLogininfor(phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
-            throw new CaptchaExpireException();
-        }
-        return code.equals(smsCode);
-    }
-
-    /**
-     * 校验邮箱验证码
-     */
-    private boolean validateEmailCode(String email, String emailCode) {
-        String code = RedisUtils.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + email);
-        if (StringUtils.isBlank(code)) {
-            recordLogininfor(email, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
-            throw new CaptchaExpireException();
-        }
-        return code.equals(emailCode);
-    }
-
-    /**
-     * 登录校验
-     */
-    private void checkLogin(LoginType loginType, String username, Supplier<Boolean> supplier) {
-        String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username;
-        String loginFail = Constants.LOGIN_FAIL;
-        Integer maxRetryCount = userPasswordProperties.getMaxRetryCount();
-        Integer lockTime = userPasswordProperties.getLockTime();
-
-        // 获取用户登录错误次数(可自定义限制策略 例如: key + username + ip)
-        Integer errorNumber = RedisUtils.getCacheObject(errorKey);
-        // 锁定时间内登录 则踢出
-        if (ObjectUtil.isNotNull(errorNumber) && errorNumber.equals(maxRetryCount)) {
-            recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
-            throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
-        }
-
-        if (supplier.get()) {
-            // 是否第一次
-            errorNumber = ObjectUtil.isNull(errorNumber) ? 1 : errorNumber + 1;
-            // 达到规定错误次数 则锁定登录
-            if (errorNumber.equals(maxRetryCount)) {
-                RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime));
-                recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
-                throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
-            } else {
-                // 未达到规定错误次数 则递增
-                RedisUtils.setCacheObject(errorKey, errorNumber);
-                recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitCount(), errorNumber));
-                throw new UserException(loginType.getRetryLimitCount(), errorNumber);
-            }
-        }
-        // 登录成功 清空错误次数
-        RedisUtils.deleteObject(errorKey);
-    }
-}

ruoyi-auth/src/main/java/org/dromara/auth/RuoYiAuthApplication.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth;
+package org.dromara.auth;
 
 import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.springframework.boot.SpringApplication;

ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java

@@ -0,0 +1,146 @@
+package org.dromara.auth.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.auth.domain.convert.TenantVoConvert;
+import org.dromara.auth.domain.vo.LoginTenantVo;
+import org.dromara.auth.domain.vo.LoginVo;
+import org.dromara.auth.domain.vo.TenantListVo;
+import org.dromara.auth.form.EmailLoginBody;
+import org.dromara.auth.form.LoginBody;
+import org.dromara.auth.form.RegisterBody;
+import org.dromara.auth.form.SmsLoginBody;
+import org.dromara.auth.service.SysLoginService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.system.api.RemoteTenantService;
+import org.dromara.system.api.domain.vo.RemoteTenantVo;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotBlank;
+import java.net.URL;
+import java.util.List;
+
+/**
+ * token 控制
+ *
+ * @author Lion Li
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+public class TokenController {
+
+    private final SysLoginService sysLoginService;
+
+    @DubboReference
+    private final RemoteTenantService remoteTenantService;
+
+    /**
+     * 登录方法
+     */
+    @PostMapping("login")
+    public R<LoginVo> login(@Validated @RequestBody LoginBody body) {
+        LoginVo loginVo = new LoginVo();
+        // 生成令牌
+        String token = sysLoginService.login(
+            body.getTenantId(),
+            body.getUsername(),
+            body.getPassword());
+        loginVo.setToken(token);
+        return R.ok(loginVo);
+    }
+
+    /**
+     * 短信登录
+     *
+     * @param smsLoginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/smsLogin")
+    public R<LoginVo> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
+        LoginVo loginVo = new LoginVo();
+        // 生成令牌
+        String token = sysLoginService.smsLogin(smsLoginBody.getTenantId(),smsLoginBody.getPhonenumber(), smsLoginBody.getSmsCode());
+        loginVo.setToken(token);
+        return R.ok(loginVo);
+    }
+
+    /**
+     * 邮件登录
+     *
+     * @param body 登录信息
+     * @return 结果
+     */
+    @PostMapping("/emailLogin")
+    public R<LoginVo> emailLogin(@Validated @RequestBody EmailLoginBody body) {
+        LoginVo loginVo = new LoginVo();
+        // 生成令牌
+        String token = sysLoginService.emailLogin(body.getTenantId(), body.getEmail(), body.getEmailCode());
+        loginVo.setToken(token);
+        return R.ok(loginVo);
+    }
+
+    /**
+     * 小程序登录(示例)
+     *
+     * @param xcxCode 小程序code
+     * @return 结果
+     */
+    @PostMapping("/xcxLogin")
+    public R<LoginVo> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
+        LoginVo loginVo = new LoginVo();
+        // 生成令牌
+        String token = sysLoginService.xcxLogin(xcxCode);
+        loginVo.setToken(token);
+        return R.ok(loginVo);
+    }
+
+    /**
+     * 登出方法
+     */
+    @PostMapping("logout")
+    public R<Void> logout() {
+        sysLoginService.logout();
+        return R.ok();
+    }
+
+    /**
+     * 用户注册
+     */
+    @PostMapping("register")
+    public R<Void> register(@RequestBody RegisterBody registerBody) {
+        // 用户注册
+        sysLoginService.register(registerBody);
+        return R.ok();
+    }
+
+    /**
+     * 登录页面租户下拉框
+     *
+     * @return 租户列表
+     */
+    @GetMapping("/tenant/list")
+    public R<LoginTenantVo> tenantList(HttpServletRequest request) throws Exception {
+        List<RemoteTenantVo> tenantList = remoteTenantService.queryList();
+        List<TenantListVo> voList = TenantVoConvert.INSTANCE.convertList(tenantList);
+        // 获取域名
+        String host = new URL(request.getRequestURL().toString()).getHost();
+        // 根据域名进行筛选
+        List<TenantListVo> list = StreamUtils.filter(voList, vo -> StringUtils.equals(vo.getDomain(), host));
+        // 返回对象
+        LoginTenantVo vo = new LoginTenantVo();
+        vo.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
+        vo.setTenantEnabled(TenantHelper.isEnable());
+        return R.ok(vo);
+    }
+
+}

ruoyi-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java

@@ -0,0 +1,35 @@
+package org.dromara.auth.domain.convert;
+
+import org.dromara.auth.domain.vo.TenantListVo;
+import org.dromara.system.api.domain.vo.RemoteTenantVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 租户vo转换器
+ * @author zhujie
+ */
+@Mapper
+public interface TenantVoConvert {
+
+    TenantVoConvert INSTANCE = Mappers.getMapper(TenantVoConvert.class);
+
+    /**
+     * RemoteTenantVoToTenantListVo
+     * @param remoteTenantVo 待转换对象
+     * @return 转换后对象
+     */
+    TenantListVo convert(RemoteTenantVo remoteTenantVo);
+
+    /**
+     * RemoteTenantVoToTenantListVo
+     * @param remoteTenantVo 待转换对象
+     * @return 转换后对象
+     */
+    List<TenantListVo> convertList(List<RemoteTenantVo> remoteTenantVo);
+
+
+
+}

ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java

@@ -0,0 +1,25 @@
+package org.dromara.auth.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 登录租户对象
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class LoginTenantVo {
+
+    /**
+     * 租户开关
+     */
+    private Boolean tenantEnabled;
+
+    /**
+     * 租户对象列表
+     */
+    private List<TenantListVo> voList;
+
+}

ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java

@@ -0,0 +1,15 @@
+package org.dromara.auth.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 登录验证信息
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class LoginVo {
+
+    private String token;
+
+}

ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java

@@ -0,0 +1,19 @@
+package org.dromara.auth.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 租户列表
+ *
+ * @author zhujie
+ */
+@Data
+public class TenantListVo {
+
+    private String tenantId;
+
+    private String companyName;
+
+    private String domain;
+
+}

ruoyi-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth.form;
+package org.dromara.auth.form;
 
 import lombok.Data;
 
@@ -14,6 +14,12 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class EmailLoginBody {
 
+    /**
+     * 租户ID
+     */
+    @NotBlank(message = "{tenant.number.not.blank}")
+    private String tenantId;
+
     /**
      * 邮箱
      */

ruoyi-auth/src/main/java/org/dromara/auth/form/LoginBody.java

@@ -1,6 +1,6 @@
-package com.ruoyi.auth.form;
+package org.dromara.auth.form;
 
-import com.ruoyi.common.core.constant.UserConstants;
+import org.dromara.common.core.constant.UserConstants;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
@@ -16,6 +16,12 @@ import javax.validation.constraints.NotBlank;
 @NoArgsConstructor
 public class LoginBody {
 
+    /**
+     * 租户ID
+     */
+    @NotBlank(message = "{tenant.number.not.blank}")
+    private String tenantId;
+
     /**
      * 用户名
      */

ruoyi-auth/src/main/java/org/dromara/auth/form/RegisterBody.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth.form;
+package org.dromara.auth.form;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

ruoyi-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth.form;
+package org.dromara.auth.form;
 
 import lombok.Data;
 
@@ -13,6 +13,11 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class SmsLoginBody {
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
     /**
      * 手机号
      */

ruoyi-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth.listener;
+package org.dromara.auth.listener;
 
 import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.listener.SaTokenListener;
@@ -6,14 +6,14 @@ import cn.dev33.satoken.stp.SaLoginModel;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
-import com.ruoyi.common.core.constant.CacheConstants;
+import org.dromara.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.enums.UserType;
+import org.dromara.common.core.enums.UserType;
-import com.ruoyi.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.ip.AddressUtils;
+import org.dromara.common.core.utils.ip.AddressUtils;
-import com.ruoyi.common.redis.utils.RedisUtils;
+import org.dromara.common.redis.utils.RedisUtils;
-import com.ruoyi.common.satoken.utils.LoginHelper;
+import org.dromara.common.satoken.utils.LoginHelper;
-import com.ruoyi.system.api.domain.SysUserOnline;
+import org.dromara.system.api.domain.SysUserOnline;
-import com.ruoyi.system.api.model.LoginUser;
+import org.dromara.system.api.model.LoginUser;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

ruoyi-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth.properties;
+package org.dromara.auth.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java

@@ -0,0 +1,256 @@
+package org.dromara.auth.service;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.secure.BCrypt;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.auth.form.RegisterBody;
+import org.dromara.auth.properties.UserPasswordProperties;
+import org.dromara.common.core.constant.CacheConstants;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.TenantConstants;
+import org.dromara.common.core.enums.DeviceType;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.enums.TenantStatus;
+import org.dromara.common.core.enums.UserType;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.exception.TenantException;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.system.api.RemoteTenantService;
+import org.dromara.system.api.RemoteUserService;
+import org.dromara.system.api.domain.bo.RemoteUserBo;
+import org.dromara.system.api.domain.vo.RemoteTenantVo;
+import org.dromara.system.api.model.LoginUser;
+import org.dromara.system.api.model.XcxLoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.util.Date;
+import java.util.function.Supplier;
+
+/**
+ * 登录校验方法
+ *
+ * @author ruoyi
+ */
+@RequiredArgsConstructor
+@Service
+@Slf4j
+public class SysLoginService {
+
+    @DubboReference
+    private RemoteUserService remoteUserService;
+    @DubboReference
+    private RemoteTenantService remoteTenantService;
+
+    @Autowired
+    private UserPasswordProperties userPasswordProperties;
+
+    /**
+     * 登录
+     */
+    public String login(String tenantId, String username, String password) {
+        // 校验租户
+        checkTenant(tenantId);
+        LoginUser userInfo = remoteUserService.getUserInfo(username);
+        checkLogin(LoginType.PASSWORD, tenantId, username, () -> !BCrypt.checkpw(password, userInfo.getPassword()));
+        // 获取登录token
+        LoginHelper.loginByDevice(userInfo, DeviceType.PC);
+
+        recordLogininfor(tenantId, username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
+        return StpUtil.getTokenValue();
+    }
+
+    public String smsLogin(String tenantId, String phonenumber, String smsCode) {
+        // 校验租户
+        checkTenant(tenantId);
+        // 通过手机号查找用户
+        LoginUser userInfo = remoteUserService.getUserInfoByPhonenumber(phonenumber);
+
+        checkLogin(LoginType.SMS, tenantId, userInfo.getUsername(), () -> !validateSmsCode(tenantId, phonenumber, smsCode));
+        // 生成token
+        LoginHelper.loginByDevice(userInfo, DeviceType.APP);
+
+        recordLogininfor(tenantId, userInfo.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
+        return StpUtil.getTokenValue();
+    }
+
+    public String emailLogin(String tenantId, String email, String emailCode) {
+        // 校验租户
+        checkTenant(tenantId);
+        // 通过邮箱查找用户
+        LoginUser userInfo = remoteUserService.getUserInfoByEmail(email);
+
+        checkLogin(LoginType.EMAIL,tenantId, userInfo.getUsername(), () -> !validateEmailCode(tenantId, email, emailCode));
+        // 生成token
+        LoginHelper.loginByDevice(userInfo, DeviceType.APP);
+
+        recordLogininfor(tenantId, userInfo.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
+        return StpUtil.getTokenValue();
+    }
+
+    public String xcxLogin(String xcxCode) {
+        // xcxCode 为 小程序调用 wx.login 授权后获取
+        // todo 自行实现 校验 appid + appsrcret + xcxCode 调用登录凭证校验接口 获取 session_key 与 openid
+        String openid = "";
+        XcxLoginUser userInfo = remoteUserService.getUserInfoByOpenid(openid);
+        // 校验租户
+        checkTenant(userInfo.getTenantId());
+        // 生成token
+        LoginHelper.loginByDevice(userInfo, DeviceType.XCX);
+
+        recordLogininfor(userInfo.getTenantId(), userInfo.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
+        return StpUtil.getTokenValue();
+    }
+
+    /**
+     * 退出登录
+     */
+    public void logout() {
+        try {
+            LoginUser loginUser = LoginHelper.getLoginUser();
+            if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
+                // 超级管理员 登出清除动态租户
+                TenantHelper.clearDynamic();
+            }
+            StpUtil.logout();
+            recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
+        } catch (NotLoginException ignored) {
+        }
+    }
+
+    /**
+     * 注册
+     */
+    public void register(RegisterBody registerBody) {
+        String tenantId = registerBody.getTenantId();
+        String username = registerBody.getUsername();
+        String password = registerBody.getPassword();
+        // 校验用户类型是否存在
+        String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
+
+        // 注册用户信息
+        RemoteUserBo remoteUserBo = new RemoteUserBo();
+        remoteUserBo.setUserName(username);
+        remoteUserBo.setNickName(username);
+        remoteUserBo.setPassword(BCrypt.hashpw(password));
+        remoteUserBo.setUserType(userType);
+        boolean regFlag = remoteUserService.registerUserInfo(remoteUserBo);
+        if (!regFlag) {
+            throw new UserException("user.register.error");
+        }
+        recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
+    }
+
+    /**
+     * 记录登录信息
+     *
+     * @param username 用户名
+     * @param status   状态
+     * @param message  消息内容
+     * @return
+     */
+    public void recordLogininfor(String tenantId, String username, String status, String message) {
+        // 封装对象
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setTenantId(tenantId);
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(status);
+        logininforEvent.setMessage(message);
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
+    }
+
+    /**
+     * 校验短信验证码
+     */
+    private boolean validateSmsCode(String tenantId, String phonenumber, String smsCode) {
+        String code = RedisUtils.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + phonenumber);
+        if (StringUtils.isBlank(code)) {
+            recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        return code.equals(smsCode);
+    }
+
+    /**
+     * 校验邮箱验证码
+     */
+    private boolean validateEmailCode(String tenantId, String email, String emailCode) {
+        String code = RedisUtils.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + email);
+        if (StringUtils.isBlank(code)) {
+            recordLogininfor(tenantId, email, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        return code.equals(emailCode);
+    }
+
+    /**
+     * 登录校验
+     */
+    private void checkLogin(LoginType loginType, String tenantId, String username, Supplier<Boolean> supplier) {
+        String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username;
+        String loginFail = Constants.LOGIN_FAIL;
+        Integer maxRetryCount = userPasswordProperties.getMaxRetryCount();
+        Integer lockTime = userPasswordProperties.getLockTime();
+
+        // 获取用户登录错误次数(可自定义限制策略 例如: key + username + ip)
+        Integer errorNumber = RedisUtils.getCacheObject(errorKey);
+        // 锁定时间内登录 则踢出
+        if (ObjectUtil.isNotNull(errorNumber) && errorNumber.equals(maxRetryCount)) {
+            recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
+            throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
+        }
+
+        if (supplier.get()) {
+            // 是否第一次
+            errorNumber = ObjectUtil.isNull(errorNumber) ? 1 : errorNumber + 1;
+            // 达到规定错误次数 则锁定登录
+            if (errorNumber.equals(maxRetryCount)) {
+                RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime));
+                recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
+                throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
+            } else {
+                // 未达到规定错误次数 则递增
+                RedisUtils.setCacheObject(errorKey, errorNumber);
+                recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitCount(), errorNumber));
+                throw new UserException(loginType.getRetryLimitCount(), errorNumber);
+            }
+        }
+        // 登录成功 清空错误次数
+        RedisUtils.deleteObject(errorKey);
+    }
+
+    private void checkTenant(String tenantId) {
+        if (!TenantHelper.isEnable()) {
+            return;
+        }
+        if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
+            return;
+        }
+        RemoteTenantVo tenant = remoteTenantService.queryByTenantId(tenantId);
+        if (ObjectUtil.isNull(tenant)) {
+            log.info("登录租户：{} 不存在.", tenantId);
+            throw new TenantException("tenant.not.exists");
+        } else if (TenantStatus.DISABLE.getCode().equals(tenant.getStatus())) {
+            log.info("登录租户：{} 已被停用.", tenantId);
+            throw new TenantException("tenant.blocked");
+        } else if (ObjectUtil.isNotNull(tenant.getExpireTime())
+            && new Date().after(tenant.getExpireTime())) {
+            log.info("登录租户：{} 已超过有效期.", tenantId);
+            throw new TenantException("tenant.expired");
+        }
+    }
+}

ruoyi-common/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
+        <groupId>org.dromara</groupId>
         <artifactId>ruoyi-cloud-plus</artifactId>
         <version>1.6.0</version>
     </parent>
@@ -36,6 +36,7 @@
         <module>ruoyi-common-prometheus</module>
         <module>ruoyi-common-translation</module>
         <module>ruoyi-common-encrypt</module>
+        <module>ruoyi-common-tenant</module>
     </modules>
 
     <artifactId>ruoyi-common</artifactId>

ruoyi-common/ruoyi-common-alibaba-bom/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.ruoyi</groupId>
+    <groupId>org.dromara</groupId>
     <artifactId>ruoyi-common-alibaba-bom</artifactId>
     <version>1.6.0</version>
     <packaging>pom</packaging>

ruoyi-common/ruoyi-common-bom/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.ruoyi</groupId>
+    <groupId>org.dromara</groupId>
     <artifactId>ruoyi-common-bom</artifactId>
     <version>1.6.0</version>
     <packaging>pom</packaging>
@@ -17,163 +17,170 @@
         <dependencies>
             <!-- 核心模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <!-- 接口模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-doc</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <!-- 安全模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-security</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-satoken</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <!-- 日志记录 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-log</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <!-- 字典 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-dict</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <!-- excel -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-excel</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <!-- 缓存服务 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-redis</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <!-- web服务 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-web</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <!-- 数据库服务 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-mybatis</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-job</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-dubbo</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-seata</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-loadbalancer</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-oss</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-idempotent</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-mail</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-sms</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-logstash</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-elasticsearch</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-sentinel</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-skylog</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-prometheus</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-translation</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-encrypt</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- 租户模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-tenant</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 </project>

ruoyi-common/ruoyi-common-core/pom.xml

@@ -3,7 +3,7 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
+        <groupId>org.dromara</groupId>
         <artifactId>ruoyi-common</artifactId>
         <version>1.6.0</version>
     </parent>
@@ -110,6 +110,11 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.github.linpeilie</groupId>
+            <artifactId>mapstruct-plus-spring-boot-starter</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/annotation/Sensitive.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.annotation;
+package org.dromara.common.core.annotation;
 
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.ruoyi.common.core.enums.SensitiveStrategy;
+import org.dromara.common.core.enums.SensitiveStrategy;
-import com.ruoyi.common.core.jackson.SensitiveJsonSerializer;
+import org.dromara.common.core.jackson.SensitiveJsonSerializer;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.config;
+package org.dromara.common.core.config;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java

@@ -1,8 +1,8 @@
-package com.ruoyi.common.core.config;
+package org.dromara.common.core.config;
 
 import cn.hutool.core.util.ArrayUtil;
-import com.ruoyi.common.core.exception.ServiceException;
+import org.dromara.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/JacksonConfig.java

@@ -1,10 +1,10 @@
-package com.ruoyi.common.core.config;
+package org.dromara.common.core.config;
 
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.ruoyi.common.core.jackson.BigNumberSerializer;
+import org.dromara.common.core.jackson.BigNumberSerializer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.config;
+package org.dromara.common.core.config;
 
 import org.hibernate.validator.HibernateValidator;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package org.dromara.common.core.constant;
 
 /**
  * 缓存常量信息

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package org.dromara.common.core.constant;
 
 /**
  * 缓存组名称常量
@@ -30,6 +30,11 @@ public interface CacheNames {
      */
     String SYS_DICT = "sys_dict";
 
+    /**
+     * 租户
+     */
+    String SYS_TENANT = GlobalConstants.GLOBAL_REDIS_KEY + "sys_tenant#30d";
+
     /**
      * 用户账户
      */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java

@@ -1,11 +1,12 @@
-package com.ruoyi.common.core.constant;
+package org.dromara.common.core.constant;
 
 /**
  * 通用常量信息
  *
- * @author Lion Li
+ * @author ruoyi
  */
 public interface Constants {
+
     /**
      * UTF-8 字符集
      */
@@ -32,24 +33,14 @@ public interface Constants {
     String HTTPS = "https://";
 
     /**
-     * 成功标记
+     * 通用成功标识
      */
-    Integer SUCCESS = 200;
+    String SUCCESS = "0";
 
     /**
-     * 失败标记
+     * 通用失败标识
      */
-    Integer FAIL = 500;
+    String FAIL = "1";
-
-    /**
-     * 登录成功状态
-     */
-    String LOGIN_SUCCESS_STATUS = "0";
-
-    /**
-     * 登录失败状态
-     */
-    String LOGIN_FAIL_STATUS = "1";
 
     /**
      * 登录成功
@@ -74,13 +65,17 @@ public interface Constants {
     /**
      * 验证码有效期（分钟）
      */
-    long CAPTCHA_EXPIRATION = 2;
+    Integer CAPTCHA_EXPIRATION = 2;
 
     /**
-     * 防重提交 redis key
+     * 令牌
      */
-    String REPEAT_SUBMIT_KEY = "repeat_submit:";
+    String TOKEN = "token";
 
-    String ACCESS_TOKEN = "access_token";
+    /**
+     * 顶级部门id
+     */
+    Long TOP_PARENT_ID = 0L;
 
 }
+

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java

@@ -0,0 +1,39 @@
+package org.dromara.common.core.constant;
+
+/**
+ * 全局的key常量 (业务无关的key)
+ *
+ * @author Lion Li
+ */
+public interface GlobalConstants {
+
+    /**
+     * 全局 redis key (业务无关的key)
+     */
+    String GLOBAL_REDIS_KEY = "global:";
+
+    /**
+     * 登录用户 redis key
+     */
+    String LOGIN_TOKEN_KEY = GLOBAL_REDIS_KEY + "Authorization:login:token:";
+
+    /**
+     * 验证码 redis key
+     */
+    String CAPTCHA_CODE_KEY = GLOBAL_REDIS_KEY + "captcha_codes:";
+
+    /**
+     * 防重提交 redis key
+     */
+    String REPEAT_SUBMIT_KEY = GLOBAL_REDIS_KEY + "repeat_submit:";
+
+    /**
+     * 限流 redis key
+     */
+    String RATE_LIMIT_KEY = GLOBAL_REDIS_KEY + "rate_limit:";
+
+    /**
+     * 登录账户密码错误次数 redis key
+     */
+    String PWD_ERR_CNT_KEY = GLOBAL_REDIS_KEY + "pwd_err_cnt:";
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package org.dromara.common.core.constant;
 
 /**
  * 返回状态码

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java

@@ -0,0 +1,45 @@
+package org.dromara.common.core.constant;
+
+/**
+ * 租户常量信息
+ *
+ * @author Lion Li
+ */
+public interface TenantConstants {
+
+    /**
+     * 租户正常状态
+     */
+    String NORMAL = "0";
+
+    /**
+     * 租户封禁状态
+     */
+    String DISABLE = "1";
+
+    /**
+     * 超级管理员ID
+     */
+    Long SUPER_ADMIN_ID = 1L;
+
+    /**
+     * 超级管理员角色 roleKey
+     */
+    String SUPER_ADMIN_ROLE_KEY = "superadmin";
+
+    /**
+     * 租户管理员角色 roleKey
+     */
+    String TENANT_ADMIN_ROLE_KEY = "admin";
+
+    /**
+     * 租户管理员角色名称
+     */
+    String TENANT_ADMIN_ROLE_NAME = "管理员";
+
+    /**
+     * 默认租户ID
+     */
+    String DEFAULT_TENANT_ID = "000000";
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.constant;
+package org.dromara.common.core.constant;
 
 /**
  * 用户常量信息
@@ -128,5 +128,5 @@ public interface UserConstants {
     /**
      * 管理员ID
      */
-    Long ADMIN_ID = 1L;
+    Long SUPER_ADMIN_ID = 1L;
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java

@@ -1,9 +1,8 @@
-package com.ruoyi.common.core.domain;
+package org.dromara.common.core.domain;
 
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.HttpStatus;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.dromara.common.core.constant.HttpStatus;
 
 import java.io.Serializable;
 
@@ -20,12 +19,12 @@ public class R<T> implements Serializable {
     /**
      * 成功
      */
-    public static final int SUCCESS = Constants.SUCCESS;
+    public static final int SUCCESS = 200;
 
     /**
      * 失败
      */
-    public static final int FAIL = Constants.FAIL;
+    public static final int FAIL = 500;
 
     /**
      * 消息状态码

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.enums;
+package org.dromara.common.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.enums;
+package org.dromara.common.core.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/SensitiveStrategy.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.enums;
+package org.dromara.common.core.enums;
 
 import cn.hutool.core.util.DesensitizedUtil;
 import lombok.AllArgsConstructor;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java

@@ -0,0 +1,30 @@
+package org.dromara.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 用户状态
+ *
+ * @author LionLi
+ */
+@Getter
+@AllArgsConstructor
+public enum TenantStatus {
+    /**
+     * 正常
+     */
+    OK("0", "正常"),
+    /**
+     * 停用
+     */
+    DISABLE("1", "停用"),
+    /**
+     * 删除
+     */
+    DELETED("2", "删除");
+
+    private final String code;
+    private final String info;
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java

@@ -1,19 +1,19 @@
-package com.ruoyi.common.core.enums;
+package org.dromara.common.core.enums;
-
+
-import lombok.AllArgsConstructor;
+import lombok.AllArgsConstructor;
-import lombok.Getter;
+import lombok.Getter;
-
+
-/**
+/**
- * 用户状态
+ * 用户状态
- *
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-@Getter
+@Getter
-@AllArgsConstructor
+@AllArgsConstructor
-public enum UserStatus {
+public enum UserStatus {
-    OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
+    OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
-
+
-    private final String code;
+    private final String code;
-    private final String info;
+    private final String info;
-
+
-}
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.enums;
+package org.dromara.common.core.enums;
 
-import com.ruoyi.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/CaptchaException.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.exception;
+package org.dromara.common.core.exception;
 
-import com.ruoyi.common.core.exception.user.UserException;
+import org.dromara.common.core.exception.user.UserException;
 
 /**
  * 验证码错误异常类

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/CheckedException.java

@@ -1,26 +1,26 @@
-package com.ruoyi.common.core.exception;
+package org.dromara.common.core.exception;
-
+
-/**
+/**
- * 检查异常
+ * 检查异常
- *
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public class CheckedException extends RuntimeException {
+public class CheckedException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
-
+
-    public CheckedException(String message) {
+    public CheckedException(String message) {
-        super(message);
+        super(message);
-    }
+    }
-
+
-    public CheckedException(Throwable cause) {
+    public CheckedException(Throwable cause) {
-        super(cause);
+        super(cause);
-    }
+    }
-
+
-    public CheckedException(String message, Throwable cause) {
+    public CheckedException(String message, Throwable cause) {
-        super(message, cause);
+        super(message, cause);
-    }
+    }
-
+
-    public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+    public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
+        super(message, cause, enableSuppression, writableStackTrace);
-    }
+    }
-}
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/DemoModeException.java

@@ -1,13 +1,13 @@
-package com.ruoyi.common.core.exception;
+package org.dromara.common.core.exception;
-
+
-/**
+/**
- * 演示模式异常
+ * 演示模式异常
- *
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public class DemoModeException extends RuntimeException {
+public class DemoModeException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
-
+
-    public DemoModeException() {
+    public DemoModeException() {
-    }
+    }
-}
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/GlobalException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package org.dromara.common.core.exception;
 
 /**
  * 全局异常

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package org.dromara.common.core.exception;
 
 /**
  * 业务异常

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/UtilException.java

@@ -1,22 +1,22 @@
-package com.ruoyi.common.core.exception;
+package org.dromara.common.core.exception;
-
+
-/**
+/**
- * 工具类异常
+ * 工具类异常
- *
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public class UtilException extends RuntimeException {
+public class UtilException extends RuntimeException {
-    private static final long serialVersionUID = 8247610319171014183L;
+    private static final long serialVersionUID = 8247610319171014183L;
-
+
-    public UtilException(Throwable e) {
+    public UtilException(Throwable e) {
-        super(e.getMessage(), e);
+        super(e.getMessage(), e);
-    }
+    }
-
+
-    public UtilException(String message) {
+    public UtilException(String message) {
-        super(message);
+        super(message);
-    }
+    }
-
+
-    public UtilException(String message, Throwable throwable) {
+    public UtilException(String message, Throwable throwable) {
-        super(message, throwable);
+        super(message, throwable);
-    }
+    }
-}
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.core.exception.base;
+package org.dromara.common.core.exception.base;
 
-import com.ruoyi.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.MessageUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java

@@ -1,17 +1,17 @@
-package com.ruoyi.common.core.exception.file;
+package org.dromara.common.core.exception.file;
-
+
-import com.ruoyi.common.core.exception.base.BaseException;
+import org.dromara.common.core.exception.base.BaseException;
-
+
-/**
+/**
- * 文件信息异常类
+ * 文件信息异常类
- *
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public class FileException extends BaseException {
+public class FileException extends BaseException {
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
-
+
-    public FileException(String code, Object[] args) {
+    public FileException(String code, Object[] args) {
-        super("file", code, args, null);
+        super("file", code, args, null);
-    }
+    }
-
+
-}
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java

@@ -1,14 +1,14 @@
-package com.ruoyi.common.core.exception.file;
+package org.dromara.common.core.exception.file;
-
+
-/**
+/**
- * 文件名称超长限制异常类
+ * 文件名称超长限制异常类
- *
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public class FileNameLengthLimitExceededException extends FileException {
+public class FileNameLengthLimitExceededException extends FileException {
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
-
+
-    public FileNameLengthLimitExceededException(int defaultFileNameLength) {
+    public FileNameLengthLimitExceededException(int defaultFileNameLength) {
-        super("upload.filename.exceed.length", new Object[]{defaultFileNameLength});
+        super("upload.filename.exceed.length", new Object[]{defaultFileNameLength});
-    }
+    }
-}
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java

@@ -1,14 +1,14 @@
-package com.ruoyi.common.core.exception.file;
+package org.dromara.common.core.exception.file;
-
+
-/**
+/**
- * 文件名大小限制异常类
+ * 文件名大小限制异常类
- *
+ *
- * @author ruoyi
+ * @author ruoyi
- */
+ */
-public class FileSizeLimitExceededException extends FileException {
+public class FileSizeLimitExceededException extends FileException {
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
-
+
-    public FileSizeLimitExceededException(long defaultMaxSize) {
+    public FileSizeLimitExceededException(long defaultMaxSize) {
-        super("upload.exceed.maxSize", new Object[]{defaultMaxSize});
+        super("upload.exceed.maxSize", new Object[]{defaultMaxSize});
-    }
+    }
-}
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.user;
+package org.dromara.common.core.exception.user;
 
 /**
  * 验证码失效异常类

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.exception.user;
+package org.dromara.common.core.exception.user;
 
-import com.ruoyi.common.core.exception.base.BaseException;
+import org.dromara.common.core.exception.base.BaseException;
 
 /**
  * 用户信息异常类

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserPasswordNotMatchException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.user;
+package org.dromara.common.core.exception.user;
 
 /**
  * 用户密码不正确或不符合规范异常类

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/jackson/BigNumberSerializer.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.jackson;
+package org.dromara.common.core.jackson;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/jackson/SensitiveJsonSerializer.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.jackson;
+package org.dromara.common.core.jackson;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.ruoyi.common.core.annotation.Sensitive;
+import org.dromara.common.core.annotation.Sensitive;
-import com.ruoyi.common.core.enums.SensitiveStrategy;
+import org.dromara.common.core.enums.SensitiveStrategy;
-import com.ruoyi.common.core.service.SensitiveService;
+import org.dromara.common.core.service.SensitiveService;
-import com.ruoyi.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.service;
+package org.dromara.common.core.service;
 
-import com.ruoyi.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.StringUtils;
 
 /**
  * 字典服务服务

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SensitiveService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.service;
+package org.dromara.common.core.service;
 
 /**
  * 脱敏服务

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/BeanCopyUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package org.dromara.common.core.utils;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.SimpleCache;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package org.dromara.common.core.utils;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/JsonUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package org.dromara.common.core.utils;
 
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ArrayUtil;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java

@@ -0,0 +1,92 @@
+package org.dromara.common.core.utils;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
+import io.github.linpeilie.Converter;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Mapstruct 工具类
+ * <p>参考文档：<a href="https://mapstruct.plus/guide/quick-start">mapstruct-plus</a></p>
+ *
+ * @author Michelle.Chung
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class MapstructUtils {
+
+    private final static Converter CONVERTER = SpringUtils.getBean(Converter.class);
+
+    /**
+     * 将 T 类型对象，转换为 desc 类型的对象并返回
+     *
+     * @param source 数据来源实体
+     * @param desc   描述对象 转换后的对象
+     * @return desc
+     */
+    public static <T, V> V convert(T source, Class<V> desc) {
+        if (ObjectUtil.isNull(source)) {
+            return null;
+        }
+        if (ObjectUtil.isNull(desc)) {
+            return null;
+        }
+        return CONVERTER.convert(source, desc);
+    }
+
+    /**
+     * 将 T 类型对象，按照配置的映射字段规则，给 desc 类型的对象赋值并返回 desc 对象
+     *
+     * @param source 数据来源实体
+     * @param desc   转换后的对象
+     * @return desc
+     */
+    public static <T, V> V convert(T source, V desc) {
+        if (ObjectUtil.isNull(source)) {
+            return null;
+        }
+        if (ObjectUtil.isNull(desc)) {
+            return null;
+        }
+        return CONVERTER.convert(source, desc);
+    }
+
+    /**
+     * 将 T 类型的集合，转换为 desc 类型的集合并返回
+     *
+     * @param sourceList 数据来源实体列表
+     * @param desc       描述对象 转换后的对象
+     * @return desc
+     */
+    public static <T, V> List<V> convert(List<T> sourceList, Class<V> desc) {
+        if (ObjectUtil.isNull(sourceList)) {
+            return null;
+        }
+        if (CollUtil.isEmpty(sourceList)) {
+            return CollUtil.newArrayList();
+        }
+        return CONVERTER.convert(sourceList, desc);
+    }
+
+    /**
+     * 将 Map 转换为 beanClass 类型的集合并返回
+     *
+     * @param map       数据来源
+     * @param beanClass bean类
+     * @return bean对象
+     */
+    public static <T> T convert(Map<String, Object> map, Class<T> beanClass) {
+        if (MapUtil.isEmpty(map)) {
+            return null;
+        }
+        if (ObjectUtil.isNull(beanClass)) {
+            return null;
+        }
+        return CONVERTER.convert(map, beanClass);
+    }
+
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package org.dromara.common.core.utils;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ReUtil.java

@@ -1,148 +1,148 @@
-package com.ruoyi.common.core.utils;
+package org.dromara.common.core.utils;
-
+
-
+
-import cn.hutool.core.convert.Convert;
+import cn.hutool.core.convert.Convert;
-
+
-import java.util.Arrays;
+import java.util.Arrays;
-import java.util.Collection;
+import java.util.Collection;
-import java.util.HashSet;
+import java.util.HashSet;
-import java.util.Set;
+import java.util.Set;
-import java.util.regex.Matcher;
+import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.regex.Pattern;
-
+
-public class ReUtil {
+public class ReUtil {
-    public final static Pattern GROUP_VAR = Pattern.compile("\\$(\\d+)");
+    public final static Pattern GROUP_VAR = Pattern.compile("\\$(\\d+)");
-
+
-    /**
+    /**
-     * 正则中需要被转义的关键字
+     * 正则中需要被转义的关键字
-     */
+     */
-    public final static Set<Character> RE_KEYS = new HashSet<>(
+    public final static Set<Character> RE_KEYS = new HashSet<>(
-            Arrays.asList('$', '(', ')', '*', '+', '.', '[', ']', '?', '\\', '^', '{', '}', '|'));
+            Arrays.asList('$', '(', ')', '*', '+', '.', '[', ']', '?', '\\', '^', '{', '}', '|'));
-    ;
+    ;
-
+
-    /**
+    /**
-     * 正则替换指定值<br>
+     * 正则替换指定值<br>
-     * 通过正则查找到字符串，然后把匹配到的字符串加入到replacementTemplate中，$1表示分组1的字符串
+     * 通过正则查找到字符串，然后把匹配到的字符串加入到replacementTemplate中，$1表示分组1的字符串
-     *
+     *
-     * <p>
+     * <p>
-     * 例如：原字符串是：中文1234，我想把1234换成(1234)，则可以：
+     * 例如：原字符串是：中文1234，我想把1234换成(1234)，则可以：
-     *
+     *
-     * <pre>
+     * <pre>
-     * ReUtil.replaceAll("中文1234", "(\\d+)", "($1)"))
+     * ReUtil.replaceAll("中文1234", "(\\d+)", "($1)"))
-     *
+     *
-     * 结果：中文(1234)
+     * 结果：中文(1234)
-     * </pre>
+     * </pre>
-     *
+     *
-     * @param content             文本
+     * @param content             文本
-     * @param regex               正则
+     * @param regex               正则
-     * @param replacementTemplate 替换的文本模板，可以使用$1类似的变量提取正则匹配出的内容
+     * @param replacementTemplate 替换的文本模板，可以使用$1类似的变量提取正则匹配出的内容
-     * @return 处理后的文本
+     * @return 处理后的文本
-     */
+     */
-    public static String replaceAll(CharSequence content, String regex, String replacementTemplate) {
+    public static String replaceAll(CharSequence content, String regex, String replacementTemplate) {
-        final Pattern pattern = Pattern.compile(regex, Pattern.DOTALL);
+        final Pattern pattern = Pattern.compile(regex, Pattern.DOTALL);
-        return replaceAll(content, pattern, replacementTemplate);
+        return replaceAll(content, pattern, replacementTemplate);
-    }
+    }
-
+
-    /**
+    /**
-     * 正则替换指定值<br>
+     * 正则替换指定值<br>
-     * 通过正则查找到字符串，然后把匹配到的字符串加入到replacementTemplate中，$1表示分组1的字符串
+     * 通过正则查找到字符串，然后把匹配到的字符串加入到replacementTemplate中，$1表示分组1的字符串
-     *
+     *
-     * @param content             文本
+     * @param content             文本
-     * @param pattern             {@link Pattern}
+     * @param pattern             {@link Pattern}
-     * @param replacementTemplate 替换的文本模板，可以使用$1类似的变量提取正则匹配出的内容
+     * @param replacementTemplate 替换的文本模板，可以使用$1类似的变量提取正则匹配出的内容
-     * @return 处理后的文本
+     * @return 处理后的文本
-     * @since 3.0.4
+     * @since 3.0.4
-     */
+     */
-    public static String replaceAll(CharSequence content, Pattern pattern, String replacementTemplate) {
+    public static String replaceAll(CharSequence content, Pattern pattern, String replacementTemplate) {
-        if (StringUtils.isEmpty(content)) {
+        if (StringUtils.isEmpty(content)) {
-            return StringUtils.EMPTY;
+            return StringUtils.EMPTY;
-        }
+        }
-
+
-        final Matcher matcher = pattern.matcher(content);
+        final Matcher matcher = pattern.matcher(content);
-        boolean result = matcher.find();
+        boolean result = matcher.find();
-        if (result) {
+        if (result) {
-            final Set<String> varNums = findAll(GROUP_VAR, replacementTemplate, 1, new HashSet<>());
+            final Set<String> varNums = findAll(GROUP_VAR, replacementTemplate, 1, new HashSet<>());
-            final StringBuffer sb = new StringBuffer();
+            final StringBuffer sb = new StringBuffer();
-            do {
+            do {
-                String replacement = replacementTemplate;
+                String replacement = replacementTemplate;
-                for (String var : varNums) {
+                for (String var : varNums) {
-                    int group = Integer.parseInt(var);
+                    int group = Integer.parseInt(var);
-                    replacement = replacement.replace("$" + var, matcher.group(group));
+                    replacement = replacement.replace("$" + var, matcher.group(group));
-                }
+                }
-                matcher.appendReplacement(sb, escape(replacement));
+                matcher.appendReplacement(sb, escape(replacement));
-                result = matcher.find();
+                result = matcher.find();
-            }
+            }
-            while (result);
+            while (result);
-            matcher.appendTail(sb);
+            matcher.appendTail(sb);
-            return sb.toString();
+            return sb.toString();
-        }
+        }
-        return Convert.toStr(content);
+        return Convert.toStr(content);
-    }
+    }
-
+
-    /**
+    /**
-     * 取得内容中匹配的所有结果
+     * 取得内容中匹配的所有结果
-     *
+     *
-     * @param <T>        集合类型
+     * @param <T>        集合类型
-     * @param pattern    编译后的正则模式
+     * @param pattern    编译后的正则模式
-     * @param content    被查找的内容
+     * @param content    被查找的内容
-     * @param group      正则的分组
+     * @param group      正则的分组
-     * @param collection 返回的集合类型
+     * @param collection 返回的集合类型
-     * @return 结果集
+     * @return 结果集
-     */
+     */
-    public static <T extends Collection<String>> T findAll(Pattern pattern, CharSequence content, int group,
+    public static <T extends Collection<String>> T findAll(Pattern pattern, CharSequence content, int group,
-                                                           T collection) {
+                                                           T collection) {
-        if (null == pattern || null == content) {
+        if (null == pattern || null == content) {
-            return null;
+            return null;
-        }
+        }
-
+
-        if (null == collection) {
+        if (null == collection) {
-            throw new NullPointerException("Null collection param provided!");
+            throw new NullPointerException("Null collection param provided!");
-        }
+        }
-
+
-        final Matcher matcher = pattern.matcher(content);
+        final Matcher matcher = pattern.matcher(content);
-        while (matcher.find()) {
+        while (matcher.find()) {
-            collection.add(matcher.group(group));
+            collection.add(matcher.group(group));
-        }
+        }
-        return collection;
+        return collection;
-    }
+    }
-
+
-    /**
+    /**
-     * 转义字符，将正则的关键字转义
+     * 转义字符，将正则的关键字转义
-     *
+     *
-     * @param c 字符
+     * @param c 字符
-     * @return 转义后的文本
+     * @return 转义后的文本
-     */
+     */
-    public static String escape(char c) {
+    public static String escape(char c) {
-        final StringBuilder builder = new StringBuilder();
+        final StringBuilder builder = new StringBuilder();
-        if (RE_KEYS.contains(c)) {
+        if (RE_KEYS.contains(c)) {
-            builder.append('\\');
+            builder.append('\\');
-        }
+        }
-        builder.append(c);
+        builder.append(c);
-        return builder.toString();
+        return builder.toString();
-    }
+    }
-
+
-    /**
+    /**
-     * 转义字符串，将正则的关键字转义
+     * 转义字符串，将正则的关键字转义
-     *
+     *
-     * @param content 文本
+     * @param content 文本
-     * @return 转义后的文本
+     * @return 转义后的文本
-     */
+     */
-    public static String escape(CharSequence content) {
+    public static String escape(CharSequence content) {
-        if (StringUtils.isBlank(content)) {
+        if (StringUtils.isBlank(content)) {
-            return StringUtils.EMPTY;
+            return StringUtils.EMPTY;
-        }
+        }
-
+
-        final StringBuilder builder = new StringBuilder();
+        final StringBuilder builder = new StringBuilder();
-        int len = content.length();
+        int len = content.length();
-        char current;
+        char current;
-        for (int i = 0; i < len; i++) {
+        for (int i = 0; i < len; i++) {
-            current = content.charAt(i);
+            current = content.charAt(i);
-            if (RE_KEYS.contains(current)) {
+            if (RE_KEYS.contains(current)) {
-                builder.append('\\');
+                builder.append('\\');
-            }
+            }
-            builder.append(current);
+            builder.append(current);
-        }
+        }
-        return builder.toString();
+        return builder.toString();
-    }
+    }
-
+
-}
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.core.utils;
+package org.dromara.common.core.utils;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.http.HttpStatus;
-import com.ruoyi.common.core.constant.Constants;
+import org.dromara.common.core.constant.Constants;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.springframework.http.MediaType;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package org.dromara.common.core.utils;
 
 import cn.hutool.extra.spring.SpringUtil;
 import org.springframework.aop.framework.AopContext;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package org.dromara.common.core.utils;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package org.dromara.common.core.utils;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.utils;
+package org.dromara.common.core.utils;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.lang.tree.parser.NodeParser;
-import com.ruoyi.common.core.utils.reflect.ReflectUtils;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils;
+package org.dromara.common.core.utils;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.file;
+package org.dromara.common.core.utils.file;
 
 import cn.hutool.core.io.FileUtil;
 import lombok.AccessLevel;