!313 solon 升为 3.0.1

Merge pull request !313 from 西东/dev
zhanghjie · Oct 7, 2024 · bbb30e7 · bbb30e7
2 parents 1fa0788 + d3d11ce
commit bbb30e7
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 144 deletions.
diff --git a/sa-token-demo/sa-token-demo-solon-redisson/pom.xml b/sa-token-demo/sa-token-demo-solon-redisson/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.noear</groupId>
 		<artifactId>solon-parent</artifactId>
-		<version>2.7.0</version>
+		<version>3.0.1</version>
 		<relativePath/>
 	</parent>
 

diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.noear</groupId>
 		<artifactId>solon-parent</artifactId>
-		<version>2.9.1</version>
+		<version>3.0.1</version>
 		<relativePath/>
 	</parent>
 

diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml
@@ -10,14 +10,13 @@
 	<parent>
 		<groupId>org.noear</groupId>
 		<artifactId>solon-parent</artifactId>
-		<version>2.7.0</version>
+		<version>3.0.1</version>
 		<relativePath/>
 	</parent>
 
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
 		<sa-token.version>1.39.0</sa-token.version>
-		<solon.version>2.7.0</solon.version>
 	</properties>
 
 	<dependencies>

diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.noear</groupId>
 		<artifactId>solon-parent</artifactId>
-		<version>2.7.0</version>
+		<version>3.0.1</version>
 		<relativePath/>
 	</parent>
 

diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.noear</groupId>
 		<artifactId>solon-parent</artifactId>
-		<version>2.7.0</version>
+		<version>3.0.1</version>
 		<relativePath/>
 	</parent>
 

diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.noear</groupId>
 		<artifactId>solon-parent</artifactId>
-		<version>2.7.0</version>
+		<version>3.0.1</version>
 		<relativePath/>
 	</parent>
 

diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
@@ -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>2.7.0</solon.version>
+		<solon.version>3.0.1</solon.version>
 		<noear-redisx.version>1.6.2</noear-redisx.version>
 		<noear-snack3.version>3.2.88</noear-snack3.version>
 		<jfinal.version>4.9.17</jfinal.version>

diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java
@@ -51,21 +51,9 @@ public class XPluginImp implements Plugin {
 
     @Override
     public void start(AppContext context) {
-        // Sa-Token 日志输出 Bean
-        context.getBeanAsync(SaLog.class, bean -> {
-            SaManager.setLog(bean);
-        });
-
-
-        //注入其它 Bean
-        context.lifecycle(-99, () -> {
-            beanInitDo(context);
-            context.beanMake(SaSsoAutoConfigure.class);
-            context.beanMake(SaOAuth2AutoConfigure.class);
-        });
-    }
+        context.beanMake(SaSsoAutoConfigure.class);
+        context.beanMake(SaOAuth2AutoConfigure.class);
 
-    private void beanInitDo(AppContext context) {
         // 注入上下文Bean
         SaManager.setSaTokenContext(new SaContextForSolon());
 
@@ -78,6 +66,12 @@ private void beanInitDo(AppContext context) {
             SaManager.setConfig(saTokenConfig);
         }
 
+        // Sa-Token 日志输出 Bean
+        context.getBeanAsync(SaLog.class, bean -> {
+            SaManager.setLog(bean);
+        });
+
+        //注入 SaTokenConfig
         context.getBeanAsync(SaTokenConfig.class, bean -> {
             SaManager.setConfig(bean);
         });
@@ -146,6 +140,5 @@ private void beanInitDo(AppContext context) {
         context.getBeanAsync(StpLogic.class, bean -> {
             StpUtil.setStpLogic(bean);
         });
-
     }
 }
diff --git a/...rter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaSessionForJson.java b/...rter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaSessionForJson.java
diff --git a/...sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java b/...sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
@@ -15,7 +15,6 @@
  */
 package cn.dev33.satoken.solon.integration;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.exception.BackResultException;
 import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.exception.StopMatchException;
@@ -24,7 +23,6 @@
 import cn.dev33.satoken.filter.SaFilter;
 import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.strategy.SaAnnotationStrategy;
-import cn.dev33.satoken.strategy.SaStrategy;
 import org.noear.solon.Solon;
 import org.noear.solon.core.handle.*;
 import org.noear.solon.core.route.RoutingTable;

diff --git a/...r/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java b/...r/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java
@@ -33,7 +33,7 @@ public class SaRequestForSolon implements SaRequest {
 
     protected Context ctx;
 
-    public SaRequestForSolon(){
+    public SaRequestForSolon() {
         ctx = Context.current();
     }
 
@@ -48,18 +48,18 @@ public String getParam(String s) {
     }
 
     @Override
-    public List<String> getParamNames(){
-        Set<String> names = ctx.paramMap().keySet();
-        return new ArrayList<>(names);
+    public List<String> getParamNames() {
+        return new ArrayList<>(ctx.paramNames());
     }
 
     /**
      * 获取 [请求体] 里提交的所有参数
+     *
      * @return 参数列表
      */
     @Override
-    public Map<String, String> getParamMap(){
-        return ctx.paramMap();
+    public Map<String, String> getParamMap() {
+        return ctx.paramMap().toValueMap();
     }
 
     @Override
@@ -76,31 +76,19 @@ public String getCookieValue(String name) {
      * 在 [ Cookie作用域 ] 里获取一个值 (第一个此名称的)
      */
     @Override
-    public String getCookieFirstValue(String name){
+    public String getCookieFirstValue(String name) {
         return ctx.cookie(name);
     }
 
     /**
      * 在 [ Cookie作用域 ] 里获取一个值 (最后一个此名称的)
+     *
      * @param name 键
      * @return 值
      */
     @Override
-    public String getCookieLastValue(String name){
-        String value = null;
-        String cookieStr = ctx.header("Cookie");
-        if(SaFoxUtil.isNotEmpty(cookieStr)) {
-            String[] cookieItems = cookieStr.split(";");
-            for (String item : cookieItems) {
-                String[] kv = item.split("=");
-                if (kv.length == 2) {
-                    if (kv[0].trim().equals(name)) {
-                        value = kv[1].trim();
-                    }
-                }
-            }
-        }
-        return value;
+    public String getCookieLastValue(String name) {
+        return ctx.cookieMap().holder(name).getLastValue();
     }
 
     @Override
@@ -111,7 +99,7 @@ public String getRequestPath() {
     @Override
     public String getUrl() {
         String currDomain = SaManager.getConfig().getCurrDomain();
-        if( ! SaFoxUtil.isEmpty(currDomain)) {
+        if (!SaFoxUtil.isEmpty(currDomain)) {
             return currDomain + this.getRequestPath();
         }
         return ctx.url();
@@ -127,5 +115,4 @@ public Object forward(String path) {
         ctx.forward(path);
         return null;
     }
-
 }
diff --git a/.../sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaResponseForSolon.java b/.../sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaResponseForSolon.java
@@ -48,9 +48,10 @@ public SaResponse setHeader(String name, String value) {
 	}
 
 	/**
-	 * 在响应头里添加一个值 
-	 * @param name 名字
-	 * @param value 值 
+	 * 在响应头里添加一个值
+	 *
+	 * @param name  名字
+	 * @param value 值
 	 * @return 对象自身
 	 */
 	public SaResponse addHeader(String name, String value) {

diff --git a/...er/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java b/...er/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java
@@ -27,7 +27,6 @@
 import org.noear.solon.annotation.Configuration;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.AppContext;
-import org.noear.solon.core.bean.InitializingBean;
 
 /**
  * @author noear

diff --git a/sa-token-starter/sa-token-solon-plugin/src/test/java/demo2/Config.java b/sa-token-starter/sa-token-solon-plugin/src/test/java/demo2/Config.java
@@ -40,13 +40,15 @@ public class Config {
 
     @Bean
     public void saTokenPathInterceptor2() {
-        Solon.app().before((ctx) -> {
+        Solon.app().routerInterceptor((ctx, mainHandler, chain) -> {
             SaRouter.match("/**", StpUtil::checkLogin);
             // 根据路由划分模块，不同模块不同鉴权
             SaRouter.match("/user/**", r -> StpUtil.checkPermission("user"));
             SaRouter.match("/admin/**", r -> StpUtil.checkPermission("admin"));
             SaRouter.match("/goods/**", r -> StpUtil.checkPermission("goods"));
             SaRouter.match("/orders/**", r -> StpUtil.checkPermission("orders"));
+
+            chain.doIntercept(ctx, mainHandler);
         });
     }
 }