diff --git a/pom.xml b/pom.xml index 1121934..acb7fc6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,7 @@ RuoYi-Vue-Plus + 4.8.2 4.8.2 2.7.18 UTF-8 @@ -76,6 +77,13 @@ + + com.ruoyi + ruoyi-component-bom + ${revision} + pom + import + @@ -142,6 +150,11 @@ sa-token-spring-boot-starter ${satoken.version} + + cn.dev33 + sa-token-core + ${satoken.version} + cn.dev33 @@ -307,13 +320,9 @@ ruoyi-admin - ruoyi-framework ruoyi-system - ruoyi-job - ruoyi-generator - ruoyi-common - ruoyi-oss ruoyi-dk + ruoyi-component pom diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 825c72d..35368d6 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -43,13 +43,6 @@ com.microsoft.sqlserver mssql-jdbc - - - - com.ruoyi - ruoyi-framework - - com.ruoyi ruoyi-system @@ -60,28 +53,19 @@ - - - com.ruoyi - ruoyi-job - - - - com.ruoyi - ruoyi-oss - - com.ruoyi - ruoyi-generator + ruoyi-component-generator + + + com.ruoyi + ruoyi-component-sms - com.ruoyi ruoyi-dk - org.springframework.boot spring-boot-starter-test diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/OnlineUserTodayCache.java b/ruoyi-admin/src/main/java/com/ruoyi/web/cache/OnlineUserTodayCache.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/OnlineUserTodayCache.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/cache/OnlineUserTodayCache.java index 303a302..ddb9343 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/OnlineUserTodayCache.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/cache/OnlineUserTodayCache.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework; +package com.ruoyi.web.cache; -import com.ruoyi.common.constant.CacheConstants; +import com.ruoyi.component.core.constant.CacheConstants; import org.redisson.api.RSet; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; @@ -8,7 +8,6 @@ import org.springframework.stereotype.Component; import java.time.Duration; import java.time.LocalDate; -import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Set; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java index 604b5df..34d11de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java @@ -5,17 +5,17 @@ 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.constant.Constants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.enums.CaptchaType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.email.MailUtils; -import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.CaptchaProperties; -import com.ruoyi.framework.config.properties.MailProperties; +import com.ruoyi.component.core.constant.CacheConstants; +import com.ruoyi.component.core.constant.Constants; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.reflect.ReflectUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; +import com.ruoyi.component.mail.config.properties.MailProperties; +import com.ruoyi.component.mail.utils.MailUtils; +import com.ruoyi.component.redis.util.RedisUtils; +import com.ruoyi.component.web.config.properties.CaptchaProperties; +import com.ruoyi.component.web.enums.CaptchaType; import com.ruoyi.system.service.ISysConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java index f0ecce1..9e6bf10 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java +++ b/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.constant.CacheNames; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.CacheUtils; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.component.core.constant.CacheConstants; +import com.ruoyi.component.core.constant.CacheNames; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.json.utils.JsonUtils; +import com.ruoyi.component.redis.util.CacheUtils; +import com.ruoyi.component.redis.util.RedisUtils; import com.ruoyi.system.domain.SysCache; import lombok.RequiredArgsConstructor; import org.redisson.spring.data.connection.RedissonConnectionFactory; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java index caae8b0..d41ad46 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/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.constant.CacheConstants; -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.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.component.core.constant.CacheConstants; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.excel.utils.ExcelUtil; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.redis.util.RedisUtils; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.service.ISysLogininforService; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index 468b9c4..6688307 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/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.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.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.excel.utils.ExcelUtil; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.service.ISysOperLogService; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java index 17e6d5a..fef4df9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/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.constant.CacheConstants; -import com.ruoyi.common.core.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.enums.BusinessType; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.component.core.constant.CacheConstants; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.domain.dto.UserOnlineDTO; +import com.ruoyi.component.core.util.StreamUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.redis.util.RedisUtils; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.system.domain.SysUserOnline; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index f5cb2a5..ed2bcbb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -1,14 +1,13 @@ package com.ruoyi.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -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.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.excel.utils.ExcelUtil; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.service.ISysConfigService; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index a54483c..833d92e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/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.convert.Convert; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.web.core.BaseController; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.component.core.util.StringUtils; import com.ruoyi.system.service.ISysDeptService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index 01613db..007c8a9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/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.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.excel.utils.ExcelUtil; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; +import com.ruoyi.system.domain.SysDictData; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictTypeService; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index e6beb64..d6adb0f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -1,15 +1,14 @@ package com.ruoyi.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -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.domain.entity.SysDictType; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.excel.utils.ExcelUtil; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; +import com.ruoyi.system.domain.SysDictType; import com.ruoyi.system.service.ISysDictTypeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index f982a5f..a2b0769 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -1,15 +1,15 @@ package com.ruoyi.web.controller.system; import cn.dev33.satoken.annotation.SaIgnore; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.EmailLoginBody; -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.component.core.constant.Constants; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.system.domain.SysMenu; +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.component.core.domain.model.EmailLoginBody; +import com.ruoyi.component.core.domain.model.LoginBody; +import com.ruoyi.component.core.domain.model.LoginUser; +import com.ruoyi.component.core.domain.model.SmsLoginBody; +import com.ruoyi.component.satoken.utils.LoginHelper; import com.ruoyi.system.domain.vo.RouterVo; import com.ruoyi.system.service.ISysMenuService; import com.ruoyi.system.service.ISysUserService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java index 1f13861..8a1d018 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -2,13 +2,14 @@ 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.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.web.core.BaseController; +import com.ruoyi.system.domain.SysMenu; +import com.ruoyi.component.core.util.StringUtils; import com.ruoyi.system.service.ISysMenuService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -37,7 +38,7 @@ public class SysMenuController extends BaseController { @SaCheckPermission("system:menu:list") @GetMapping("/list") public R> list(SysMenu menu) { - List menus = menuService.selectMenuList(menu, getUserId()); + List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); return R.ok(menus); } @@ -57,7 +58,7 @@ public class SysMenuController extends BaseController { */ @GetMapping("/treeselect") public R>> treeselect(SysMenu menu) { - List menus = menuService.selectMenuList(menu, getUserId()); + List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); return R.ok(menuService.buildMenuTreeSelect(menus)); } @@ -68,7 +69,7 @@ public class SysMenuController extends BaseController { */ @GetMapping(value = "/roleMenuTreeselect/{roleId}") public R> roleMenuTreeselect(@PathVariable("roleId") Long roleId) { - List menus = menuService.selectMenuList(getUserId()); + List menus = menuService.selectMenuList(LoginHelper.getUserId()); Map ajax = new HashMap<>(); ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); ajax.put("menus", menuService.buildMenuTreeSelect(menus)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index 54b30d6..9072d45 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/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.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.enums.BusinessType; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.service.ISysNoticeService; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java index 8dc4876..29427ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java +++ b/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.annotation.RepeatSubmit; -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.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.component.core.domain.R; +import com.ruoyi.component.core.validate.AddGroup; +import com.ruoyi.component.core.validate.EditGroup; +import com.ruoyi.component.core.validate.QueryGroup; +import com.ruoyi.component.idempotent.annotation.RepeatSubmit; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.system.domain.bo.SysOssConfigBo; import com.ruoyi.system.domain.vo.SysOssConfigVo; import com.ruoyi.system.service.ISysOssConfigService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java index e38bb98..5dc8773 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java @@ -3,13 +3,13 @@ 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.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.core.validate.QueryGroup; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.validate.QueryGroup; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.system.domain.bo.SysOssBo; import com.ruoyi.system.domain.vo.SysOssVo; import com.ruoyi.system.service.ISysOssService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java index 429256a..858db2d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/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.constant.UserConstants; -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.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.excel.utils.ExcelUtil; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.service.ISysPostService; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 707c003..93bffbd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -2,16 +2,14 @@ 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.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.MimeTypeUtils; -import com.ruoyi.system.domain.SysOss; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.web.core.BaseController; +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.file.MimeTypeUtils; import com.ruoyi.system.domain.vo.SysOssVo; import com.ruoyi.system.service.ISysOssService; import com.ruoyi.system.service.ISysUserService; @@ -44,7 +42,7 @@ public class SysProfileController extends BaseController { */ @GetMapping public R> profile() { - SysUser user = userService.selectUserById(getUserId()); + SysUser user = userService.selectUserById(LoginHelper.getUserId()); Map ajax = new HashMap<>(); ajax.put("user", user); ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName())); @@ -64,7 +62,7 @@ public class SysProfileController extends BaseController { if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } - user.setUserId(getUserId()); + user.setUserId(LoginHelper.getUserId()); user.setUserName(null); user.setPassword(null); user.setAvatar(null); @@ -116,7 +114,7 @@ public class SysProfileController extends BaseController { } SysOssVo oss = iSysOssService.upload(avatarfile); String avatar = oss.getUrl(); - if (userService.updateUserAvatar(getUsername(), avatar)) { + if (userService.updateUserAvatar(LoginHelper.getUsername(), avatar)) { ajax.put("imgUrl", avatar); return R.ok(ajax); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index 2644582..206cf87 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -1,9 +1,9 @@ package com.ruoyi.web.controller.system; import cn.dev33.satoken.annotation.SaIgnore; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.model.RegisterBody; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.domain.model.RegisterBody; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.SysRegisterService; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 97d7b3c..dbca995 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.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.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.excel.utils.ExcelUtil; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysRoleService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index d055e71..6a0ce72 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/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.constant.UserConstants; -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.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.excel.ExcelResult; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.excel.core.ExcelResult; +import com.ruoyi.component.excel.utils.ExcelUtil; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.StreamUtils; +import com.ruoyi.component.core.util.StringUtils; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.vo.SysUserExportVo; import com.ruoyi.system.domain.vo.SysUserImportVo; @@ -182,7 +182,7 @@ public class SysUserController extends BaseController { @Log(title = "用户管理", businessType = BusinessType.DELETE) @DeleteMapping("/{userIds}") public R remove(@PathVariable Long[] userIds) { - if (ArrayUtil.contains(userIds, getUserId())) { + if (ArrayUtil.contains(userIds, LoginHelper.getUserId())) { return R.fail("当前用户不能删除"); } return toAjax(userService.deleteUserByIds(userIds)); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java b/ruoyi-admin/src/main/java/com/ruoyi/web/listener/UserActionListener.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/listener/UserActionListener.java index 1ca6d3e..f8f44ef 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/listener/UserActionListener.java @@ -1,19 +1,19 @@ -package com.ruoyi.framework.listener; +package com.ruoyi.web.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.domain.dto.UserOnlineDTO; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.framework.OnlineUserTodayCache; +import com.ruoyi.component.core.constant.CacheConstants; +import com.ruoyi.component.core.domain.dto.UserOnlineDTO; +import com.ruoyi.component.core.domain.model.LoginUser; +import com.ruoyi.component.core.enums.UserType; +import com.ruoyi.component.redis.util.RedisUtils; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.ServletUtils; +import com.ruoyi.component.core.util.ip.AddressUtils; +import com.ruoyi.web.cache.OnlineUserTodayCache; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/manager/ShutdownManager.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/manager/ShutdownManager.java index 9d27874..199aefb 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/manager/ShutdownManager.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.manager; +package com.ruoyi.web.manager; -import com.ruoyi.common.utils.Threads; +import com.ruoyi.component.core.util.Threads; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java index a40fd82..4abd058 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java +++ b/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.component.core.config.RuoYiConfig; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java index 04bf1b5..be65033 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java +++ b/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.component.core.enums.UserType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml deleted file mode 100644 index 1c72ef2..0000000 --- a/ruoyi-common/pom.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - dk-sass-server - com.ruoyi - 4.8.2 - - 4.0.0 - - ruoyi-common - - - common通用工具 - - - - - - - org.springframework - spring-context-support - - - - - org.springframework - spring-web - - - - - cn.dev33 - sa-token-spring-boot-starter - - - - cn.dev33 - sa-token-jwt - - - - - org.springframework.boot - spring-boot-starter-validation - - - - - org.apache.commons - commons-lang3 - - - - - com.fasterxml.jackson.core - jackson-databind - - - - com.alibaba - easyexcel - - - - - org.yaml - snakeyaml - - - - - javax.servlet - javax.servlet-api - - - - com.baomidou - mybatis-plus-boot-starter - - - - - com.baomidou - dynamic-datasource-spring-boot-starter - - - - cn.hutool - hutool-core - - - - cn.hutool - hutool-http - - - - cn.hutool - hutool-captcha - - - - cn.hutool - hutool-jwt - - - - cn.hutool - hutool-extra - - - - com.sun.mail - jakarta.mail - - - - org.projectlombok - lombok - - - - org.springframework.boot - spring-boot-configuration-processor - - - - - org.redisson - redisson-spring-boot-starter - - - - org.redisson - redisson-spring-data-27 - - - - com.baomidou - lock4j-redisson-spring-boot-starter - - - - - org.bouncycastle - bcprov-jdk15to18 - - - - com.github.xiaoymin - knife4j-openapi3-spring-boot-starter - - - - - org.lionsoul - ip2region - - - - com.google.guava - guava - 27.0.1-jre - - - - org.springframework.boot - spring-boot-starter-amqp - - - com.alibaba - fastjson - 2.0.32 - - - - diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java deleted file mode 100644 index 564b2a4..0000000 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.ruoyi.common.annotation; - -import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.ruoyi.common.jackson.DictDataJsonSerializer; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 字典数据映射注解 - * - * @author itino - * @deprecated 建议使用通用翻译注解 - */ -@Deprecated -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.METHOD}) -@JacksonAnnotationsInside -@JsonSerialize(using = DictDataJsonSerializer.class) -public @interface DictDataMapper { - - /** - * 设置字典的type值 (如: sys_user_sex) - */ - String dictType() default ""; -} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBaseUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBaseUser.java deleted file mode 100644 index 23891e0..0000000 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBaseUser.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ruoyi.common.core.domain.model; - -import lombok.Getter; -import lombok.Setter; - -import java.io.Serializable; - -@Getter -@Setter -public class LoginBaseUser implements Serializable { - private Long userId; - private String userType; - - public String getLoginId() { - if (userId == null) { - throw new IllegalArgumentException("用户ID不能为空"); - } - return getUserType() + ":" + userId; - } - -} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java b/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java deleted file mode 100644 index 5fbf051..0000000 --- a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.ruoyi.common.jackson; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.BeanProperty; -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.utils.spring.SpringUtils; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeansException; - -import java.io.IOException; -import java.util.Objects; - -/** - * 字典数据json序列化工具 - * - * @author itino - * @deprecated 建议使用通用翻译注解 - */ -@Deprecated -@Slf4j -public class DictDataJsonSerializer extends JsonSerializer implements ContextualSerializer { - - private String dictType; - - @Override - public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException { - try { - DictService dictService = SpringUtils.getBean(DictService.class); - if (ObjectUtil.isNotNull(dictService)) { - String label = dictService.getDictLabel(dictType, value); - gen.writeString(StringUtils.isNotBlank(label) ? label : value); - } else { - gen.writeString(value); - } - } catch (BeansException e) { - log.error("字典数据未查到, 采用默认处理 => {}", e.getMessage()); - gen.writeString(value); - } - } - - @Override - public JsonSerializer createContextual(SerializerProvider prov, BeanProperty property) throws JsonMappingException { - DictDataMapper anno = property.getAnnotation(DictDataMapper.class); - if (Objects.nonNull(anno) && StrUtil.isNotBlank(anno.dictType())) { - this.dictType = anno.dictType(); - return this; - } - return prov.findValueSerializer(property.getType(), property); - } -} diff --git a/ruoyi-component/pom.xml b/ruoyi-component/pom.xml new file mode 100644 index 0000000..f250ee2 --- /dev/null +++ b/ruoyi-component/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + com.ruoyi + dk-sass-server + 4.8.2 + + ruoyi-component + pom + + ruoyi-component-bom + ruoyi-component-tenant + ruoyi-component-core + ruoyi-component-redis + ruoyi-component-satoken + ruoyi-component-security + ruoyi-component-mybatis + ruoyi-component-log + ruoyi-component-json + ruoyi-component-excel + ruoyi-component-idempotent + ruoyi-component-ratelimiter + ruoyi-component-sensitive + ruoyi-component-translation + ruoyi-component-web + ruoyi-component-mail + ruoyi-component-encrypt + ruoyi-component-job + ruoyi-component-oss + ruoyi-component-generator + ruoyi-component-sms + + + + diff --git a/ruoyi-component/ruoyi-component-bom/pom.xml b/ruoyi-component/ruoyi-component-bom/pom.xml new file mode 100644 index 0000000..76a07b3 --- /dev/null +++ b/ruoyi-component/ruoyi-component-bom/pom.xml @@ -0,0 +1,117 @@ + + 4.0.0 + com.ruoyi + ruoyi-component-bom + ${revision} + pom + + + 4.8.2 + + + + + + com.ruoyi + ruoyi-component-core + ${revision} + + + com.ruoyi + ruoyi-component-redis + ${revision} + + + com.ruoyi + ruoyi-component-tenant + ${revision} + + + com.ruoyi + ruoyi-component-satoken + ${revision} + + + com.ruoyi + ruoyi-component-security + ${revision} + + + com.ruoyi + ruoyi-component-mybatis + ${revision} + + + com.ruoyi + ruoyi-component-json + ${revision} + + + com.ruoyi + ruoyi-component-log + ${revision} + + + com.ruoyi + ruoyi-component-excel + ${revision} + + + com.ruoyi + ruoyi-component-idempotent + ${revision} + + + com.ruoyi + ruoyi-component-web + ${revision} + + + com.ruoyi + ruoyi-component-translation + ${revision} + + + com.ruoyi + ruoyi-component-sensitive + ${revision} + + + com.ruoyi + ruoyi-component-ratelimiter + ${revision} + + + com.ruoyi + ruoyi-component-job + ${revision} + + + com.ruoyi + ruoyi-component-oss + ${revision} + + + com.ruoyi + ruoyi-component-generator + ${revision} + + + com.ruoyi + ruoyi-component-encrypt + ${revision} + + + com.ruoyi + ruoyi-component-mail + ${revision} + + + com.ruoyi + ruoyi-component-sms + ${revision} + + + + diff --git a/ruoyi-component/ruoyi-component-core/pom.xml b/ruoyi-component/ruoyi-component-core/pom.xml new file mode 100644 index 0000000..8cc90bd --- /dev/null +++ b/ruoyi-component/ruoyi-component-core/pom.xml @@ -0,0 +1,84 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-core + jar + + UTF-8 + + + + + org.projectlombok + lombok + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.springframework + spring-context-support + + + + javax.servlet + javax.servlet-api + + + + org.springframework.boot + spring-boot-starter-aop + + + + org.yaml + snakeyaml + + + + org.springframework + spring-web + + + + org.apache.commons + commons-lang3 + + + com.google.guava + guava + 27.0.1-jre + + + cn.hutool + hutool-core + + + cn.hutool + hutool-http + + + cn.hutool + hutool-extra + + + + org.lionsoul + ip2region + + + + org.springframework.boot + spring-boot-configuration-processor + + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ApplicationConfig.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ApplicationConfig.java index 072eef9..4404821 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.core.config; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/AsyncConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/AsyncConfig.java index d011b58..0c70e1c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/AsyncConfig.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.core.config; import cn.hutool.core.util.ArrayUtil; -import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.component.core.exception.ServiceException; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/RuoYiConfig.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/RuoYiConfig.java index 70c3d29..0d12cb3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/RuoYiConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.config; +package com.ruoyi.component.core.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ThreadPoolConfig.java similarity index 77% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ThreadPoolConfig.java index cb5b99d..0c6b178 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ThreadPoolConfig.java @@ -1,12 +1,13 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.core.config; -import com.ruoyi.common.utils.Threads; -import com.ruoyi.framework.config.properties.ThreadPoolProperties; +import com.ruoyi.component.core.config.properties.ThreadPoolProperties; +import com.ruoyi.component.core.util.Threads; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.ScheduledExecutorService; @@ -18,7 +19,9 @@ import java.util.concurrent.ThreadPoolExecutor; * * @author Lion Li **/ -@Configuration +@Slf4j +@AutoConfiguration +@EnableConfigurationProperties(ThreadPoolProperties.class) public class ThreadPoolConfig { /** @@ -27,12 +30,10 @@ public class ThreadPoolConfig { // private final int core = Runtime.getRuntime().availableProcessors() + 1; private final int core = 6 + 1; - @Autowired - private ThreadPoolProperties threadPoolProperties; @Bean(name = "threadPoolTaskExecutor") @ConditionalOnProperty(prefix = "thread-pool", name = "enabled", havingValue = "true") - public ThreadPoolTaskExecutor threadPoolTaskExecutor() { + public ThreadPoolTaskExecutor threadPoolTaskExecutor(ThreadPoolProperties threadPoolProperties) { ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); executor.setCorePoolSize(core); executor.setMaxPoolSize(core * 2); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ValidatorConfig.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ValidatorConfig.java index 0a2007c..c695e7b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/ValidatorConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.core.config; import org.hibernate.validator.HibernateValidator; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/properties/ThreadPoolProperties.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/properties/ThreadPoolProperties.java index fe06733..db18879 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/config/properties/ThreadPoolProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.component.core.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/CacheConstants.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/CacheConstants.java index 3621b8d..58792a8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/CacheConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.component.core.constant; /** * 缓存的key 常量 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheNames.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/CacheNames.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheNames.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/CacheNames.java index 1396b6d..2442a26 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheNames.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/CacheNames.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.component.core.constant; /** * 缓存组名称常量 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/Constants.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/Constants.java index e634ed2..eec0ba5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/Constants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.component.core.constant; /** * 通用常量信息 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/DateConstant.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/DateConstant.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/DateConstant.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/DateConstant.java index 4667557..4d35c64 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/DateConstant.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/DateConstant.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.component.core.constant; /** *

created on 2021/7/15

diff --git a/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/GlobalConstants.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/GlobalConstants.java new file mode 100644 index 0000000..9d2c292 --- /dev/null +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/GlobalConstants.java @@ -0,0 +1,39 @@ +package com.ruoyi.component.core.constant; + +/** + * 全局的key常量 (业务无关的key) + * + * @author Lion Li + */ +public interface GlobalConstants { + + /** + * 全局 redis key (业务无关的key) + */ + String GLOBAL_REDIS_KEY = "global:"; + + /** + * 验证码 redis key + */ + String CAPTCHA_CODE_KEY = GLOBAL_REDIS_KEY + "captcha_codes:"; + + /** + * 防重提交 redis key + */ + String REPEAT_SUBMIT_KEY = GLOBAL_REDIS_KEY + "repeat_submit:"; + + /** + * 限流 redis key + */ + String RATE_LIMIT_KEY = GLOBAL_REDIS_KEY + "rate_limit:"; + + /** + * 登录账户密码错误次数 redis key + */ + String PWD_ERR_CNT_KEY = GLOBAL_REDIS_KEY + "pwd_err_cnt:"; + + /** + * 三方认证 redis key + */ + String SOCIAL_AUTH_CODE_KEY = GLOBAL_REDIS_KEY + "social_auth_codes:"; +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/HttpStatus.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/HttpStatus.java index f007b8c..d06901d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/HttpStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.component.core.constant; /** * 返回状态码 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/UserConstants.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/UserConstants.java index 61552f8..c69e3df 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/constant/UserConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.component.core.constant; /** * 用户常量信息 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/R.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/R.java index 381a6f6..e0876a1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/R.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.domain; +package com.ruoyi.component.core.domain; -import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.component.core.constant.HttpStatus; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/dto/RoleDTO.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/dto/RoleDTO.java index e25243f..557e97b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/dto/RoleDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.dto; +package com.ruoyi.component.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/dto/UserOnlineDTO.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/dto/UserOnlineDTO.java index 3a221aa..4398ac2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/dto/UserOnlineDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.dto; +package com.ruoyi.component.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/EmailLoginBody.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/EmailLoginBody.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/EmailLoginBody.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/EmailLoginBody.java index 692a210..c007349 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/EmailLoginBody.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/EmailLoginBody.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.model; +package com.ruoyi.component.core.domain.model; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/LoginBody.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/LoginBody.java index 4a4cfb5..43a3c31 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/LoginBody.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.domain.model; +package com.ruoyi.component.core.domain.model; -import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.component.core.constant.UserConstants; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/LoginUser.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/LoginUser.java index 83fcf9f..5a58f7e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/LoginUser.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.domain.model; +package com.ruoyi.component.core.domain.model; -import com.ruoyi.common.core.domain.dto.RoleDTO; +import com.ruoyi.component.core.domain.dto.RoleDTO; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/RegisterBody.java similarity index 68% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/RegisterBody.java index 88367e7..0c6d69b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/RegisterBody.java @@ -1,5 +1,6 @@ -package com.ruoyi.common.core.domain.model; +package com.ruoyi.component.core.domain.model; +import com.ruoyi.component.core.domain.model.LoginBody; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/SmsLoginBody.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/SmsLoginBody.java index b12e74c..eda5b7d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/SmsLoginBody.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.model; +package com.ruoyi.component.core.domain.model; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/XcxLoginUser.java similarity index 78% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/XcxLoginUser.java index 83313a0..bc08f99 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/domain/model/XcxLoginUser.java @@ -1,5 +1,6 @@ -package com.ruoyi.common.core.domain.model; +package com.ruoyi.component.core.domain.model; +import com.ruoyi.component.core.domain.model.LoginUser; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/DeviceType.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/DeviceType.java index 118a212..ac1cb45 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/DeviceType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/HttpMethod.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/HttpMethod.java index bd1bfcc..7698ef1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/HttpMethod.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.core.enums; import org.springframework.lang.Nullable; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LoginType.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/LoginType.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/LoginType.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/LoginType.java index 875e476..69fd2e7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LoginType.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/LoginType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/UserStatus.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/UserStatus.java index 673ddeb..6ed701d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/UserStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.core.enums; /** * 用户状态 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/UserType.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/UserType.java index ec6510d..1a3883f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/enums/UserType.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.core.enums; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/CustomException.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/CustomException.java index 5890661..a9faa7b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/CustomException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.ruoyi.component.core.exception; import cn.hutool.http.HttpStatus; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/DemoModeException.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/DemoModeException.java index 9178131..ae77d16 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/DemoModeException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.ruoyi.component.core.exception; /** * 演示模式异常 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/GlobalException.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/GlobalException.java index 080785c..d3d3416 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/GlobalException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.ruoyi.component.core.exception; /** * 全局异常 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/ServiceException.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/ServiceException.java index af2d982..14d3067 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/ServiceException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.ruoyi.component.core.exception; /** * 业务异常 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/UtilException.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/UtilException.java index 01cc878..9e57cf5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/UtilException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.ruoyi.component.core.exception; /** * 工具类异常 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/base/BaseException.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/base/BaseException.java index d06617c..b15ea8d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/base/BaseException.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.exception.base; +package com.ruoyi.component.core.exception.base; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.MessageUtils; +import com.ruoyi.component.core.util.StringUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/file/FileException.java similarity index 70% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/file/FileException.java index 794f4e1..0f180f9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/file/FileException.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.exception.file; +package com.ruoyi.component.core.exception.file; -import com.ruoyi.common.exception.base.BaseException; +import com.ruoyi.component.core.exception.base.BaseException; /** * 文件信息异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/file/FileNameLengthLimitExceededException.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/file/FileNameLengthLimitExceededException.java index 64a5020..6fc471c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/file/FileNameLengthLimitExceededException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.ruoyi.component.core.exception.file; /** * 文件名称超长限制异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/file/FileSizeLimitExceededException.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/file/FileSizeLimitExceededException.java index 93e9e1c..2bac330 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/file/FileSizeLimitExceededException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.ruoyi.component.core.exception.file; /** * 文件名大小限制异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/CaptchaException.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/CaptchaException.java index 2345c20..3c2cabf 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/CaptchaException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.ruoyi.component.core.exception.user; /** * 验证码错误异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/CaptchaExpireException.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/CaptchaExpireException.java index bb4c037..26054d6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/CaptchaExpireException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.ruoyi.component.core.exception.user; /** * 验证码失效异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/UserException.java similarity index 70% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/UserException.java index 99a8880..4939cfe 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/UserException.java @@ -1,6 +1,7 @@ -package com.ruoyi.common.exception.user; +package com.ruoyi.component.core.exception.user; -import com.ruoyi.common.exception.base.BaseException; + +import com.ruoyi.component.core.exception.base.BaseException; /** * 用户信息异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/UserPasswordNotMatchException.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/UserPasswordNotMatchException.java index 863ba76..37690fb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/UserPasswordNotMatchException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.ruoyi.component.core.exception.user; /** * 用户密码不正确或不符合规范异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/UserPasswordRetryLimitExceedException.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/UserPasswordRetryLimitExceedException.java index 3d2b640..31fb806 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/exception/user/UserPasswordRetryLimitExceedException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.ruoyi.component.core.exception.user; /** * 用户错误最大次数异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/ConfigService.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/ConfigService.java index c6badf6..7289199 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/ConfigService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.ruoyi.component.core.service; /** * 通用 参数配置服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DeptService.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/DeptService.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/DeptService.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/DeptService.java index c27f461..3c47c29 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DeptService.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/DeptService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.ruoyi.component.core.service; /** * 通用 部门服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/DictService.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/DictService.java index a4dbfd5..978a041 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/DictService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.ruoyi.component.core.service; import java.util.Map; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/OssService.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/OssService.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/OssService.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/OssService.java index 65dda7c..8529613 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/OssService.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/OssService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.ruoyi.component.core.service; /** * 通用 OSS服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/UserService.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/UserService.java index d2206c8..e606a50 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/service/UserService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.ruoyi.component.core.service; /** * 通用 用户服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanConvertUtil.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/BeanConvertUtil.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanConvertUtil.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/BeanConvertUtil.java index 3204b56..b917bca 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanConvertUtil.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/BeanConvertUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.core.util; import com.google.common.collect.Lists; import org.springframework.beans.BeanUtils; @@ -9,7 +9,6 @@ import java.util.function.Supplier; /** * bean工具 - * @Author: 004795 * @Date: 2022/5/24 11:11 */ public class BeanConvertUtil extends BeanUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/BeanCopyUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/BeanCopyUtils.java index d5b3414..7b00530 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/BeanCopyUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.core.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.SimpleCache; @@ -6,6 +6,7 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; +import com.ruoyi.component.core.util.StreamUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.cglib.beans.BeanCopier; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/DateUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/DateUtils.java index c64f1f8..ff8022f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.core.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MapGetUtil.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/MapGetUtil.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/MapGetUtil.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/MapGetUtil.java index 86c59f7..abcb41e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MapGetUtil.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/MapGetUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.core.util; import java.math.BigDecimal; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/MessageUtils.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/MessageUtils.java index c9c091d..c3475b1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/MessageUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.core.util; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.context.MessageSource; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/ServletUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/ServletUtils.java index dad7715..42f4242 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/ServletUtils.java @@ -1,10 +1,9 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.core.util; import cn.hutool.core.convert.Convert; import cn.hutool.extra.servlet.ServletUtil; -import cn.hutool.http.Header; import cn.hutool.http.HttpStatus; -import com.ruoyi.common.constant.Constants; +import com.ruoyi.component.core.constant.Constants; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.http.MediaType; @@ -21,11 +20,9 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.nio.file.attribute.FileTime; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.UUID; /** * 客户端工具类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StreamUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/StreamUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/StreamUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/StreamUtils.java index 72c2f93..70fee7b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StreamUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/StreamUtils.java @@ -1,7 +1,8 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.core.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; +import com.ruoyi.component.core.util.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/StringUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/StringUtils.java index 2a5bd48..a8a7b23 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/StringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.core.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/Threads.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/Threads.java index 1952929..3c2d966 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/Threads.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.core.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/TreeBuildUtils.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/TreeBuildUtils.java index f9f8fa1..f4773b7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/TreeBuildUtils.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.core.util; 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.utils.reflect.ReflectUtils; +import com.ruoyi.component.core.util.reflect.ReflectUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ValidatorUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/ValidatorUtils.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ValidatorUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/ValidatorUtils.java index 1fe2eaf..2cb863f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ValidatorUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/ValidatorUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.core.util; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/file/FileUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/file/FileUtils.java index 1ef2229..93d3315 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/file/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.ruoyi.component.core.util.file; import cn.hutool.core.io.FileUtil; import lombok.AccessLevel; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/file/MimeTypeUtils.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/file/MimeTypeUtils.java index 6ca97fe..6edfd42 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/file/MimeTypeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.ruoyi.component.core.util.file; /** * 媒体类型工具类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/ip/AddressUtils.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/ip/AddressUtils.java index 647d2a2..25f0f93 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/ip/AddressUtils.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.utils.ip; +package com.ruoyi.component.core.util.ip; import cn.hutool.core.net.NetUtil; import cn.hutool.http.HtmlUtil; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/RegionUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/ip/RegionUtils.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/RegionUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/ip/RegionUtils.java index 581061a..95ba067 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/RegionUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/ip/RegionUtils.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.utils.ip; +package com.ruoyi.component.core.util.ip; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.resource.ClassPathResource; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.file.FileUtils; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.util.file.FileUtils; import lombok.extern.slf4j.Slf4j; import org.lionsoul.ip2region.xdb.Searcher; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/reflect/ReflectUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/reflect/ReflectUtils.java index 0e0d7e7..576d9a4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/reflect/ReflectUtils.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.utils.reflect; +package com.ruoyi.component.core.util.reflect; import cn.hutool.core.util.ReflectUtil; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/spring/SpringUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/spring/SpringUtils.java index 8b37e41..aa0dee0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/spring/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.spring; +package com.ruoyi.component.core.util.spring; import cn.hutool.extra.spring.SpringUtil; import org.springframework.aop.framework.AopContext; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/sql/SqlUtil.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/sql/SqlUtil.java index 7891496..1f3093a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/util/sql/SqlUtil.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.utils.sql; +package com.ruoyi.component.core.util.sql; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.exception.UtilException; +import com.ruoyi.component.core.util.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/validate/AddGroup.java similarity index 65% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/validate/AddGroup.java index e1934e1..336c99c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/validate/AddGroup.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.validate; +package com.ruoyi.component.core.validate; /** * 校验分组 add diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/validate/EditGroup.java similarity index 65% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/validate/EditGroup.java index 3c6ca7f..4223ea4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/validate/EditGroup.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.validate; +package com.ruoyi.component.core.validate; /** * 校验分组 edit diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/validate/QueryGroup.java similarity index 66% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/validate/QueryGroup.java index bbbfe03..6d0e750 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/validate/QueryGroup.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.validate; +package com.ruoyi.component.core.validate; /** * 校验分组 query diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/xss/Xss.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/xss/Xss.java index 0a26d60..3a05ff7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/xss/Xss.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.xss; +package com.ruoyi.component.core.xss; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/xss/XssValidator.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java rename to ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/xss/XssValidator.java index 03102df..0736ee8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java +++ b/ruoyi-component/ruoyi-component-core/src/main/java/com/ruoyi/component/core/xss/XssValidator.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.xss; +package com.ruoyi.component.core.xss; import cn.hutool.core.util.ReUtil; import cn.hutool.http.HtmlUtil; diff --git a/ruoyi-component/ruoyi-component-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..4c94d21 --- /dev/null +++ b/ruoyi-component/ruoyi-component-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,6 @@ +com.ruoyi.component.core.config.ApplicationConfig +com.ruoyi.component.core.config.AsyncConfig +com.ruoyi.component.core.config.RuoYiConfig +com.ruoyi.component.core.config.ThreadPoolConfig +com.ruoyi.component.core.config.ValidatorConfig +com.ruoyi.component.core.utils.SpringUtils diff --git a/ruoyi-component/ruoyi-component-encrypt/pom.xml b/ruoyi-component/ruoyi-component-encrypt/pom.xml new file mode 100644 index 0000000..d29a4bc --- /dev/null +++ b/ruoyi-component/ruoyi-component-encrypt/pom.xml @@ -0,0 +1,42 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-encrypt + jar + + + UTF-8 + + + + + com.ruoyi + ruoyi-component-core + + + org.bouncycastle + bcprov-jdk15to18 + + + + com.baomidou + mybatis-plus-boot-starter + + + + cn.hutool + hutool-crypto + + + + org.springframework + spring-webmvc + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/EncryptField.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/annotation/EncryptField.java similarity index 81% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/EncryptField.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/annotation/EncryptField.java index 2242351..be55976 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/EncryptField.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/annotation/EncryptField.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.component.encrypt.annotation; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; +import com.ruoyi.component.encrypt.enums.AlgorithmType; +import com.ruoyi.component.encrypt.enums.EncodeType; import java.lang.annotation.*; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/EncryptorConfig.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/config/EncryptorAutoConfiguration.java similarity index 60% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/EncryptorConfig.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/config/EncryptorAutoConfiguration.java index ed90d20..68537bd 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/EncryptorConfig.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/config/EncryptorAutoConfiguration.java @@ -1,13 +1,14 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.encrypt.config; -import com.ruoyi.framework.config.properties.EncryptorProperties; -import com.ruoyi.framework.manager.EncryptorManager; -import com.ruoyi.framework.encrypt.MybatisDecryptInterceptor; -import com.ruoyi.framework.encrypt.MybatisEncryptInterceptor; +import com.ruoyi.component.encrypt.core.EncryptorManager; +import com.ruoyi.component.encrypt.interceptor.MybatisDecryptInterceptor; +import com.ruoyi.component.encrypt.interceptor.MybatisEncryptInterceptor; +import com.ruoyi.component.encrypt.properties.EncryptorProperties; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * 加解密配置 @@ -15,9 +16,10 @@ import org.springframework.context.annotation.Configuration; * @author 老马 * @version 4.6.0 */ -@Configuration +@AutoConfiguration +@EnableConfigurationProperties(EncryptorProperties.class) @ConditionalOnProperty(value = "mybatis-encryptor.enable", havingValue = "true") -public class EncryptorConfig { +public class EncryptorAutoConfiguration { @Autowired private EncryptorProperties properties; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/EncryptContext.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/EncryptContext.java similarity index 77% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/EncryptContext.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/EncryptContext.java index 1b82d51..1cb92ba 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/EncryptContext.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/EncryptContext.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.encrypt; +package com.ruoyi.component.encrypt.core; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; +import com.ruoyi.component.encrypt.enums.AlgorithmType; +import com.ruoyi.component.encrypt.enums.EncodeType; import lombok.Data; /** diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/EncryptorManager.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/EncryptorManager.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/EncryptorManager.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/EncryptorManager.java index 94515aa..f9dff4f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/EncryptorManager.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/EncryptorManager.java @@ -1,9 +1,7 @@ -package com.ruoyi.framework.manager; +package com.ruoyi.component.encrypt.core; import cn.hutool.core.util.ReflectUtil; -import com.ruoyi.common.annotation.EncryptField; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.encrypt.IEncryptor; +import com.ruoyi.component.encrypt.annotation.EncryptField; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/IEncryptor.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/IEncryptor.java similarity index 78% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/IEncryptor.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/IEncryptor.java index 7986a9b..3ebb012 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/IEncryptor.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/IEncryptor.java @@ -1,7 +1,8 @@ -package com.ruoyi.common.encrypt; +package com.ruoyi.component.encrypt.core; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; + +import com.ruoyi.component.encrypt.enums.AlgorithmType; +import com.ruoyi.component.encrypt.enums.EncodeType; /** * 加解者 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AbstractEncryptor.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/AbstractEncryptor.java similarity index 61% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AbstractEncryptor.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/AbstractEncryptor.java index 8605336..c6d09cd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AbstractEncryptor.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/AbstractEncryptor.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.encrypt.encryptor; +package com.ruoyi.component.encrypt.core.encryptor; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.encrypt.IEncryptor; +import com.ruoyi.component.encrypt.core.EncryptContext; +import com.ruoyi.component.encrypt.core.IEncryptor; /** * 所有加密执行者的基类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AesEncryptor.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/AesEncryptor.java similarity index 79% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AesEncryptor.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/AesEncryptor.java index 7252145..0dbcc3e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AesEncryptor.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/AesEncryptor.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.encrypt.encryptor; +package com.ruoyi.component.encrypt.core.encryptor; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; -import com.ruoyi.common.utils.EncryptUtils; +import com.ruoyi.component.encrypt.core.EncryptContext; +import com.ruoyi.component.encrypt.enums.AlgorithmType; +import com.ruoyi.component.encrypt.enums.EncodeType; +import com.ruoyi.component.encrypt.utils.EncryptUtils; /** * AES算法实现 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Base64Encryptor.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/Base64Encryptor.java similarity index 75% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Base64Encryptor.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/Base64Encryptor.java index 3bd4149..fc8b467 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Base64Encryptor.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/Base64Encryptor.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.encrypt.encryptor; +package com.ruoyi.component.encrypt.core.encryptor; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; -import com.ruoyi.common.utils.EncryptUtils; +import com.ruoyi.component.encrypt.core.EncryptContext; +import com.ruoyi.component.encrypt.enums.AlgorithmType; +import com.ruoyi.component.encrypt.enums.EncodeType; +import com.ruoyi.component.encrypt.utils.EncryptUtils; /** * Base64算法实现 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/RsaEncryptor.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/RsaEncryptor.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/RsaEncryptor.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/RsaEncryptor.java index 9e07764..c676980 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/RsaEncryptor.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/RsaEncryptor.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.encrypt.encryptor; +package com.ruoyi.component.encrypt.core.encryptor; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; -import com.ruoyi.common.utils.EncryptUtils; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.encrypt.core.EncryptContext; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.encrypt.enums.AlgorithmType; +import com.ruoyi.component.encrypt.enums.EncodeType; +import com.ruoyi.component.encrypt.utils.EncryptUtils; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm2Encryptor.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/Sm2Encryptor.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm2Encryptor.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/Sm2Encryptor.java index ec4714a..de8587f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm2Encryptor.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/Sm2Encryptor.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.encrypt.encryptor; +package com.ruoyi.component.encrypt.core.encryptor; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; -import com.ruoyi.common.utils.EncryptUtils; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.encrypt.core.EncryptContext; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.encrypt.enums.AlgorithmType; +import com.ruoyi.component.encrypt.enums.EncodeType; +import com.ruoyi.component.encrypt.utils.EncryptUtils; /** * sm2算法实现 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm4Encryptor.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/Sm4Encryptor.java similarity index 79% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm4Encryptor.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/Sm4Encryptor.java index 80a57df..5b97cb8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm4Encryptor.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/core/encryptor/Sm4Encryptor.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.encrypt.encryptor; +package com.ruoyi.component.encrypt.core.encryptor; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; -import com.ruoyi.common.utils.EncryptUtils; +import com.ruoyi.component.encrypt.core.EncryptContext; +import com.ruoyi.component.encrypt.enums.AlgorithmType; +import com.ruoyi.component.encrypt.enums.EncodeType; +import com.ruoyi.component.encrypt.utils.EncryptUtils; /** * sm4算法实现 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/AlgorithmType.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/enums/AlgorithmType.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/AlgorithmType.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/enums/AlgorithmType.java index 124a139..0e25fab 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/AlgorithmType.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/enums/AlgorithmType.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.encrypt.enums; -import com.ruoyi.common.encrypt.encryptor.*; +import com.ruoyi.component.encrypt.core.encryptor.*; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/EncodeType.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/enums/EncodeType.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/EncodeType.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/enums/EncodeType.java index 4d46959..0297c5d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/EncodeType.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/enums/EncodeType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.encrypt.enums; /** * 编码类型 diff --git a/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/filter/.gitkeep b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/filter/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisDecryptInterceptor.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/interceptor/MybatisDecryptInterceptor.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisDecryptInterceptor.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/interceptor/MybatisDecryptInterceptor.java index 65624a8..77a0ccc 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisDecryptInterceptor.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/interceptor/MybatisDecryptInterceptor.java @@ -1,15 +1,15 @@ -package com.ruoyi.framework.encrypt; +package com.ruoyi.component.encrypt.interceptor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.EncryptField; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.EncryptorProperties; -import com.ruoyi.framework.manager.EncryptorManager; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.encrypt.annotation.EncryptField; +import com.ruoyi.component.encrypt.core.EncryptContext; +import com.ruoyi.component.encrypt.core.EncryptorManager; +import com.ruoyi.component.encrypt.enums.AlgorithmType; +import com.ruoyi.component.encrypt.enums.EncodeType; +import com.ruoyi.component.encrypt.properties.EncryptorProperties; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.executor.resultset.ResultSetHandler; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisEncryptInterceptor.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/interceptor/MybatisEncryptInterceptor.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisEncryptInterceptor.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/interceptor/MybatisEncryptInterceptor.java index ec42432..d801969 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisEncryptInterceptor.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/interceptor/MybatisEncryptInterceptor.java @@ -1,15 +1,15 @@ -package com.ruoyi.framework.encrypt; +package com.ruoyi.component.encrypt.interceptor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.EncryptField; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.EncryptorProperties; -import com.ruoyi.framework.manager.EncryptorManager; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.encrypt.annotation.EncryptField; +import com.ruoyi.component.encrypt.core.EncryptContext; +import com.ruoyi.component.encrypt.core.EncryptorManager; +import com.ruoyi.component.encrypt.enums.AlgorithmType; +import com.ruoyi.component.encrypt.enums.EncodeType; +import com.ruoyi.component.encrypt.properties.EncryptorProperties; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.executor.parameter.ParameterHandler; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/EncryptorProperties.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/properties/EncryptorProperties.java similarity index 82% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/EncryptorProperties.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/properties/EncryptorProperties.java index 8b2000d..2607813 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/EncryptorProperties.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/properties/EncryptorProperties.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.component.encrypt.properties; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; +import com.ruoyi.component.encrypt.enums.AlgorithmType; +import com.ruoyi.component.encrypt.enums.EncodeType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -13,7 +13,6 @@ import org.springframework.stereotype.Component; * @version 4.6.0 */ @Data -@Component @ConfigurationProperties(prefix = "mybatis-encryptor") public class EncryptorProperties { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/EncryptUtils.java b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/utils/EncryptUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/EncryptUtils.java rename to ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/utils/EncryptUtils.java index ab213b7..d550921 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/EncryptUtils.java +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/java/com/ruoyi/component/encrypt/utils/EncryptUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.encrypt.utils; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.ArrayUtil; diff --git a/ruoyi-component/ruoyi-component-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..4321dcc --- /dev/null +++ b/ruoyi-component/ruoyi-component-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.ruoyi.component.encrypt.config.EncryptorAutoConfiguration + diff --git a/ruoyi-component/ruoyi-component-excel/pom.xml b/ruoyi-component/ruoyi-component-excel/pom.xml new file mode 100644 index 0000000..c494e9c --- /dev/null +++ b/ruoyi-component/ruoyi-component-excel/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-excel + jar + + + UTF-8 + + + + + com.ruoyi + ruoyi-component-json + + + com.alibaba + easyexcel + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/annotation/CellMerge.java similarity index 75% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/annotation/CellMerge.java index 4af822e..1f06ff3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/annotation/CellMerge.java @@ -1,6 +1,7 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.component.excel.annotation; -import com.ruoyi.common.excel.CellMergeStrategy; + +import com.ruoyi.component.excel.core.CellMergeStrategy; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/annotation/ExcelDictFormat.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/annotation/ExcelDictFormat.java index 4bb0cc8..56fc973 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/annotation/ExcelDictFormat.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.component.excel.annotation; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelEnumFormat.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/annotation/ExcelEnumFormat.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelEnumFormat.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/annotation/ExcelEnumFormat.java index a8f550a..07e1bee 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelEnumFormat.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/annotation/ExcelEnumFormat.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.component.excel.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/convert/ExcelBigNumberConvert.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/convert/ExcelBigNumberConvert.java index 432ab74..4cbbfd1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/convert/ExcelBigNumberConvert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.convert; +package com.ruoyi.component.excel.convert; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/convert/ExcelDictConvert.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/convert/ExcelDictConvert.java index 03dad1f..5bd25eb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/convert/ExcelDictConvert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.convert; +package com.ruoyi.component.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.utils.poi.ExcelUtil; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.service.DictService; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; +import com.ruoyi.component.excel.annotation.ExcelDictFormat; +import com.ruoyi.component.excel.utils.ExcelUtil; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelEnumConvert.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/convert/ExcelEnumConvert.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelEnumConvert.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/convert/ExcelEnumConvert.java index 9a3eb31..27ad1a1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelEnumConvert.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/convert/ExcelEnumConvert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.convert; +package com.ruoyi.component.excel.convert; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; @@ -9,8 +9,8 @@ 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.ExcelEnumFormat; -import com.ruoyi.common.utils.reflect.ReflectUtils; +import com.ruoyi.component.core.util.reflect.ReflectUtils; +import com.ruoyi.component.excel.annotation.ExcelEnumFormat; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/CellMergeStrategy.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/CellMergeStrategy.java index 2e8b6ae..2a52b16 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/CellMergeStrategy.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.excel; +package com.ruoyi.component.excel.core; import cn.hutool.core.collection.CollUtil; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.write.merge.AbstractMergeStrategy; -import com.ruoyi.common.annotation.CellMerge; -import com.ruoyi.common.utils.reflect.ReflectUtils; +import com.ruoyi.component.core.util.reflect.ReflectUtils; +import com.ruoyi.component.excel.annotation.CellMerge; import lombok.AllArgsConstructor; import lombok.Data; import lombok.SneakyThrows; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/DefaultExcelListener.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/DefaultExcelListener.java index 2a3fc3b..eb80ed3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/DefaultExcelListener.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.excel; +package com.ruoyi.component.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.utils.StreamUtils; -import com.ruoyi.common.utils.ValidatorUtils; +import com.ruoyi.component.core.util.StreamUtils; +import com.ruoyi.component.core.util.ValidatorUtils; +import com.ruoyi.component.json.utils.JsonUtils; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelResult.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/DefaultExcelResult.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelResult.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/DefaultExcelResult.java index 5ef65bf..7db75d9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelResult.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/DefaultExcelResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.ruoyi.component.excel.core; import cn.hutool.core.util.StrUtil; import lombok.Setter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DropDownOptions.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/DropDownOptions.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/DropDownOptions.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/DropDownOptions.java index b649ebc..53d28ab 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DropDownOptions.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/DropDownOptions.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.excel; +package com.ruoyi.component.excel.core; import cn.hutool.core.util.StrUtil; -import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.component.core.exception.ServiceException; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelDownHandler.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/ExcelDownHandler.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelDownHandler.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/ExcelDownHandler.java index 09f0388..a08104c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelDownHandler.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/ExcelDownHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.ruoyi.component.excel.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; @@ -11,12 +11,12 @@ import com.alibaba.excel.util.ClassUtils; import com.alibaba.excel.write.handler.SheetWriteHandler; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.annotation.ExcelEnumFormat; -import com.ruoyi.common.core.service.DictService; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.service.DictService; +import com.ruoyi.component.core.util.StreamUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; +import com.ruoyi.component.excel.annotation.ExcelDictFormat; +import com.ruoyi.component.excel.annotation.ExcelEnumFormat; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddressList; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelListener.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/ExcelListener.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelListener.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/ExcelListener.java index 2064cad..b959808 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelListener.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/ExcelListener.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.ruoyi.component.excel.core; import com.alibaba.excel.read.listener.ReadListener; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelResult.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/ExcelResult.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelResult.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/ExcelResult.java index 63f8b8a..21c342d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelResult.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/core/ExcelResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.ruoyi.component.excel.core; import java.util.List; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/utils/ExcelUtil.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/utils/ExcelUtil.java index 78cf0e7..f971093 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-component/ruoyi-component-excel/src/main/java/com/ruoyi/component/excel/utils/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.ruoyi.component.excel.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.resource.ClassPathResource; @@ -10,10 +10,10 @@ 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.excel.*; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.file.FileUtils; +import com.ruoyi.component.excel.convert.ExcelBigNumberConvert; +import com.ruoyi.component.excel.core.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-component/ruoyi-component-generator/pom.xml b/ruoyi-component/ruoyi-component-generator/pom.xml new file mode 100644 index 0000000..01e75dc --- /dev/null +++ b/ruoyi-component/ruoyi-component-generator/pom.xml @@ -0,0 +1,42 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-generator + jar + + + + UTF-8 + + + + + + org.apache.velocity + velocity-engine-core + + + + com.ruoyi + ruoyi-component-core + + + com.ruoyi + ruoyi-component-mybatis + + + com.ruoyi + ruoyi-component-web + + + com.ruoyi + ruoyi-component-log + + + diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/config/GenConfig.java similarity index 97% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java rename to ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/config/GenConfig.java index 187426f..db8266d 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java +++ b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.config; +package com.ruoyi.component.generator.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/constant/GenConstants.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java rename to ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/constant/GenConstants.java index bb08d50..36dfc1e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/constant/GenConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.component.generator.constant; /** * 代码生成通用常量 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/controller/GenController.java similarity index 92% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java rename to ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/controller/GenController.java index 6116477..9fe79d6 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/controller/GenController.java @@ -1,17 +1,17 @@ -package com.ruoyi.generator.controller; +package com.ruoyi.component.generator.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; -import com.ruoyi.common.annotation.Log; -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.enums.BusinessType; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.service.IGenTableService; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.generator.domain.GenTable; +import com.ruoyi.component.generator.domain.GenTableColumn; +import com.ruoyi.component.generator.service.IGenTableService; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/domain/GenTable.java similarity index 95% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java rename to ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/domain/GenTable.java index 45e9168..af71d78 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/domain/GenTable.java @@ -1,9 +1,9 @@ -package com.ruoyi.generator.domain; +package com.ruoyi.component.generator.domain; import com.baomidou.mybatisplus.annotation.*; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.generator.constant.GenConstants; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.ArrayUtils; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/domain/GenTableColumn.java similarity index 97% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java rename to ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/domain/GenTableColumn.java index f6dbcaa..35fdc0d 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/domain/GenTableColumn.java @@ -1,11 +1,11 @@ -package com.ruoyi.generator.domain; +package com.ruoyi.component.generator.domain; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.ibatis.type.JdbcType; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/mapper/GenTableColumnMapper.java similarity index 74% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java rename to ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/mapper/GenTableColumnMapper.java index 93578f2..472ba56 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java +++ b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/mapper/GenTableColumnMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.generator.mapper; +package com.ruoyi.component.generator.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.ruoyi.common.core.mapper.BaseMapperPlus; -import com.ruoyi.generator.domain.GenTableColumn; +import com.ruoyi.component.generator.domain.GenTableColumn; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import java.util.List; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/mapper/GenTableMapper.java similarity index 88% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java rename to ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/mapper/GenTableMapper.java index f70a11e..eda450a 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java +++ b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/mapper/GenTableMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.generator.mapper; +package com.ruoyi.component.generator.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.mapper.BaseMapperPlus; -import com.ruoyi.generator.domain.GenTable; +import com.ruoyi.component.generator.domain.GenTable; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/service/GenTableServiceImpl.java similarity index 94% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java rename to ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/service/GenTableServiceImpl.java index 34c4569..ece3aa5 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.service; +package com.ruoyi.component.generator.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; @@ -10,23 +10,23 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; -import com.ruoyi.generator.mapper.GenTableMapper; -import com.ruoyi.generator.util.GenUtils; -import com.ruoyi.generator.util.VelocityInitializer; -import com.ruoyi.generator.util.VelocityUtils; +import com.ruoyi.component.core.constant.Constants; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.generator.constant.GenConstants; +import com.ruoyi.component.generator.domain.GenTable; +import com.ruoyi.component.generator.domain.GenTableColumn; +import com.ruoyi.component.generator.mapper.GenTableColumnMapper; +import com.ruoyi.component.generator.mapper.GenTableMapper; +import com.ruoyi.component.generator.util.GenUtils; +import com.ruoyi.component.generator.util.VelocityInitializer; +import com.ruoyi.component.generator.util.VelocityUtils; +import com.ruoyi.component.json.utils.JsonUtils; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.StreamUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.file.FileUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.velocity.Template; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/service/IGenTableService.java similarity index 90% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java rename to ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/service/IGenTableService.java index c432d06..2422b23 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/service/IGenTableService.java @@ -1,9 +1,9 @@ -package com.ruoyi.generator.service; +package com.ruoyi.component.generator.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.ruoyi.component.generator.domain.GenTable; +import com.ruoyi.component.generator.domain.GenTableColumn; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import java.util.List; import java.util.Map; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/util/GenUtils.java similarity index 96% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java rename to ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/util/GenUtils.java index f04beb9..686f84b 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/util/GenUtils.java @@ -1,10 +1,10 @@ -package com.ruoyi.generator.util; +package com.ruoyi.component.generator.util; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.config.GenConfig; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.generator.config.GenConfig; +import com.ruoyi.component.generator.constant.GenConstants; +import com.ruoyi.component.generator.domain.GenTable; +import com.ruoyi.component.generator.domain.GenTableColumn; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.commons.lang3.RegExUtils; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/util/VelocityInitializer.java similarity index 90% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java rename to ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/util/VelocityInitializer.java index 67769a8..ed70edf 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java +++ b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/util/VelocityInitializer.java @@ -1,6 +1,6 @@ -package com.ruoyi.generator.util; +package com.ruoyi.component.generator.util; -import com.ruoyi.common.constant.Constants; +import com.ruoyi.component.core.constant.Constants; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.velocity.app.Velocity; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/util/VelocityUtils.java similarity index 97% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java rename to ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/util/VelocityUtils.java index 2277e2c..21edcca 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-component/ruoyi-component-generator/src/main/java/com/ruoyi/component/generator/util/VelocityUtils.java @@ -1,16 +1,16 @@ -package com.ruoyi.generator.util; +package com.ruoyi.component.generator.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.helper.DataBaseHelper; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.ruoyi.component.core.util.DateUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.generator.constant.GenConstants; +import com.ruoyi.component.generator.domain.GenTable; +import com.ruoyi.component.generator.domain.GenTableColumn; +import com.ruoyi.component.json.utils.JsonUtils; +import com.ruoyi.component.mybatis.helper.DataBaseHelper; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.velocity.VelocityContext; diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-component/ruoyi-component-generator/src/main/resources/generator.yml similarity index 100% rename from ruoyi-generator/src/main/resources/generator.yml rename to ruoyi-component/ruoyi-component-generator/src/main/resources/generator.yml diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-component/ruoyi-component-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 98% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to ruoyi-component/ruoyi-component-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 01a81af..b0a1715 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/ruoyi-component/ruoyi-component-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-component/ruoyi-component-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 99% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to ruoyi-component/ruoyi-component-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 2f17694..8d561fe 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/ruoyi-component/ruoyi-component-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-generator/src/main/resources/mapper/package-info.md b/ruoyi-component/ruoyi-component-generator/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-generator/src/main/resources/mapper/package-info.md rename to ruoyi-component/ruoyi-component-generator/src/main/resources/mapper/package-info.md diff --git a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/bo.java.vm similarity index 91% rename from ruoyi-generator/src/main/resources/vm/java/bo.java.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/bo.java.vm index 4a709e0..50e9b75 100644 --- a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/bo.java.vm @@ -1,13 +1,9 @@ package ${packageName}.domain.bo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.*; -import java.util.Date; - #foreach ($import in $importList) import ${import}; #end diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/controller.java.vm similarity index 94% rename from ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/controller.java.vm index 3edbc33..5ac9b28 100644 --- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/controller.java.vm @@ -2,7 +2,6 @@ package ${packageName}.controller; import java.util.List; import java.util.Arrays; -import java.util.concurrent.TimeUnit; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; @@ -14,10 +13,9 @@ import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.annotation.Log; 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.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.validate.AddGroup; +import com.ruoyi.component.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import ${packageName}.domain.vo.${ClassName}Vo; diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/domain.java.vm similarity index 93% rename from ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/domain.java.vm index 2956500..6b0777d 100644 --- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/domain.java.vm @@ -3,9 +3,6 @@ package ${packageName}.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.util.Date; -import java.math.BigDecimal; #foreach ($import in $importList) import ${import}; diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/mapper.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/service.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/service.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 98% rename from ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/serviceImpl.java.vm index 7767382..e981a39 100644 --- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -1,8 +1,7 @@ package ${packageName}.service.impl; import cn.hutool.core.bean.BeanUtil; -import com.ruoyi.common.utils.StringUtils; -#if($table.crud || $table.sub) + #if($table.crud || $table.sub) import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/sub-domain.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/sub-domain.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/vo.java.vm similarity index 98% rename from ruoyi-generator/src/main/resources/vm/java/vo.java.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/vo.java.vm index f6062ff..f843de1 100644 --- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/java/vo.java.vm @@ -8,7 +8,6 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import lombok.Data; -import java.util.Date; import java.io.Serializable; diff --git a/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/js/api.js.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/js/api.js.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/js/api.js.vm diff --git a/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/sql/oracle/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/sql/oracle/sql.vm diff --git a/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/sql/postgres/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/sql/postgres/sql.vm diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/sql/sqlserver/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/sql/sqlserver/sql.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/vue/v3/index.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/vue/v3/index.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/vue/v3/readme.txt similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/vue/v3/readme.txt diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-component/ruoyi-component-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to ruoyi-component/ruoyi-component-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-component/ruoyi-component-idempotent/pom.xml b/ruoyi-component/ruoyi-component-idempotent/pom.xml new file mode 100644 index 0000000..b537e16 --- /dev/null +++ b/ruoyi-component/ruoyi-component-idempotent/pom.xml @@ -0,0 +1,35 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-idempotent + jar + + + UTF-8 + + + + + com.ruoyi + ruoyi-component-json + + + com.ruoyi + ruoyi-component-redis + + + cn.hutool + hutool-crypto + + + cn.dev33 + sa-token-core + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/ruoyi-component/ruoyi-component-idempotent/src/main/java/com/ruoyi/component/idempotent/annotation/RepeatSubmit.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java rename to ruoyi-component/ruoyi-component-idempotent/src/main/java/com/ruoyi/component/idempotent/annotation/RepeatSubmit.java index d30962d..d28796e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java +++ b/ruoyi-component/ruoyi-component-idempotent/src/main/java/com/ruoyi/component/idempotent/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.component.idempotent.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java b/ruoyi-component/ruoyi-component-idempotent/src/main/java/com/ruoyi/component/idempotent/aspectj/RepeatSubmitAspect.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java rename to ruoyi-component/ruoyi-component-idempotent/src/main/java/com/ruoyi/component/idempotent/aspectj/RepeatSubmitAspect.java index 4c4249c..55cae50 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java +++ b/ruoyi-component/ruoyi-component-idempotent/src/main/java/com/ruoyi/component/idempotent/aspectj/RepeatSubmitAspect.java @@ -1,24 +1,23 @@ -package com.ruoyi.framework.aspectj; +package com.ruoyi.component.idempotent.aspectj; import cn.dev33.satoken.SaManager; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.SecureUtil; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.component.core.constant.CacheConstants; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.util.MessageUtils; +import com.ruoyi.component.core.util.ServletUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.idempotent.annotation.RepeatSubmit; +import com.ruoyi.component.json.utils.JsonUtils; +import com.ruoyi.component.redis.util.RedisUtils; 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.aspectj.lang.annotation.Before; -import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; @@ -35,7 +34,6 @@ import java.util.StringJoiner; * @author Lion Li */ @Aspect -@Component public class RepeatSubmitAspect { private static final ThreadLocal KEY_CACHE = new ThreadLocal<>(); diff --git a/ruoyi-component/ruoyi-component-idempotent/src/main/java/com/ruoyi/component/idempotent/config/IdempotentConfig.java b/ruoyi-component/ruoyi-component-idempotent/src/main/java/com/ruoyi/component/idempotent/config/IdempotentConfig.java new file mode 100644 index 0000000..308ac79 --- /dev/null +++ b/ruoyi-component/ruoyi-component-idempotent/src/main/java/com/ruoyi/component/idempotent/config/IdempotentConfig.java @@ -0,0 +1,21 @@ +package com.ruoyi.component.idempotent.config; + +import com.ruoyi.component.idempotent.aspectj.RepeatSubmitAspect; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.data.redis.connection.RedisConfiguration; + +/** + * 幂等功能配置 + * + * @author Lion Li + */ +@AutoConfiguration(after = RedisConfiguration.class) +public class IdempotentConfig { + + @Bean + public RepeatSubmitAspect repeatSubmitAspect() { + return new RepeatSubmitAspect(); + } + +} diff --git a/ruoyi-component/ruoyi-component-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..95d2640 --- /dev/null +++ b/ruoyi-component/ruoyi-component-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.component.idempotent.config.IdempotentConfig diff --git a/ruoyi-job/pom.xml b/ruoyi-component/ruoyi-component-job/pom.xml similarity index 62% rename from ruoyi-job/pom.xml rename to ruoyi-component/ruoyi-component-job/pom.xml index e6c30ee..5b7e509 100644 --- a/ruoyi-job/pom.xml +++ b/ruoyi-component/ruoyi-component-job/pom.xml @@ -1,26 +1,24 @@ - - + 4.0.0 - dk-sass-server com.ruoyi + ruoyi-component 4.8.2 - 4.0.0 - jar - ruoyi-job - - 任务调度 - + ruoyi-component-job + jar + + + UTF-8 + - com.ruoyi - ruoyi-common + ruoyi-component-core @@ -28,8 +26,5 @@ com.xuxueli xxl-job-core - - - diff --git a/ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java b/ruoyi-component/ruoyi-component-job/src/main/java/com/ruoyi/component/job/config/XxlJobConfig.java similarity index 93% rename from ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java rename to ruoyi-component/ruoyi-component-job/src/main/java/com/ruoyi/component/job/config/XxlJobConfig.java index e051ff0..62d3871 100644 --- a/ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java +++ b/ruoyi-component/ruoyi-component-job/src/main/java/com/ruoyi/component/job/config/XxlJobConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.job.config; +package com.ruoyi.component.job.config; -import com.ruoyi.job.config.properties.XxlJobProperties; +import com.ruoyi.component.job.config.properties.XxlJobProperties; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java b/ruoyi-component/ruoyi-component-job/src/main/java/com/ruoyi/component/job/config/properties/XxlJobProperties.java similarity index 92% rename from ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java rename to ruoyi-component/ruoyi-component-job/src/main/java/com/ruoyi/component/job/config/properties/XxlJobProperties.java index f2c755a..9898e88 100644 --- a/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java +++ b/ruoyi-component/ruoyi-component-job/src/main/java/com/ruoyi/component/job/config/properties/XxlJobProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.config.properties; +package com.ruoyi.component.job.config.properties; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-job/src/main/java/com/ruoyi/job/service/SampleService.java b/ruoyi-component/ruoyi-component-job/src/main/java/com/ruoyi/component/job/service/SampleService.java similarity index 99% rename from ruoyi-job/src/main/java/com/ruoyi/job/service/SampleService.java rename to ruoyi-component/ruoyi-component-job/src/main/java/com/ruoyi/component/job/service/SampleService.java index 4ca170b..ac581bf 100644 --- a/ruoyi-job/src/main/java/com/ruoyi/job/service/SampleService.java +++ b/ruoyi-component/ruoyi-component-job/src/main/java/com/ruoyi/component/job/service/SampleService.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.service; +package com.ruoyi.component.job.service; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/ruoyi-component/ruoyi-component-json/pom.xml b/ruoyi-component/ruoyi-component-json/pom.xml new file mode 100644 index 0000000..5c6c779 --- /dev/null +++ b/ruoyi-component/ruoyi-component-json/pom.xml @@ -0,0 +1,34 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-json + jar + + + UTF-8 + + + + + com.ruoyi + ruoyi-component-core + + + + + com.fasterxml.jackson.core + jackson-databind + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java b/ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/config/JacksonConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java rename to ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/config/JacksonConfig.java index eace537..efe09f7 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java +++ b/ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/config/JacksonConfig.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.json.config; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import com.ruoyi.framework.jackson.BigNumberSerializer; +import com.ruoyi.component.json.handler.BigNumberSerializer; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/jackson/BigNumberSerializer.java b/ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/handler/BigNumberSerializer.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/jackson/BigNumberSerializer.java rename to ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/handler/BigNumberSerializer.java index a4aee15..191db2a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/jackson/BigNumberSerializer.java +++ b/ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/handler/BigNumberSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.jackson; +package com.ruoyi.component.json.handler; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java b/ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/utils/JsonUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java rename to ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/utils/JsonUtils.java index e5c471e..4051719 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java +++ b/ruoyi-component/ruoyi-component-json/src/main/java/com/ruoyi/component/json/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.component.json.utils; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ArrayUtil; @@ -7,7 +7,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; +import com.ruoyi.component.core.util.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-component/ruoyi-component-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..eb44437 --- /dev/null +++ b/ruoyi-component/ruoyi-component-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.component.json.config.JacksonConfig diff --git a/ruoyi-component/ruoyi-component-log/pom.xml b/ruoyi-component/ruoyi-component-log/pom.xml new file mode 100644 index 0000000..cc96227 --- /dev/null +++ b/ruoyi-component/ruoyi-component-log/pom.xml @@ -0,0 +1,31 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-log + jar + + + UTF-8 + + + + + com.ruoyi + ruoyi-component-satoken + + + com.ruoyi + ruoyi-component-json + + + com.alibaba + transmittable-thread-local + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/annotation/Log.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java rename to ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/annotation/Log.java index f818cc6..c7a9965 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/annotation/Log.java @@ -1,7 +1,8 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.component.log.annotation; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.enums.OperatorType; + +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.log.enums.OperatorType; import java.lang.annotation.*; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/aspect/LogAspect.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/aspect/LogAspect.java index 300ef0b..eca208f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/aspect/LogAspect.java @@ -1,19 +1,19 @@ -package com.ruoyi.framework.aspectj; +package com.ruoyi.component.log.aspect; import cn.hutool.core.lang.Dict; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.domain.event.OperLogEvent; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.BusinessStatus; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.domain.model.LoginUser; +import com.ruoyi.component.core.enums.HttpMethod; +import com.ruoyi.component.core.util.ServletUtils; +import com.ruoyi.component.json.utils.JsonUtils; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessStatus; +import com.ruoyi.component.log.event.OperLogEvent; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/enums/BusinessStatus.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java rename to ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/enums/BusinessStatus.java index ce32cb4..e6f2101 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java +++ b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/enums/BusinessStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.log.enums; /** * 操作状态 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/enums/BusinessType.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java rename to ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/enums/BusinessType.java index 2d2f2e4..64c327e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/enums/BusinessType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.log.enums; /** * 业务操作类型 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/enums/OperatorType.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java rename to ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/enums/OperatorType.java index 3c4127d..23c9974 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java +++ b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/enums/OperatorType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.log.enums; /** * 操作人类别 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/event/LogininforEvent.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java rename to ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/event/LogininforEvent.java index 2dfd3dd..0d5ff70 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java +++ b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/event/LogininforEvent.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.event; +package com.ruoyi.component.log.event; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/event/OperLogEvent.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java rename to ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/event/OperLogEvent.java index 4375204..ea1c08b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java +++ b/ruoyi-component/ruoyi-component-log/src/main/java/com/ruoyi/component/log/event/OperLogEvent.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.event; +package com.ruoyi.component.log.event; import lombok.Data; diff --git a/ruoyi-component/ruoyi-component-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..cb67cd8 --- /dev/null +++ b/ruoyi-component/ruoyi-component-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.component.log.aspect.LogAspect diff --git a/ruoyi-component/ruoyi-component-mail/pom.xml b/ruoyi-component/ruoyi-component-mail/pom.xml new file mode 100644 index 0000000..bf8b961 --- /dev/null +++ b/ruoyi-component/ruoyi-component-mail/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-mail + jar + + + UTF-8 + + + + + com.ruoyi + ruoyi-component-core + + + com.sun.mail + jakarta.mail + + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java b/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/MailConfig.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java rename to ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/MailConfig.java index 20769aa..65eaa73 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java +++ b/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/MailConfig.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.mail.config; import cn.hutool.extra.mail.MailAccount; -import com.ruoyi.framework.config.properties.MailProperties; +import com.ruoyi.component.mail.config.properties.MailProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java b/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/properties/MailProperties.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java rename to ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/properties/MailProperties.java index 95e6cb8..cb1d789 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java +++ b/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/config/properties/MailProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.component.mail.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java b/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/utils/MailUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java rename to ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/utils/MailUtils.java index 32a3f82..73fecf4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java +++ b/ruoyi-component/ruoyi-component-mail/src/main/java/com/ruoyi/component/mail/utils/MailUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.email; +package com.ruoyi.component.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.utils.spring.SpringUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-component/ruoyi-component-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..c6ea808 --- /dev/null +++ b/ruoyi-component/ruoyi-component-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.component.mail.config.MailConfig diff --git a/ruoyi-component/ruoyi-component-mybatis/pom.xml b/ruoyi-component/ruoyi-component-mybatis/pom.xml new file mode 100644 index 0000000..a0115b3 --- /dev/null +++ b/ruoyi-component/ruoyi-component-mybatis/pom.xml @@ -0,0 +1,41 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + ruoyi-component-mybatis + jar + + + UTF-8 + + + + + + com.ruoyi + ruoyi-component-core + + + com.ruoyi + ruoyi-component-satoken + + + com.baomidou + mybatis-plus-boot-starter + + + + com.baomidou + dynamic-datasource-spring-boot-starter + + + + p6spy + p6spy + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/annotation/DataColumn.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/annotation/DataColumn.java index df416ed..8a748a9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/annotation/DataColumn.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.component.mybatis.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/annotation/DataPermission.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/annotation/DataPermission.java index 73d9c03..2691d66 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/annotation/DataPermission.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.component.mybatis.annotation; import java.lang.annotation.*; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/config/MybatisPlusConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/config/MybatisPlusConfig.java index 77b7a99..87c8f06 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.mybatis.config; import cn.hutool.core.net.NetUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.ruoyi.framework.handler.CreateAndUpdateMetaObjectHandler; -import com.ruoyi.framework.interceptor.PlusDataPermissionInterceptor; +import com.ruoyi.component.mybatis.handler.CreateAndUpdateMetaObjectHandler; +import com.ruoyi.component.mybatis.interceptor.PlusDataPermissionInterceptor; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/core/domain/BaseEntity.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/core/domain/BaseEntity.java index bd31607..3ebf210 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/core/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.ruoyi.component.mybatis.core.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/core/mapper/BaseMapperPlus.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/core/mapper/BaseMapperPlus.java index 20b05d8..981c1e5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/core/mapper/BaseMapperPlus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.mapper; +package com.ruoyi.component.mybatis.core.mapper; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.Db; -import com.ruoyi.common.utils.BeanCopyUtils; +import com.ruoyi.component.core.util.BeanCopyUtils; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/core/page/PageQuery.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/core/page/PageQuery.java index fd3cf18..e4a1f3b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/core/page/PageQuery.java @@ -1,13 +1,12 @@ -package com.ruoyi.common.core.domain; +package com.ruoyi.component.mybatis.core.page; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.sql.SqlUtil; -import io.swagger.v3.oas.annotations.media.Schema; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.sql.SqlUtil; import lombok.Data; import java.io.Serializable; @@ -21,7 +20,6 @@ import java.util.List; */ @Data -@Schema(description = "分页实体") public class PageQuery implements Serializable { private static final long serialVersionUID = 1L; @@ -29,25 +27,21 @@ public class PageQuery implements Serializable { /** * 分页大小 */ - @Schema(description = "分页大小") private Integer pageSize = 20; /** * 当前页数 */ - @Schema(description = "页数") private Integer pageNum; /** * 排序列 */ - @Schema(hidden = true) private String orderByColumn; /** * 排序的方向desc或者asc */ - @Schema(hidden = true) private String isAsc; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/core/page/TableDataInfo.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/core/page/TableDataInfo.java index ea4a2f6..1b0938d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/core/page/TableDataInfo.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.core.page; +package com.ruoyi.component.mybatis.core.page; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.ruoyi.common.utils.BeanConvertUtil; +import com.ruoyi.component.core.util.BeanConvertUtil; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataBaseType.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/enums/DataBaseType.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DataBaseType.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/enums/DataBaseType.java index 5d0f05a..598f68b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataBaseType.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/enums/DataBaseType.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.mybatis.enums; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/enums/DataScopeType.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/enums/DataScopeType.java index 8364565..71fd827 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/enums/DataScopeType.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.mybatis.enums; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/CreateAndUpdateMetaObjectHandler.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/CreateAndUpdateMetaObjectHandler.java index 3f0e122..ac4c117 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/CreateAndUpdateMetaObjectHandler.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.handler; +package com.ruoyi.component.mybatis.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.BaseEntity; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.domain.model.LoginUser; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.StringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; diff --git a/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/MybatisExceptionHandler.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/MybatisExceptionHandler.java new file mode 100644 index 0000000..31275f7 --- /dev/null +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/MybatisExceptionHandler.java @@ -0,0 +1,46 @@ +package com.ruoyi.component.mybatis.handler; + +import com.ruoyi.component.core.domain.R; +import lombok.extern.slf4j.Slf4j; +import org.mybatis.spring.MyBatisSystemException; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import javax.servlet.http.HttpServletRequest; + +/** + * Mybatis异常处理器 + * + * @author Lion Li + */ +@Slf4j +@RestControllerAdvice +public class MybatisExceptionHandler { + + /** + * 主键或UNIQUE索引，数据重复异常 + */ + @ExceptionHandler(DuplicateKeyException.class) + public R handleDuplicateKeyException(DuplicateKeyException e, HttpServletRequest request) { + String requestURI = request.getRequestURI(); + log.error("请求地址'{}',数据库中已存在记录'{}'", requestURI, e.getMessage()); + return R.fail("数据库中已存在该记录，请联系管理员确认"); + } + + /** + * Mybatis系统异常 通用处理 + */ + @ExceptionHandler(MyBatisSystemException.class) + public R handleCannotFindDataSourceException(MyBatisSystemException e, HttpServletRequest request) { + String requestURI = request.getRequestURI(); + String message = e.getMessage(); + if (message.contains("CannotFindDataSourceException")) { + log.error("请求地址'{}', 未找到数据源", requestURI); + return R.fail("未找到数据源，请联系管理员确认"); + } + log.error("请求地址'{}', Mybatis系统异常", requestURI, e); + return R.fail(message); + } + +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/PlusDataPermissionHandler.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/PlusDataPermissionHandler.java index 4299256..9c86a50 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/handler/PlusDataPermissionHandler.java @@ -1,20 +1,20 @@ -package com.ruoyi.framework.handler; +package com.ruoyi.component.mybatis.handler; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.collection.CollUtil; 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.exception.ServiceException; -import com.ruoyi.common.helper.DataPermissionHelper; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.domain.dto.RoleDTO; +import com.ruoyi.component.core.domain.model.LoginUser; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.mybatis.annotation.DataColumn; +import com.ruoyi.component.mybatis.annotation.DataPermission; +import com.ruoyi.component.mybatis.enums.DataScopeType; +import com.ruoyi.component.mybatis.helper.DataPermissionHelper; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.StreamUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.expression.Expression; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/helper/DataBaseHelper.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/helper/DataBaseHelper.java index 33e0a78..09d87f3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/helper/DataBaseHelper.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.helper; +package com.ruoyi.component.mybatis.helper; import cn.hutool.core.convert.Convert; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; -import com.ruoyi.common.enums.DataBaseType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.util.spring.SpringUtils; +import com.ruoyi.component.mybatis.enums.DataBaseType; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/helper/DataPermissionHelper.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/helper/DataPermissionHelper.java index c3b8b47..43ac138 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/helper/DataPermissionHelper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.helper; +package com.ruoyi.component.mybatis.helper; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaStorage; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusDataPermissionInterceptor.java b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/interceptor/PlusDataPermissionInterceptor.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusDataPermissionInterceptor.java rename to ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/interceptor/PlusDataPermissionInterceptor.java index 5d71aeb..5901d70 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusDataPermissionInterceptor.java +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/java/com/ruoyi/component/mybatis/interceptor/PlusDataPermissionInterceptor.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor; +package com.ruoyi.component.mybatis.interceptor; import cn.hutool.core.collection.ConcurrentHashSet; import cn.hutool.core.util.ArrayUtil; @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport; import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; -import com.ruoyi.common.annotation.DataColumn; -import com.ruoyi.framework.handler.PlusDataPermissionHandler; +import com.ruoyi.component.mybatis.annotation.DataColumn; +import com.ruoyi.component.mybatis.handler.PlusDataPermissionHandler; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.statement.delete.Delete; import net.sf.jsqlparser.statement.select.PlainSelect; diff --git a/ruoyi-component/ruoyi-component-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..54c159a --- /dev/null +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.component.mybatis.config.MybatisPlusConfig diff --git a/ruoyi-component/ruoyi-component-mybatis/src/main/resources/common-mybatis.yml b/ruoyi-component/ruoyi-component-mybatis/src/main/resources/common-mybatis.yml new file mode 100644 index 0000000..f5dc637 --- /dev/null +++ b/ruoyi-component/ruoyi-component-mybatis/src/main/resources/common-mybatis.yml @@ -0,0 +1,33 @@ +# 内置配置 不允许修改 如需修改请在 nacos 上写相同配置覆盖 +# MyBatisPlus配置 +# https://baomidou.com/config/ +mybatis-plus: + # 启动时是否检查 MyBatis XML 文件的存在，默认不检查 + checkConfigLocation: false + configuration: + # 自动驼峰命名规则（camel case）映射 + mapUnderscoreToCamelCase: true + # MyBatis 自动映射策略 + # NONE：不启用 PARTIAL：只对非嵌套 resultMap 自动映射 FULL：对所有 resultMap 自动映射 + autoMappingBehavior: FULL + # MyBatis 自动映射时未知列或未知属性处理策 + # NONE：不做处理 WARNING：打印相关警告 FAILING：抛出异常和详细信息 + autoMappingUnknownColumnBehavior: NONE + # 更详细的日志输出 会有性能损耗 org.apache.ibatis.logging.stdout.StdOutImpl + # 关闭日志记录 (可单纯使用 p6spy 分析) org.apache.ibatis.logging.nologging.NoLoggingImpl + # 默认日志输出 org.apache.ibatis.logging.slf4j.Slf4jImpl + logImpl: org.apache.ibatis.logging.nologging.NoLoggingImpl + global-config: + # 是否打印 Logo banner + banner: true + dbConfig: + # 主键类型 + # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID + idType: ASSIGN_ID + # 逻辑已删除值(框架表均使用此值 禁止随意修改) + logicDeleteValue: 2 + # 逻辑未删除值 + logicNotDeleteValue: 0 + insertStrategy: NOT_NULL + updateStrategy: NOT_NULL + whereStrategy: NOT_NULL diff --git a/ruoyi-component/ruoyi-component-oss/pom.xml b/ruoyi-component/ruoyi-component-oss/pom.xml new file mode 100644 index 0000000..b3dd53f --- /dev/null +++ b/ruoyi-component/ruoyi-component-oss/pom.xml @@ -0,0 +1,32 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-oss + jar + + + + UTF-8 + + + + + com.ruoyi + ruoyi-component-json + + + com.ruoyi + ruoyi-component-redis + + + com.amazonaws + aws-java-sdk-s3 + + + diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/constant/OssConstant.java similarity index 93% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java rename to ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/constant/OssConstant.java index 06202d0..30f6a0a 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java +++ b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/constant/OssConstant.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.constant; +package com.ruoyi.component.oss.constant; import java.util.Arrays; import java.util.List; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/core/OssClient.java similarity index 95% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java rename to ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/core/OssClient.java index dad3aa9..c4eb55c 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java +++ b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/core/OssClient.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.core; +package com.ruoyi.component.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.utils.StringUtils; -import com.ruoyi.oss.constant.OssConstant; -import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.enumd.AccessPolicyType; -import com.ruoyi.oss.enumd.PolicyType; -import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.OssProperties; +import com.ruoyi.component.core.util.DateUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.oss.enumd.PolicyType; +import com.ruoyi.component.oss.constant.OssConstant; +import com.ruoyi.component.oss.entity.UploadResult; +import com.ruoyi.component.oss.enumd.AccessPolicyType; +import com.ruoyi.component.oss.exception.OssException; +import com.ruoyi.component.oss.properties.OssProperties; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/entity/UploadResult.java similarity index 87% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java rename to ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/entity/UploadResult.java index 2e38f4e..0c2d9a2 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java +++ b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/entity/UploadResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.entity; +package com.ruoyi.component.oss.entity; import lombok.Builder; import lombok.Data; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/AccessPolicyType.java b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/enumd/AccessPolicyType.java similarity index 96% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/AccessPolicyType.java rename to ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/enumd/AccessPolicyType.java index 1cae670..2d9d106 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/AccessPolicyType.java +++ b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/enumd/AccessPolicyType.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.enumd; +package com.ruoyi.component.oss.enumd; import com.amazonaws.services.s3.model.CannedAccessControlList; import lombok.AllArgsConstructor; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/PolicyType.java b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/enumd/PolicyType.java similarity index 91% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/PolicyType.java rename to ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/enumd/PolicyType.java index 606f0f4..66e8262 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/PolicyType.java +++ b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/enumd/PolicyType.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.enumd; +package com.ruoyi.component.oss.enumd; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/exception/OssException.java similarity index 83% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java rename to ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/exception/OssException.java index 540b1cc..d5b72be 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java +++ b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/exception/OssException.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.exception; +package com.ruoyi.component.oss.exception; /** * OSS异常类 diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/factory/OssFactory.java similarity index 76% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java rename to ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/factory/OssFactory.java index b77973b..3c1a053 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java +++ b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/factory/OssFactory.java @@ -1,14 +1,14 @@ -package com.ruoyi.oss.factory; +package com.ruoyi.component.oss.factory; -import com.ruoyi.common.constant.CacheNames; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.CacheUtils; -import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.oss.constant.OssConstant; -import com.ruoyi.oss.core.OssClient; -import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.OssProperties; +import com.ruoyi.component.core.constant.CacheNames; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.json.utils.JsonUtils; +import com.ruoyi.component.oss.constant.OssConstant; +import com.ruoyi.component.oss.core.OssClient; +import com.ruoyi.component.oss.exception.OssException; +import com.ruoyi.component.oss.properties.OssProperties; +import com.ruoyi.component.redis.util.CacheUtils; +import com.ruoyi.component.redis.util.RedisUtils; import lombok.extern.slf4j.Slf4j; import java.util.Map; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/properties/OssProperties.java similarity index 94% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java rename to ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/properties/OssProperties.java index 781a170..b6cbfd4 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java +++ b/ruoyi-component/ruoyi-component-oss/src/main/java/com/ruoyi/component/oss/properties/OssProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.properties; +package com.ruoyi.component.oss.properties; import lombok.Data; diff --git a/ruoyi-component/ruoyi-component-ratelimiter/pom.xml b/ruoyi-component/ruoyi-component-ratelimiter/pom.xml new file mode 100644 index 0000000..154ad6f --- /dev/null +++ b/ruoyi-component/ruoyi-component-ratelimiter/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-ratelimiter + jar + + + UTF-8 + + + + + com.ruoyi + ruoyi-component-core + + + com.ruoyi + ruoyi-component-redis + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java b/ruoyi-component/ruoyi-component-ratelimiter/src/main/java/com/ruoyi/component/ratelimiter/annotation/RateLimiter.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java rename to ruoyi-component/ruoyi-component-ratelimiter/src/main/java/com/ruoyi/component/ratelimiter/annotation/RateLimiter.java index 6eeb2f2..981bdba 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java +++ b/ruoyi-component/ruoyi-component-ratelimiter/src/main/java/com/ruoyi/component/ratelimiter/annotation/RateLimiter.java @@ -1,6 +1,7 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.component.ratelimiter.annotation; -import com.ruoyi.common.enums.LimitType; + +import com.ruoyi.component.ratelimiter.enums.LimitType; import java.lang.annotation.*; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/ruoyi-component/ruoyi-component-ratelimiter/src/main/java/com/ruoyi/component/ratelimiter/aspectj/RateLimiterAspect.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java rename to ruoyi-component/ruoyi-component-ratelimiter/src/main/java/com/ruoyi/component/ratelimiter/aspectj/RateLimiterAspect.java index a9d61fb..e943c82 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java +++ b/ruoyi-component/ruoyi-component-ratelimiter/src/main/java/com/ruoyi/component/ratelimiter/aspectj/RateLimiterAspect.java @@ -1,14 +1,14 @@ -package com.ruoyi.framework.aspectj; +package com.ruoyi.component.ratelimiter.aspectj; import cn.hutool.core.util.ArrayUtil; -import com.ruoyi.common.annotation.RateLimiter; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.enums.LimitType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.component.core.constant.CacheConstants; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.util.MessageUtils; +import com.ruoyi.component.core.util.ServletUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.ratelimiter.annotation.RateLimiter; +import com.ruoyi.component.ratelimiter.enums.LimitType; +import com.ruoyi.component.redis.util.RedisUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; @@ -24,7 +24,6 @@ import org.springframework.expression.ParserContext; import org.springframework.expression.common.TemplateParserContext; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.stereotype.Component; import java.lang.reflect.Method; @@ -35,7 +34,6 @@ import java.lang.reflect.Method; */ @Slf4j @Aspect -@Component public class RateLimiterAspect { /** diff --git a/ruoyi-component/ruoyi-component-ratelimiter/src/main/java/com/ruoyi/component/ratelimiter/config/RateLimiterConfig.java b/ruoyi-component/ruoyi-component-ratelimiter/src/main/java/com/ruoyi/component/ratelimiter/config/RateLimiterConfig.java new file mode 100644 index 0000000..6853934 --- /dev/null +++ b/ruoyi-component/ruoyi-component-ratelimiter/src/main/java/com/ruoyi/component/ratelimiter/config/RateLimiterConfig.java @@ -0,0 +1,20 @@ +package com.ruoyi.component.ratelimiter.config; + +import com.ruoyi.component.ratelimiter.aspectj.RateLimiterAspect; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.data.redis.connection.RedisConfiguration; + +/** + * @author guangxin + * @date 2023/1/18 + */ +@AutoConfiguration(after = RedisConfiguration.class) +public class RateLimiterConfig { + + @Bean + public RateLimiterAspect rateLimiterAspect() { + return new RateLimiterAspect(); + } + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java b/ruoyi-component/ruoyi-component-ratelimiter/src/main/java/com/ruoyi/component/ratelimiter/enums/LimitType.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java rename to ruoyi-component/ruoyi-component-ratelimiter/src/main/java/com/ruoyi/component/ratelimiter/enums/LimitType.java index ac88c62..6d64361 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java +++ b/ruoyi-component/ruoyi-component-ratelimiter/src/main/java/com/ruoyi/component/ratelimiter/enums/LimitType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.ratelimiter.enums; /** * 限流类型 diff --git a/ruoyi-component/ruoyi-component-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..64aec94 --- /dev/null +++ b/ruoyi-component/ruoyi-component-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.component.ratelimiter.config.RateLimiterConfig diff --git a/ruoyi-component/ruoyi-component-redis/pom.xml b/ruoyi-component/ruoyi-component-redis/pom.xml new file mode 100644 index 0000000..1a52f42 --- /dev/null +++ b/ruoyi-component/ruoyi-component-redis/pom.xml @@ -0,0 +1,39 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-redis + jar + + + UTF-8 + + + + + + com.ruoyi + ruoyi-component-core + + + + + org.redisson + redisson-spring-boot-starter + + + + com.baomidou + lock4j-redisson-spring-boot-starter + + + org.redisson + redisson-spring-data-27 + + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/config/RedisConfig.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java rename to ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/config/RedisConfig.java index 8016ab8..ca05c8c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/config/RedisConfig.java @@ -1,10 +1,9 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.redis.config; -import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.framework.config.properties.RedissonProperties; -import com.ruoyi.framework.handler.KeyPrefixHandler; -import com.ruoyi.framework.manager.PlusSpringCacheManager; +import com.ruoyi.component.redis.handler.KeyPrefixHandler; +import com.ruoyi.component.redis.manager.PlusSpringCacheManager; +import com.ruoyi.component.redis.properties.RedissonProperties; import lombok.extern.slf4j.Slf4j; import org.redisson.codec.JsonJacksonCodec; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; @@ -39,7 +38,7 @@ public class RedisConfig { .setNettyThreads(redissonProperties.getNettyThreads()) .setCodec(new JsonJacksonCodec(objectMapper)); RedissonProperties.SingleServerConfig singleServerConfig = redissonProperties.getSingleServerConfig(); - if (ObjectUtil.isNotNull(singleServerConfig)) { + if (singleServerConfig != null) { // 使用单机模式 config.useSingleServer() //设置redis key前缀 @@ -53,7 +52,7 @@ public class RedisConfig { } // 集群配置方式 参考下方注释 RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig(); - if (ObjectUtil.isNotNull(clusterServersConfig)) { + if (clusterServersConfig != null) { config.useClusterServers() //设置redis key前缀 .setNameMapper(new KeyPrefixHandler(redissonProperties.getKeyPrefix())) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/handler/KeyPrefixHandler.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java rename to ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/handler/KeyPrefixHandler.java index 161c271..f783bfc 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java +++ b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/handler/KeyPrefixHandler.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.handler; +package com.ruoyi.component.redis.handler; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; import org.redisson.api.NameMapper; /** diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/PlusSpringCacheManager.java b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/manager/PlusSpringCacheManager.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/PlusSpringCacheManager.java rename to ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/manager/PlusSpringCacheManager.java index ddd0f33..74eab74 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/PlusSpringCacheManager.java +++ b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/manager/PlusSpringCacheManager.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ruoyi.framework.manager; +package com.ruoyi.component.redis.manager; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.component.redis.util.RedisUtils; import org.redisson.api.RMap; import org.redisson.api.RMapCache; import org.redisson.spring.cache.CacheConfig; @@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; /** - * A {@link org.springframework.cache.CacheManager} implementation + * A {@link CacheManager} implementation * backed by Redisson instance. *

* 修改 RedissonSpringCacheManager 源码 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/properties/RedissonProperties.java similarity index 98% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java rename to ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/properties/RedissonProperties.java index b0bf285..20c9ff9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java +++ b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/properties/RedissonProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.component.redis.properties; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/CacheUtils.java b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/util/CacheUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/CacheUtils.java rename to ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/util/CacheUtils.java index 9e0b09b..531b663 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/CacheUtils.java +++ b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/util/CacheUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils.redis; +package com.ruoyi.component.redis.util; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.RMap; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/util/QueueUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java rename to ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/util/QueueUtils.java index 0597352..b6892dd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java +++ b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/util/QueueUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils.redis; +package com.ruoyi.component.redis.util; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/util/RedisUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java rename to ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/util/RedisUtils.java index 7a852bf..667d791 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java +++ b/ruoyi-component/ruoyi-component-redis/src/main/java/com/ruoyi/component/redis/util/RedisUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils.redis; +package com.ruoyi.component.redis.util; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.*; diff --git a/ruoyi-component/ruoyi-component-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..016b83b --- /dev/null +++ b/ruoyi-component/ruoyi-component-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.component.redis.config.RedisConfig diff --git a/ruoyi-component/ruoyi-component-satoken/pom.xml b/ruoyi-component/ruoyi-component-satoken/pom.xml new file mode 100644 index 0000000..76dd26f --- /dev/null +++ b/ruoyi-component/ruoyi-component-satoken/pom.xml @@ -0,0 +1,32 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + ruoyi-component-satoken + + + + com.ruoyi + ruoyi-component-core + + + com.ruoyi + ruoyi-component-redis + + + + cn.dev33 + sa-token-spring-boot-starter + + + + + cn.dev33 + sa-token-jwt + + + diff --git a/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/config/SaTokenConfig.java b/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/config/SaTokenConfig.java new file mode 100644 index 0000000..2e0948c --- /dev/null +++ b/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/config/SaTokenConfig.java @@ -0,0 +1,47 @@ +package com.ruoyi.component.satoken.config; + +import cn.dev33.satoken.dao.SaTokenDao; +import cn.dev33.satoken.jwt.StpLogicJwtForSimple; +import cn.dev33.satoken.stp.StpInterface; +import cn.dev33.satoken.stp.StpLogic; +import com.ruoyi.component.satoken.core.PlusSaTokenDao; +import com.ruoyi.component.satoken.core.SaPermissionImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * sa-token 配置 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Slf4j +@Configuration +public class SaTokenConfig implements WebMvcConfigurer { + + @Bean + public StpLogic getStpLogicJwt() { + // Sa-Token 整合 jwt (简单模式) + return new StpLogicJwtForSimple(); + } + + /** + * 权限接口实现(使用bean注入方便用户替换) + */ + @Bean + public StpInterface stpInterface() { + return new SaPermissionImpl(); + } + + /** + * 自定义dao层存储 + */ + @Bean + public SaTokenDao saTokenDao() { + return new PlusSaTokenDao(); + } + +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java b/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/core/PlusSaTokenDao.java similarity index 98% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java rename to ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/core/PlusSaTokenDao.java index 2e4e890..d6e7aa6 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java +++ b/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/core/PlusSaTokenDao.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.satoken.dao; +package com.ruoyi.component.satoken.core; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.util.SaFoxUtil; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.component.redis.util.RedisUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaPermissionImpl.java b/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/core/SaPermissionImpl.java similarity index 85% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaPermissionImpl.java rename to ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/core/SaPermissionImpl.java index 1b698d1..59277bf 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaPermissionImpl.java +++ b/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/core/SaPermissionImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.satoken.service; +package com.ruoyi.component.satoken.core; import cn.dev33.satoken.stp.StpInterface; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.helper.LoginHelper; +import com.ruoyi.component.core.domain.model.LoginUser; +import com.ruoyi.component.core.enums.UserType; +import com.ruoyi.component.satoken.utils.LoginHelper; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java b/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/utils/LoginHelper.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java rename to ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/utils/LoginHelper.java index 86515f2..64cccb6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java +++ b/ruoyi-component/ruoyi-component-satoken/src/main/java/com/ruoyi/component/satoken/utils/LoginHelper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.helper; +package com.ruoyi.component.satoken.utils; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaStorage; @@ -7,14 +7,16 @@ import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.DeviceType; -import com.ruoyi.common.enums.UserType; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.core.domain.model.LoginUser; +import com.ruoyi.component.core.enums.DeviceType; +import com.ruoyi.component.core.enums.UserType; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; +import java.util.function.Supplier; + /** * 登录鉴权助手 *

@@ -34,6 +36,34 @@ public class LoginHelper { public static final String LOGIN_USER_KEY = "loginUser"; public static final String USER_KEY = "userId"; + public static final String TENANT_KEY = "tenantId"; + + + /** + * 获取租户ID + */ + public static String getTenantId() { + return Convert.toStr(getExtra(TENANT_KEY)); + } + + private static Object getExtra(String key) { + return getStorageIfAbsentSet(key, () -> StpUtil.getExtra(key)); + } + + public static Object getStorageIfAbsentSet(String key, Supplier handle) { + try { + Object obj = SaHolder.getStorage().get(key); + if (ObjectUtil.isNull(obj)) { + obj = handle.get(); + SaHolder.getStorage().set(key, obj); + } + return obj; + } catch (Exception e) { + return null; + } + } + + /** * 登录系统 * diff --git a/ruoyi-component/ruoyi-component-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..6fbda19 --- /dev/null +++ b/ruoyi-component/ruoyi-component-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.component.satoken.config.SaTokenConfig diff --git a/ruoyi-component/ruoyi-component-satoken/src/main/resources/common-satoken.yml b/ruoyi-component/ruoyi-component-satoken/src/main/resources/common-satoken.yml new file mode 100644 index 0000000..7402357 --- /dev/null +++ b/ruoyi-component/ruoyi-component-satoken/src/main/resources/common-satoken.yml @@ -0,0 +1,13 @@ +# 内置配置 不允许修改 +# Sa-Token配置 +sa-token: + # 允许动态设置 token 有效期 + dynamic-active-timeout: true + # 允许从 请求参数 读取 token + is-read-body: true + # 允许从 header 读取 token + is-read-header: true + # 关闭 cookie 鉴权 从根源杜绝 csrf 漏洞风险 + is-read-cookie: false + # token前缀 + token-prefix: "Bearer" diff --git a/ruoyi-component/ruoyi-component-security/pom.xml b/ruoyi-component/ruoyi-component-security/pom.xml new file mode 100644 index 0000000..cb9597c --- /dev/null +++ b/ruoyi-component/ruoyi-component-security/pom.xml @@ -0,0 +1,16 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + ruoyi-component-security + + + com.ruoyi + ruoyi-component-satoken + + + diff --git a/ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/config/SecurityConfig.java b/ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/config/SecurityConfig.java new file mode 100644 index 0000000..bd79506 --- /dev/null +++ b/ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/config/SecurityConfig.java @@ -0,0 +1,71 @@ +package com.ruoyi.component.security.config; + +import cn.dev33.satoken.exception.NotLoginException; +import cn.dev33.satoken.interceptor.SaInterceptor; +import cn.dev33.satoken.router.SaRouter; +import cn.dev33.satoken.stp.StpUtil; +import com.ruoyi.component.core.util.spring.SpringUtils; +import com.ruoyi.component.security.config.properties.SecurityProperties; +import com.ruoyi.component.security.handler.AllUrlHandler; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * 权限安全配置 + * + * @author Lion Li + */ + +@Slf4j +@AutoConfiguration +@EnableConfigurationProperties(SecurityProperties.class) +@RequiredArgsConstructor +public class SecurityConfig implements WebMvcConfigurer { + + private final SecurityProperties securityProperties; + + /** + * 注册sa-token的拦截器 + */ + @Override + public void addInterceptors(InterceptorRegistry registry) { + // 注册路由拦截器，自定义验证规则 + registry.addInterceptor(new SaInterceptor(handler -> { + AllUrlHandler allUrlHandler = SpringUtils.getBean(AllUrlHandler.class); + // 登录验证 -- 排除多个路径 + SaRouter + // 获取所有的 + .match(allUrlHandler.getUrls()) + // 对未排除的路径进行检查 + .check(() -> { + // 检查是否登录 是否有token + StpUtil.checkLogin(); + + // 检查 header 与 param 里的 clientid 与 token 里的是否一致 TODO +// String headerCid = ServletUtils.getRequest().getHeader(LoginHelper.CLIENT_KEY); +// String paramCid = ServletUtils.getParameter(LoginHelper.CLIENT_KEY); +// String clientId = StpUtil.getExtra(LoginHelper.CLIENT_KEY).toString(); +// if (!StringUtils.equalsAny(clientId, headerCid, paramCid)) { +// // token 无效 +// throw NotLoginException.newInstance(StpUtil.getLoginType(), +// "-100", "客户端ID与Token不匹配", +// StpUtil.getTokenValue()); +// } + + // 有效率影响 用于临时测试 + // if (log.isDebugEnabled()) { + // log.info("剩余有效时间: {}", StpUtil.getTokenTimeout()); + // log.info("临时有效时间: {}", StpUtil.getTokenActivityTimeout()); + // } + + }); + })).addPathPatterns("/**") + // 排除不需要拦截的路径 + .excludePathPatterns(securityProperties.getExcludes()); + } + +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java b/ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/config/properties/SecurityProperties.java similarity index 86% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java rename to ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/config/properties/SecurityProperties.java index b374181..fdb7514 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java +++ b/ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/config/properties/SecurityProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.component.security.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AllUrlHandler.java b/ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/handler/AllUrlHandler.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AllUrlHandler.java rename to ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/handler/AllUrlHandler.java index 76e5ffd..ffb20e0 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AllUrlHandler.java +++ b/ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/handler/AllUrlHandler.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.handler; +package com.ruoyi.component.security.handler; import cn.hutool.core.util.ReUtil; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import lombok.Data; import org.springframework.beans.factory.InitializingBean; import org.springframework.stereotype.Component; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/handler/GlobalExceptionHandler.java similarity index 82% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/handler/GlobalExceptionHandler.java index f3eda48..1b29e9e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/ruoyi-component/ruoyi-component-security/src/main/java/com/ruoyi/component/security/handler/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.exception; +package com.ruoyi.component.security.handler; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; @@ -6,14 +6,13 @@ import cn.dev33.satoken.exception.NotRoleException; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.exception.DemoModeException; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.exception.base.BaseException; -import com.ruoyi.common.utils.StreamUtils; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.exception.CustomException; +import com.ruoyi.component.core.exception.DemoModeException; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.exception.base.BaseException; +import com.ruoyi.component.core.util.StreamUtils; import lombok.extern.slf4j.Slf4j; -import org.mybatis.spring.MyBatisSystemException; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.dao.DuplicateKeyException; import org.springframework.validation.BindException; @@ -89,30 +88,6 @@ public class GlobalExceptionHandler { return R.fail(e.getMessage()); } - /** - * 主键或UNIQUE索引，数据重复异常 - */ - @ExceptionHandler(DuplicateKeyException.class) - public R handleDuplicateKeyException(DuplicateKeyException e, HttpServletRequest request) { - String requestURI = request.getRequestURI(); - log.error("请求地址'{}',数据库中已存在记录'{}'", requestURI, e.getMessage()); - return R.fail("数据库中已存在该记录，请联系管理员确认"); - } - - /** - * Mybatis系统异常 通用处理 - */ - @ExceptionHandler(MyBatisSystemException.class) - public R handleCannotFindDataSourceException(MyBatisSystemException e, HttpServletRequest request) { - String requestURI = request.getRequestURI(); - String message = e.getMessage(); - if (message.contains("CannotFindDataSourceException")) { - log.error("请求地址'{}', 未找到数据源", requestURI); - return R.fail("未找到数据源，请联系管理员确认"); - } - log.error("请求地址'{}', Mybatis系统异常", requestURI, e); - return R.fail(message); - } /** * 业务异常 diff --git a/ruoyi-component/ruoyi-component-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..9a1fefe --- /dev/null +++ b/ruoyi-component/ruoyi-component-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.ruoyi.component.security.handler.GlobalExceptionHandler +com.ruoyi.component.security.handler.AllUrlHandler +com.ruoyi.component.security.config.SecurityConfig diff --git a/ruoyi-component/ruoyi-component-sensitive/pom.xml b/ruoyi-component/ruoyi-component-sensitive/pom.xml new file mode 100644 index 0000000..bdd3c7e --- /dev/null +++ b/ruoyi-component/ruoyi-component-sensitive/pom.xml @@ -0,0 +1,23 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-sensitive + jar + + + UTF-8 + + + + + com.ruoyi + ruoyi-component-json + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java b/ruoyi-component/ruoyi-component-sensitive/src/main/java/com/ruoyi/component/sensitive/annotation/Sensitive.java similarity index 75% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java rename to ruoyi-component/ruoyi-component-sensitive/src/main/java/com/ruoyi/component/sensitive/annotation/Sensitive.java index 2ad9777..22a0595 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java +++ b/ruoyi-component/ruoyi-component-sensitive/src/main/java/com/ruoyi/component/sensitive/annotation/Sensitive.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.component.sensitive.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.ruoyi.common.enums.SensitiveStrategy; -import com.ruoyi.common.jackson.SensitiveJsonSerializer; +import com.ruoyi.component.sensitive.core.SensitiveStrategy; +import com.ruoyi.component.sensitive.handler.SensitiveJsonSerializer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java b/ruoyi-component/ruoyi-component-sensitive/src/main/java/com/ruoyi/component/sensitive/core/SensitiveService.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java rename to ruoyi-component/ruoyi-component-sensitive/src/main/java/com/ruoyi/component/sensitive/core/SensitiveService.java index 85ce22f..9e870e6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java +++ b/ruoyi-component/ruoyi-component-sensitive/src/main/java/com/ruoyi/component/sensitive/core/SensitiveService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.ruoyi.component.sensitive.core; /** * 脱敏服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java b/ruoyi-component/ruoyi-component-sensitive/src/main/java/com/ruoyi/component/sensitive/core/SensitiveStrategy.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java rename to ruoyi-component/ruoyi-component-sensitive/src/main/java/com/ruoyi/component/sensitive/core/SensitiveStrategy.java index f667173..0752de0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java +++ b/ruoyi-component/ruoyi-component-sensitive/src/main/java/com/ruoyi/component/sensitive/core/SensitiveStrategy.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.sensitive.core; import cn.hutool.core.util.DesensitizedUtil; import lombok.AllArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java b/ruoyi-component/ruoyi-component-sensitive/src/main/java/com/ruoyi/component/sensitive/handler/SensitiveJsonSerializer.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java rename to ruoyi-component/ruoyi-component-sensitive/src/main/java/com/ruoyi/component/sensitive/handler/SensitiveJsonSerializer.java index 41e5781..ca74031 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java +++ b/ruoyi-component/ruoyi-component-sensitive/src/main/java/com/ruoyi/component/sensitive/handler/SensitiveJsonSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.jackson; +package com.ruoyi.component.sensitive.handler; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import com.ruoyi.common.annotation.Sensitive; -import com.ruoyi.common.core.service.SensitiveService; -import com.ruoyi.common.enums.SensitiveStrategy; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; +import com.ruoyi.component.sensitive.annotation.Sensitive; +import com.ruoyi.component.sensitive.core.SensitiveService; +import com.ruoyi.component.sensitive.core.SensitiveStrategy; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/ruoyi-component/ruoyi-component-sms/pom.xml b/ruoyi-component/ruoyi-component-sms/pom.xml new file mode 100644 index 0000000..61d4b9b --- /dev/null +++ b/ruoyi-component/ruoyi-component-sms/pom.xml @@ -0,0 +1,34 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-sms + jar + + + UTF-8 + + + + + org.dromara.sms4j + sms4j-spring-boot-starter + + + + com.alibaba + fastjson + + + + + com.ruoyi + ruoyi-component-core + + + diff --git a/ruoyi-component/ruoyi-component-sms/src/main/java/com/ruoyi/component/sms/config/SmsConfig.java b/ruoyi-component/ruoyi-component-sms/src/main/java/com/ruoyi/component/sms/config/SmsConfig.java new file mode 100644 index 0000000..a3e5ae5 --- /dev/null +++ b/ruoyi-component/ruoyi-component-sms/src/main/java/com/ruoyi/component/sms/config/SmsConfig.java @@ -0,0 +1,12 @@ +package com.ruoyi.component.sms.config; + +/** + * 短信配置类 + * + * @author Lion Li + * @version 4.2.0 + */ +//@Configuration // 暂时用不上 留着后续扩展使用 +public class SmsConfig { + +} diff --git a/ruoyi-component/ruoyi-component-sms/src/main/java/com/ruoyi/component/sms/config/SmsProperties.java b/ruoyi-component/ruoyi-component-sms/src/main/java/com/ruoyi/component/sms/config/SmsProperties.java new file mode 100644 index 0000000..4c7cae7 --- /dev/null +++ b/ruoyi-component/ruoyi-component-sms/src/main/java/com/ruoyi/component/sms/config/SmsProperties.java @@ -0,0 +1,20 @@ +package com.ruoyi.component.sms.config;//package com.ruoyi.sms.config.properties; +// +//import lombok.Data; +//import org.springframework.boot.context.properties.ConfigurationProperties; +//import org.springframework.stereotype.Component; +// +///** +// * SMS短信 配置属性 +// * +// * @author Lion Li +// * @version 4.2.0 +// */ +//@Data +//@Component +//@ConfigurationProperties(prefix = "sms") +//public class SmsProperties { +// +// private Boolean enabled; +// +//} diff --git a/ruoyi-component/ruoyi-component-tenant/pom.xml b/ruoyi-component/ruoyi-component-tenant/pom.xml new file mode 100644 index 0000000..1cfbee1 --- /dev/null +++ b/ruoyi-component/ruoyi-component-tenant/pom.xml @@ -0,0 +1,32 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + ruoyi-component-tenant + + + com.ruoyi + ruoyi-common + + + com.ruoyi + ruoyi-component-redis + + + com.ruoyi + ruoyi-component-satoken + + + com.alibaba + transmittable-thread-local + + + com.ruoyi + ruoyi-component-mybatis + + + diff --git a/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/config/TenantConfig.java b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/config/TenantConfig.java new file mode 100644 index 0000000..8a3e77e --- /dev/null +++ b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/config/TenantConfig.java @@ -0,0 +1,100 @@ +package com.ruoyi.component.tenant.config; + +import cn.dev33.satoken.dao.SaTokenDao; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; +import com.ruoyi.component.core.util.reflect.ReflectUtils; +import com.ruoyi.component.mybatis.config.MybatisPlusConfig; +import com.ruoyi.component.redis.config.RedisConfig; +import com.ruoyi.component.redis.properties.RedissonProperties; +import com.ruoyi.component.tenant.core.TenantSaTokenDao; +import com.ruoyi.component.tenant.handle.PlusTenantLineHandler; +import com.ruoyi.component.tenant.handle.TenantKeyPrefixHandler; +import com.ruoyi.component.tenant.manager.TenantSpringCacheManager; +import com.ruoyi.component.tenant.properties.TenantProperties; +import org.redisson.config.ClusterServersConfig; +import org.redisson.config.SingleServerConfig; +import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cache.CacheManager; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; + +import java.util.ArrayList; +import java.util.List; + +/** + * 租户配置类 + * + * @author Lion Li + */ +@EnableConfigurationProperties(TenantProperties.class) +@AutoConfiguration(after = {RedisConfig.class, MybatisPlusConfig.class}) +@ConditionalOnProperty(value = "tenant.enable", havingValue = "true") +public class TenantConfig { + + /** + * 初始化租户配置 + */ + @Bean + public boolean tenantInit(MybatisPlusInterceptor mybatisPlusInterceptor, + TenantProperties tenantProperties) { + List interceptors = new ArrayList<>(); + // 多租户插件 必须放到第一位 + interceptors.add(tenantLineInnerInterceptor(tenantProperties)); + interceptors.addAll(mybatisPlusInterceptor.getInterceptors()); + mybatisPlusInterceptor.setInterceptors(interceptors); + return true; + } + + /** + * 多租户插件 + */ + public TenantLineInnerInterceptor tenantLineInnerInterceptor(TenantProperties tenantProperties) { + return new TenantLineInnerInterceptor(new PlusTenantLineHandler(tenantProperties)); + } + + @Bean + public RedissonAutoConfigurationCustomizer tenantRedissonCustomizer(RedissonProperties redissonProperties) { + return config -> { + TenantKeyPrefixHandler nameMapper = new TenantKeyPrefixHandler(redissonProperties.getKeyPrefix()); + SingleServerConfig singleServerConfig = ReflectUtils.invokeGetter(config, "singleServerConfig"); + if (ObjectUtil.isNotNull(singleServerConfig)) { + // 使用单机模式 + // 设置多租户 redis key前缀 + singleServerConfig.setNameMapper(nameMapper); + ReflectUtils.invokeSetter(config, "singleServerConfig", singleServerConfig); + } + ClusterServersConfig clusterServersConfig = ReflectUtils.invokeGetter(config, "clusterServersConfig"); + // 集群配置方式 参考下方注释 + if (ObjectUtil.isNotNull(clusterServersConfig)) { + // 设置多租户 redis key前缀 + clusterServersConfig.setNameMapper(nameMapper); + ReflectUtils.invokeSetter(config, "clusterServersConfig", clusterServersConfig); + } + }; + } + + /** + * 多租户缓存管理器 + */ + @Primary + @Bean + public CacheManager tenantCacheManager() { + return new TenantSpringCacheManager(); + } + + /** + * 多租户鉴权dao实现 + */ + @Primary + @Bean + public SaTokenDao tenantSaTokenDao() { + return new TenantSaTokenDao(); + } + +} diff --git a/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/core/TenantEntity.java b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/core/TenantEntity.java new file mode 100644 index 0000000..2520740 --- /dev/null +++ b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/core/TenantEntity.java @@ -0,0 +1,21 @@ +package com.ruoyi.component.tenant.core; + +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 租户基类 + * + * @author Michelle.Chung + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TenantEntity extends BaseEntity { + + /** + * 租户编号 + */ + private String tenantId; + +} diff --git a/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/core/TenantSaTokenDao.java b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/core/TenantSaTokenDao.java new file mode 100644 index 0000000..a31dc0b --- /dev/null +++ b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/core/TenantSaTokenDao.java @@ -0,0 +1,148 @@ +package com.ruoyi.component.tenant.core; + +import com.ruoyi.component.core.constant.GlobalConstants; +import com.ruoyi.component.redis.util.RedisUtils; +import com.ruoyi.component.satoken.core.PlusSaTokenDao; + +import java.time.Duration; +import java.util.List; + +/** + * SaToken 认证数据持久层 适配多租户 + * + * @author Lion Li + */ +public class TenantSaTokenDao extends PlusSaTokenDao { + + @Override + public String get(String key) { + return super.get(GlobalConstants.GLOBAL_REDIS_KEY + key); + } + + @Override + public void set(String key, String value, long timeout) { + super.set(GlobalConstants.GLOBAL_REDIS_KEY + key, value, timeout); + } + + /** + * 修修改指定key-value键值对 (过期时间不变) + */ + @Override + public void update(String key, String value) { + long expire = getTimeout(key); + // -2 = 无此键 + if (expire == NOT_VALUE_EXPIRE) { + return; + } + this.set(key, value, expire); + } + + /** + * 删除Value + */ + @Override + public void delete(String key) { + super.delete(GlobalConstants.GLOBAL_REDIS_KEY + key); + } + + /** + * 获取Value的剩余存活时间 (单位: 秒) + */ + @Override + public long getTimeout(String key) { + return super.getTimeout(GlobalConstants.GLOBAL_REDIS_KEY + key); + } + + /** + * 修改Value的剩余存活时间 (单位: 秒) + */ + @Override + public void updateTimeout(String key, long timeout) { + // 判断是否想要设置为永久 + if (timeout == NEVER_EXPIRE) { + long expire = getTimeout(key); + if (expire == NEVER_EXPIRE) { + // 如果其已经被设置为永久，则不作任何处理 + } else { + // 如果尚未被设置为永久，那么再次set一次 + this.set(key, this.get(key), timeout); + } + return; + } + RedisUtils.expire(GlobalConstants.GLOBAL_REDIS_KEY + key, Duration.ofSeconds(timeout)); + } + + + /** + * 获取Object，如无返空 + */ + @Override + public Object getObject(String key) { + return super.getObject(GlobalConstants.GLOBAL_REDIS_KEY + key); + } + + /** + * 写入Object，并设定存活时间 (单位: 秒) + */ + @Override + public void setObject(String key, Object object, long timeout) { + super.setObject(GlobalConstants.GLOBAL_REDIS_KEY + key, object, timeout); + } + + /** + * 更新Object (过期时间不变) + */ + @Override + public void updateObject(String key, Object object) { + long expire = getObjectTimeout(key); + // -2 = 无此键 + if (expire == NOT_VALUE_EXPIRE) { + return; + } + this.setObject(key, object, expire); + } + + /** + * 删除Object + */ + @Override + public void deleteObject(String key) { + super.deleteObject(GlobalConstants.GLOBAL_REDIS_KEY + key); + } + + /** + * 获取Object的剩余存活时间 (单位: 秒) + */ + @Override + public long getObjectTimeout(String key) { + return super.getObjectTimeout(GlobalConstants.GLOBAL_REDIS_KEY + key); + } + + /** + * 修改Object的剩余存活时间 (单位: 秒) + */ + @Override + public void updateObjectTimeout(String key, long timeout) { + // 判断是否想要设置为永久 + if (timeout == NEVER_EXPIRE) { + long expire = getObjectTimeout(key); + if (expire == NEVER_EXPIRE) { + // 如果其已经被设置为永久，则不作任何处理 + } else { + // 如果尚未被设置为永久，那么再次set一次 + this.setObject(key, this.getObject(key), timeout); + } + return; + } + RedisUtils.expire(GlobalConstants.GLOBAL_REDIS_KEY + key, Duration.ofSeconds(timeout)); + } + + + /** + * 搜索数据 + */ + @Override + public List searchData(String prefix, String keyword, int start, int size, boolean sortType) { + return super.searchData(GlobalConstants.GLOBAL_REDIS_KEY + prefix, keyword, start, size, sortType); + } +} diff --git a/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/exception/TenantException.java b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/exception/TenantException.java new file mode 100644 index 0000000..69bd07c --- /dev/null +++ b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/exception/TenantException.java @@ -0,0 +1,22 @@ +package com.ruoyi.component.tenant.exception; + + +import com.ruoyi.component.core.exception.base.BaseException; + +import java.io.Serializable; + + +/** + * 租户异常类 + * + * @author Lion + */ +public class TenantException extends BaseException implements Serializable { + + + private static final long serialVersionUID = 1L; + + public TenantException(String code, Object... args) { + super("tenant", code, args, null); + } +} diff --git a/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/handle/PlusTenantLineHandler.java b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/handle/PlusTenantLineHandler.java new file mode 100644 index 0000000..1472133 --- /dev/null +++ b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/handle/PlusTenantLineHandler.java @@ -0,0 +1,56 @@ +package com.ruoyi.component.tenant.handle; + +import cn.hutool.core.collection.ListUtil; +import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.tenant.helper.TenantHelper; +import com.ruoyi.component.tenant.properties.TenantProperties; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.expression.NullValue; +import net.sf.jsqlparser.expression.StringValue; + +import java.util.List; + +/** + * 自定义租户处理器 + * + * @author Lion Li + */ +@Slf4j +@AllArgsConstructor +public class PlusTenantLineHandler implements TenantLineHandler { + + private final TenantProperties tenantProperties; + + @Override + public Expression getTenantId() { + String tenantId = TenantHelper.getTenantId(); + if (StringUtils.isBlank(tenantId)) { + log.error("无法获取有效的租户id -> Null"); + return new NullValue(); + } + // 返回固定租户 + return new StringValue(tenantId); + } + + @Override + public boolean ignoreTable(String tableName) { + String tenantId = TenantHelper.getTenantId(); + // 判断是否有租户 + if (StringUtils.isNotBlank(tenantId)) { + // 不需要过滤租户的表 + List excludes = tenantProperties.getExcludes(); + // 非业务表 + List tables = ListUtil.toList( + "gen_table", + "gen_table_column" + ); + tables.addAll(excludes); + return tables.contains(tableName); + } + return true; + } + +} diff --git a/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/handle/TenantKeyPrefixHandler.java b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/handle/TenantKeyPrefixHandler.java new file mode 100644 index 0000000..51a0998 --- /dev/null +++ b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/handle/TenantKeyPrefixHandler.java @@ -0,0 +1,66 @@ +package com.ruoyi.component.tenant.handle; + +import com.ruoyi.component.core.constant.GlobalConstants; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.redis.handler.KeyPrefixHandler; +import com.ruoyi.component.tenant.helper.TenantHelper; +import lombok.extern.slf4j.Slf4j; + +/** + * 多租户redis缓存key前缀处理 + * + * @author Lion Li + */ +@Slf4j +public class TenantKeyPrefixHandler extends KeyPrefixHandler { + + public TenantKeyPrefixHandler(String keyPrefix) { + super(keyPrefix); + } + + /** + * 增加前缀 + */ + @Override + public String map(String name) { + if (StringUtils.isBlank(name)) { + return null; + } + if (StringUtils.contains(name, GlobalConstants.GLOBAL_REDIS_KEY)) { + return super.map(name); + } + String tenantId = TenantHelper.getTenantId(); + if (StringUtils.isBlank(tenantId)) { + log.error("无法获取有效的租户id -> Null"); + } + if (StringUtils.startsWith(name, tenantId + "")) { + // 如果存在则直接返回 + return super.map(name); + } + return super.map(tenantId + ":" + name); + } + + /** + * 去除前缀 + */ + @Override + public String unmap(String name) { + String unmap = super.unmap(name); + if (StringUtils.isBlank(unmap)) { + return null; + } + if (StringUtils.contains(name, GlobalConstants.GLOBAL_REDIS_KEY)) { + return super.unmap(name); + } + String tenantId = TenantHelper.getTenantId(); + if (StringUtils.isBlank(tenantId)) { + log.error("无法获取有效的租户id -> Null"); + } + if (StringUtils.startsWith(unmap, tenantId + "")) { + // 如果存在则删除 + return unmap.substring((tenantId + ":").length()); + } + return unmap; + } + +} diff --git a/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/helper/TenantHelper.java b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/helper/TenantHelper.java new file mode 100644 index 0000000..9cd1b0b --- /dev/null +++ b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/helper/TenantHelper.java @@ -0,0 +1,189 @@ +package com.ruoyi.component.tenant.helper; + +import cn.dev33.satoken.context.SaHolder; +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.convert.Convert; +import com.alibaba.ttl.TransmittableThreadLocal; +import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy; +import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.constant.GlobalConstants; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; +import com.ruoyi.component.redis.util.RedisUtils; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import java.util.function.Supplier; + +/** + * 租户助手 + * + * @author Lion Li + */ +@Slf4j +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class TenantHelper { + + private static final String DYNAMIC_TENANT_KEY = GlobalConstants.GLOBAL_REDIS_KEY + "dynamicTenant"; + + private static final ThreadLocal TEMP_DYNAMIC_TENANT = new TransmittableThreadLocal<>(); + + /** + * 租户功能是否启用 + */ + public static boolean isEnable() { + return Convert.toBool(SpringUtils.getProperty("tenant.enable"), false); + } + + /** + * 开启忽略租户(开启后需手动调用 {@link #disableIgnore()} 关闭) + */ + public static void enableIgnore() { + InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build()); + } + + /** + * 关闭忽略租户 + */ + public static void disableIgnore() { + InterceptorIgnoreHelper.clearIgnoreStrategy(); + } + + /** + * 在忽略租户中执行 + * + * @param handle 处理执行方法 + */ + public static void ignore(Runnable handle) { + enableIgnore(); + try { + handle.run(); + } finally { + disableIgnore(); + } + } + + /** + * 在忽略租户中执行 + * + * @param handle 处理执行方法 + */ + public static T ignore(Supplier handle) { + enableIgnore(); + try { + return handle.get(); + } finally { + disableIgnore(); + } + } + + /** + * 设置动态租户(一直有效 需要手动清理) + *

+ * 如果为未登录状态下 那么只在当前线程内生效 + */ + public static void setDynamic(String tenantId) { + if (!isEnable()) { + return; + } + if (!isLogin()) { + TEMP_DYNAMIC_TENANT.set(tenantId); + return; + } + String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId(); + RedisUtils.setCacheObject(cacheKey, tenantId); + SaHolder.getStorage().set(cacheKey, tenantId); + } + + /** + * 获取动态租户(一直有效 需要手动清理) + *

+ * 如果为未登录状态下 那么只在当前线程内生效 + */ + public static String getDynamic() { + if (!isEnable()) { + return null; + } + if (!isLogin()) { + return TEMP_DYNAMIC_TENANT.get(); + } + String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId(); + String tenantId = (String) SaHolder.getStorage().get(cacheKey); + if (StringUtils.isNotBlank(tenantId)) { + return tenantId; + } + tenantId = RedisUtils.getCacheObject(cacheKey); + SaHolder.getStorage().set(cacheKey, tenantId); + return tenantId; + } + + /** + * 清除动态租户 + */ + public static void clearDynamic() { + if (!isEnable()) { + return; + } + if (!isLogin()) { + TEMP_DYNAMIC_TENANT.remove(); + return; + } + String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId(); + RedisUtils.deleteObject(cacheKey); + SaHolder.getStorage().delete(cacheKey); + } + + /** + * 在动态租户中执行 + * + * @param handle 处理执行方法 + */ + public static void dynamic(String tenantId, Runnable handle) { + setDynamic(tenantId); + try { + handle.run(); + } finally { + clearDynamic(); + } + } + + /** + * 在动态租户中执行 + * + * @param handle 处理执行方法 + */ + public static T dynamic(String tenantId, Supplier handle) { + setDynamic(tenantId); + try { + return handle.get(); + } finally { + clearDynamic(); + } + } + + /** + * 获取当前租户id(动态租户优先) + */ + public static String getTenantId() { + if (!isEnable()) { + return null; + } + String tenantId = TenantHelper.getDynamic(); + if (StringUtils.isBlank(tenantId)) { + tenantId = LoginHelper.getTenantId(); + } + return tenantId; + } + + private static boolean isLogin() { + try { + StpUtil.checkLogin(); + return true; + } catch (Exception e) { + return false; + } + } + +} diff --git a/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/manager/TenantSpringCacheManager.java b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/manager/TenantSpringCacheManager.java new file mode 100644 index 0000000..5e0778f --- /dev/null +++ b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/manager/TenantSpringCacheManager.java @@ -0,0 +1,32 @@ +package com.ruoyi.component.tenant.manager; + +import com.ruoyi.component.core.constant.GlobalConstants; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.redis.manager.PlusSpringCacheManager; +import com.ruoyi.component.tenant.helper.TenantHelper; +import org.springframework.cache.Cache; + +/** + * 重写 cacheName 处理方法 支持多租户 + * + * @author Lion Li + */ +public class TenantSpringCacheManager extends PlusSpringCacheManager { + + public TenantSpringCacheManager() { + } + + @Override + public Cache getCache(String name) { + if (StringUtils.contains(name, GlobalConstants.GLOBAL_REDIS_KEY)) { + return super.getCache(name); + } + String tenantId = TenantHelper.getTenantId(); + if (StringUtils.startsWith(name, tenantId)) { + // 如果存在则直接返回 + return super.getCache(name); + } + return super.getCache(tenantId + ":" + name); + } + +} diff --git a/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/properties/TenantProperties.java b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/properties/TenantProperties.java new file mode 100644 index 0000000..50a7d83 --- /dev/null +++ b/ruoyi-component/ruoyi-component-tenant/src/main/java/com/ruoyi/component/tenant/properties/TenantProperties.java @@ -0,0 +1,27 @@ +package com.ruoyi.component.tenant.properties; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +import java.util.List; + +/** + * 租户 配置属性 + * + * @author Lion Li + */ +@Data +@ConfigurationProperties(prefix = "tenant") +public class TenantProperties { + + /** + * 是否启用 + */ + private Boolean enable; + + /** + * 排除表 + */ + private List excludes; + +} diff --git a/ruoyi-component/ruoyi-component-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..2b7e59c --- /dev/null +++ b/ruoyi-component/ruoyi-component-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.component.tenant.config.TenantConfig diff --git a/ruoyi-component/ruoyi-component-translation/pom.xml b/ruoyi-component/ruoyi-component-translation/pom.xml new file mode 100644 index 0000000..b222fae --- /dev/null +++ b/ruoyi-component/ruoyi-component-translation/pom.xml @@ -0,0 +1,22 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-translation + jar + + UTF-8 + + + + + com.ruoyi + ruoyi-component-json + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Translation.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/annotation/Translation.java similarity index 79% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Translation.java rename to ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/annotation/Translation.java index ba8cd22..259e047 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Translation.java +++ b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/annotation/Translation.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.component.translation.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.ruoyi.common.translation.handler.TranslationHandler; +import com.ruoyi.component.translation.core.handler.TranslationHandler; import java.lang.annotation.*; @@ -20,7 +20,7 @@ import java.lang.annotation.*; public @interface Translation { /** - * 类型 (需与实现类上的 {@link com.ruoyi.common.annotation.TranslationType} 注解type对应) + * 类型 (需与实现类上的 {@link TranslationType} 注解type对应) *

* 默认取当前字段的值 如果设置了 @{@link Translation#mapper()} 则取映射字段的值 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/TranslationType.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/annotation/TranslationType.java similarity index 59% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/TranslationType.java rename to ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/annotation/TranslationType.java index f592f6d..4ec9610 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/TranslationType.java +++ b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/annotation/TranslationType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.component.translation.annotation; import java.lang.annotation.*; /** - * 翻译类型注解 (标注到{@link com.ruoyi.common.translation.TranslationInterface} 的实现类) + * 翻译类型注解 (标注到{@link com.ruoyi.component.translation.core.TranslationInterface} 的实现类) * * @author Lion Li */ diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TranslationConfig.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/config/TranslationConfig.java similarity index 80% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/TranslationConfig.java rename to ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/config/TranslationConfig.java index c68bf60..8b54e89 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TranslationConfig.java +++ b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/config/TranslationConfig.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.translation.config; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.common.annotation.TranslationType; -import com.ruoyi.common.translation.TranslationInterface; -import com.ruoyi.common.translation.handler.TranslationBeanSerializerModifier; -import com.ruoyi.common.translation.handler.TranslationHandler; +import com.ruoyi.component.translation.annotation.TranslationType; +import com.ruoyi.component.translation.core.TranslationInterface; +import com.ruoyi.component.translation.core.handler.TranslationBeanSerializerModifier; +import com.ruoyi.component.translation.core.handler.TranslationHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/TransConstant.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/constant/TransConstant.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/TransConstant.java rename to ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/constant/TransConstant.java index 5c5e5f8..01cd75c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/TransConstant.java +++ b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/constant/TransConstant.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.component.translation.constant; /** * 翻译常量 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/TranslationInterface.java similarity index 58% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java rename to ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/TranslationInterface.java index 91af97c..717d4bb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java +++ b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/TranslationInterface.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.translation; +package com.ruoyi.component.translation.core; /** - * 翻译接口 (实现类需标注 {@link com.ruoyi.common.annotation.TranslationType} 注解标明翻译类型) + * 翻译接口 (实现类需标注 {@link com.ruoyi.component.translation.annotation.TranslationType} 注解标明翻译类型) * * @author Lion Li */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationBeanSerializerModifier.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/handler/TranslationBeanSerializerModifier.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationBeanSerializerModifier.java rename to ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/handler/TranslationBeanSerializerModifier.java index 0bcaf28..37691bb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationBeanSerializerModifier.java +++ b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/handler/TranslationBeanSerializerModifier.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.translation.handler; +package com.ruoyi.component.translation.core.handler; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.SerializationConfig; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/handler/TranslationHandler.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java rename to ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/handler/TranslationHandler.java index ede7206..5813377 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java +++ b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/handler/TranslationHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.translation.handler; +package com.ruoyi.component.translation.core.handler; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import com.ruoyi.common.annotation.Translation; -import com.ruoyi.common.translation.TranslationInterface; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; +import com.ruoyi.component.translation.annotation.Translation; +import com.ruoyi.component.translation.core.TranslationInterface; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.reflect.ReflectUtils; import lombok.extern.slf4j.Slf4j; import java.io.IOException; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/DeptNameTranslationImpl.java similarity index 61% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java rename to ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/DeptNameTranslationImpl.java index ada3c25..f82ae19 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java +++ b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/DeptNameTranslationImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.translation.impl; +package com.ruoyi.component.translation.core.impl; -import com.ruoyi.common.annotation.TranslationType; -import com.ruoyi.common.constant.TransConstant; -import com.ruoyi.common.core.service.DeptService; -import com.ruoyi.common.translation.TranslationInterface; +import com.ruoyi.component.core.service.DeptService; +import com.ruoyi.component.translation.annotation.TranslationType; +import com.ruoyi.component.translation.constant.TransConstant; +import com.ruoyi.component.translation.core.TranslationInterface; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -18,7 +18,7 @@ import org.springframework.stereotype.Component; public class DeptNameTranslationImpl implements TranslationInterface { private final DeptService deptService; - + @Override public String translation(Object key, String other) { return deptService.selectDeptNameByIds(key.toString()); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/DictTypeTranslationImpl.java similarity index 63% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java rename to ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/DictTypeTranslationImpl.java index 1e97b66..e478a79 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java +++ b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/DictTypeTranslationImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.translation.impl; +package com.ruoyi.component.translation.core.impl; -import com.ruoyi.common.annotation.TranslationType; -import com.ruoyi.common.constant.TransConstant; -import com.ruoyi.common.core.service.DictService; -import com.ruoyi.common.translation.TranslationInterface; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.service.DictService; +import com.ruoyi.component.translation.annotation.TranslationType; +import com.ruoyi.component.translation.constant.TransConstant; +import com.ruoyi.component.translation.core.TranslationInterface; +import com.ruoyi.component.core.util.StringUtils; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/OssUrlTranslationImpl.java similarity index 61% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java rename to ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/OssUrlTranslationImpl.java index 863e4d6..68aa8dd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java +++ b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/OssUrlTranslationImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.translation.impl; +package com.ruoyi.component.translation.core.impl; -import com.ruoyi.common.annotation.TranslationType; -import com.ruoyi.common.constant.TransConstant; -import com.ruoyi.common.core.service.OssService; -import com.ruoyi.common.translation.TranslationInterface; +import com.ruoyi.component.core.service.OssService; +import com.ruoyi.component.translation.annotation.TranslationType; +import com.ruoyi.component.translation.constant.TransConstant; +import com.ruoyi.component.translation.core.TranslationInterface; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/UserNameTranslationImpl.java similarity index 65% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java rename to ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/UserNameTranslationImpl.java index eccf1c8..42ea36c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java +++ b/ruoyi-component/ruoyi-component-translation/src/main/java/com/ruoyi/component/translation/core/impl/UserNameTranslationImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.translation.impl; +package com.ruoyi.component.translation.core.impl; -import com.ruoyi.common.annotation.TranslationType; -import com.ruoyi.common.constant.TransConstant; -import com.ruoyi.common.core.service.UserService; -import com.ruoyi.common.translation.TranslationInterface; +import com.ruoyi.component.core.service.UserService; +import com.ruoyi.component.translation.annotation.TranslationType; +import com.ruoyi.component.translation.constant.TransConstant; +import com.ruoyi.component.translation.core.TranslationInterface; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/ruoyi-component/ruoyi-component-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..06f3005 --- /dev/null +++ b/ruoyi-component/ruoyi-component-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.ruoyi.component.translation.config.TranslationConfig +com.ruoyi.component.translation.core.impl.DeptNameTranslationImpl +com.ruoyi.component.translation.core.impl.DictTypeTranslationImpl +com.ruoyi.component.translation.core.impl.OssUrlTranslationImpl +com.ruoyi.component.translation.core.impl.UserNameTranslationImpl diff --git a/ruoyi-component/ruoyi-component-web/pom.xml b/ruoyi-component/ruoyi-component-web/pom.xml new file mode 100644 index 0000000..5614964 --- /dev/null +++ b/ruoyi-component/ruoyi-component-web/pom.xml @@ -0,0 +1,60 @@ + + 4.0.0 + + com.ruoyi + ruoyi-component + 4.8.2 + + + ruoyi-component-web + jar + + + UTF-8 + + + + + com.ruoyi + ruoyi-component-json + + + com.ruoyi + ruoyi-component-redis + + + + org.springframework.boot + spring-boot-starter-web + + + spring-boot-starter-tomcat + org.springframework.boot + + + + + + org.springframework.boot + spring-boot-starter-undertow + + + cn.hutool + hutool-captcha + + + cn.hutool + hutool-jwt + + + cn.hutool + hutool-crypto + + + + com.alibaba + transmittable-thread-local + + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/CaptchaConfig.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/CaptchaConfig.java index b284216..8725fd1 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/CaptchaConfig.java @@ -1,11 +1,10 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.web.config; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.CircleCaptcha; import cn.hutool.captcha.LineCaptcha; import cn.hutool.captcha.ShearCaptcha; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; import java.awt.*; @@ -15,7 +14,6 @@ import java.awt.*; * * @author Lion Li */ -@Configuration public class CaptchaConfig { private static final int WIDTH = 160; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/FilterConfig.java similarity index 85% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/FilterConfig.java index 0770c21..fcfb363 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/FilterConfig.java @@ -1,14 +1,13 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.web.config; -import com.ruoyi.common.filter.RepeatableFilter; -import com.ruoyi.common.filter.XssFilter; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.XssProperties; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.web.config.properties.XssProperties; +import com.ruoyi.component.web.filter.RepeatableFilter; +import com.ruoyi.component.web.filter.XssFilter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import javax.servlet.DispatcherType; import java.util.HashMap; @@ -19,7 +18,6 @@ import java.util.Map; * * @author Lion Li */ -@Configuration public class FilterConfig { @Autowired diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/I18nConfig.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/I18nConfig.java index e64fa3a..3f928e2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/I18nConfig.java @@ -1,8 +1,7 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.web.config; import cn.hutool.core.util.StrUtil; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.LocaleResolver; import javax.servlet.http.HttpServletRequest; @@ -14,7 +13,6 @@ import java.util.Locale; * * @author Lion Li */ -@Configuration public class I18nConfig { @Bean diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/ResourcesConfig.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/ResourcesConfig.java index ea83338..3696fdf 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/ResourcesConfig.java @@ -1,8 +1,7 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.web.config; -import com.ruoyi.framework.interceptor.PlusWebInvokeTimeInterceptor; +import com.ruoyi.component.web.interceptor.PlusWebInvokeTimeInterceptor; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; @@ -15,7 +14,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * * @author Lion Li */ -@Configuration public class ResourcesConfig implements WebMvcConfigurer { @Override diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/UndertowConfig.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/UndertowConfig.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/UndertowConfig.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/UndertowConfig.java index 64e745a..e16d213 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/UndertowConfig.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/UndertowConfig.java @@ -1,17 +1,15 @@ -package com.ruoyi.framework.config; +package com.ruoyi.component.web.config; import io.undertow.server.DefaultByteBufferPool; import io.undertow.websockets.jsr.WebSocketDeploymentInfo; import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; import org.springframework.boot.web.server.WebServerFactoryCustomizer; -import org.springframework.context.annotation.Configuration; /** * Undertow 自定义配置 * * @author Lion Li */ -@Configuration public class UndertowConfig implements WebServerFactoryCustomizer { /** diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/CaptchaProperties.java similarity index 79% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/CaptchaProperties.java index 1b41c66..ff95f6e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/CaptchaProperties.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.component.web.config.properties; -import com.ruoyi.common.enums.CaptchaCategory; -import com.ruoyi.common.enums.CaptchaType; +import com.ruoyi.component.web.enums.CaptchaCategory; +import com.ruoyi.component.web.enums.CaptchaType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/XssProperties.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/XssProperties.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/XssProperties.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/XssProperties.java index d8a68a8..4ca7907 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/XssProperties.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/config/properties/XssProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.component.web.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/core/BaseController.java similarity index 79% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/core/BaseController.java index 1e0a5d5..f2d9b05 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/core/BaseController.java @@ -1,9 +1,7 @@ -package com.ruoyi.common.core.controller; +package com.ruoyi.component.web.core; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.util.StringUtils; /** * web层通用数据处理 @@ -41,29 +39,29 @@ public class BaseController { /** * 获取用户缓存信息 - */ + *//* 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(); - } + }*/ } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaCategory.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/enums/CaptchaCategory.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaCategory.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/enums/CaptchaCategory.java index 35d3ea3..3ee3f5a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaCategory.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/enums/CaptchaCategory.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.web.enums; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CircleCaptcha; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaType.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/enums/CaptchaType.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaType.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/enums/CaptchaType.java index b1c50ca..45e6ef7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaType.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/enums/CaptchaType.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.enums; +package com.ruoyi.component.web.enums; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.RandomGenerator; -import com.ruoyi.common.captcha.UnsignedMathGenerator; +import com.ruoyi.component.web.utils.UnsignedMathGenerator; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/filter/RepeatableFilter.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/filter/RepeatableFilter.java index 8927366..cdfd167 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/filter/RepeatableFilter.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.filter; +package com.ruoyi.component.web.filter; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; import org.springframework.http.MediaType; import javax.servlet.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/filter/RepeatedlyRequestWrapper.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/filter/RepeatedlyRequestWrapper.java index c1cbe3f..39544fe 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/filter/RepeatedlyRequestWrapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.filter; +package com.ruoyi.component.web.filter; import cn.hutool.core.io.IoUtil; -import com.ruoyi.common.constant.Constants; +import com.ruoyi.component.core.constant.Constants; import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/filter/XssFilter.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/filter/XssFilter.java index 72772c1..7ee1052 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/filter/XssFilter.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.filter; +package com.ruoyi.component.web.filter; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.enums.HttpMethod; +import com.ruoyi.component.core.util.StringUtils; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/filter/XssHttpServletRequestWrapper.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/filter/XssHttpServletRequestWrapper.java index a7fbd4c..eadcded 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/filter/XssHttpServletRequestWrapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.filter; +package com.ruoyi.component.web.filter; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HtmlUtil; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/interceptor/PlusWebInvokeTimeInterceptor.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/interceptor/PlusWebInvokeTimeInterceptor.java index f2d3cd7..df82a9c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/interceptor/PlusWebInvokeTimeInterceptor.java @@ -1,12 +1,12 @@ -package com.ruoyi.framework.interceptor; +package com.ruoyi.component.web.interceptor; import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; import com.alibaba.ttl.TransmittableThreadLocal; -import com.ruoyi.common.filter.RepeatedlyRequestWrapper; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; +import com.ruoyi.component.json.utils.JsonUtils; +import com.ruoyi.component.web.filter.RepeatedlyRequestWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.StopWatch; import org.springframework.http.MediaType; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/utils/UnsignedMathGenerator.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java rename to ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/utils/UnsignedMathGenerator.java index 5dd00ec..1b239fe 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java +++ b/ruoyi-component/ruoyi-component-web/src/main/java/com/ruoyi/component/web/utils/UnsignedMathGenerator.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.captcha; +package com.ruoyi.component.web.utils; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.math.Calculator; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.RandomUtil; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; /** * 无符号计算生成器 diff --git a/ruoyi-component/ruoyi-component-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-component/ruoyi-component-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..a4a99ac --- /dev/null +++ b/ruoyi-component/ruoyi-component-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.ruoyi.component.web.config.CaptchaConfig +com.ruoyi.component.web.config.FilterConfig +com.ruoyi.component.web.config.I18nConfig +com.ruoyi.component.web.config.ResourcesConfig +com.ruoyi.component.web.config.UndertowConfig diff --git a/ruoyi-dk/pom.xml b/ruoyi-dk/pom.xml index 19fc1da..12c30b1 100644 --- a/ruoyi-dk/pom.xml +++ b/ruoyi-dk/pom.xml @@ -23,10 +23,6 @@ com.ruoyi ruoyi-system - - com.ruoyi - ruoyi-framework - org.freemarker freemarker @@ -40,5 +36,14 @@ aliyun-sdk-oss 3.16.1 + + com.alibaba + fastjson + 2.0.32 + + + com.github.xiaoymin + knife4j-openapi3-spring-boot-starter + diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/BorrowStatusController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/BorrowStatusController.java index 9273463..8abef7f 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/BorrowStatusController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/BorrowStatusController.java @@ -3,16 +3,16 @@ package com.ruoyi.dk.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.component.idempotent.annotation.RepeatSubmit; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.dk.domain.BorrowStatus; import com.ruoyi.dk.enums.BankTypeEnums; import com.ruoyi.dk.service.BorrowStatusService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -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.enums.BusinessType; +import com.ruoyi.component.core.domain.R; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkAgreementSettingController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkAgreementSettingController.java index c71807b..b373e18 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkAgreementSettingController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkAgreementSettingController.java @@ -1,13 +1,13 @@ package com.ruoyi.dk.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import com.ruoyi.component.idempotent.annotation.RepeatSubmit; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.dk.domain.AgreementSetting; import com.ruoyi.dk.service.AgreementSettingService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.component.core.domain.R; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkBorrowController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkBorrowController.java index 05e9dc2..83304c8 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkBorrowController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkBorrowController.java @@ -2,17 +2,17 @@ package com.ruoyi.dk.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.component.idempotent.annotation.RepeatSubmit; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.dk.domain.Borrow; import com.ruoyi.dk.dto.admin.req.BorrowUpdateStatusReq; import com.ruoyi.dk.dto.admin.resp.BorrowResp; import com.ruoyi.dk.service.BorrowService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -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.enums.BusinessType; +import com.ruoyi.component.core.domain.R; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkCustomerController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkCustomerController.java index 440981e..73a956b 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkCustomerController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkCustomerController.java @@ -2,20 +2,20 @@ package com.ruoyi.dk.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ruoyi.component.excel.utils.ExcelUtil; +import com.ruoyi.component.idempotent.annotation.RepeatSubmit; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.dk.domain.Customer; import com.ruoyi.dk.dto.admin.req.UpdatePwdCustomerReq; import com.ruoyi.dk.dto.admin.resp.CustomerAdminResp; import com.ruoyi.dk.dto.admin.resp.CustomerExportVo; import com.ruoyi.dk.mapper.CustomerMapper; import com.ruoyi.dk.service.CustomerService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -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.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.component.core.domain.R; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkCustomerInfoController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkCustomerInfoController.java index 724c904..4fd9c6d 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkCustomerInfoController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkCustomerInfoController.java @@ -3,15 +3,15 @@ package com.ruoyi.dk.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.component.idempotent.annotation.RepeatSubmit; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.dk.domain.CustomerInfo; import com.ruoyi.dk.service.CustomerInfoService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -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.enums.BusinessType; +import com.ruoyi.component.core.domain.R; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkHomeSettingController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkHomeSettingController.java index 6d7a7f5..65f4bb5 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkHomeSettingController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkHomeSettingController.java @@ -1,13 +1,13 @@ package com.ruoyi.dk.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.idempotent.annotation.RepeatSubmit; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.dk.domain.HomeSetting; import com.ruoyi.dk.service.HomeSettingService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.enums.BusinessType; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkLoansSettingController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkLoansSettingController.java index 55ba597..959af90 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkLoansSettingController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/DkLoansSettingController.java @@ -1,13 +1,13 @@ package com.ruoyi.dk.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import com.ruoyi.component.idempotent.annotation.RepeatSubmit; +import com.ruoyi.component.log.annotation.Log; +import com.ruoyi.component.log.enums.BusinessType; +import com.ruoyi.component.web.core.BaseController; import com.ruoyi.dk.domain.LoansSetting; import com.ruoyi.dk.service.LoansSettingService; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.component.core.domain.R; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/HomeController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/HomeController.java index 990b554..bb45baf 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/HomeController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/HomeController.java @@ -5,7 +5,7 @@ import com.ruoyi.dk.domain.Borrow; import com.ruoyi.dk.domain.Customer; import com.ruoyi.dk.service.BorrowService; import com.ruoyi.dk.service.CustomerService; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.component.core.domain.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppBorrowController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppBorrowController.java index 7832fe4..b89daca 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppBorrowController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppBorrowController.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.dk.domain.Borrow; import com.ruoyi.dk.domain.HomeSetting; import com.ruoyi.dk.dto.admin.resp.BorrowAdminVO; @@ -13,12 +15,10 @@ import com.ruoyi.dk.dto.app.resp.BorrowInfo; import com.ruoyi.dk.dto.app.resp.LoanProcessResp; import com.ruoyi.dk.service.BorrowService; import com.ruoyi.dk.service.HomeSettingService; -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.helper.LoginHelper; -import com.ruoyi.common.utils.BeanConvertUtil; -import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.BeanConvertUtil; +import com.ruoyi.component.core.util.MessageUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppCustomerController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppCustomerController.java index 7a9bd98..e343505 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppCustomerController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppCustomerController.java @@ -6,9 +6,9 @@ import com.ruoyi.dk.dto.admin.resp.CustomerAdminVO; import com.ruoyi.dk.service.CustomerInfoService; import com.ruoyi.dk.service.CustomerService; import com.ruoyi.dk.service.HomeSettingService; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.BeanConvertUtil; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.BeanConvertUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppCustomerOpenController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppCustomerOpenController.java index db9f885..0cd998c 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppCustomerOpenController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppCustomerOpenController.java @@ -2,16 +2,16 @@ package com.ruoyi.dk.controller.app; import cn.hutool.core.lang.UUID; import cn.hutool.core.util.RandomUtil; +import com.ruoyi.component.redis.util.RedisUtils; import com.ruoyi.dk.domain.Customer; import com.ruoyi.dk.dto.app.req.CustomerRegisterReq; import com.ruoyi.dk.dto.app.req.UpdatePwdOpenReq; import com.ruoyi.dk.service.CustomerService; import com.ruoyi.dk.sms.CodeService; import com.ruoyi.dk.sms.CodeType; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.exception.CustomException; +import com.ruoyi.component.core.util.MessageUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppHomeController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppHomeController.java index fbac9ba..5f4a1d6 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppHomeController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppHomeController.java @@ -13,8 +13,8 @@ import com.ruoyi.dk.service.HomeSettingService; import com.ruoyi.dk.service.LoansSettingService; import com.ruoyi.dk.util.Loan; import com.ruoyi.dk.util.PhoneRandomUtil; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.BeanConvertUtil; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.util.BeanConvertUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppSettingController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppSettingController.java index f410ee7..56eaabb 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppSettingController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/AppSettingController.java @@ -9,8 +9,8 @@ import com.ruoyi.dk.enums.BankTypeEnums; import com.ruoyi.dk.service.AgreementSettingService; import com.ruoyi.dk.service.HomeSettingService; import com.ruoyi.dk.service.LoansSettingService; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.BeanConvertUtil; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.util.BeanConvertUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/LoginV2Controller.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/LoginV2Controller.java index c919b73..3c623b3 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/LoginV2Controller.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/LoginV2Controller.java @@ -2,7 +2,7 @@ package com.ruoyi.dk.controller.app; import com.ruoyi.dk.dto.app.req.LoginPhoneBody; import com.ruoyi.dk.kit.DkLoginKit; -import com.ruoyi.common.core.domain.R; +import com.ruoyi.component.core.domain.R; import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/V2CommonController.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/V2CommonController.java index bb196c8..bbbb67b 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/V2CommonController.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/controller/app/V2CommonController.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.ObjectUtil; import com.ruoyi.dk.dto.common.FileUploadRes; import com.ruoyi.dk.oss.ali.StsOssKit; import com.ruoyi.dk.oss.ali.StsResult; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.component.core.domain.R; +import com.ruoyi.component.core.util.MessageUtils; import com.ruoyi.system.domain.vo.SysOssVo; import com.ruoyi.system.service.ISysOssService; import io.swagger.v3.oas.annotations.Operation; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/dto/admin/resp/CustomerExportVo.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/dto/admin/resp/CustomerExportVo.java index 3f7b80f..ce069de 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/dto/admin/resp/CustomerExportVo.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/dto/admin/resp/CustomerExportVo.java @@ -2,10 +2,10 @@ package com.ruoyi.dk.dto.admin.resp; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.ruoyi.component.excel.annotation.ExcelEnumFormat; +import com.ruoyi.component.excel.convert.ExcelEnumConvert; import com.ruoyi.dk.enums.KinsfolkRefEnum; import com.ruoyi.dk.enums.YesOrNoEnum; -import com.ruoyi.common.annotation.ExcelEnumFormat; -import com.ruoyi.common.convert.ExcelEnumConvert; import lombok.Data; @Data diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/kit/DkLoginKit.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/kit/DkLoginKit.java index d3229ab..f88c901 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/kit/DkLoginKit.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/kit/DkLoginKit.java @@ -5,13 +5,13 @@ import cn.dev33.satoken.stp.StpUtil; import com.ruoyi.dk.domain.Customer; import com.ruoyi.dk.executor.ExecutorConstant; import com.ruoyi.dk.service.CustomerService; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.exception.base.BaseException; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.component.core.constant.Constants; +import com.ruoyi.component.core.domain.model.LoginUser; +import com.ruoyi.component.core.enums.UserType; +import com.ruoyi.component.core.exception.base.BaseException; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.MessageUtils; +import com.ruoyi.component.core.util.ServletUtils; import com.ruoyi.system.service.SysLoginService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/service/BorrowService.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/service/BorrowService.java index f63b14e..cc784bf 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/service/BorrowService.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/service/BorrowService.java @@ -2,12 +2,12 @@ package com.ruoyi.dk.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.component.mybatis.core.page.PageQuery; import com.ruoyi.dk.domain.Borrow; import com.ruoyi.dk.dto.admin.req.BorrowUpdateStatusReq; import com.ruoyi.dk.dto.admin.resp.BorrowResp; import com.ruoyi.dk.dto.app.req.BorrowStartReq; import com.ruoyi.dk.dto.app.resp.LoanProcessResp; -import com.ruoyi.common.core.domain.PageQuery; public interface BorrowService extends IService { Borrow borrow(BorrowStartReq req); diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/service/CustomerService.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/service/CustomerService.java index b493203..6d5366c 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/service/CustomerService.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/service/CustomerService.java @@ -2,10 +2,10 @@ package com.ruoyi.dk.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.component.mybatis.core.page.PageQuery; import com.ruoyi.dk.domain.Customer; import com.ruoyi.dk.dto.admin.resp.CustomerAdminResp; import com.ruoyi.dk.dto.app.req.CustomerRegisterReq; -import com.ruoyi.common.core.domain.PageQuery; import java.math.BigDecimal; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/service/impl/BorrowServiceImpl.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/service/impl/BorrowServiceImpl.java index 05eee09..eac1681 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/service/impl/BorrowServiceImpl.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/service/impl/BorrowServiceImpl.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.component.json.utils.JsonUtils; +import com.ruoyi.component.mybatis.core.page.PageQuery; import com.ruoyi.dk.domain.*; import com.ruoyi.dk.dto.admin.req.BorrowUpdateStatusReq; import com.ruoyi.dk.dto.admin.resp.BorrowResp; @@ -18,11 +20,9 @@ import com.ruoyi.dk.util.ContentReplaceUtil; import com.ruoyi.dk.util.Loan; import com.ruoyi.dk.util.MoneyUtil; import com.ruoyi.dk.util.OrderTradeNoUtil; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.BeanConvertUtil; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.component.core.exception.CustomException; +import com.ruoyi.component.core.util.BeanConvertUtil; +import com.ruoyi.component.core.util.MessageUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.redisson.api.RLock; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/service/impl/CustomerInfoServiceImpl.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/service/impl/CustomerInfoServiceImpl.java index dd7d1bd..d82c537 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/service/impl/CustomerInfoServiceImpl.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/service/impl/CustomerInfoServiceImpl.java @@ -9,8 +9,8 @@ import com.ruoyi.dk.mapper.CustomerInfoMapper; import com.ruoyi.dk.service.BorrowService; import com.ruoyi.dk.service.CustomerInfoService; import com.ruoyi.dk.service.CustomerService; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.component.core.exception.CustomException; +import com.ruoyi.component.core.util.MessageUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-dk/src/main/java/com/ruoyi/dk/service/impl/CustomerServiceImpl.java b/ruoyi-dk/src/main/java/com/ruoyi/dk/service/impl/CustomerServiceImpl.java index 9f78c7f..5325e97 100644 --- a/ruoyi-dk/src/main/java/com/ruoyi/dk/service/impl/CustomerServiceImpl.java +++ b/ruoyi-dk/src/main/java/com/ruoyi/dk/service/impl/CustomerServiceImpl.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.secure.BCrypt; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.component.mybatis.core.page.PageQuery; import com.ruoyi.dk.domain.BorrowLog; import com.ruoyi.dk.domain.Customer; import com.ruoyi.dk.domain.CustomerInfo; @@ -13,9 +14,8 @@ import com.ruoyi.dk.mapper.BorrowLogMapper; import com.ruoyi.dk.mapper.CustomerMapper; import com.ruoyi.dk.service.CustomerInfoService; import com.ruoyi.dk.service.CustomerService; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.component.core.exception.CustomException; +import com.ruoyi.component.core.util.MessageUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml deleted file mode 100644 index e15f59e..0000000 --- a/ruoyi-framework/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - dk-sass-server - com.ruoyi - 4.8.2 - - 4.0.0 - - ruoyi-framework - - - framework框架核心 - - - - - - - org.springframework.boot - spring-boot-starter-web - - - spring-boot-starter-tomcat - org.springframework.boot - - - - - - org.springframework.boot - spring-boot-starter-undertow - - - - - org.springframework.boot - spring-boot-starter-aop - - - - - p6spy - p6spy - - - - - - - - com.alibaba - transmittable-thread-local - - - - - com.ruoyi - ruoyi-common - - - - - diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java deleted file mode 100644 index f23f5ef..0000000 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.ruoyi.framework.config; - -import cn.dev33.satoken.dao.SaTokenDao; -import cn.dev33.satoken.interceptor.SaInterceptor; -import cn.dev33.satoken.jwt.StpLogicJwtForSimple; -import cn.dev33.satoken.router.SaRouter; -import cn.dev33.satoken.stp.StpInterface; -import cn.dev33.satoken.stp.StpLogic; -import cn.dev33.satoken.stp.StpUtil; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.SecurityProperties; -import com.ruoyi.framework.handler.AllUrlHandler; -import com.ruoyi.framework.satoken.dao.PlusSaTokenDao; -import com.ruoyi.framework.satoken.service.SaPermissionImpl; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -/** - * sa-token 配置 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Slf4j -@Configuration -public class SaTokenConfig implements WebMvcConfigurer { - - private final SecurityProperties securityProperties; - - /** - * 注册sa-token的拦截器 - */ - @Override - public void addInterceptors(InterceptorRegistry registry) { - // 注册路由拦截器，自定义验证规则 - registry.addInterceptor(new SaInterceptor(handler -> { - AllUrlHandler allUrlHandler = SpringUtils.getBean(AllUrlHandler.class); - // 登录验证 -- 排除多个路径 - SaRouter - .match(allUrlHandler.getUrls()) - .check(() -> StpUtil.checkLogin()); - })).addPathPatterns("/**") - // 排除不需要拦截的路径 - .excludePathPatterns(securityProperties.getExcludes()); - } - - @Bean - public StpLogic getStpLogicJwt() { - // Sa-Token 整合 jwt (简单模式) - return new StpLogicJwtForSimple(); - } - - /** - * 权限接口实现(使用bean注入方便用户替换) - */ - @Bean - public StpInterface stpInterface() { - return new SaPermissionImpl(); - } - - /** - * 自定义dao层存储 - */ - @Bean - public SaTokenDao saTokenDao() { - return new PlusSaTokenDao(); - } - -} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java deleted file mode 100644 index ece75ef..0000000 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.ruoyi.framework.config.properties; - -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * swagger 配置属性 - * - * @author Lion Li - */ -@Data -@Component -@ConfigurationProperties(prefix = "swagger") -public class SwaggerProperties { - - /** - * 验证码类型 - */ - private Boolean enabled; - /** - * 设置请求的统一前缀 - */ - private String pathMapping; - /** - * 验证码类别 - */ - private String title; - /** - * 数字验证码位数 - */ - private String description; - /** - * 字符验证码长度 - */ - private String version; - - /** - * 联系方式 - */ - private Contact contact; - - @Data - @NoArgsConstructor - public static class Contact{ - - /** - * 联系人 - **/ - private String name; - /** - * 联系人url - **/ - private String url; - /** - * 联系人email - **/ - private String email; - - } - -} diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml deleted file mode 100644 index 2ecbe4d..0000000 --- a/ruoyi-generator/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - dk-sass-server - com.ruoyi - 4.8.2 - - 4.0.0 - - ruoyi-generator - - - generator代码生成 - - - - - - - org.apache.velocity - velocity-engine-core - - - - - com.ruoyi - ruoyi-common - - - - - diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml deleted file mode 100644 index 2c635c0..0000000 --- a/ruoyi-oss/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - dk-sass-server - com.ruoyi - 4.8.2 - - 4.0.0 - - ruoyi-oss - - - OSS对象存储模块 - - - - - - - com.ruoyi - ruoyi-common - - - - com.amazonaws - aws-java-sdk-s3 - - - - - diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index e13ed00..49d90d2 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -20,21 +20,52 @@ com.ruoyi - ruoyi-common + ruoyi-component-core - - com.ruoyi - ruoyi-oss + ruoyi-component-translation - - com.ruoyi - ruoyi-sms + ruoyi-component-oss + + + com.ruoyi + ruoyi-component-log + + + com.ruoyi + ruoyi-component-excel + + + com.ruoyi + ruoyi-component-security + + + com.ruoyi + ruoyi-component-web + + + com.ruoyi + ruoyi-component-encrypt + + + com.ruoyi + ruoyi-component-sensitive + + + com.ruoyi + ruoyi-component-idempotent + + + com.ruoyi + ruoyi-component-mybatis + + + com.ruoyi + ruoyi-component-mail - diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java index 974019d..76839cb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java @@ -1,6 +1,6 @@ package com.ruoyi.system.domain; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index ca9a77c..51b8ad9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -4,9 +4,9 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.component.excel.annotation.ExcelDictFormat; +import com.ruoyi.component.excel.convert.ExcelDictConvert; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java index ba4a382..fda28ed 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.domain.entity; +package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.TreeEntity; +import com.ruoyi.system.domain.model.TreeEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java index 4ed2c54..ed27310 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.domain.entity; +package com.ruoyi.system.domain; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.excel.annotation.ExcelDictFormat; +import com.ruoyi.component.excel.convert.ExcelDictConvert; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java index 76c20e1..25274f7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.domain.entity; +package com.ruoyi.system.domain; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.component.excel.annotation.ExcelDictFormat; +import com.ruoyi.component.excel.convert.ExcelDictConvert; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java index 1137160..c034850 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -5,8 +5,8 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; +import com.ruoyi.component.excel.annotation.ExcelDictFormat; +import com.ruoyi.component.excel.convert.ExcelDictConvert; import lombok.Data; import java.io.Serializable; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java index 38bd936..8a7a624 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.domain.entity; +package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.core.domain.TreeEntity; +import com.ruoyi.system.domain.model.TreeEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index dec401e..5b7ab67 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -2,8 +2,8 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.xss.Xss; +import com.ruoyi.component.core.xss.Xss; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index d031135..b773d48 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -5,8 +5,8 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; +import com.ruoyi.component.excel.annotation.ExcelDictFormat; +import com.ruoyi.component.excel.convert.ExcelDictConvert; import lombok.Data; import java.io.Serializable; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java index 968304b..b650c8f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java @@ -2,7 +2,7 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java index ac5e5a3..8417f93 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java @@ -2,7 +2,7 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index ecb84f4..0e7a483 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -5,9 +5,9 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.component.excel.annotation.ExcelDictFormat; +import com.ruoyi.component.excel.convert.ExcelDictConvert; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java index 5949569..9bb37de 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.ruoyi.system.domain; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.excel.annotation.ExcelDictFormat; +import com.ruoyi.component.excel.convert.ExcelDictConvert; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java index 3196e9e..64f6608 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.domain.entity; +package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.ruoyi.common.annotation.Sensitive; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.enums.SensitiveStrategy; -import com.ruoyi.common.xss.Xss; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.core.xss.Xss; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; +import com.ruoyi.component.sensitive.annotation.Sensitive; +import com.ruoyi.component.sensitive.core.SensitiveStrategy; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java index f874b20..f8aeba9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java @@ -1,6 +1,6 @@ package com.ruoyi.system.domain.bo; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java index 2e257e8..b8b4694 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java @@ -1,8 +1,8 @@ package com.ruoyi.system.domain.bo; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.component.core.validate.AddGroup; +import com.ruoyi.component.core.validate.EditGroup; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/model/TreeEntity.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/model/TreeEntity.java index c7bb9b4..a47c607 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/model/TreeEntity.java @@ -1,6 +1,7 @@ -package com.ruoyi.common.core.domain; +package com.ruoyi.system.domain.model; import com.baomidou.mybatisplus.annotation.TableField; +import com.ruoyi.component.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java index ec1f02e..9c5817b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java @@ -1,6 +1,6 @@ package com.ruoyi.system.domain.vo; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; import lombok.Data; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java index a50283d..f64e178 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java @@ -1,8 +1,8 @@ package com.ruoyi.system.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; +import com.ruoyi.component.excel.annotation.ExcelDictFormat; +import com.ruoyi.component.excel.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java index d461332..af889cd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java @@ -1,8 +1,8 @@ package com.ruoyi.system.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; +import com.ruoyi.component.excel.annotation.ExcelDictFormat; +import com.ruoyi.component.excel.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java b/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java index b883dae..9189d36 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java @@ -5,13 +5,13 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.excel.ExcelListener; -import com.ruoyi.common.excel.ExcelResult; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.ValidatorUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.excel.core.ExcelListener; +import com.ruoyi.component.excel.core.ExcelResult; +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.ValidatorUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import com.ruoyi.system.domain.vo.SysUserImportVo; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserService; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java index 13cce2d..5d657a3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.system.domain.SysConfig; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java index 7e7a441..132d291 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java @@ -2,10 +2,10 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.ruoyi.common.annotation.DataColumn; -import com.ruoyi.common.annotation.DataPermission; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.annotation.DataColumn; +import com.ruoyi.component.mybatis.annotation.DataPermission; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; +import com.ruoyi.system.domain.SysDept; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java index 0d506bc..38ce2c0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java @@ -1,9 +1,9 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; +import com.ruoyi.system.domain.SysDictData; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java index 7107aed..9f04250 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; +import com.ruoyi.system.domain.SysDictType; /** * 字典表 数据层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java index b74f3ff..ad6f516 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.system.domain.SysLogininfor; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java index 0043903..9927311 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java @@ -3,9 +3,9 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; +import com.ruoyi.system.domain.SysMenu; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java index 69fa3ba..f137518 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.system.domain.SysNotice; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java index bbb265d..352238b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.system.domain.SysOperLog; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java index 72f29a7..b278495 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.system.domain.SysOssConfig; import com.ruoyi.system.domain.vo.SysOssConfigVo; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java index edbaed6..b2905f6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.domain.vo.SysOssVo; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java index 7330494..0bd9500 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.system.domain.SysPost; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java index 0428d98..5a63ff4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.system.domain.SysRoleDept; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java index d741cdf..e576505 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java @@ -3,10 +3,10 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.annotation.DataColumn; -import com.ruoyi.common.annotation.DataPermission; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.annotation.DataColumn; +import com.ruoyi.component.mybatis.annotation.DataPermission; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; +import com.ruoyi.system.domain.SysRole; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java index e9987cc..0a2b9d9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.system.domain.SysRoleMenu; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 7147198..882e8f1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -3,10 +3,10 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.annotation.DataColumn; -import com.ruoyi.common.annotation.DataPermission; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.annotation.DataColumn; +import com.ruoyi.component.mybatis.annotation.DataPermission; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; +import com.ruoyi.system.domain.SysUser; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java index 1af9b24..708e4e7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.system.domain.SysUserPost; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java index be8fb8f..fef2caa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.component.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.system.domain.SysUserRole; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java b/ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java index e9ad6ee..66d4014 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java @@ -1,6 +1,6 @@ package com.ruoyi.system.runner; -import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.component.core.config.RuoYiConfig; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysDictTypeService; import com.ruoyi.system.service.ISysOssConfigService; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java index d6bd54f..27df6eb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.system.domain.SysConfig; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index 4ae34ab..887428b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; import cn.hutool.core.lang.tree.Tree; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.system.domain.SysDept; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java index 3c5a04e..00ed14c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -1,8 +1,8 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.system.domain.SysDictData; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java index 0e3d94d..1c607f4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java @@ -1,9 +1,9 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.system.domain.SysDictData; +import com.ruoyi.system.domain.SysDictType; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java index f63c7dd..632fcdf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.system.domain.SysLogininfor; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java index 906cd88..194309e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; import cn.hutool.core.lang.tree.Tree; -import com.ruoyi.common.core.domain.entity.SysMenu; +import com.ruoyi.system.domain.SysMenu; import com.ruoyi.system.domain.vo.RouterVo; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java index a6dbcbf..8524274 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.system.domain.SysNotice; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java index 14ffcfd..7fe5141 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.system.domain.SysOperLog; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java index 80d874f..3b43225 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.system.domain.bo.SysOssConfigBo; import com.ruoyi.system.domain.vo.SysOssConfigVo; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java index f2221b1..a1835a0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.system.domain.bo.SysOssBo; import com.ruoyi.system.domain.vo.SysOssVo; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java index 42968e9..06999ed 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.system.domain.SysPost; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java index d046984..c4e224a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java @@ -1,8 +1,8 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.system.domain.SysRole; import com.ruoyi.system.domain.SysUserRole; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index cfa6e16..58c4d19 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -1,8 +1,8 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.system.domain.SysUser; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java index 56d1b99..626aed9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java @@ -6,27 +6,27 @@ 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.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.dto.RoleDTO; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.event.LogininforEvent; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.domain.model.XcxLoginUser; -import com.ruoyi.common.enums.DeviceType; -import com.ruoyi.common.enums.LoginType; -import com.ruoyi.common.enums.UserStatus; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.exception.user.UserException; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.constant.CacheConstants; +import com.ruoyi.component.core.constant.Constants; +import com.ruoyi.component.core.domain.dto.RoleDTO; +import com.ruoyi.component.log.event.LogininforEvent; +import com.ruoyi.component.redis.util.RedisUtils; +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.component.core.domain.model.LoginUser; +import com.ruoyi.component.core.domain.model.XcxLoginUser; +import com.ruoyi.component.core.enums.DeviceType; +import com.ruoyi.component.core.enums.LoginType; +import com.ruoyi.component.core.enums.UserStatus; +import com.ruoyi.component.core.enums.UserType; +import com.ruoyi.component.core.exception.user.CaptchaException; +import com.ruoyi.component.core.exception.user.CaptchaExpireException; +import com.ruoyi.component.core.exception.user.UserException; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.DateUtils; +import com.ruoyi.component.core.util.MessageUtils; +import com.ruoyi.component.core.util.ServletUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import com.ruoyi.system.mapper.SysUserMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java index 5adc632..2ddff95 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.domain.SysUser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java index 1a034e5..9010581 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java @@ -1,20 +1,20 @@ package com.ruoyi.system.service; import cn.dev33.satoken.secure.BCrypt; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.event.LogininforEvent; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.RegisterBody; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.exception.user.UserException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.constant.CacheConstants; +import com.ruoyi.component.core.constant.Constants; +import com.ruoyi.component.log.event.LogininforEvent; +import com.ruoyi.component.redis.util.RedisUtils; +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.component.core.domain.model.RegisterBody; +import com.ruoyi.component.core.enums.UserType; +import com.ruoyi.component.core.exception.user.CaptchaException; +import com.ruoyi.component.core.exception.user.CaptchaExpireException; +import com.ruoyi.component.core.exception.user.UserException; +import com.ruoyi.component.core.util.MessageUtils; +import com.ruoyi.component.core.util.ServletUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 932753b..5182275 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -5,15 +5,15 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.constant.CacheNames; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.service.ConfigService; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.CacheUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.constant.CacheNames; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.core.service.ConfigService; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.redis.util.CacheUtils; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.mapper.SysConfigMapper; import com.ruoyi.system.service.ISysConfigService; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java index 6c3240c..56eb512 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java @@ -3,9 +3,9 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.helper.DataBaseHelper; -import com.ruoyi.common.utils.StreamUtils; +import com.ruoyi.component.mybatis.helper.DataBaseHelper; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.component.core.util.StreamUtils; import com.ruoyi.system.domain.SysRoleDept; import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.mapper.SysRoleDeptMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index aba3d99..91df2bb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -6,19 +6,19 @@ import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.ruoyi.common.constant.CacheNames; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.service.DeptService; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.DataBaseHelper; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.TreeBuildUtils; -import com.ruoyi.common.utils.redis.CacheUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.constant.CacheNames; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.mybatis.helper.DataBaseHelper; +import com.ruoyi.component.redis.util.CacheUtils; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.component.core.service.DeptService; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.TreeBuildUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysUserMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index 6b80cf4..e3281d6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -2,13 +2,13 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.constant.CacheNames; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.CacheUtils; +import com.ruoyi.component.core.constant.CacheNames; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.redis.util.CacheUtils; +import com.ruoyi.system.domain.SysDictData; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.util.StringUtils; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.service.ISysDictDataService; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 85d8924..d51deed 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -6,19 +6,19 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.CacheNames; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.service.DictService; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.CacheUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.component.core.constant.CacheConstants; +import com.ruoyi.component.core.constant.CacheNames; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.redis.util.CacheUtils; +import com.ruoyi.system.domain.SysDictData; +import com.ruoyi.system.domain.SysDictType; +import com.ruoyi.component.core.service.DictService; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.util.StreamUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysDictTypeMapper; import com.ruoyi.system.service.ISysDictTypeService; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index 3234b0d..6ad5847 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -4,13 +4,13 @@ import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.event.LogininforEvent; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.AddressUtils; +import com.ruoyi.component.core.constant.Constants; +import com.ruoyi.component.core.util.ServletUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.ip.AddressUtils; +import com.ruoyi.component.log.event.LogininforEvent; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.mapper.SysLogininforMapper; import com.ruoyi.system.service.ISysLogininforService; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index a7f16b7..651c758 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -6,14 +6,14 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.TreeBuildUtils; +import com.ruoyi.component.core.constant.Constants; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.system.domain.SysMenu; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.StreamUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.TreeBuildUtils; import com.ruoyi.system.domain.SysRoleMenu; import com.ruoyi.system.domain.vo.MetaVo; import com.ruoyi.system.domain.vo.RouterVo; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java index 73a6736..d4e96e2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -2,9 +2,9 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.mapper.SysNoticeMapper; import com.ruoyi.system.service.ISysNoticeService; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java index a8b4b0a..4a23309 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -4,11 +4,11 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.event.OperLogEvent; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.AddressUtils; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.ip.AddressUtils; +import com.ruoyi.component.log.event.OperLogEvent; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.mapper.SysOperLogMapper; import com.ruoyi.system.service.ISysOperLogService; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java index 2e90e50..835b035 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java @@ -7,15 +7,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.constant.CacheNames; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.CacheUtils; -import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.oss.constant.OssConstant; +import com.ruoyi.component.core.constant.CacheNames; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.json.utils.JsonUtils; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.oss.constant.OssConstant; +import com.ruoyi.component.redis.util.CacheUtils; +import com.ruoyi.component.redis.util.RedisUtils; import com.ruoyi.system.domain.SysOssConfig; import com.ruoyi.system.domain.bo.SysOssConfigBo; import com.ruoyi.system.domain.vo.SysOssConfigVo; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java index e06dba6..b34e27e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java @@ -7,18 +7,18 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.constant.CacheNames; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.service.OssService; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.oss.core.OssClient; -import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.enumd.AccessPolicyType; -import com.ruoyi.oss.factory.OssFactory; +import com.ruoyi.component.core.constant.CacheNames; +import com.ruoyi.component.core.service.OssService; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.core.util.file.FileUtils; +import com.ruoyi.component.core.util.spring.SpringUtils; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.oss.core.OssClient; +import com.ruoyi.component.oss.entity.UploadResult; +import com.ruoyi.component.oss.enumd.AccessPolicyType; +import com.ruoyi.component.oss.factory.OssFactory; import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.domain.bo.SysOssBo; import com.ruoyi.system.domain.vo.SysOssVo; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index f41a2d0..2c1d193 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -3,10 +3,10 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.core.util.StringUtils; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.mapper.SysPostMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index b84d81f..e92dfef 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -9,15 +9,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.component.core.domain.model.LoginUser; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.StreamUtils; +import com.ruoyi.component.core.util.StringUtils; import com.ruoyi.system.domain.SysRoleDept; import com.ruoyi.system.domain.SysRoleMenu; import com.ruoyi.system.domain.SysUserRole; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java index 450d135..2730a25 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service.impl; -import com.ruoyi.common.core.service.SensitiveService; -import com.ruoyi.common.helper.LoginHelper; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.sensitive.core.SensitiveService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index b410587..ab5b209 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -9,19 +9,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.constant.CacheNames; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.service.UserService; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.DataBaseHelper; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.component.core.constant.CacheNames; +import com.ruoyi.component.core.constant.UserConstants; +import com.ruoyi.component.mybatis.core.page.PageQuery; +import com.ruoyi.component.mybatis.core.page.TableDataInfo; +import com.ruoyi.component.mybatis.helper.DataBaseHelper; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.component.core.service.UserService; +import com.ruoyi.component.core.exception.ServiceException; +import com.ruoyi.component.satoken.utils.LoginHelper; +import com.ruoyi.component.core.util.StreamUtils; +import com.ruoyi.component.core.util.StringUtils; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserRole;