refactor 重构 common 模块结构 (doc, excel, job, log, mail, oss, sms, web) ;

update 更新 admin, demo, generator, system 模块包名以及 maven 依赖 ;
delete 删除模块 ruoyi-framework, ruoyi-job, ruoyi-oss, ruoyi-sms ;

pom.xml

@@ -133,6 +133,13 @@
                 <artifactId>sa-token-spring-boot-starter</artifactId>
                 <version>${satoken.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-core</artifactId>
+                <version>${satoken.version}</version>
+            </dependency>
+
             <!-- Sa-Token 整合 jwt -->
             <dependency>
                 <groupId>cn.dev33</groupId>
@@ -163,6 +170,11 @@
                 <artifactId>mybatis-plus-extension</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-annotation</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
             <!-- sql性能分析插件 -->
             <dependency>
                 <groupId>p6spy</groupId>
@@ -244,13 +256,6 @@
                 <version>${snakeyaml.version}</version>
             </dependency>
 
-            <!-- 定时任务 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-job</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
-
             <!-- 代码生成-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -258,13 +263,6 @@
                 <version>${ruoyi-vue-plus.version}</version>
             </dependency>
 
-            <!-- 核心模块-->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-framework</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
-
             <!-- 系统模块-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -279,20 +277,6 @@
                 <version>${ruoyi-vue-plus.version}</version>
             </dependency>
 
-            <!-- OSS对象存储模块 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-oss</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
-
-            <!-- SMS短信模块 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-sms</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
-
             <!-- demo模块 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -305,15 +289,11 @@
 
     <modules>
         <module>ruoyi-admin</module>
-        <module>ruoyi-framework</module>
         <module>ruoyi-system</module>
-        <module>ruoyi-job</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-common</module>
         <module>ruoyi-demo</module>
         <module>ruoyi-extend</module>
-        <module>ruoyi-oss</module>
-        <module>ruoyi-sms</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-admin/pom.xml

@@ -45,12 +45,6 @@
             <artifactId>mssql-jdbc</artifactId>
         </dependency>
 
-        <!-- 核心模块-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-framework</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-system</artifactId>
@@ -58,12 +52,27 @@
 
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-job</artifactId>
+            <artifactId>ruoyi-common-satoken</artifactId>
         </dependency>
 
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-oss</artifactId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-job</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-oss</artifactId>
         </dependency>
 
         <!-- 代码生成-->

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -5,18 +5,18 @@ 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.constant.CacheConstants;
+import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.enums.CaptchaType;
+import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.core.utils.reflect.ReflectUtils;
-import com.ruoyi.common.utils.reflect.ReflectUtils;
+import com.ruoyi.common.redis.utils.RedisUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.common.sms.config.properties.SmsProperties;
-import com.ruoyi.framework.config.properties.CaptchaProperties;
+import com.ruoyi.common.sms.core.SmsTemplate;
-import com.ruoyi.sms.config.properties.SmsProperties;
+import com.ruoyi.common.sms.entity.SmsResult;
-import com.ruoyi.sms.core.SmsTemplate;
+import com.ruoyi.common.web.config.properties.CaptchaProperties;
-import com.ruoyi.sms.entity.SmsResult;
+import com.ruoyi.common.web.enums.CaptchaType;
 import com.ruoyi.system.service.ISysConfigService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -2,13 +2,13 @@ package com.ruoyi.web.controller.monitor;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.collection.CollUtil;
-import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.constant.CacheNames;
+import com.ruoyi.common.core.constant.CacheNames;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.core.utils.JsonUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.utils.redis.CacheUtils;
+import com.ruoyi.common.redis.utils.CacheUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.redis.utils.RedisUtils;
 import com.ruoyi.system.domain.SysCache;
 import lombok.RequiredArgsConstructor;
 import org.redisson.spring.data.connection.RedissonConnectionFactory;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -1,15 +1,15 @@
 package com.ruoyi.web.controller.monitor;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.datasource.core.page.PageQuery;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.datasource.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.excel.utils.ExcelUtil;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.redis.utils.RedisUtils;
 import com.ruoyi.system.domain.SysLogininfor;
 import com.ruoyi.system.service.ISysLogininforService;
 import lombok.RequiredArgsConstructor;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -1,13 +1,13 @@
 package com.ruoyi.web.controller.monitor;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.datasource.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.datasource.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.excel.utils.ExcelUtil;
 import com.ruoyi.system.domain.SysOperLog;
 import com.ruoyi.system.service.ISysOperLogService;
 import lombok.RequiredArgsConstructor;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -4,16 +4,16 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.datasource.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.utils.StreamUtils;
+import com.ruoyi.common.core.utils.StreamUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.redis.utils.RedisUtils;
 import com.ruoyi.system.domain.SysUserOnline;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -1,14 +1,14 @@
 package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.datasource.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.datasource.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.excel.utils.ExcelUtil;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.ISysConfigService;
 import lombok.RequiredArgsConstructor;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -2,13 +2,13 @@ package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ArrayUtil;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.system.domain.SysDept;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -2,14 +2,14 @@ package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.datasource.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.system.domain.SysDictData;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.datasource.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.excel.utils.ExcelUtil;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;
 import lombok.RequiredArgsConstructor;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -1,15 +1,15 @@
 package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.datasource.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysDictType;
+import com.ruoyi.system.domain.SysDictType;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.datasource.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.excel.utils.ExcelUtil;
 import com.ruoyi.system.service.ISysDictTypeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaIgnore;
-import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.core.config.RuoYiConfig;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.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/com/ruoyi/web/controller/system/SysLoginController.java

@@ -1,14 +1,14 @@
 package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaIgnore;
-import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.SysMenu;
+import com.ruoyi.system.domain.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.domain.model.SmsLoginBody;
-import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.system.domain.vo.RouterVo;
 import com.ruoyi.system.service.ISysMenuService;
 import com.ruoyi.system.service.ISysUserService;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -2,13 +2,13 @@ package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.tree.Tree;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.system.domain.SysMenu;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.service.ISysMenuService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -18,6 +18,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.ruoyi.common.satoken.utils.LoginHelper.getUserId;
+
 /**
  * 菜单信息
  *

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -1,12 +1,12 @@
 package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.datasource.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.datasource.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import lombok.RequiredArgsConstructor;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java

@@ -1,16 +1,16 @@
 package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.datasource.core.page.PageQuery;
-import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.datasource.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.web.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.bo.SysOssConfigBo;
 import com.ruoyi.system.domain.vo.SysOssConfigVo;
 import com.ruoyi.system.service.ISysOssConfigService;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java

@@ -6,18 +6,15 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpException;
 import cn.hutool.http.HttpUtil;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.datasource.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.datasource.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.core.utils.file.FileUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.oss.core.OssClient;
-import com.ruoyi.oss.factory.OssFactory;
-import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.domain.bo.SysOssBo;
 import com.ruoyi.system.domain.vo.SysOssVo;
 import com.ruoyi.system.service.ISysOssService;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -1,14 +1,14 @@
 package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.datasource.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.datasource.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.excel.utils.ExcelUtil;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.service.ISysPostService;
 import lombok.RequiredArgsConstructor;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -2,15 +2,15 @@ package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.io.FileUtil;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.SysUser;
-import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.utils.file.MimeTypeUtils;
+import com.ruoyi.common.core.utils.file.MimeTypeUtils;
 import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.domain.vo.SysOssVo;
 import com.ruoyi.system.service.ISysOssService;
@@ -25,6 +25,9 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.ruoyi.common.satoken.utils.LoginHelper.getUserId;
+import static com.ruoyi.common.satoken.utils.LoginHelper.getUsername;
+
 /**
  * 个人信息 业务处理
  *

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java

@@ -1,7 +1,7 @@
 package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaIgnore;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.model.RegisterBody;
 import com.ruoyi.system.service.ISysConfigService;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -2,19 +2,19 @@ package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.datasource.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.system.domain.SysDept;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.SysRole;
+import com.ruoyi.system.domain.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.datasource.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.excel.utils.ExcelUtil;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysRoleService;
@@ -29,6 +29,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.ruoyi.common.satoken.utils.LoginHelper.getLoginUser;
+
 /**
  * 角色信息
  *

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -6,21 +6,21 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.excel.core.ExcelResult;
-import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.datasource.core.page.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.system.domain.SysDept;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.SysRole;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.domain.SysUser;
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.datasource.core.page.TableDataInfo;
-import com.ruoyi.common.excel.ExcelResult;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.core.utils.StreamUtils;
-import com.ruoyi.common.utils.StreamUtils;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.excel.utils.ExcelUtil;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.vo.SysUserExportVo;
 import com.ruoyi.system.domain.vo.SysUserImportVo;
 import com.ruoyi.system.listener.SysUserImportListener;
@@ -40,6 +40,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.ruoyi.common.satoken.utils.LoginHelper.getUserId;
+
 /**
  * 用户信息
  *

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

@@ -1,7 +1,7 @@
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   url: http://localhost:9090/admin
   instance:
     service-host-type: IP
@@ -11,7 +11,7 @@ spring.boot.admin.client:
 --- # xxl-job 配置
 xxl.job:
   # 执行器开关
-  enabled: true
+  enabled: false
   # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
   admin-addresses: http://localhost:9100/xxl-job-admin
   # 执行器通讯TOKEN：非空时启用

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

@@ -27,7 +27,7 @@ captcha:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 9595
   servlet:
     # 应用的访问路径
     context-path: /
@@ -254,3 +254,6 @@ management:
       show-details: ALWAYS
     logfile:
       external-file: ./logs/sys-console.log
+  metrics:
+    tags:
+      application: ${spring.application.name}

ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java

@@ -1,6 +1,6 @@
 package com.ruoyi.test;
 
-import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.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/com/ruoyi/test/ParamUnitTest.java

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

ruoyi-common/pom.xml

@@ -14,8 +14,16 @@
         <module>ruoyi-common-core</module>
         <module>ruoyi-common-datasource</module>
         <module>ruoyi-common-dict</module>
-        <module>ruoyi-common-satoken</module>
+        <module>ruoyi-common-doc</module>
+        <module>ruoyi-common-excel</module>
+        <module>ruoyi-common-job</module>
+        <module>ruoyi-common-log</module>
+        <module>ruoyi-common-mail</module>
+        <module>ruoyi-common-oss</module>
         <module>ruoyi-common-redis</module>
+        <module>ruoyi-common-sms</module>
+        <module>ruoyi-common-satoken</module>
+        <module>ruoyi-common-web</module>
     </modules>
 
     <artifactId>ruoyi-common</artifactId>
@@ -25,30 +33,4 @@
         common通用模块
     </description>
 
-    <dependencies>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>jakarta.mail</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-webmvc-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-javadoc</artifactId>
-        </dependency>
-
-    </dependencies>
-
 </project>

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

@@ -36,9 +36,45 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- 接口模块 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-satoken</artifactId>
+                <artifactId>ruoyi-common-doc</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <!-- excel -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-excel</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <!-- 定时任务 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-job</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <!-- 日志记录 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-log</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <!-- 邮件服务 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-mail</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <!-- OSS -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-oss</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
@@ -48,6 +84,27 @@
                 <artifactId>ruoyi-common-redis</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
+            <!-- 安全模块 satoken -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-satoken</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <!-- 短信模块 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-sms</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <!-- web服务 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-web</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

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

@@ -28,6 +28,11 @@
             <artifactId>spring-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+        </dependency>
+
         <!-- 自定义验证注解 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -45,6 +50,10 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
 
         <!-- servlet包 -->
         <dependency>
@@ -93,7 +102,6 @@
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ThreadPoolConfig.java

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

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

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

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

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

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

@@ -1,7 +1,6 @@
 package com.ruoyi.common.core.domain.model;
 
 import com.ruoyi.common.core.domain.dto.RoleDTO;
-import com.ruoyi.common.helper.LoginHelper;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -111,7 +110,7 @@ public class LoginUser implements Serializable {
         if (userId == null) {
             throw new IllegalArgumentException("用户ID不能为空");
         }
-        return userType + LoginHelper.JOIN_CODE + userId;
+        return userType + ":" + userId;
     }
 
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/manager/ShutdownManager.java

@@ -1,6 +1,6 @@
-package com.ruoyi.framework.manager;
+package com.ruoyi.common.core.manager;
 
-import com.ruoyi.common.utils.Threads;
+import com.ruoyi.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/com/ruoyi/common/core/utils/MessageUtils.java

@@ -1,6 +1,5 @@
 package com.ruoyi.common.core.utils;
 
-import com.ruoyi.common.utils.spring.SpringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.springframework.context.MessageSource;

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java

@@ -1,9 +1,7 @@
 package com.ruoyi.common.core.web.controller;
 
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.helper.LoginHelper;
-import com.ruoyi.common.utils.StringUtils;
 
 /**
  * web层通用数据处理
@@ -39,31 +37,4 @@ public class BaseController {
         return StringUtils.format("redirect:{}", url);
     }
 
-    /**
-     * 获取用户缓存信息
-     */
-    public LoginUser getLoginUser() {
-        return LoginHelper.getLoginUser();
-    }
-
-    /**
-     * 获取登录用户id
-     */
-    public Long getUserId() {
-        return LoginHelper.getUserId();
-    }
-
-    /**
-     * 获取登录部门id
-     */
-    public Long getDeptId() {
-        return LoginHelper.getDeptId();
-    }
-
-    /**
-     * 获取登录用户名
-     */
-    public String getUsername() {
-        return LoginHelper.getUsername();
-    }
 }

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

