2.6.4

README.md

@@ -1,7 +1,7 @@
 <h1 align="center" style="text-align:center;">
 <img src="solon_icon.png" width="128" />
 <br />
-Solon v2.6.4-SNAPSHOT
+Solon v2.6.4
 </h1>
 <p align="center">
 	<strong>Java's new application development framework, smaller, faster, and easier!</strong>
@@ -65,7 +65,7 @@ Build from scratch. It has its own standards and norms and open ecology. Combina
 * Supports Web, Data, Job, Remoting, Cloud, and other development scenarios
 * The two architecture modes are Handler + Context and Listener + Message
 * Emphasizes plug-in extensibility, expandable and swappable, adaptable to different application scenarios
-* Supports GraalVm Native Image packaging
+* Supports GraalVm Native Image packaging. Support FaaS pattern development
 * Allow service plug-ins to hot-plug, hot-swap, and hot-manage.
 
 ## Ecosystem Architecture Diagram:

README_CN.md

@@ -1,7 +1,7 @@
 <h1 align="center" style="text-align:center;">
 <img src="solon_icon.png" width="128" />
 <br />
-Solon v2.6.4-SNAPSHOT
+Solon v2.6.4
 </h1>
 <p align="center">
 	<strong>Java 新的应用开发框架，更小、更快、更简单！</strong>
@@ -65,7 +65,7 @@ Solon v2.6.4-SNAPSHOT
 * 支持 Web、Data、Job、Remoting、Cloud 等任何开发场景
 * 兼顾 Handler + Context 和 Listener + Message 两种架构模式
 * 强调插件式扩展，可扩展可切换；适应不同的应用场景
-* 支持 GraalVm Native Image 打包
+* 支持 GraalVm Native Image 打包。支持 FaaS 模式开发
 * 允许业务插件“热插”、“热拔”、“热管理”
 
 

README_EN.md

@@ -1,7 +1,7 @@
 <h1 align="center" style="text-align:center;">
 <img src="solon_icon.png" width="128" />
 <br />
-Solon v2.6.4-SNAPSHOT
+Solon v2.6.4
 </h1>
 <p align="center">
 	<strong>Java's new application development framework, smaller, faster, and easier!</strong>
@@ -65,7 +65,7 @@ Build from scratch. It has its own standards and norms and open ecology. Combina
 * Supports Web, Data, Job, Remoting, Cloud, and other development scenarios
 * The two architecture modes are Handler + Context and Listener + Message
 * Emphasizes plug-in extensibility, expandable and swappable, adaptable to different application scenarios
-* Supports GraalVm Native Image packaging
+* Supports GraalVm Native Image packaging. Support FaaS pattern development
 * Allow service plug-ins to hot-plug, hot-swap, and hot-manage.
 
 ## Ecosystem Architecture Diagram:

README_JP.md

@@ -1,7 +1,7 @@
 <h1 align="center" style="text-align:center;">
 <img src="solon_icon.png" width="128" />
 <br />
-Solon v2.6.4-SNAPSHOT
+Solon v2.6.4
 </h1>
 <p align="center">
 	<strong>Javaの新しいアプリケーション開発フレームワーク、より小さく、より速く、より簡単です!</strong>
@@ -65,7 +65,7 @@ Solon v2.6.4-SNAPSHOT
 * Web、Data、Job、Remoting、Cloudなどの開発シナリオをサポート
 * Handler+ContextとListener+Messageの2つのイベントモデルを両立
 * プラグイン式の拡張を強調し、異なるアプリケーションシーンに対応可能
-* GraalVm Native Imageパッケージをサポート
+* GraalVm Native Imageパッケージに対応しています。FaaSモデルの開発を支援します
 * サービスプラグインには「ホットプラグ」「ホットプラグ」「ホットマネジメント」ができます。
 
 

README_RU.md

@@ -1,7 +1,7 @@
 <h1 align="center" style="text-align:center;">
 <img src="solon_icon.png" width="128" />
 <br />
-Solon v2.6.4-SNAPSHOT
+Solon v2.6.4
 </h1>
 <p align="center">
 	<strong>Новая структура разработки приложений Java, меньше, быстрее и проще!</strong>
@@ -65,7 +65,7 @@ Solon v2.6.4-SNAPSHOT
 * Поддерживаем любые сценарии развития, такие как Web, Data, Job, Remoting, Cloud и т.д
 * Совместить архитектурные модели Handler + Context и Listener + Message
 * Подчеркивает расширение плагина, расширяемое и переключаемое; Адаптация к различным параметрам применения
-* В поддержку "GraalVm Native Image"
+* Поддерживаем пакование "GraalVm Native Image". Поддержка разработки фаас модели
 * Позволяет бизнес-плагины "включать", "вырывать", "управление теплом"
 
 

UPDATE_LOG.md

@@ -20,11 +20,18 @@
 * 新增 graphql-solon-plugin 插件
 
 ### 2.6.4
+* 新增 graphql-solon-plugin 插件（欢迎试用） 
 * 修复 @Header 与 @Body 同时注入时，@Header 会失效的问题
+* 修复 LocalCacheService 时间过大时会超界的问题
 * 添加 local-solon-cloud-plugin 对描述信息的获取
 * fastjson2 升为 2.0.44
