update 修改包名为org.dromara

dev
Yjoioooo 3 years ago
parent 0944318dc6
commit fbe8aa4f5f

@ -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:

@ -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
# 表前缀(生成类名不会包含表前缀,多个用逗号分隔) # 表前缀(生成类名不会包含表前缀,多个用逗号分隔)

@ -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,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>

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

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

@ -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;
/** /**
* *

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

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

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

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

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

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

@ -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;
/** /**
* *

@ -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;
/** /**
* *

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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,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>

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

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

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

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

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

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

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

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

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant; package org.dromara.common.core.constant;
/** /**
* *

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant; package org.dromara.common.core.constant;
/** /**
* *

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant; package org.dromara.common.core.constant;
/** /**
* *

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant; package org.dromara.common.core.constant;
/** /**
* *

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant; package org.dromara.common.core.constant;
/** /**
* key (key) * key (key)

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant; package org.dromara.common.core.constant;
/** /**
* *

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant; package org.dromara.common.core.constant;
/** /**
* *

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant; package org.dromara.common.core.constant;
/** /**
* *

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

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

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

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

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

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

@ -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;
/** /**
* *

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

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

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

@ -1,6 +1,6 @@
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;
/** /**
* *

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.file; package org.dromara.common.core.exception.file;
/** /**
* *

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.file; package org.dromara.common.core.exception.file;
/** /**
* *

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.user; package org.dromara.common.core.exception.user;
/** /**
* *

@ -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;
/** /**
* *

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.user; package org.dromara.common.core.exception.user;
/** /**
* *

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

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

@ -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;
/** /**
* *

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils.file; package org.dromara.common.core.utils.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;

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

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

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

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

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

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

@ -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;
/** /**

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

Loading…
Cancel
Save