@@ -1,5 +1,7 @@
-com.ruoyi.common.core.utils.SpringUtils
 com.ruoyi.common.core.config.ApplicationConfig
-com.ruoyi.common.core.config.JacksonConfig
-com.ruoyi.common.core.config.ValidatorConfig
 com.ruoyi.common.core.config.AsyncConfig
+com.ruoyi.common.core.config.JacksonConfig
+com.ruoyi.common.core.config.RuoYiConfig
+com.ruoyi.common.core.config.ThreadPoolConfig
+com.ruoyi.common.core.config.ValidatorConfig
+com.ruoyi.common.core.utils.SpringUtils

ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/handler/CreateAndUpdateMetaObjectHandler.java

@@ -3,9 +3,11 @@ package com.ruoyi.common.datasource.handler;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.satoken.utils.LoginHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
 

ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/handler/PlusDataPermissionHandler.java

@@ -6,17 +6,17 @@ import cn.hutool.core.collection.ConcurrentHashSet;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.common.annotation.DataColumn;
-import com.ruoyi.common.annotation.DataPermission;
 import com.ruoyi.common.core.domain.dto.RoleDTO;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.enums.DataScopeType;
+import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.helper.DataPermissionHelper;
+import com.ruoyi.common.core.utils.StreamUtils;
-import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.utils.StreamUtils;
+import com.ruoyi.common.datasource.annotation.DataColumn;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.datasource.annotation.DataPermission;
-import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.common.datasource.enums.DataScopeType;
+import com.ruoyi.common.datasource.helper.DataPermissionHelper;
+import com.ruoyi.common.satoken.utils.LoginHelper;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;

