From f3aff3460203eef795e9b5a5b3dd41368cc5ec39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Mon, 16 Jan 2023 11:16:37 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20system=20entity=20=E5=AE=9E=E4=BD=93=E4=B8=8E=20con?= =?UTF-8?q?troller=20=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/{common => }/CaptchaController.java | 2 +- .../web/controller/{system => }/SysIndexController.java | 2 +- .../web/controller/{system => }/SysLoginController.java | 6 +++--- .../controller/{system => }/SysRegisterController.java | 2 +- ruoyi-admin/src/main/resources/application.yml | 6 ++++-- .../ruoyi/system}/controller/monitor/CacheController.java | 2 +- .../controller/monitor/SysLogininforController.java | 2 +- .../system}/controller/monitor/SysOperlogController.java | 2 +- .../controller/monitor/SysUserOnlineController.java | 2 +- .../system}/controller/system/SysConfigController.java | 2 +- .../system}/controller/system/SysDeptController.java | 4 ++-- .../system}/controller/system/SysDictDataController.java | 4 ++-- .../system}/controller/system/SysDictTypeController.java | 4 ++-- .../system}/controller/system/SysMenuController.java | 4 ++-- .../system}/controller/system/SysNoticeController.java | 2 +- .../system}/controller/system/SysOssConfigController.java | 2 +- .../ruoyi/system}/controller/system/SysOssController.java | 2 +- .../system}/controller/system/SysPostController.java | 2 +- .../system}/controller/system/SysProfileController.java | 5 ++--- .../system}/controller/system/SysRoleController.java | 8 ++++---- .../system}/controller/system/SysUserController.java | 8 ++++---- .../src/main/java/com/ruoyi/system/domain}/SysDept.java | 2 +- .../main/java/com/ruoyi/system/domain}/SysDictData.java | 2 +- .../main/java/com/ruoyi/system/domain}/SysDictType.java | 2 +- .../src/main/java/com/ruoyi/system/domain}/SysMenu.java | 2 +- .../src/main/java/com/ruoyi/system/domain}/SysRole.java | 2 +- .../src/main/java/com/ruoyi/system/domain}/SysUser.java | 2 +- .../com/ruoyi/system/listener/SysUserImportListener.java | 2 +- .../main/java/com/ruoyi/system/mapper/SysDeptMapper.java | 2 +- .../java/com/ruoyi/system/mapper/SysDictDataMapper.java | 2 +- .../java/com/ruoyi/system/mapper/SysDictTypeMapper.java | 2 +- .../main/java/com/ruoyi/system/mapper/SysMenuMapper.java | 2 +- .../main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 2 +- .../main/java/com/ruoyi/system/mapper/SysUserMapper.java | 2 +- .../java/com/ruoyi/system/service/ISysDeptService.java | 2 +- .../com/ruoyi/system/service/ISysDictDataService.java | 2 +- .../com/ruoyi/system/service/ISysDictTypeService.java | 4 ++-- .../java/com/ruoyi/system/service/ISysMenuService.java | 2 +- .../java/com/ruoyi/system/service/ISysRoleService.java | 2 +- .../java/com/ruoyi/system/service/ISysUserService.java | 2 +- .../java/com/ruoyi/system/service/SysLoginService.java | 2 +- .../com/ruoyi/system/service/SysPermissionService.java | 4 ++-- .../java/com/ruoyi/system/service/SysRegisterService.java | 2 +- .../system/service/impl/SysDataScopeServiceImpl.java | 2 +- .../com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 6 +++--- .../ruoyi/system/service/impl/SysDictDataServiceImpl.java | 2 +- .../ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 4 ++-- .../com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 4 ++-- .../com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 2 +- .../com/ruoyi/system/service/impl/SysUserServiceImpl.java | 6 +++--- .../src/main/resources/mapper/system/SysDeptMapper.xml | 2 +- .../src/main/resources/mapper/system/SysMenuMapper.xml | 2 +- .../src/main/resources/mapper/system/SysRoleMapper.xml | 2 +- .../src/main/resources/mapper/system/SysUserMapper.xml | 6 +++--- 54 files changed, 80 insertions(+), 79 deletions(-) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{common => }/CaptchaController.java (99%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{system => }/SysIndexController.java (95%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{system => }/SysLoginController.java (96%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{system => }/SysRegisterController.java (96%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/monitor/CacheController.java (99%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/monitor/SysLogininforController.java (98%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/monitor/SysOperlogController.java (98%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/monitor/SysUserOnlineController.java (98%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/system/SysConfigController.java (99%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/system/SysDeptController.java (97%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/system/SysDictDataController.java (97%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/system/SysDictTypeController.java (97%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/system/SysMenuController.java (97%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/system/SysNoticeController.java (98%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/system/SysOssConfigController.java (98%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/system/SysOssController.java (98%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/system/SysPostController.java (98%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/system/SysProfileController.java (97%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/system/SysRoleController.java (97%) rename {ruoyi-admin/src/main/java/com/ruoyi/web => ruoyi-system/src/main/java/com/ruoyi/system}/controller/system/SysUserController.java (97%) rename {ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity => ruoyi-system/src/main/java/com/ruoyi/system/domain}/SysDept.java (97%) rename {ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity => ruoyi-system/src/main/java/com/ruoyi/system/domain}/SysDictData.java (98%) rename {ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity => ruoyi-system/src/main/java/com/ruoyi/system/domain}/SysDictType.java (97%) rename {ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity => ruoyi-system/src/main/java/com/ruoyi/system/domain}/SysMenu.java (97%) rename {ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity => ruoyi-system/src/main/java/com/ruoyi/system/domain}/SysRole.java (98%) rename {ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity => ruoyi-system/src/main/java/com/ruoyi/system/domain}/SysUser.java (98%) 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/CaptchaController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java index 1e58d5653..554b7eab9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.common; +package com.ruoyi.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.captcha.AbstractCaptcha; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysIndexController.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysIndexController.java index 698257406..3f3848f0e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysIndexController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.ruoyi.common.config.RuoYiConfig; 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/SysLoginController.java similarity index 96% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java index 5fd0667aa..eb98bf1cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java @@ -1,10 +1,10 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller; 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.system.domain.SysMenu; +import com.ruoyi.system.domain.SysUser; import com.ruoyi.common.core.domain.model.LoginBody; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.SmsLoginBody; 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/SysRegisterController.java similarity index 96% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysRegisterController.java index 26445820e..b00bfd4e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysRegisterController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.ruoyi.common.core.controller.BaseController; diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index fd935760d..81e22b7c2 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -212,9 +212,11 @@ springdoc: group-configs: - group: 1.演示模块 packages-to-scan: com.ruoyi.demo - - group: 2.系统模块 + - group: 2.通用模块 packages-to-scan: com.ruoyi.web - - group: 3.代码生成模块 + - group: 3.系统模块 + packages-to-scan: com.ruoyi.system + - group: 4.代码生成模块 packages-to-scan: com.ruoyi.generator # 防止XSS攻击 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java index 12662ece9..26895d2ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.ruoyi.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.collection.CollUtil; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysLogininforController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysLogininforController.java index b695c3aae..8b15a50df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysLogininforController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.ruoyi.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.annotation.Log; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysOperlogController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysOperlogController.java index 35980bc76..5b72587ed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysOperlogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.ruoyi.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.annotation.Log; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java index b0b574c37..b1c5e3f37 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.monitor; +package com.ruoyi.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.exception.NotLoginException; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java index c32d823b5..8959098e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.annotation.Log; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java index fa763df33..4334b881c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ArrayUtil; @@ -6,7 +6,7 @@ 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.system.domain.SysDept; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.service.ISysDeptService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java index 62a1daa00..287a1e7d3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; @@ -6,7 +6,7 @@ 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.system.domain.SysDictData; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java index 70eb8aa6b..354d2f757 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.annotation.Log; @@ -6,7 +6,7 @@ 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.system.domain.SysDictType; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java index e80f0ee7c..6046b0cde 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; @@ -6,7 +6,7 @@ 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.system.domain.SysMenu; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.service.ISysMenuService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java index 54b30d60d..ba28194d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.annotation.Log; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java index f83378037..98f9fdd0e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.annotation.Log; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java index f5df4214e..893a10d98 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java index 9a173fe8d..b8faaf99d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.annotation.Log; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java index 77a8767de..a777410e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller.system; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.io.FileUtil; @@ -6,12 +6,11 @@ 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.system.domain.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.system.domain.vo.SysOssVo; import com.ruoyi.system.service.ISysOssService; import com.ruoyi.system.service.ISysUserService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java index 8353ac02e..0bc73cb82 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; @@ -7,9 +7,9 @@ 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.system.domain.SysDept; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java rename to ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java index 0bd5f34eb..657a802ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.secure.BCrypt; @@ -11,9 +11,9 @@ 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.system.domain.SysDept; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.excel.ExcelResult; 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 97% 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 9f565d889..774f28941 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,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; 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 98% 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 c8531253d..e527b723c 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,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; 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 97% 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 4229bd7bb..9740a7108 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,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; 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 97% 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 9955381f6..3b6097529 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,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; 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 98% 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 90941dda9..a6fe6ad56 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; 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 98% 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 0938fa0dd..1d7b49907 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,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.*; import com.ruoyi.common.annotation.Sensitive; 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 b883dae93..0449f5f18 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,7 +5,7 @@ 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.system.domain.SysUser; import com.ruoyi.common.excel.ExcelListener; import com.ruoyi.common.excel.ExcelResult; import com.ruoyi.common.exception.ServiceException; 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 7e7a44160..fdafbca2a 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 @@ -4,7 +4,7 @@ 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.system.domain.SysDept; import com.ruoyi.common.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Param; 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 0d506bc06..c9ae69e5b 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 @@ -2,7 +2,7 @@ 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.system.domain.SysDictData; import com.ruoyi.common.core.mapper.BaseMapperPlus; 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 7107aedc8..c1a25a659 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,6 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.common.core.domain.entity.SysDictType; +import com.ruoyi.system.domain.SysDictType; import com.ruoyi.common.core.mapper.BaseMapperPlus; /** 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 00439032c..157bb53fc 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 @@ -4,7 +4,7 @@ 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.system.domain.SysMenu; import com.ruoyi.common.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Param; 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 e2b3c0190..ff4f6728a 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 @@ -5,7 +5,7 @@ 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.system.domain.SysRole; import com.ruoyi.common.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Param; 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 9b585e1db..5e9968541 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 @@ -5,7 +5,7 @@ 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.system.domain.SysUser; import com.ruoyi.common.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Param; 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 d821a4ab3..d91cc0692 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 3c5a04e65..904367d92 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,7 +1,7 @@ package com.ruoyi.system.service; import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.system.domain.SysDictData; import com.ruoyi.common.core.page.TableDataInfo; 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 1bad68089..d7e31a6cf 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,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.domain.entity.SysDictType; +import com.ruoyi.system.domain.SysDictData; +import com.ruoyi.system.domain.SysDictType; import com.ruoyi.common.core.page.TableDataInfo; 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 813b1e282..fa4f4187a 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/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java index 5b726b2e0..b83584db0 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,7 +1,7 @@ package com.ruoyi.system.service; import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.system.domain.SysRole; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.system.domain.SysUserRole; 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 042efc2c9..8d5a3268c 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,7 +1,7 @@ package com.ruoyi.system.service; import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.domain.SysUser; import com.ruoyi.common.core.page.TableDataInfo; 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 96bd1edfd..1290c3c11 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 @@ -10,7 +10,7 @@ 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.dto.RoleDTO; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.domain.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.XcxLoginUser; import com.ruoyi.common.enums.DeviceType; 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 97ff4801a..c82f73d3f 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,7 +1,7 @@ package com.ruoyi.system.service; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.domain.SysRole; +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 e0e65578e..bd4605522 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 @@ -5,7 +5,7 @@ import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.event.LogininforEvent; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.domain.SysUser; import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.enums.UserType; import com.ruoyi.common.exception.user.CaptchaException; 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 44f8625ec..9c01c7a14 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,7 +3,7 @@ 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.system.domain.SysDept; import com.ruoyi.common.helper.DataBaseHelper; import com.ruoyi.common.utils.StreamUtils; import com.ruoyi.system.domain.SysRoleDept; 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 00b402467..6067a7d41 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 @@ -7,9 +7,9 @@ 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.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.system.domain.SysDept; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysUser; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.DataBaseHelper; import com.ruoyi.common.helper.LoginHelper; 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 6b80cf482..46fed61b9 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 @@ -4,7 +4,7 @@ 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.system.domain.SysDictData; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.StringUtils; 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 d7244116a..bb3ebd7f1 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 @@ -10,8 +10,8 @@ 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.system.domain.SysDictData; +import com.ruoyi.system.domain.SysDictType; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.service.DictService; import com.ruoyi.common.exception.ServiceException; 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 4d3406757..bc1b430dd 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 @@ -8,8 +8,8 @@ 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.system.domain.SysMenu; +import com.ruoyi.system.domain.SysRole; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.StreamUtils; import com.ruoyi.common.utils.StringUtils; 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 e7e5b53c5..0681a6308 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 @@ -10,7 +10,7 @@ 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.system.domain.SysRole; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; 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 4e63f17ea..19430ba6e 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 @@ -11,9 +11,9 @@ 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.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.domain.SysDept; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.DataBaseHelper; diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 9f9c0bc1b..fedf82054 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 45e090a65..875352b68 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index a8a4a510b..d89d4b2ad 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -5,17 +5,17 @@ - + - + - +