From aa2902f2f2952f4ed082e19d89c46fb59ae5b17a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=8D=8E=E9=94=8B?= Date: Mon, 30 Oct 2023 16:18:34 +0800 Subject: [PATCH] =?UTF-8?q?add:ruoyi-auth=E6=8E=88=E6=9D=83=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 5 +- .../web/controller/AuthController.java | 12 ++-- ruoyi-front/pom.xml | 7 ++- .../src/test/java/org/dromara/AppTest.java | 38 ------------ ruoyi-modules/pom.xml | 1 + ruoyi-modules/ruoyi-auth/pom.xml | 59 +++++++++++++++++++ .../auth}/controller/CaptchaController.java | 4 +- .../dromara/auth}/domain/vo/CaptchaVo.java | 2 +- .../auth}/domain/vo/LoginTenantVo.java | 2 +- .../org/dromara/auth}/domain/vo/LoginVo.java | 2 +- .../dromara/auth}/domain/vo/TenantListVo.java | 2 +- .../dromara/auth}/service/IAuthStrategy.java | 4 +- .../auth}/service/SysLoginService.java | 2 +- .../auth}/service/SysRegisterService.java | 2 +- .../auth}/service/impl/EmailAuthStrategy.java | 8 +-- .../service/impl/PasswordAuthStrategy.java | 8 +-- .../auth}/service/impl/SmsAuthStrategy.java | 8 +-- .../service/impl/SocialAuthStrategy.java | 8 +-- .../auth}/service/impl/XcxAuthStrategy.java | 8 +-- 19 files changed, 105 insertions(+), 77 deletions(-) delete mode 100644 ruoyi-front/src/test/java/org/dromara/AppTest.java create mode 100644 ruoyi-modules/ruoyi-auth/pom.xml rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/controller/CaptchaController.java (98%) rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/domain/vo/CaptchaVo.java (88%) rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/domain/vo/LoginTenantVo.java (89%) rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/domain/vo/LoginVo.java (95%) rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/domain/vo/TenantListVo.java (90%) rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/service/IAuthStrategy.java (93%) rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/service/SysLoginService.java (99%) rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/service/SysRegisterService.java (99%) rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/service/impl/EmailAuthStrategy.java (96%) rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/service/impl/PasswordAuthStrategy.java (96%) rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/service/impl/SmsAuthStrategy.java (96%) rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/service/impl/SocialAuthStrategy.java (97%) rename {ruoyi-admin/src/main/java/org/dromara/web => ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth}/service/impl/XcxAuthStrategy.java (95%) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 0287d5552..378d66417 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -63,7 +63,10 @@ org.dromara ruoyi-system - + + org.dromara + ruoyi-auth + org.dromara ruoyi-job diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java index 86452e53d..68f2a3b02 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java @@ -29,12 +29,12 @@ import org.dromara.system.service.ISysClientService; import org.dromara.system.service.ISysConfigService; import org.dromara.system.service.ISysSocialService; import org.dromara.system.service.ISysTenantService; -import org.dromara.web.domain.vo.LoginTenantVo; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.domain.vo.TenantListVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; -import org.dromara.web.service.SysRegisterService; +import org.dromara.auth.domain.vo.LoginTenantVo; +import org.dromara.auth.domain.vo.LoginVo; +import org.dromara.auth.domain.vo.TenantListVo; +import org.dromara.auth.service.IAuthStrategy; +import org.dromara.auth.service.SysLoginService; +import org.dromara.auth.service.SysRegisterService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-front/pom.xml b/ruoyi-front/pom.xml index b17fe9fbf..c9ff55559 100644 --- a/ruoyi-front/pom.xml +++ b/ruoyi-front/pom.xml @@ -4,7 +4,7 @@ org.dromara ruoyi-vue-plus - 5.1.0 + ${revision} ruoyi-front @@ -58,7 +58,10 @@ org.dromara ruoyi-system - + + org.dromara + ruoyi-auth + org.dromara ruoyi-job diff --git a/ruoyi-front/src/test/java/org/dromara/AppTest.java b/ruoyi-front/src/test/java/org/dromara/AppTest.java deleted file mode 100644 index 5bc944327..000000000 --- a/ruoyi-front/src/test/java/org/dromara/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.dromara; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index bb442404e..a6c0ff449 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -14,6 +14,7 @@ ruoyi-generator ruoyi-job ruoyi-system + ruoyi-auth ruoyi-modules diff --git a/ruoyi-modules/ruoyi-auth/pom.xml b/ruoyi-modules/ruoyi-auth/pom.xml new file mode 100644 index 000000000..d7c085a20 --- /dev/null +++ b/ruoyi-modules/ruoyi-auth/pom.xml @@ -0,0 +1,59 @@ + + 4.0.0 + + org.dromara + ruoyi-modules + ${revision} + + + ruoyi-auth + jar + + + + + org.dromara + ruoyi-common-core + + + + org.dromara + ruoyi-common-doc + + + org.dromara + ruoyi-common-mail + + + + org.dromara + ruoyi-common-social + + + + + org.dromara + ruoyi-system + + + + + me.zhyd.oauth + JustAuth + + + + + + + + + + + + + + + + diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java similarity index 98% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java index 656447e89..0d52734d2 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java @@ -1,4 +1,4 @@ -package org.dromara.web.controller; +package org.dromara.auth.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.captcha.AbstractCaptcha; @@ -20,7 +20,7 @@ import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.core.factory.SmsFactory; import org.dromara.sms4j.provider.enumerate.SupplierType; -import org.dromara.web.domain.vo.CaptchaVo; +import org.dromara.auth.domain.vo.CaptchaVo; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java similarity index 88% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java index 664df1ee6..2a4c0bd42 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package org.dromara.auth.domain.vo; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java similarity index 89% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java index 0a83acea6..fcfdcc3d2 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package org.dromara.auth.domain.vo; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java similarity index 95% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java index 834afe5a1..e4bea143d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package org.dromara.auth.domain.vo; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java similarity index 90% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java index 4d4bc89eb..845b90e1d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package org.dromara.auth.domain.vo; import org.dromara.system.domain.vo.SysTenantVo; import io.github.linpeilie.annotations.AutoMapper; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java similarity index 93% rename from ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java index 690f74024..1b1cf991d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java @@ -1,11 +1,11 @@ -package org.dromara.web.service; +package org.dromara.auth.service; import org.dromara.common.core.domain.model.LoginBody; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.SpringUtils; import org.dromara.system.domain.SysClient; -import org.dromara.web.domain.vo.LoginVo; +import org.dromara.auth.domain.vo.LoginVo; /** * 授权策略 diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java similarity index 99% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java index 7e07e20fc..05a0662be 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java @@ -1,4 +1,4 @@ -package org.dromara.web.service; +package org.dromara.auth.service; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysRegisterService.java similarity index 99% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysRegisterService.java index 4d4b07283..e0023573d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysRegisterService.java @@ -1,4 +1,4 @@ -package org.dromara.web.service; +package org.dromara.auth.service; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java similarity index 96% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java index edb12c925..169162917 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package org.dromara.auth.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; @@ -25,9 +25,9 @@ import org.dromara.system.domain.SysClient; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import org.dromara.auth.domain.vo.LoginVo; +import org.dromara.auth.service.IAuthStrategy; +import org.dromara.auth.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java similarity index 96% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java index 46bd5661f..69da1dd44 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package org.dromara.auth.service.impl; import cn.dev33.satoken.secure.BCrypt; import cn.dev33.satoken.stp.SaLoginModel; @@ -28,9 +28,9 @@ import org.dromara.system.domain.SysClient; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import org.dromara.auth.domain.vo.LoginVo; +import org.dromara.auth.service.IAuthStrategy; +import org.dromara.auth.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java similarity index 96% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java index 0ddb75350..5f39928a0 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package org.dromara.auth.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; @@ -25,9 +25,9 @@ import org.dromara.system.domain.SysClient; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import org.dromara.auth.domain.vo.LoginVo; +import org.dromara.auth.service.IAuthStrategy; +import org.dromara.auth.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java similarity index 97% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java index 2b055df06..7fca3e835 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package org.dromara.auth.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; @@ -31,9 +31,9 @@ import org.dromara.system.domain.vo.SysSocialVo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.service.ISysSocialService; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import org.dromara.auth.domain.vo.LoginVo; +import org.dromara.auth.service.IAuthStrategy; +import org.dromara.auth.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java similarity index 95% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java index 5016e5bc4..943037744 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package org.dromara.auth.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; @@ -15,9 +15,9 @@ import org.dromara.common.core.validate.auth.WechatGroup; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysClient; import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import org.dromara.auth.domain.vo.LoginVo; +import org.dromara.auth.service.IAuthStrategy; +import org.dromara.auth.service.SysLoginService; import org.springframework.stereotype.Service; /**