ruoyi-common/ruoyi-common-dict/pom.xml

@@ -11,5 +11,15 @@
 
     <artifactId>ruoyi-common-dict</artifactId>
 
+    <description>
+        ruoyi-common-dict 字典
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+    </dependencies>
 
 </project>

ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/annotation/DictDataMapper.java

@@ -1,8 +1,8 @@
-package com.ruoyi.common.annotation;
+package com.ruoyi.common.dict.annotation;
 
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.ruoyi.common.jackson.DictDataJsonSerializer;
+import com.ruoyi.common.dict.jackson.DictDataJsonSerializer;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/jackson/DictDataJsonSerializer.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.jackson;
+package com.ruoyi.common.dict.jackson;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.ruoyi.common.annotation.DictDataMapper;
 import com.ruoyi.common.core.service.DictService;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.dict.annotation.DictDataMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;
 

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

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>4.4.0</version>
+    </parent>
+
+    <artifactId>ruoyi-common-doc</artifactId>
+
+    <description>
+        ruoyi-common-swagger系统接口
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-webmvc-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-javadoc</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/SwaggerConfig.java

@@ -1,8 +1,8 @@
-package com.ruoyi.framework.config;
+package com.ruoyi.common.doc.config;
 
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.framework.config.properties.SwaggerProperties;
+import com.ruoyi.common.doc.config.properties.SwaggerProperties;
-import com.ruoyi.framework.handler.OpenApiHandler;
+import com.ruoyi.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/com/ruoyi/common/doc/config/properties/SwaggerProperties.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.config.properties;
+package com.ruoyi.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/com/ruoyi/common/doc/handler/OpenApiHandler.java

