opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 18:15:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add:ruoyi-auth授权模块

Browse Source
This commit is contained in:
邓华锋 2023-10-30 16:18:34 +08:00
parent 5f266f6e5d
commit aa2902f2f2
19 changed files with 105 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/pom.xml
View File

@ -63,7 +63,10 @@
<groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-auth</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-job</artifactId>

12
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
View File

@ -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.*;

7
ruoyi-front/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
<version>5.1.0</version>
<version>${revision}</version>
</parent>
<artifactId>ruoyi-front</artifactId>
@ -58,7 +58,10 @@
<groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-auth</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-job</artifactId>

38
ruoyi-front/src/test/java/org/dromara/AppTest.java
View File

@ -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 );
}
}

1
ruoyi-modules/pom.xml
View File

@ -14,6 +14,7 @@
<module>ruoyi-generator</module>
<module>ruoyi-job</module>
<module>ruoyi-system</module>
<module>ruoyi-auth</module>
</modules>
<artifactId>ruoyi-modules</artifactId>

59
ruoyi-modules/ruoyi-auth/pom.xml Normal file
View File

@ -0,0 +1,59 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-modules</artifactId>
<version>${revision}</version>
</parent>
<artifactId>ruoyi-auth</artifactId>
<packaging>jar</packaging>
<dependencies>
<!-- 通用工具-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-doc</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mail</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-social</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
<dependency>
<groupId>me.zhyd.oauth</groupId>
<artifactId>JustAuth</artifactId>
</dependency>
<!-- skywalking 整合 logback -->
<!-- <dependency>-->
<!-- <groupId>org.apache.skywalking</groupId>-->
<!-- <artifactId>apm-toolkit-logback-1.x</artifactId>-->
<!-- <version>${与你的agent探针版本保持一致}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.skywalking</groupId>-->
<!-- <artifactId>apm-toolkit-trace</artifactId>-->
<!-- <version>${与你的agent探针版本保持一致}</version>-->
<!-- </dependency>-->
</dependencies>
</project>

4
ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java
View File

@ -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;

2
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.domain.vo;
package org.dromara.auth.domain.vo;
import lombok.Data;

2
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.web.domain.vo;
package org.dromara.auth.domain.vo;
import lombok.Data;

2
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java
View File

@ -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;

2
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java
View File

@ -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;

4
ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java
View File

@ -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;
/**
* 授权策略

2
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java
View File

@ -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;

2
ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysRegisterService.java
View File

@ -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;

8
ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java
View File

@ -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;
/**

8
ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java
View File

@ -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;
/**

8
ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java
View File

@ -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;
/**

8
ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java
View File

@ -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;
/**

8
ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java → ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java
View File

@ -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;
/**