yinq
/
hwbm-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 修改包名为org.dromara

Browse Source
dev
Yjoioooo 3 years ago
parent 0944318dc6
commit fbe8aa4f5f
719 changed files with 2412 additions and 2412 deletions
Show Stats Download Patch File Download Diff File

6
config/nacos/application-common.yml
Unescape Escape View File

@ -55,7 +55,7 @@ dubbo:
check: false check: false
scan: scan:
# 接口实现类扫描 # 接口实现类扫描
base-packages: com.ruoyi.**.dubbo base-packages: org.dromara.**.dubbo
# 自定义配置 # 自定义配置
custom: custom:
# 全局请求log # 全局请求log
@ -195,11 +195,11 @@ sa-token:
mybatis-plus: mybatis-plus:
# 不支持多包, 如有需要可在注解配置 或 提升扫包等级 # 不支持多包, 如有需要可在注解配置 或 提升扫包等级
# 例如 com.**.**.mapper # 例如 com.**.**.mapper
mapperPackage: com.ruoyi.**.mapper mapperPackage: org.dromara.**.mapper
# 对应的 XML 文件位置 # 对应的 XML 文件位置
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 实体扫描，多个package用逗号或者分号分隔 # 实体扫描，多个package用逗号或者分号分隔
typeAliasesPackage: com.ruoyi.**.domain typeAliasesPackage: org.dromara.**.domain
# 启动时是否检查 MyBatis XML 文件的存在，默认不检查 # 启动时是否检查 MyBatis XML 文件的存在，默认不检查
checkConfigLocation: false checkConfigLocation: false
configuration: configuration:

2
config/nacos/ruoyi-gen.yml
Unescape Escape View File

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

8
pom.xml
Unescape Escape View File

@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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> <modelVersion>4.0.0</modelVersion>
<groupId>com.ruoyi</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-cloud-plus</artifactId> <artifactId>ruoyi-cloud-plus</artifactId>
<version>1.6.0</version> <version>1.6.0</version>
@ -104,7 +104,7 @@
<!-- SpringCloud Alibaba 微服务 --> <!-- SpringCloud Alibaba 微服务 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-common-alibaba-bom</artifactId> <artifactId>ruoyi-common-alibaba-bom</artifactId>
<version>${ruoyi.version}</version> <version>${ruoyi.version}</version>
<type>pom</type> <type>pom</type>
@ -131,7 +131,7 @@
<!-- common 的依赖配置--> <!-- common 的依赖配置-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-common-bom</artifactId> <artifactId>ruoyi-common-bom</artifactId>
<version>${ruoyi.version}</version> <version>${ruoyi.version}</version>
<type>pom</type> <type>pom</type>
@ -140,7 +140,7 @@
<!-- api 的依赖配置--> <!-- api 的依赖配置-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-api-bom</artifactId> <artifactId>ruoyi-api-bom</artifactId>
<version>${ruoyi.version}</version> <version>${ruoyi.version}</version>
<type>pom</type> <type>pom</type>

2
ruoyi-api/pom.xml
Unescape Escape View File

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

6
ruoyi-api/ruoyi-api-bom/pom.xml
Unescape Escape View File

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

4
ruoyi-api/ruoyi-api-resource/pom.xml
Unescape Escape View File

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

6
ruoyi-api/ruoyi-api-resource/src/main/java/com/ruoyi/resource/api/RemoteFileService.java → ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteFileService.java
Unescape Escape View File