@@ -1,4 +1,4 @@
-package com.ruoyi.framework.handler;
+package com.ruoyi.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

@@ -0,0 +1 @@
+com.ruoyi.common.doc.config.SwaggerConfig

ruoyi-common/ruoyi-common-excel/pom.xml

@@ -2,34 +2,29 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common</artifactId>
         <version>4.4.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
-    <packaging>jar</packaging>
+    <artifactId>ruoyi-common-excel</artifactId>
-    <artifactId>ruoyi-job</artifactId>
 
     <description>
-        任务调度
+        ruoyi-common-excel
     </description>
 
     <dependencies>
-
-        <!-- 通用工具-->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common</artifactId>
+            <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 
-        <!-- xxl-job-core -->
         <dependency>
-            <groupId>com.xuxueli</groupId>
+            <groupId>com.alibaba</groupId>
-            <artifactId>xxl-job-core</artifactId>
+            <artifactId>easyexcel</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>
-

ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/annotation/CellMerge.java

@@ -1,6 +1,6 @@
-package com.ruoyi.common.annotation;
+package com.ruoyi.common.excel.annotation;
 
-import com.ruoyi.common.excel.CellMergeStrategy;
+import com.ruoyi.common.excel.core.CellMergeStrategy;
 
 import java.lang.annotation.*;
 

ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/annotation/ExcelDictFormat.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.ruoyi.common.excel.annotation;
 
 import java.lang.annotation.*;
 

ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/convert/ExcelBigNumberConvert.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.convert;
+package com.ruoyi.common.excel.convert;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;

ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/convert/ExcelDictConvert.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.convert;
+package com.ruoyi.common.excel.convert;
 
 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.convert.Convert;
