!221 sa-token-solon-plugin::添加sso和oauth2框架的自动化适配

Merge pull request !221 from 西东/dev
This commit is contained in:
孔明 2023-01-30 05:29:46 +00:00 committed by Gitee
commit f73336beb9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
10 changed files with 139 additions and 41 deletions

View File

@ -10,7 +10,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.34.0</sa-token.version>
<solon.version>1.10.13</solon.version>
<solon.version>1.12.4</solon.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@ -40,29 +40,16 @@
<!-- sa-token整合redis (使用jdk默认序列化方式) -->
<!-- <dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-dao-redis</artifactId>
<version>${sa-token.version}</version>
</dependency> -->
<!-- sa-token整合redis (使用jackson序列化方式) -->
<!-- <dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-dao-redis-jackson</artifactId>
<artifactId>sa-token-dao-redisx</artifactId>
<version>${sa-token.version}</version>
</dependency> -->
<!-- 提供redis连接池 -->
<!-- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency> -->
<!-- sa-token整合SpringAOP实现注解鉴权 -->
<!-- <dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-aop</artifactId>
<version>${sa-token.version}</version>
</dependency> -->
<!-- hutool工具类用来生成雪花算法唯一id -->
<!-- <dependency>

View File

@ -1,6 +1,7 @@
package com.pj.satoken;
import cn.dev33.satoken.solon.integration.SaTokenInterceptor;
import org.noear.solon.Solon;
import org.noear.solon.annotation.Bean;
import org.noear.solon.annotation.Configuration;
@ -8,7 +9,6 @@ import org.noear.solon.annotation.Configuration;
import com.pj.util.AjaxJson;
import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.solon.integration.SaTokenPathInterceptor;
/**

View File

@ -6,17 +6,10 @@
<artifactId>sa-token-demo-sso-server-solon</artifactId>
<version>0.0.1-SNAPSHOT</version>
<!-- SpringBoot -->
<parent>
<groupId>org.noear</groupId>
<artifactId>solon-parent</artifactId>
<version>1.12.0</version>
<relativePath/>
</parent>
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.34.0</sa-token.version>
<solon.version>1.12.4</solon.version>
</properties>
<dependencies>
@ -25,6 +18,7 @@
<dependency>
<groupId>org.noear</groupId>
<artifactId>solon-web</artifactId>
<version>${solon.version}</version>
</dependency>
<!-- Sa-Token 权限认证, 在线文档https://sa-token.cc/ -->
@ -52,12 +46,14 @@
<dependency>
<groupId>org.noear</groupId>
<artifactId>solon.view.thymeleaf</artifactId>
<version>${solon.version}</version>
</dependency>
<!-- Http请求工具在模式三的单点注销功能下用到如不需要可以注释掉 -->
<dependency>
<groupId>org.noear</groupId>
<artifactId>forest-solon-plugin</artifactId>
<version>${solon.version}</version>
</dependency>

View File

@ -16,13 +16,6 @@ import org.noear.solon.core.handle.ModelAndView;
*/
@Configuration
public class SsoConfig {
/**
* 构建 SaSsoConfig bean
* */
@Bean
public SaSsoConfig getSaSsoConfig(@Inject("${sa-token.sso}") SaSsoConfig ssoConfig) {
return ssoConfig;
}
/**
* 构建建 SaToken redis dao如果不需要 redis可以注释掉
@ -34,7 +27,7 @@ public class SsoConfig {
// 配置SSO相关参数
@Bean
public void configSso(SaSsoConfig sso) {
public void configSso(SaSsoConfig sso) { //SaSsoConfig 已自动构建
// 配置未登录时返回的View
sso.setNotLoginView(() -> {

View File

@ -16,7 +16,7 @@ sa-token:
# 所有允许的授权回调地址
allow-url: "*"
# 是否打开单点注销功能
is-slo: true
isSlo: true
# ------- SSO-模式三相关配置 下面的配置在SSO模式三并且 is-slo=true 时打开)
# 是否打开模式三

View File

@ -23,7 +23,7 @@
<servlet-api.version>3.1.0</servlet-api.version>
<jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version>
<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
<solon.version>1.12.2</solon.version>
<solon.version>1.12.4</solon.version>
<noear-redisx.version>1.4.5</noear-redisx.version>
<noear-snack3.version>3.2.50</noear-snack3.version>
<jfinal.version>4.9.17</jfinal.version>

View File

@ -17,15 +17,29 @@
<description>solon integrate sa-token</description>
<dependencies>
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-core</artifactId>
</dependency>
<dependency>
<groupId>org.noear</groupId>
<artifactId>solon</artifactId>
</dependency>
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-core</artifactId>
</dependency>
<!-- OAuth2.0 (optional) -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-oauth2</artifactId>
<optional>true</optional>
</dependency>
<!-- SSO (optional) -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-sso</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</project>

View File

@ -1,6 +1,9 @@
package cn.dev33.satoken.solon;
import cn.dev33.satoken.solon.oauth2.SaOAuth2AutoConfigure;
import cn.dev33.satoken.solon.sso.SaSsoAutoConfigure;
import org.noear.solon.Solon;
import org.noear.solon.Utils;
import org.noear.solon.core.AopContext;
import org.noear.solon.core.Plugin;
@ -39,9 +42,23 @@ public class XPluginImp implements Plugin {
//注入其它 Bean
context.beanOnloaded(c -> {
beanInitDo(c);
ssoBeanInitDo(c);
oauth2BeanInitDo(c);
});
}
private void ssoBeanInitDo(AopContext context){
if (Utils.loadClass("cn.dev33.satoken.sso.SaSsoManager") != null) {
context.beanMake(SaSsoAutoConfigure.class);
}
}
private void oauth2BeanInitDo(AopContext context){
if(Utils.loadClass("cn.dev33.satoken.oauth2.SaOAuth2Manager") != null){
context.beanMake(SaOAuth2AutoConfigure.class);
}
}
private void beanInitDo(AopContext context) {
// 注入上下文Bean
SaManager.setSaTokenContext(new SaContextForSolon());
@ -112,5 +129,4 @@ public class XPluginImp implements Plugin {
StpUtil.setStpLogic(bean);
});
}
}

View File

@ -0,0 +1,44 @@
package cn.dev33.satoken.solon.oauth2;
import cn.dev33.satoken.oauth2.SaOAuth2Manager;
import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
import cn.dev33.satoken.oauth2.logic.SaOAuth2Template;
import cn.dev33.satoken.oauth2.logic.SaOAuth2Util;
import org.noear.solon.annotation.Bean;
import org.noear.solon.annotation.Configuration;
import org.noear.solon.annotation.Inject;
/**
* @author noear
* @since 2.0
*/
@Configuration
public class SaOAuth2AutoConfigure {
/**
* 获取 OAuth2配置Bean
*/
@Bean
public SaOAuth2Config getConfig(@Inject(value = "${sa-token.oauth2}",required = false) SaOAuth2Config oAuth2Config) {
return oAuth2Config;
}
/**
* 注入OAuth2配置Bean
*
* @param saOAuth2Config 配置对象
*/
@Bean
public void setSaOAuth2Config(@Inject(required = false) SaOAuth2Config saOAuth2Config) {
SaOAuth2Manager.setConfig(saOAuth2Config);
}
/**
* 注入代码模板Bean
*
* @param saOAuth2Template 代码模板Bean
*/
@Bean
public void setSaOAuth2Interface(@Inject(required = false) SaOAuth2Template saOAuth2Template) {
SaOAuth2Util.saOAuth2Template = saOAuth2Template;
}
}

View File

@ -0,0 +1,48 @@
package cn.dev33.satoken.solon.sso;
import cn.dev33.satoken.config.SaSsoConfig;
import cn.dev33.satoken.sso.SaSsoManager;
import cn.dev33.satoken.sso.SaSsoProcessor;
import cn.dev33.satoken.sso.SaSsoTemplate;
import cn.dev33.satoken.sso.SaSsoUtil;
import org.noear.solon.annotation.Bean;
import org.noear.solon.annotation.Configuration;
import org.noear.solon.annotation.Init;
import org.noear.solon.annotation.Inject;
import org.noear.solon.core.AopContext;
/**
* @author noear
* @since 2.0
*/
@Configuration
public class SaSsoAutoConfigure {
/**
* 获取 SSO 配置Bean
* */
@Bean
public SaSsoConfig getConfig(@Inject(value = "${sa-token.sso}",required = false) SaSsoConfig ssoConfig) {
return ssoConfig;
}
/**
* 注入 Sa-Token-SSO 配置Bean
*
* @param saSsoConfig 配置对象
*/
@Bean
public void setSaSsoConfig(@Inject(required = false) SaSsoConfig saSsoConfig) {
SaSsoManager.setConfig(saSsoConfig);
}
/**
* 注入 Sa-Token-SSO 单点登录模块 Bean
*
* @param ssoTemplate saSsoTemplate对象
*/
@Bean
public void setSaSsoTemplate(@Inject(required = false) SaSsoTemplate ssoTemplate) {
SaSsoUtil.ssoTemplate = ssoTemplate;
SaSsoProcessor.instance.ssoTemplate = ssoTemplate;
}
}