-* log4j 升为 2.22.0
-* socket.d 升为 2.2.1
+* log4j 升为 2.22.1
+* logback 升为 1.3.14
+* sqltoy 升为 5.2.88
+* mybatis-flex 升为 1.7.6
+* beetlsql 升为 3.27.4-RELEASE
+* fastmybatis 升为 2.10.0
+* socket.d 升为 2.2.2
 * folkmq 升为 1.0.26
 
 ### 2.6.3

__hatch/metrics-solon-plugin/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__hatch/nami.coder.thrift/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 
@@ -19,13 +19,13 @@
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon</artifactId>
-            <version>2.6.4-SNAPSHOT</version>
+            <version>2.6.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>nami</artifactId>
-            <version>2.6.4-SNAPSHOT</version>
+            <version>2.6.4</version>
         </dependency>
     </dependencies>
 

__hatch/nanoxlsx4j-solon-plugin/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__hatch/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../solon-parent/pom.xml</relativePath>
     </parent>
 

__hatch/solon.boot.reactor-netty/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__hatch/solon.serialization.avro/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__hatch/solon.serialization.thrift/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__release/nami-bundle/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__release/solon-base-bundle1/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__release/solon-base-bundle2/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__release/solon-base-bundle3/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__release/solon-base-bundle4/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__release/solon-base-bundle5/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__release/solon-base-bundle6/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__release/solon-cloud-bundle1/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__release/solon-cloud-bundle2/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__release/solon-shortcuts-bundle/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

__test/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.4-SNAPSHOT</version>
+        <version>2.6.4</version>
         <relativePath>../solon-parent/pom.xml</relativePath>
     </parent>
 
@@ -224,6 +224,11 @@
             <artifactId>solon.data</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon.auth</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon.validation</artifactId>

__test/src/main/java/webapp/demo2_mvc/HeaderController.java

@@ -1,6 +1,8 @@
 package webapp.demo2_mvc;
 
+import org.noear.solon.annotation.Body;
 import org.noear.solon.annotation.Controller;
+import org.noear.solon.annotation.Header;
 import org.noear.solon.annotation.Mapping;
 import org.noear.solon.core.handle.Context;
 

__test/src/main/java/webapp/demo2_mvc/Param4Controller.java

@@ -35,6 +35,13 @@ public Object test_json_2(@Body Map user) throws IOException {
         return user;
     }
 
+    @Mapping("json_2/header/t")
+    public Object test_json_2_header(@Header String id, @Body Map user) throws IOException {
+        asyncTask.test();
+
+        return id + user;
+    }
+
     @Mapping("json_2/{id}")
     public Object test_json_2_path(@Path String id ,@Body Map user) throws IOException {
         asyncTask.test();

__test/src/test/java/features/HttpParam4Test.java

@@ -43,6 +43,17 @@ public void json_2() throws IOException {
         assert new Datetime(oNode2.get("date").getDate()).getYear() > 2000;
     }
 
+    @Test
+    public void json_2_header() throws IOException {
+        //走json通过，这个格式会有问题
+        String json = "{id:1,name:'noear',date:'2021-12-12'}";
+
+        String json2 = path("/demo2/param4/json_2/header/t").header("id", "1").bodyJson(json).post();
+
+        assert json2 != null;
+        assert json2.startsWith("1{");
+    }
+
     @Test
     public void json_2_path() throws IOException {
         //走json通过，这个格式会有问题

__test/src/test/java/features/RouteTest.java

@@ -0,0 +1,48 @@
+package features;
+
+import org.junit.Test;
+import org.noear.solon.auth.impl.AuthRuleImpl;
+import org.noear.solon.core.handle.MethodType;
+import org.noear.solon.core.route.PathRule;
+import org.noear.solon.core.route.RoutingDefault;
+
+/**
+ * @author noear 2024/1/2 created
+ */
+public class RouteTest {
+    @Test
+    public void routingDefault() {
+        //Mvc 里用的 Mapping 路由记录
+        RoutingDefault routingDefault = new RoutingDefault("/captchaImage", MethodType.GET, null);
+        assert routingDefault.matches(MethodType.GET, "/captchaImage");
+        assert routingDefault.matches(MethodType.GET, "/captchaimage") == false;
+
+        routingDefault = new RoutingDefault("/captchaimage", MethodType.GET, null);
+        assert routingDefault.matches(MethodType.GET, "/captchaImage") == false;
+        assert routingDefault.matches(MethodType.GET, "/captchaimage");
+    }
+
+    @Test
+    public void authRuleImpl() {
+        //AuthRuleImpl 内用的路由规则
+        PathRule pathRule = new PathRule();
+        pathRule.exclude("/captchaImage");
+        assert pathRule.test("/captchaImage") == false;
+        assert pathRule.test("/captchaimage");
+
+        pathRule = new PathRule();
+        pathRule.exclude("/captchaimage");
+        assert pathRule.test("/captchaImage");
+        assert pathRule.test("/captchaimage") == false;
+
+        pathRule = new PathRule();
+        pathRule.include("/captchaImage");
+        assert pathRule.test("/captchaImage");
+        assert pathRule.test("/captchaimage") == false;
+
+        pathRule = new PathRule();
+        pathRule.include("/captchaimage");
+        assert pathRule.test("/captchaImage") == false;
+        assert pathRule.test("/captchaimage");
+    }
+}