@@ -9,11 +9,11 @@ import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.data.ReadCellData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.core.service.DictService;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.common.excel.annotation.ExcelDictFormat;
+import com.ruoyi.common.excel.utils.ExcelUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Field;

ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/CellMergeStrategy.java

@@ -1,8 +1,8 @@
-package com.ruoyi.common.excel;
+package com.ruoyi.common.excel.core;
 
 import com.alibaba.excel.metadata.Head;
 import com.alibaba.excel.write.merge.AbstractMergeStrategy;
-import com.ruoyi.common.annotation.CellMerge;
+import com.ruoyi.common.excel.annotation.CellMerge;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.SneakyThrows;

ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/DefaultExcelListener.java

@@ -1,13 +1,13 @@
-package com.ruoyi.common.excel;
+package com.ruoyi.common.excel.core;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.exception.ExcelAnalysisException;
 import com.alibaba.excel.exception.ExcelDataConvertException;
-import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.core.utils.JsonUtils;
-import com.ruoyi.common.utils.StreamUtils;
+import com.ruoyi.common.core.utils.StreamUtils;
-import com.ruoyi.common.utils.ValidatorUtils;
+import com.ruoyi.common.core.utils.ValidatorUtils;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/DefautExcelResult.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.excel;
+package com.ruoyi.common.excel.core;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Setter;

ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/ExcelListener.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.excel;
+package com.ruoyi.common.excel.core;
 
 import com.alibaba.excel.read.listener.ReadListener;
 

ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/ExcelResult.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.excel;
+package com.ruoyi.common.excel.core;
 
 import java.util.List;
 

ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/utils/ExcelUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.poi;
+package com.ruoyi.common.excel.utils;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.resource.ClassPathResource;
@@ -10,13 +10,13 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
-import com.ruoyi.common.convert.ExcelBigNumberConvert;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.excel.CellMergeStrategy;
+import com.ruoyi.common.core.utils.file.FileUtils;
-import com.ruoyi.common.excel.DefaultExcelListener;
+import com.ruoyi.common.excel.convert.ExcelBigNumberConvert;
-import com.ruoyi.common.excel.ExcelListener;
+import com.ruoyi.common.excel.core.CellMergeStrategy;
-import com.ruoyi.common.excel.ExcelResult;
+import com.ruoyi.common.excel.core.DefaultExcelListener;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.excel.core.ExcelListener;
-import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.excel.core.ExcelResult;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

