update 更改包名为 org.dromara

update 更改文档地址为 plus-doc.dromara.org

README.md

@@ -5,7 +5,7 @@
 ## 平台简介
 
 [![码云Gitee](https://gitee.com/dromara/RuoYi-Vue-Plus/badge/star.svg?theme=blue)](https://gitee.com/dromara/RuoYi-Vue-Plus)
-[![GitHub](https://img.shields.io/github/stars/JavaLionLi/RuoYi-Vue-Plus.svg?style=social&label=Stars)](https://github.com/dromara/RuoYi-Vue-Plus)
+[![GitHub](https://img.shields.io/github/stars/dromara/RuoYi-Vue-Plus.svg?style=social&label=Stars)](https://github.com/dromara/RuoYi-Vue-Plus)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/master/LICENSE)
 [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
 <br>
@@ -19,7 +19,7 @@
 > 项目代码、文档 均开源免费可商用 遵循开源协议在项目中保留开源协议文件即可<br>
 活到老写到老 为兴趣而开源 为学习而开源 为让大家真正可以学到技术而开源
 
-> 系统演示: [传送门](https://javalionli.gitee.io/plus-doc/#/common/demo_system)
+> 系统演示: [传送门](https://plus-doc.dromara.org/#/common/demo_system)
 
 > 前端项目地址: [plus-ui](https://gitee.com/JavaLionLi/plus-ui)
 
@@ -27,7 +27,7 @@
 
 | 功能          | 本框架                                                                                                               | RuoYi                                                                              |
 |-------------|-------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------|
-| 前端项目        | 基于vue3-element-admin开源项目重写<br/>Vue3 + TS + ElementPlus                                                            | 基于Vue2/Vue3 + JS                                                                   | 
+| 前端项目        | 采用 Vue3 + TS + ElementPlus 重写                                                                                     | 基于Vue2/Vue3 + JS                                                                   | 
 | 后端项目结构      | 采用插件化 + 扩展包形式 结构解耦 易于扩展                                                                                           | 模块相互注入耦合严重难以扩展                                                                     | 
 | 后端代码风格      | 严格遵守Alibaba规范与项目统一配置的代码格式化                                                                                        | 代码书写与常规结构不同阅读障碍大                                                                   |
 | Web容器       | 采用 Undertow 基于 XNIO 的高性能容器                                                                                        | 采用 Tomcat                                                                          |
@@ -51,6 +51,7 @@
 | WebSocket协议 | 基于 Spring 封装的 WebSocket 协议 扩展了Token鉴权与分布式会话同步 不再只是基于单机的废物                                                         | 无                                                                                  |
 | 序列化         | 采用 Jackson Spring官方内置序列化 靠谱!!!                                                                                    | 采用 fastjson bugjson 远近闻名                                                           | 
 | 分布式幂等       | 参考美团GTIS防重系统简化实现(细节可看文档)                                                                                          | 手动编写注解基于aop实现                                                                      |
+| 分布式锁        | 采用 Lock4j 底层基于 Redisson                                                                                           | 无                                                                                  |
 | 分布式任务调度     | 采用 Xxl-Job 天生支持分布式 统一的管理中心                                                                                        | 采用 Quartz 基于数据库锁性能差 集群需要做很多配置与改造                                                   | 
 | 文件存储        | 采用 Minio 分布式文件存储 天生支持多机、多硬盘、多分片、多副本存储<br/>支持权限管理 安全可靠 文件可加密存储                                                     | 采用 本机文件存储 文件裸漏 易丢失泄漏 不支持集群有单点效应                                                    |
 | 云存储         | 采用 AWS S3 协议客户端 支持 七牛、阿里、腾讯 等一切支持S3协议的厂家                                                                          | 不支持                                                                                |
@@ -101,17 +102,17 @@
 
 使用框架前请仔细阅读文档重点注意事项
 <br>
->[初始化项目 必看](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/quickstart/init)
->>[https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/quickstart/init](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/quickstart/init)
+>[初始化项目 必看](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/init)
+>>[https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/init](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/init)
 >
->[专栏与视频 入门必看](https://javalionli.gitee.io/plus-doc/#/common/column)
->>[https://javalionli.gitee.io/plus-doc/#/common/column](https://javalionli.gitee.io/plus-doc/#/common/column)
+>[专栏与视频 入门必看](https://plus-doc.dromara.org/#/common/column)
+>>[https://plus-doc.dromara.org/#/common/column](https://plus-doc.dromara.org/#/common/column)
 >
->[部署项目 必看](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/quickstart/deploy)
->>[https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/quickstart/deploy](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/quickstart/deploy)
+>[部署项目 必看](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy)
+>>[https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy)
 > 
->[参考文档 Wiki](https://javalionli.gitee.io/plus-doc)
->>[https://javalionli.gitee.io/plus-doc](https://javalionli.gitee.io/plus-doc)
+>[参考文档 Wiki](https://plus-doc.dromara.org)
+>>[https://plus-doc.dromara.org](https://plus-doc.dromara.org)
 
 ## 软件架构图
 
@@ -119,7 +120,7 @@
 
 ## 如何参与贡献
 
-[参与贡献的方式 https://javalionli.gitee.io/plus-doc/#/common/contribution](https://javalionli.gitee.io/plus-doc/#/common/contribution)
+[参与贡献的方式 https://plus-doc.dromara.org/#/common/contribution](https://plus-doc.dromara.org/#/common/contribution)
 
 ### 其他
 
@@ -127,16 +128,16 @@
 * GitHub 地址 [RuoYi-Vue-Plus](https://github.com/dromara/RuoYi-Vue-Plus)
 * 微服务 分支 [RuoYi-Cloud-Plus](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus)
 * 前端项目 地址 [plus-ui](https://gitee.com/JavaLionLi/plus-ui)
-* 用户扩展项目 [扩展项目列表](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/extend-project/list)
+* 用户扩展项目 [扩展项目列表](https://plus-doc.dromara.org/#/ruoyi-vue-plus/extend-project/list)
 
 ## 加群与捐献
->[加群与捐献](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/other/group_chat)
->>[https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/other/group_chat](https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/other/group_chat)
+>[加群与捐献](https://plus-doc.dromara.org/#/ruoyi-vue-plus/other/group_chat)
+>>[https://plus-doc.dromara.org/#/ruoyi-vue-plus/other/group_chat](https://plus-doc.dromara.org/#/ruoyi-vue-plus/other/group_chat)
 
 ## 捐献作者
 作者为兼职做开源,平时还需要工作,如果帮到了您可以请作者吃个盒饭  
-<img src="https://images.gitee.com/uploads/images/2022/0218/213734_b1b8197f_1766278.jpeg" width="300px" height="450px" />
-<img src="https://images.gitee.com/uploads/images/2021/0525/101713_3d18b119_1766278.jpeg" width="300px" height="450px" />
+<img src="https://foruda.gitee.com/images/1678975784848381069/d8661ed9_1766278.png" width="300px" height="450px" />
+<img src="https://foruda.gitee.com/images/1678975801230205215/6f96229d_1766278.png" width="300px" height="450px" />
 
 ## 演示图例
 

pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.ruoyi</groupId>
+    <groupId>org.dromara</groupId>
     <artifactId>ruoyi-vue-plus</artifactId>
     <version>${revision}</version>
 
@@ -113,7 +113,7 @@
 
             <!-- common 的依赖配置-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-bom</artifactId>
                 <version>${revision}</version>
                 <type>pom</type>
@@ -312,25 +312,25 @@
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-system</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-job</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-generator</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-demo</artifactId>
                 <version>${revision}</version>
             </dependency>

ruoyi-admin/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
-        <groupId>com.ruoyi</groupId>
+        <groupId>org.dromara</groupId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -40,29 +40,29 @@
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-doc</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-system</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-job</artifactId>
         </dependency>
 
         <!-- 代码生成-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
         <!--  demo模块  -->
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-demo</artifactId>
         </dependency>
 

ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java

@@ -1,4 +1,4 @@
-package com.ruoyi;
+package org.dromara;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -7,14 +7,14 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
 /**
  * 启动程序
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @SpringBootApplication
-public class RuoYiApplication {
+public class DromaraApplication {
 
     public static void main(String[] args) {
-        SpringApplication application = new SpringApplication(RuoYiApplication.class);
+        SpringApplication application = new SpringApplication(DromaraApplication.class);
         application.setApplicationStartup(new BufferingApplicationStartup(2048));
         application.run(args);
         System.out.println("(♥◠‿◠)ﾉﾞ  RuoYi-Vue-Plus启动成功   ლ(´ڡ`ლ)ﾞ");

ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java

@@ -1,4 +1,4 @@
-package com.ruoyi;
+package org.dromara;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -6,13 +6,13 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 /**
  * web容器中进行部署
  *
- * @author ruoyi
+ * @author Lion Li
  */
-public class RuoYiServletInitializer extends SpringBootServletInitializer {
+public class DromaraServletInitializer extends SpringBootServletInitializer {
 
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(RuoYiApplication.class);
+        return application.sources(DromaraApplication.class);
     }
 
 }

ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java

@@ -1,25 +1,25 @@
-package com.ruoyi.web.controller;
+package org.dromara.web.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollUtil;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.model.EmailLoginBody;
-import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.core.domain.model.RegisterBody;
-import com.ruoyi.common.core.domain.model.SmsLoginBody;
-import com.ruoyi.common.core.utils.MapstructUtils;
-import com.ruoyi.common.core.utils.StreamUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.tenant.helper.TenantHelper;
-import com.ruoyi.system.domain.bo.SysTenantBo;
-import com.ruoyi.system.domain.vo.SysTenantVo;
-import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.system.service.ISysTenantService;
-import com.ruoyi.web.domain.vo.LoginTenantVo;
-import com.ruoyi.web.domain.vo.LoginVo;
-import com.ruoyi.web.domain.vo.TenantListVo;
-import com.ruoyi.web.service.SysLoginService;
-import com.ruoyi.web.service.SysRegisterService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.EmailLoginBody;
+import org.dromara.common.core.domain.model.LoginBody;
+import org.dromara.common.core.domain.model.RegisterBody;
+import org.dromara.common.core.domain.model.SmsLoginBody;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.system.domain.bo.SysTenantBo;
+import org.dromara.system.domain.vo.SysTenantVo;
+import org.dromara.system.service.ISysConfigService;
+import org.dromara.system.service.ISysTenantService;
+import org.dromara.web.domain.vo.LoginTenantVo;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.domain.vo.TenantListVo;
+import org.dromara.web.service.SysLoginService;
+import org.dromara.web.service.SysRegisterService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;

ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java

@@ -1,25 +1,25 @@
-package com.ruoyi.web.controller;
+package org.dromara.web.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.captcha.AbstractCaptcha;
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.RandomUtil;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.GlobalConstants;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.reflect.ReflectUtils;
-import com.ruoyi.common.mail.config.properties.MailProperties;
-import com.ruoyi.common.mail.utils.MailUtils;
-import com.ruoyi.common.redis.utils.RedisUtils;
-import com.ruoyi.common.sms.config.properties.SmsProperties;
-import com.ruoyi.common.sms.core.SmsTemplate;
-import com.ruoyi.common.sms.entity.SmsResult;
-import com.ruoyi.common.web.config.properties.CaptchaProperties;
-import com.ruoyi.common.web.enums.CaptchaType;
-import com.ruoyi.web.domain.vo.CaptchaVo;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
+import org.dromara.common.mail.config.properties.MailProperties;
+import org.dromara.common.mail.utils.MailUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.sms.config.properties.SmsProperties;
+import org.dromara.common.sms.core.SmsTemplate;
+import org.dromara.common.sms.entity.SmsResult;
+import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.common.web.enums.CaptchaType;
+import org.dromara.web.domain.vo.CaptchaVo;
 import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java

@@ -1,8 +1,8 @@
-package com.ruoyi.web.controller;
+package org.dromara.web.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
-import com.ruoyi.common.core.config.RuoYiConfig;
-import com.ruoyi.common.core.utils.StringUtils;
+import org.dromara.common.core.config.RuoYiConfig;
+import org.dromara.common.core.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java

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

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

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

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

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

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

@@ -1,6 +1,6 @@
-package com.ruoyi.web.domain.vo;
+package org.dromara.web.domain.vo;
 
-import com.ruoyi.system.domain.vo.SysTenantVo;
+import org.dromara.system.domain.vo.SysTenantVo;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 

ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.service;
+package org.dromara.web.service;
 
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.secure.BCrypt;
@@ -6,34 +6,35 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.GlobalConstants;
-import com.ruoyi.common.core.constant.TenantConstants;
-import com.ruoyi.common.core.domain.dto.RoleDTO;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.domain.model.XcxLoginUser;
-import com.ruoyi.common.core.enums.DeviceType;
-import com.ruoyi.common.core.enums.LoginType;
-import com.ruoyi.common.core.enums.TenantStatus;
-import com.ruoyi.common.core.enums.UserStatus;
-import com.ruoyi.common.core.exception.user.CaptchaException;
-import com.ruoyi.common.core.exception.user.CaptchaExpireException;
-import com.ruoyi.common.core.exception.user.UserException;
-import com.ruoyi.common.core.utils.*;
-import com.ruoyi.common.log.event.LogininforEvent;
-import com.ruoyi.common.redis.utils.RedisUtils;
-import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.common.tenant.exception.TenantException;
-import com.ruoyi.common.tenant.helper.TenantHelper;
-import com.ruoyi.common.web.config.properties.CaptchaProperties;
-import com.ruoyi.system.domain.SysUser;
-import com.ruoyi.system.domain.vo.SysTenantVo;
-import com.ruoyi.system.domain.vo.SysUserVo;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.service.ISysPermissionService;
-import com.ruoyi.system.service.ISysTenantService;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.constant.TenantConstants;
+import org.dromara.common.core.domain.dto.RoleDTO;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.domain.model.XcxLoginUser;
+import org.dromara.common.core.enums.DeviceType;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.enums.TenantStatus;
+import org.dromara.common.core.enums.UserStatus;
+import org.dromara.common.core.exception.user.CaptchaException;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.*;
+import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.tenant.exception.TenantException;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.vo.SysTenantVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.system.service.ISysPermissionService;
+import org.dromara.system.service.ISysTenantService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.*;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 

ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java

@@ -1,22 +1,22 @@
-package com.ruoyi.web.service;
+package org.dromara.web.service;
 
 import cn.dev33.satoken.secure.BCrypt;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.GlobalConstants;
-import com.ruoyi.common.core.domain.model.RegisterBody;
-import com.ruoyi.common.core.enums.UserType;
-import com.ruoyi.common.core.exception.user.CaptchaException;
-import com.ruoyi.common.core.exception.user.CaptchaExpireException;
-import com.ruoyi.common.core.exception.user.UserException;
-import com.ruoyi.common.core.utils.MessageUtils;
-import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.log.event.LogininforEvent;
-import com.ruoyi.common.redis.utils.RedisUtils;
-import com.ruoyi.common.web.config.properties.CaptchaProperties;
-import com.ruoyi.system.domain.bo.SysUserBo;
-import com.ruoyi.system.service.ISysUserService;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.domain.model.RegisterBody;
+import org.dromara.common.core.enums.UserType;
+import org.dromara.common.core.exception.user.CaptchaException;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

ruoyi-admin/src/main/resources/application.yml

@@ -5,7 +5,7 @@ ruoyi:
   # 版本
   version: ${revision}
   # 版权年份
-  copyrightYear: 2022
+  copyrightYear: 2023
   # 实例演示开关
   demoEnabled: true
   # 获取ip地址开关
@@ -48,7 +48,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: @logging.level@
+    org.dromara: @logging.level@
     org.springframework: warn
   config: classpath:logback.xml
 
@@ -151,11 +151,11 @@ tenant:
 mybatis-plus:
   # 不支持多包, 如有需要可在注解配置 或 提升扫包等级
   # 例如 com.**.**.mapper
-  mapperPackage: com.ruoyi.**.mapper
+  mapperPackage: org.dromara.**.mapper
   # 对应的 XML 文件位置
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.ruoyi.**.domain
+  typeAliasesPackage: org.dromara.**.domain
   # 启动时是否检查 MyBatis XML 文件的存在，默认不检查
   checkConfigLocation: false
   configuration:
@@ -212,7 +212,7 @@ swagger:
     # 描述
     description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...'
     # 版本
-    version: '版本号: ${ruoyi-vue-plus.version}'
+    version: '版本号: ${ruoyi.version}'
     # 作者信息
     contact:
       name: Lion Li
@@ -236,13 +236,13 @@ springdoc:
   #这里定义了两个分组，可定义多个，也可以不定义
   group-configs:
     - group: 1.演示模块
-      packages-to-scan: com.ruoyi.demo
+      packages-to-scan: org.dromara.demo
     - group: 2.通用模块
-      packages-to-scan: com.ruoyi.web
+      packages-to-scan: org.dromara.web
     - group: 3.系统模块
-      packages-to-scan: com.ruoyi.system
+      packages-to-scan: org.dromara.system
     - group: 4.代码生成模块
-      packages-to-scan: com.ruoyi.generator
+      packages-to-scan: org.dromara.generator
 
 # 防止XSS攻击
 xss:

ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java

@@ -1,4 +1,4 @@
-package com.ruoyi.test;
+package org.dromara.test;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;

ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java

@@ -1,6 +1,6 @@
-package com.ruoyi.test;
+package org.dromara.test;
 
-import com.ruoyi.common.core.config.RuoYiConfig;
+import org.dromara.common.core.config.RuoYiConfig;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java

@@ -1,6 +1,6 @@
-package com.ruoyi.test;
+package org.dromara.test;
 
-import com.ruoyi.common.core.enums.UserType;
+import org.dromara.common.core.enums.UserType;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;

ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java

@@ -1,4 +1,4 @@
-package com.ruoyi.test;
+package org.dromara.test;
 
 import org.junit.jupiter.api.*;
 import org.springframework.boot.test.context.SpringBootTest;

ruoyi-common/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
-        <groupId>com.ruoyi</groupId>
+        <groupId>org.dromara</groupId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

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

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.ruoyi</groupId>
+    <groupId>org.dromara</groupId>
     <artifactId>ruoyi-common-bom</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>
@@ -21,147 +21,147 @@
         <dependencies>
             <!-- 核心模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-core</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 接口模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-doc</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- excel -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-excel</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 幂等 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-idempotent</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 调度模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-job</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 日志记录 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-log</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 邮件服务 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-mail</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 数据库服务 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-mybatis</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- OSS -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-oss</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 限流 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-ratelimiter</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 缓存服务 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-redis</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- satoken -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-satoken</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 安全模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-security</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 短信模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-sms</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- web服务 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-web</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 翻译模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-translation</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 脱敏模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-sensitive</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 序列化模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-json</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 数据库加解密模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-encrypt</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 租户模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-tenant</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- WebSocket模块 -->
             <dependency>
-                <groupId>com.ruoyi</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-common-websocket</artifactId>
                 <version>${revision}</version>
             </dependency>

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

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
+        <groupId>org.dromara</groupId>
         <artifactId>ruoyi-common</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>

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

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

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

@@ -1,7 +1,7 @@
-package com.ruoyi.common.core.config;
+package org.dromara.common.core.config;
 
 import cn.hutool.core.util.ArrayUtil;
-import com.ruoyi.common.core.exception.ServiceException;
+import org.dromara.common.core.exception.ServiceException;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

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

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

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

@@ -1,7 +1,7 @@
-package com.ruoyi.common.core.config;
+package org.dromara.common.core.config;
 
-import com.ruoyi.common.core.config.properties.ThreadPoolProperties;
-import com.ruoyi.common.core.utils.Threads;
+import org.dromara.common.core.config.properties.ThreadPoolProperties;
+import org.dromara.common.core.utils.Threads;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.config;
+package org.dromara.common.core.config;
 
 import jakarta.validation.Validator;
 import org.hibernate.validator.HibernateValidator;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.dto;
+package org.dromara.common.core.domain.dto;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.dto;
+package org.dromara.common.core.domain.dto;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.model;
+package org.dromara.common.core.domain.model;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;

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

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.domain.model;
+package org.dromara.common.core.domain.model;
 
-import com.ruoyi.common.core.constant.UserConstants;
+import org.dromara.common.core.constant.UserConstants;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 

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

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.domain.model;
+package org.dromara.common.core.domain.model;
 
-import com.ruoyi.common.core.domain.dto.RoleDTO;
+import org.dromara.common.core.domain.dto.RoleDTO;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.model;
+package org.dromara.common.core.domain.model;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.model;
+package org.dromara.common.core.domain.model;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.model;
+package org.dromara.common.core.domain.model;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package org.dromara.common.core.exception;
 
 import java.io.Serial;
 

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package org.dromara.common.core.exception;
 
 import java.io.Serial;
 

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package org.dromara.common.core.exception;
 
 import java.io.Serial;
 

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception;
+package org.dromara.common.core.exception;
 
 import java.io.Serial;
 

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

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

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

@@ -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;
 
 import java.io.Serial;
 

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.file;
+package org.dromara.common.core.exception.file;
 
 import java.io.Serial;
 

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.file;
+package org.dromara.common.core.exception.file;
 
 import java.io.Serial;
 

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.user;
+package org.dromara.common.core.exception.user;
 
 import java.io.Serial;
 

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.user;
+package org.dromara.common.core.exception.user;
 
 import java.io.Serial;
 

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

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.exception.user;
+package org.dromara.common.core.exception.user;
 
-import com.ruoyi.common.core.exception.base.BaseException;
+import org.dromara.common.core.exception.base.BaseException;
 
 import java.io.Serial;
 

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.user;
+package org.dromara.common.core.exception.user;
 
 import java.io.Serial;
 

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.exception.user;
+package org.dromara.common.core.exception.user;
 
 import java.io.Serial;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/manager/ShutdownManager.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.core.manager;
+package org.dromara.common.core.manager;
 
-import com.ruoyi.common.core.utils.Threads;
+import org.dromara.common.core.utils.Threads;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.service;
+package org.dromara.common.core.service;
 
 /**
  * 通用 参数配置服务

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.service;
+package org.dromara.common.core.service;
 
 /**
  * 通用 部门服务

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.service;
+package org.dromara.common.core.service;
 
 /**
  * 通用 字典服务

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

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

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

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

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

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

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

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

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

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

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

@@ -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.extra.servlet.JakartaServletUtil;

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.utils.file;
+package org.dromara.common.core.utils.file;
 
 import cn.hutool.core.io.FileUtil;
 import jakarta.servlet.http.HttpServletResponse;

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

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

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

@@ -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.http.HtmlUtil;
-import com.ruoyi.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.StringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

@@ -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.resource.ClassPathResource;
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.file.FileUtils;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.file.FileUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.lionsoul.ip2region.xdb.Searcher;
 

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

@@ -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 com.ruoyi.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.StringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

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

@@ -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 com.ruoyi.common.core.utils.StringUtils;
+import org.dromara.common.core.exception.UtilException;
+import org.dromara.common.core.utils.StringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java

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

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java

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

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java

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

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.xss;
+package org.dromara.common.core.xss;
 
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.xss;
+package org.dromara.common.core.xss;
 
 import cn.hutool.core.util.ReUtil;
 import cn.hutool.http.HtmlUtil;

ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,6 +1,6 @@
-com.ruoyi.common.core.config.ApplicationConfig
-com.ruoyi.common.core.config.AsyncConfig
-com.ruoyi.common.core.config.RuoYiConfig
-com.ruoyi.common.core.config.ThreadPoolConfig
-com.ruoyi.common.core.config.ValidatorConfig
-com.ruoyi.common.core.utils.SpringUtils
+org.dromara.common.core.config.ApplicationConfig
+org.dromara.common.core.config.AsyncConfig
+org.dromara.common.core.config.RuoYiConfig
+org.dromara.common.core.config.ThreadPoolConfig
+org.dromara.common.core.config.ValidatorConfig
+org.dromara.common.core.utils.SpringUtils

ruoyi-common/ruoyi-common-doc/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
+        <groupId>org.dromara</groupId>
         <artifactId>ruoyi-common</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SwaggerConfig.java

@@ -1,8 +1,8 @@
-package com.ruoyi.common.doc.config;
+package org.dromara.common.doc.config;
 
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.doc.config.properties.SwaggerProperties;
-import com.ruoyi.common.doc.handler.OpenApiHandler;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.doc.config.properties.SwaggerProperties;
+import org.dromara.common.doc.handler.OpenApiHandler;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Paths;
 import io.swagger.v3.oas.models.info.Info;

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SwaggerProperties.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.doc.config.properties;
+package org.dromara.common.doc.config.properties;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.ExternalDocumentation;

ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.doc.handler;
+package org.dromara.common.doc.handler;
 
 import cn.hutool.core.io.IoUtil;
 import io.swagger.v3.core.jackson.TypeNameResolver;

ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1 @@
-com.ruoyi.common.doc.config.SwaggerConfig
+org.dromara.common.doc.config.SwaggerConfig

ruoyi-common/ruoyi-common-encrypt/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.ruoyi</groupId>
+        <groupId>org.dromara</groupId>
         <artifactId>ruoyi-common</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
@@ -19,7 +19,7 @@
     <dependencies>
 
         <dependency>
-            <groupId>com.ruoyi</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.encrypt.annotation;
+package org.dromara.common.encrypt.annotation;
 
-import com.ruoyi.common.encrypt.enumd.AlgorithmType;
-import com.ruoyi.common.encrypt.enumd.EncodeType;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
 
 import java.lang.annotation.*;
 

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.encrypt.config;
+package org.dromara.common.encrypt.config;
 
-import com.ruoyi.common.encrypt.core.EncryptorManager;
-import com.ruoyi.common.encrypt.interceptor.MybatisDecryptInterceptor;
-import com.ruoyi.common.encrypt.interceptor.MybatisEncryptInterceptor;
-import com.ruoyi.common.encrypt.properties.EncryptorProperties;
+import org.dromara.common.encrypt.core.EncryptorManager;
+import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor;
+import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor;
+import org.dromara.common.encrypt.properties.EncryptorProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.encrypt.core;
+package org.dromara.common.encrypt.core;
 
-import com.ruoyi.common.encrypt.enumd.AlgorithmType;
-import com.ruoyi.common.encrypt.enumd.EncodeType;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
 import lombok.Data;
 
 /**

ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.encrypt.core;
+package org.dromara.common.encrypt.core;
 
 import cn.hutool.core.util.ReflectUtil;
-import com.ruoyi.common.encrypt.annotation.EncryptField;
+import org.dromara.common.encrypt.annotation.EncryptField;
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Field;