@ -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.SysFile;
/** /**
* 文件服务 * 文件服务

4
ruoyi-api/ruoyi-api-resource/src/main/java/com/ruoyi/resource/api/RemoteMailService.java → ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMailService.java
Unescape Escape View File

@ -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.io.File;
import java.util.List; import java.util.List;

8
ruoyi-api/ruoyi-api-resource/src/main/java/com/ruoyi/resource/api/RemoteSmsService.java → ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteSmsService.java
Unescape Escape View File

@ -1,8 +1,8 @@
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.SysFile;
import com.ruoyi.resource.api.domain.SysSms; import org.dromara.resource.api.domain.SysSms;
import java.util.Map; import java.util.Map;

2
ruoyi-api/ruoyi-api-resource/src/main/java/com/ruoyi/resource/api/domain/SysFile.java → ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/SysFile.java
Unescape Escape View File

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

2
ruoyi-api/ruoyi-api-resource/src/main/java/com/ruoyi/resource/api/domain/SysSms.java → ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/SysSms.java
Unescape Escape View File

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

6
ruoyi-api/ruoyi-api-system/pom.xml
Unescape Escape View File

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

2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteDataScopeService.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDataScopeService.java
Unescape Escape View File

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

2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteDeptService.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDeptService.java
Unescape Escape View File

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

4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteDictService.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDictService.java
Unescape Escape View File

@ -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.SysDictData;
import java.util.List; import java.util.List;

6
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java
Unescape Escape View File

@ -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.SysLogininfor;
import com.ruoyi.system.api.domain.SysOperLog; import org.dromara.system.api.domain.SysOperLog;
/** /**
* 日志服务 * 日志服务

10
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java
Unescape Escape View File

@ -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.SysUser;
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;
/** /**
* 用户服务 * 用户服务

4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysDept.java
Unescape Escape View File

@ -1,9 +1,9 @@
package com.ruoyi.system.api.domain; package org.dromara.system.api.domain;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.TreeEntity; import org.dromara.common.core.web.domain.TreeEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

10
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysDictData.java
Unescape Escape View File

@ -1,13 +1,13 @@
package com.ruoyi.system.api.domain; package org.dromara.system.api.domain;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.constant.UserConstants; import org.dromara.common.core.constant.UserConstants;
import com.ruoyi.common.core.web.domain.BaseEntity; import org.dromara.common.core.web.domain.BaseEntity;
import com.ruoyi.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDictFormat;
import com.ruoyi.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysDictType.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.ruoyi.system.api.domain; package org.dromara.system.api.domain;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BaseEntity; import org.dromara.common.core.web.domain.BaseEntity;
import com.ruoyi.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDictFormat;
import com.ruoyi.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

6
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysLogininfor.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.ruoyi.system.api.domain; package org.dromara.system.api.domain;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDictFormat;
import com.ruoyi.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

6
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysOperLog.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.ruoyi.system.api.domain; package org.dromara.system.api.domain;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDictFormat;
import com.ruoyi.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

10
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysRole.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.ruoyi.system.api.domain; package org.dromara.system.api.domain;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.constant.UserConstants; import org.dromara.common.core.constant.UserConstants;
import com.ruoyi.common.core.web.domain.BaseEntity; import org.dromara.common.core.web.domain.BaseEntity;
import com.ruoyi.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDictFormat;
import com.ruoyi.common.excel.convert.ExcelDictConvert; import org.dromara.common.excel.convert.ExcelDictConvert;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

12
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUser.java
Unescape Escape View File

@ -1,13 +1,13 @@
package com.ruoyi.system.api.domain; package org.dromara.system.api.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.core.annotation.Sensitive; import org.dromara.common.core.annotation.Sensitive;
import com.ruoyi.common.core.constant.UserConstants; import org.dromara.common.core.constant.UserConstants;
import com.ruoyi.common.core.enums.SensitiveStrategy; import org.dromara.common.core.enums.SensitiveStrategy;
import com.ruoyi.common.core.web.domain.BaseEntity; import org.dromara.common.core.web.domain.BaseEntity;
import com.ruoyi.common.core.xss.Xss; import org.dromara.common.core.xss.Xss;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUserOnline.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java
Unescape Escape View File

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

4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.ruoyi.system.api.model; package org.dromara.system.api.model;
import com.fasterxml.jackson.annotation.JsonIgnore; 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.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/RoleDTO.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/RoleDTO.java
Unescape Escape View File

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

2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/XcxLoginUser.java → ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/XcxLoginUser.java
Unescape Escape View File

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

24
ruoyi-auth/pom.xml
Unescape Escape View File

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

2
ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java → ruoyi-auth/src/main/java/org/dromara/auth/RuoYiAuthApplication.java
Unescape Escape View File

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

16
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java → ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java
Unescape Escape View File

@ -1,12 +1,12 @@
package com.ruoyi.auth.controller; package org.dromara.auth.controller;
import com.ruoyi.auth.form.EmailLoginBody; import org.dromara.auth.form.EmailLoginBody;
import com.ruoyi.auth.form.LoginBody; import org.dromara.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody; import org.dromara.auth.form.RegisterBody;
import com.ruoyi.auth.form.SmsLoginBody; import org.dromara.auth.form.SmsLoginBody;
import com.ruoyi.auth.service.SysLoginService; import org.dromara.auth.service.SysLoginService;
import com.ruoyi.common.core.constant.Constants; import org.dromara.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R; import org.dromara.common.core.domain.R;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;

2
ruoyi-auth/src/main/java/com/ruoyi/auth/form/EmailLoginBody.java → ruoyi-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java
Unescape Escape View File

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

4
ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java → ruoyi-auth/src/main/java/org/dromara/auth/form/LoginBody.java
Unescape Escape View File

@ -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.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;

2
ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java → ruoyi-auth/src/main/java/org/dromara/auth/form/RegisterBody.java
Unescape Escape View File

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

2
ruoyi-auth/src/main/java/com/ruoyi/auth/form/SmsLoginBody.java → ruoyi-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java
Unescape Escape View File

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

18
ruoyi-auth/src/main/java/com/ruoyi/auth/listener/UserActionListener.java → ruoyi-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.ruoyi.auth.listener; package org.dromara.auth.listener;
import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.config.SaTokenConfig;
import cn.dev33.satoken.listener.SaTokenListener; 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.core.util.ObjectUtil;
import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil; 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.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

2
ruoyi-auth/src/main/java/com/ruoyi/auth/properties/UserPasswordProperties.java → ruoyi-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java
Unescape Escape View File

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

46
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java → ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.ruoyi.auth.service; package org.dromara.auth.service;
import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.secure.BCrypt; import cn.dev33.satoken.secure.BCrypt;
@ -6,28 +6,28 @@ import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil; import cn.hutool.http.useragent.UserAgentUtil;
import com.ruoyi.auth.form.RegisterBody; import org.dromara.auth.form.RegisterBody;
import com.ruoyi.auth.properties.UserPasswordProperties; import org.dromara.auth.properties.UserPasswordProperties;
import com.ruoyi.common.core.constant.CacheConstants; import org.dromara.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.Constants; import org.dromara.common.core.constant.Constants;
import com.ruoyi.common.core.enums.DeviceType; import org.dromara.common.core.enums.DeviceType;
import com.ruoyi.common.core.enums.LoginType; import org.dromara.common.core.enums.LoginType;
import com.ruoyi.common.core.enums.UserType; import org.dromara.common.core.enums.UserType;
import com.ruoyi.common.core.exception.user.CaptchaExpireException; import org.dromara.common.core.exception.user.CaptchaExpireException;
import com.ruoyi.common.core.exception.user.UserException; import org.dromara.common.core.exception.user.UserException;
import com.ruoyi.common.core.utils.MessageUtils; import org.dromara.common.core.utils.MessageUtils;
import com.ruoyi.common.core.utils.ServletUtils; import org.dromara.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.SpringUtils; import org.dromara.common.core.utils.SpringUtils;
import com.ruoyi.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.ip.AddressUtils; import org.dromara.common.core.utils.ip.AddressUtils;
import com.ruoyi.common.log.event.LogininforEvent; import org.dromara.common.log.event.LogininforEvent;
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.RemoteLogService; import org.dromara.system.api.RemoteLogService;
import com.ruoyi.system.api.RemoteUserService; import org.dromara.system.api.RemoteUserService;
import com.ruoyi.system.api.domain.SysUser; import org.dromara.system.api.domain.SysUser;
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;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
ruoyi-common/pom.xml
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
Unescape Escape View File

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

54
ruoyi-common/ruoyi-common-bom/pom.xml
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/pom.xml
Unescape Escape View File

@ -3,7 +3,7 @@
xmlns="http://maven.apache.org/POM/4.0.0" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>com.ruoyi</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-common</artifactId> <artifactId>ruoyi-common</artifactId>
<version>1.6.0</version> <version>1.6.0</version>
</parent> </parent>

6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Sensitive.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/annotation/Sensitive.java
Unescape Escape View File

@ -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.annotation.JacksonAnnotationsInside;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; 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.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java
Unescape Escape View File

@ -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.boot.autoconfigure.AutoConfiguration;
import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.EnableAspectJAutoProxy;

6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.ruoyi.common.core.config; package org.dromara.common.core.config;
import cn.hutool.core.util.ArrayUtil; 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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/JacksonConfig.java
Unescape Escape View File

@ -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.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; 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 lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ValidatorConfig.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheNames.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GenConstants.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant; package org.dromara.common.core.constant;
/** /**
* 代码生成通用常量 * 代码生成通用常量

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GlobalConstants.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant; package org.dromara.common.core.constant;
/** /**
* 全局的key常量 (业务无关的key) * 全局的key常量 (业务无关的key)

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TenantConstants.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java
Unescape Escape View File

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

6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.ruoyi.common.core.domain; package org.dromara.common.core.domain;
import com.ruoyi.common.core.constant.Constants; import org.dromara.common.core.constant.Constants;
import com.ruoyi.common.core.constant.HttpStatus; import org.dromara.common.core.constant.HttpStatus;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/DeviceType.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/LoginType.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/SensitiveStrategy.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/SensitiveStrategy.java
Unescape Escape View File

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

38
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java
Unescape Escape View File

@ -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;
} }

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserType.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java
Unescape Escape View File

@ -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.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/CaptchaException.java
Unescape Escape View File

@ -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;
/** /**
* 验证码错误异常类 * 验证码错误异常类

52
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/CheckedException.java
Unescape Escape View File

@ -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);
} }
} }

26
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/DemoModeException.java
Unescape Escape View File

@ -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() {
} }
} }

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/GlobalException.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java
Unescape Escape View File

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

44
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/UtilException.java
Unescape Escape View File

@ -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);
} }
} }

6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java
Unescape Escape View File

@ -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.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

34
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java
Unescape Escape View File

@ -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);
} }
} }

28
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java
Unescape Escape View File

@ -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});
} }
} }

28
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java
Unescape Escape View File

@ -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});
} }
} }

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java
Unescape Escape View File

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

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java
Unescape Escape View File

@ -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;
/** /**
* 用户信息异常类 * 用户信息异常类

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserPasswordNotMatchException.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/jackson/BigNumberSerializer.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/jackson/BigNumberSerializer.java
Unescape Escape View File

@ -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.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.SerializerProvider;

10
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/jackson/SensitiveJsonSerializer.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/jackson/SensitiveJsonSerializer.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.jackson; package org.dromara.common.core.jackson;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.fasterxml.jackson.core.JsonGenerator; 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.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.ContextualSerializer; 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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/DictService.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java
Unescape Escape View File

@ -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;
/** /**
* 字典服务服务 * 字典服务服务

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/SensitiveService.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SensitiveService.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/BeanCopyUtils.java
Unescape Escape View File

@ -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.collection.CollUtil;
import cn.hutool.core.lang.SimpleCache; import cn.hutool.core.lang.SimpleCache;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JsonUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/JsonUtils.java
Unescape Escape View File

@ -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.lang.Dict;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MessageUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java
Unescape Escape View File

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

296
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ReUtil.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ReUtil.java
Unescape Escape View File

@ -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();
} }
} }

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java
Unescape Escape View File

@ -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.core.convert.Convert;
import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.extra.servlet.ServletUtil;
import cn.hutool.http.HttpStatus; import cn.hutool.http.HttpStatus;
import com.ruoyi.common.core.constant.Constants; import org.dromara.common.core.constant.Constants;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StreamUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java
Unescape Escape View File

@ -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.collection.CollUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java
Unescape Escape View File

@ -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.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/TreeBuildUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java
Unescape Escape View File

@ -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.collection.CollUtil;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeNodeConfig;
import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.lang.tree.parser.NodeParser; 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.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ValidatorUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java
Unescape Escape View File

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

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java
Unescape Escape View File

@ -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 cn.hutool.core.io.FileUtil;
import lombok.AccessLevel; import lombok.AccessLevel;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils.file; package org.dromara.common.core.utils.file;
/** /**
* 媒体类型工具类 * 媒体类型工具类

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/AddressUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.ruoyi.common.core.utils.ip; package org.dromara.common.core.utils.ip;
import cn.hutool.core.net.NetUtil; import cn.hutool.core.net.NetUtil;
import cn.hutool.http.HtmlUtil; import cn.hutool.http.HtmlUtil;
import com.ruoyi.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/RegionUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java
Unescape Escape View File

@ -1,10 +1,10 @@
package com.ruoyi.common.core.utils.ip; package org.dromara.common.core.utils.ip;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.resource.ClassPathResource; import cn.hutool.core.io.resource.ClassPathResource;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.file.FileUtils; import org.dromara.common.core.utils.file.FileUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.lionsoul.ip2region.xdb.Searcher; import org.lionsoul.ip2region.xdb.Searcher;

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.ruoyi.common.core.utils.reflect; package org.dromara.common.core.utils.reflect;
import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.ReflectUtil;
import com.ruoyi.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.ruoyi.common.core.utils.sql; package org.dromara.common.core.utils.sql;
import com.ruoyi.common.core.exception.UtilException; import org.dromara.common.core.exception.UtilException;
import com.ruoyi.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/validate/AddGroup.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.validate; package org.dromara.common.core.validate;
/** /**
* 校验分组 add * 校验分组 add

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/validate/EditGroup.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.validate; package org.dromara.common.core.validate;
/** /**
* 校验分组 edit * 校验分组 edit

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.validate; package org.dromara.common.core.validate;
/** /**
* 校验分组 query * 校验分组 query

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/web/controller/BaseController.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.ruoyi.common.core.web.controller; package org.dromara.common.core.web.controller;
import com.ruoyi.common.core.domain.R; import org.dromara.common.core.domain.R;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
/** /**

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java → ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/web/domain/BaseEntity.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.web.domain; package org.dromara.common.core.web.domain;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save