ruoyi-common/ruoyi-common-job/pom.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>4.4.0</version>
+    </parent>
+
+    <artifactId>ruoyi-common-job</artifactId>
+
+    <description>
+        ruoyi-common-job 定时任务
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+
+        <!-- xxl-job-core -->
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/config/XxlJobConfig.java

@@ -1,6 +1,6 @@
-package com.ruoyi.job.config;
+package com.ruoyi.common.job.config;
 
-import com.ruoyi.job.config.properties.XxlJobProperties;
+import com.ruoyi.common.job.config.properties.XxlJobProperties;
 import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/config/properties/XxlJobProperties.java

@@ -1,4 +1,4 @@
-package com.ruoyi.job.config.properties;
+package com.ruoyi.common.job.config.properties;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

ruoyi-common/ruoyi-common-job/src/main/java/com/ruoyi/common/job/service/SampleService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.job.service;
+package com.ruoyi.common.job.service;
 
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;

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

@@ -0,0 +1 @@
+com.ruoyi.common.job.config.XxlJobConfig

ruoyi-common/ruoyi-common-log/pom.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>4.4.0</version>
+    </parent>
+
+    <artifactId>ruoyi-common-log</artifactId>
+
+    <description>
+        ruoyi-common-log日志记录
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-satoken</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.annotation;
+package com.ruoyi.common.log.annotation;
 
-import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.enums.OperatorType;
+import com.ruoyi.common.log.enums.OperatorType;
 
 import java.lang.annotation.*;
 

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java

