lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2025-12-21 19:09:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!231 sa-token-solon-plugin: 升级 solon 为 2.2.1

Browse Source 
Merge pull request !231 from 西东/dev
This commit is contained in:
孔明
2023-03-04 14:21:01 +00:00
committed by Gitee
parent 36907d526a 870b7099de
commit 6184ba0c4e
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sa-token-demo/sa-token-demo-solon/pom.xml
View File

@@ -10,7 +10,7 @@
<!-- 定义 Sa-Token 版本号 --> <!-- 定义 Sa-Token 版本号 -->
<properties> <properties>
<sa-token.version>1.34.0</sa-token.version> <sa-token.version>1.34.0</sa-token.version>
<solon.version>2.1.4</solon.version> <solon.version>2.2.1</solon.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>

2
sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/SaTokenDemoApp.java
View File

@@ -2,6 +2,7 @@ package com.pj;
import org.noear.solon.Solon; import org.noear.solon.Solon;
import org.noear.solon.annotation.SolonMain;
import cn.dev33.satoken.SaManager; import cn.dev33.satoken.SaManager;
@@ -10,6 +11,7 @@ import cn.dev33.satoken.SaManager;
* @author noear * @author noear
* *
*/ */
@SolonMain
public class SaTokenDemoApp { public class SaTokenDemoApp {
public static void main(String[] args) { public static void main(String[] args) {

2
sa-token-demo/sa-token-demo-sso-server-solon/pom.xml
View File

@@ -9,7 +9,7 @@
<!-- 定义 Sa-Token 版本号 --> <!-- 定义 Sa-Token 版本号 -->
<properties> <properties>
<sa-token.version>1.34.0</sa-token.version> <sa-token.version>1.34.0</sa-token.version>
<solon.version>2.1.4</solon.version> <solon.version>2.2.1</solon.version>
</properties> </properties>
<dependencies> <dependencies>

2
sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java
View File

@@ -2,7 +2,9 @@ package com.pj;
import org.noear.solon.Solon; import org.noear.solon.Solon;
import org.noear.solon.annotation.SolonMain;
@SolonMain
public class SaSsoServerApp { public class SaSsoServerApp {
public static void main(String[] args) { public static void main(String[] args) {

2
sa-token-dependencies/pom.xml
View File

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

5
sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java
View File

@@ -3,7 +3,6 @@ package cn.dev33.satoken.solon;
import cn.dev33.satoken.solon.oauth2.SaOAuth2AutoConfigure; import cn.dev33.satoken.solon.oauth2.SaOAuth2AutoConfigure;
import cn.dev33.satoken.solon.sso.SaSsoAutoConfigure; import cn.dev33.satoken.solon.sso.SaSsoAutoConfigure;
import org.noear.solon.Solon; import org.noear.solon.Solon;
import org.noear.solon.Utils;
import org.noear.solon.core.AopContext; import org.noear.solon.core.AopContext;
import org.noear.solon.core.Plugin; import org.noear.solon.core.Plugin;
@@ -40,8 +39,8 @@ public class XPluginImp implements Plugin {
//注入其它 Bean //注入其它 Bean
context.beanOnloaded(c -> { context.lifecycle(-99, () -> {
beanInitDo(c); beanInitDo(context);
context.beanMake(SaSsoAutoConfigure.class); context.beanMake(SaSsoAutoConfigure.class);
context.beanMake(SaOAuth2AutoConfigure.class); context.beanMake(SaOAuth2AutoConfigure.class);
}); });