From b3a6d01343454534d21cce860a5849f250ada547 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: Tue, 7 Feb 2023 19:23:51 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=B0=86?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=B8=8E=E6=B3=A8=E5=86=8C=20Service=20?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0=20ruoyi-admin=20=E4=B8=BB=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=85=AC=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/web/controller/SysLoginController.java | 2 +- .../java/com/ruoyi/web/controller/SysRegisterController.java | 2 +- .../src/main/java/com/ruoyi/web}/service/SysLoginService.java | 4 +++- .../main/java/com/ruoyi/web}/service/SysRegisterService.java | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) rename {ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system => ruoyi-admin/src/main/java/com/ruoyi/web}/service/SysLoginService.java (98%) rename {ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system => ruoyi-admin/src/main/java/com/ruoyi/web}/service/SysRegisterService.java (96%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java index 73e6a245f..7ae669a12 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java @@ -11,7 +11,7 @@ import com.ruoyi.system.domain.vo.RouterVo; import com.ruoyi.system.domain.vo.SysUserVo; import com.ruoyi.system.service.ISysMenuService; import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.system.service.SysLoginService; +import com.ruoyi.web.service.SysLoginService; import com.ruoyi.web.domain.vo.LoginVo; import com.ruoyi.web.domain.vo.UserInfoVo; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysRegisterController.java index 46937fb79..21abf93f5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysRegisterController.java @@ -5,7 +5,7 @@ import com.ruoyi.common.web.core.BaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.SysRegisterService; +import com.ruoyi.web.service.SysRegisterService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java index 4a9c227d6..bf934b1df 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service; +package com.ruoyi.web.service; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.secure.BCrypt; @@ -24,6 +24,8 @@ import com.ruoyi.common.satoken.utils.LoginHelper; import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.domain.vo.SysUserVo; import com.ruoyi.system.mapper.SysUserMapper; +import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.system.service.ISysPermissionService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java index 5621cb8b7..f7734700e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service; +package com.ruoyi.web.service; import cn.dev33.satoken.secure.BCrypt; import com.ruoyi.common.core.constant.CacheConstants; @@ -16,6 +16,8 @@ import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.log.event.LogininforEvent; import com.ruoyi.common.redis.utils.RedisUtils; import com.ruoyi.system.domain.bo.SysUserBo; +import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.system.service.ISysUserService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service;