@@ -1,22 +1,22 @@
-package com.ruoyi.framework.aspectj;
+package com.ruoyi.common.log.aspect;
 
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.utils.JsonUtils;
-import com.ruoyi.common.core.domain.event.OperLogEvent;
+import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.enums.BusinessStatus;
+import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.enums.HttpMethod;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.log.enums.BusinessStatus;
-import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.log.event.OperLogEvent;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.common.utils.spring.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Aspect;
+import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.enums;
+package com.ruoyi.common.log.enums;
 
 /**
  * 操作状态

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.enums;
+package com.ruoyi.common.log.enums;
 
 /**
  * 业务操作类型

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.enums;
+package com.ruoyi.common.log.enums;
 
 /**
  * 操作人类别

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/event/OperLogEvent.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.event;
+package com.ruoyi.common.log.event;
 
 import lombok.Data;
 

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

@@ -0,0 +1 @@
+com.ruoyi.common.log.aspect.LogAspect

ruoyi-common/ruoyi-common-mail/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>4.4.0</version>
+    </parent>
+
+    <artifactId>ruoyi-common-mail</artifactId>
+
+    <description>
+        ruoyi-common-mail 邮件模块
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>jakarta.mail</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfig.java

@@ -1,7 +1,7 @@
-package com.ruoyi.framework.config;
+package com.ruoyi.common.mail.config;
 
 import cn.hutool.extra.mail.MailAccount;
-import com.ruoyi.framework.config.properties.MailProperties;
+import com.ruoyi.common.mail.config.properties.MailProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/properties/MailProperties.java

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

ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/utils/MailUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.email;
+package com.ruoyi.common.mail.utils;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.IoUtil;
@@ -6,8 +6,8 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.mail.*;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

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

@@ -0,0 +1 @@
+com.ruoyi.common.mail.config.MailConfig

ruoyi-common/ruoyi-common-oss/pom.xml

@@ -2,32 +2,34 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common</artifactId>
         <version>4.4.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-oss</artifactId>
+    <artifactId>ruoyi-common-oss</artifactId>
 
     <description>
-        OSS对象存储模块
+        ruoyi-common-oss oss服务
     </description>
 
     <dependencies>
-
-        <!-- 通用工具-->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common</artifactId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
         </dependency>
 
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>

ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/constant/OssConstant.java

@@ -1,4 +1,4 @@
-package com.ruoyi.oss.constant;
+package com.ruoyi.common.oss.constant;
 
 import java.util.Arrays;
 import java.util.List;

ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/core/OssClient.java

@@ -1,4 +1,4 @@
-package com.ruoyi.oss.core;
+package com.ruoyi.common.oss.core;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
@@ -14,14 +14,14 @@ import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.*;
-import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.oss.constant.OssConstant;
+import com.ruoyi.common.oss.constant.OssConstant;
-import com.ruoyi.oss.entity.UploadResult;
+import com.ruoyi.common.oss.entity.UploadResult;
-import com.ruoyi.oss.enumd.AccessPolicyType;
+import com.ruoyi.common.oss.enumd.AccessPolicyType;
-import com.ruoyi.oss.enumd.PolicyType;
+import com.ruoyi.common.oss.enumd.PolicyType;
-import com.ruoyi.oss.exception.OssException;
+import com.ruoyi.common.oss.exception.OssException;
-import com.ruoyi.oss.properties.OssProperties;
+import com.ruoyi.common.oss.properties.OssProperties;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/entity/UploadResult.java

@@ -1,4 +1,4 @@
-package com.ruoyi.oss.entity;
+package com.ruoyi.common.oss.entity;
 
 import lombok.Builder;
 import lombok.Data;

ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/enumd/AccessPolicyType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.oss.enumd;
+package com.ruoyi.common.oss.enumd;
 
 import com.amazonaws.services.s3.model.CannedAccessControlList;
 import lombok.AllArgsConstructor;

ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/enumd/PolicyType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.oss.enumd;
+package com.ruoyi.common.oss.enumd;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/exception/OssException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.oss.exception;
+package com.ruoyi.common.oss.exception;
 
 /**
  * OSS异常类

ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/factory/OssFactory.java

@@ -1,14 +1,14 @@
-package com.ruoyi.oss.factory;
+package com.ruoyi.common.oss.factory;
 
-import com.ruoyi.common.constant.CacheNames;
+import com.ruoyi.common.core.constant.CacheNames;
-import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.core.utils.JsonUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.utils.redis.CacheUtils;
+import com.ruoyi.common.oss.constant.OssConstant;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.oss.core.OssClient;
-import com.ruoyi.oss.constant.OssConstant;
+import com.ruoyi.common.oss.exception.OssException;
-import com.ruoyi.oss.core.OssClient;
+import com.ruoyi.common.oss.properties.OssProperties;
-import com.ruoyi.oss.exception.OssException;
+import com.ruoyi.common.redis.utils.CacheUtils;
-import com.ruoyi.oss.properties.OssProperties;
+import com.ruoyi.common.redis.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;

ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/properties/OssProperties.java

@@ -1,4 +1,4 @@
-package com.ruoyi.oss.properties;
+package com.ruoyi.common.oss.properties;
 
 import lombok.Data;
 

ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/annotation/RateLimiter.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.annotation;
+package com.ruoyi.common.redis.annotation;
 
-import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.enums.LimitType;
+import com.ruoyi.common.redis.enums.LimitType;
 
 import java.lang.annotation.*;
 

ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/aspectj/RateLimiterAspect.java

@@ -1,11 +1,11 @@
-package com.ruoyi.framework.aspectj;
+package com.ruoyi.common.redis.aspectj;
 
-import com.ruoyi.common.annotation.RateLimiter;
+import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.enums.LimitType;
+import com.ruoyi.common.core.utils.MessageUtils;
-import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.common.redis.annotation.RateLimiter;
-import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.redis.enums.LimitType;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.redis.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;

ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/enums/LimitType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.enums;
+package com.ruoyi.common.redis.enums;
 
 /**
  * 限流类型

ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/core/service/SaPermissionImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.common.satoken.core.service;
 
 import cn.dev33.satoken.stp.StpInterface;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.enums.UserType;
 import com.ruoyi.common.satoken.utils.LoginHelper;
 import org.springframework.stereotype.Component;

ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/listener/UserActionListener.java

@@ -1,18 +1,18 @@
-package com.ruoyi.framework.listener;
+package com.ruoyi.common.satoken.listener;
 
 import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.listener.SaTokenListener;
 import cn.dev33.satoken.stp.SaLoginModel;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
-import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.constant.CacheConstants;
 import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.enums.UserType;
+import com.ruoyi.common.core.enums.UserType;
-import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.core.utils.ServletUtils;
-import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.core.utils.ip.AddressUtils;
-import com.ruoyi.common.utils.ip.AddressUtils;
+import com.ruoyi.common.redis.utils.RedisUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.common.satoken.utils.LoginHelper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java

@@ -5,6 +5,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.enums.DeviceType;
 import com.ruoyi.common.core.enums.UserType;
 import com.ruoyi.common.core.exception.UtilException;

ruoyi-common/ruoyi-common-sms/pom.xml

@@ -2,25 +2,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common</artifactId>
         <version>4.4.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-sms</artifactId>
+    <artifactId>ruoyi-common-sms</artifactId>
 
     <description>
-        SMS短信模块
+        ruoyi-common-sms 短信模块
     </description>
 
     <dependencies>
-
-        <!-- 通用工具-->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common</artifactId>
+            <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 
         <dependency>
@@ -32,9 +30,7 @@
         <dependency>
             <groupId>com.tencentcloudapi</groupId>
             <artifactId>tencentcloud-sdk-java-sms</artifactId>
-            <optional>true</optional>
         </dependency>
-
     </dependencies>
 
 </project>

ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java

@@ -1,9 +1,9 @@
-package com.ruoyi.sms.config;
+package com.ruoyi.common.sms.config;
 
-import com.ruoyi.sms.config.properties.SmsProperties;
+import com.ruoyi.common.sms.config.properties.SmsProperties;
-import com.ruoyi.sms.core.AliyunSmsTemplate;
+import com.ruoyi.common.sms.core.AliyunSmsTemplate;
-import com.ruoyi.sms.core.SmsTemplate;
+import com.ruoyi.common.sms.core.SmsTemplate;
-import com.ruoyi.sms.core.TencentSmsTemplate;
+import com.ruoyi.common.sms.core.TencentSmsTemplate;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;