2.6.2

kinbod · Dec 8, 2023 · 661d71c · 661d71c
1 parent 30f55b0
commit 661d71c
Show file tree

Hide file tree

Showing 195 changed files with 218 additions and 209 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <h1 align="center" style="text-align:center;">
 <img src="solon_icon.png" width="128" />
 <br />
-Solon v2.6.2-SNAPSHOT
+Solon v2.6.2
 </h1>
 <p align="center">
 	<strong>Java's new application development framework, smaller, faster, and easier!</strong>

diff --git a/README_CN.md b/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.2-SNAPSHOT
+Solon v2.6.2
 </h1>
 <p align="center">
 	<strong>Java 新的应用开发框架，更小、更快、更简单！</strong>

diff --git a/README_EN.md b/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.2-SNAPSHOT
+Solon v2.6.2
 </h1>
 <p align="center">
 	<strong>Java's new application development framework, smaller, faster, and easier!</strong>

diff --git a/README_JP.md b/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.2-SNAPSHOT
+Solon v2.6.2
 </h1>
 <p align="center">
 	<strong>Javaの新しいアプリケーション開発フレームワーク、より小さく、より速く、より簡単です!</strong>

diff --git a/README_RU.md b/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.2-SNAPSHOT
+Solon v2.6.2
 </h1>
 <p align="center">
 	<strong>Новая структура разработки приложений Java, меньше, быстрее и проще!</strong>

diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md
@@ -22,10 +22,13 @@
 ### 2.6.2
 * 修复 solon.logging.logback 对 solon.logging.appender.console.enable 配置无效的问题
 * 修复 maven 打包插件，出现 “Unable to rename XXX” 错误
-* socket.d 升为 2.1.4
+* 修复 jetty 适配，添加多个 http 端口时会受 ssl 配置影响
+* 修复 swagger 适配 `@Body` 后 path 参数不能显示的问题
+* 调整 solon.data nested 事务微略处理
+* socket.d 升为 2.1.7
+* folkmq 升为 1.0.18
 * nacos2 升为 2.3.0
-* folkmq 升为 1.0.15
-* sqltoy 升为 5.2.84
+* sqltoy 升为 5.2.85
 
 ### 2.6.1
 * 新增 folkmq-solon-cloud-plugin 插件

diff --git a/__hatch/metrics-solon-plugin/pom.xml b/__hatch/metrics-solon-plugin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__hatch/nami.coder.thrift/pom.xml b/__hatch/nami.coder.thrift/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 
@@ -19,13 +19,13 @@
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon</artifactId>
-            <version>2.6.2-SNAPSHOT</version>
+            <version>2.6.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>nami</artifactId>
-            <version>2.6.2-SNAPSHOT</version>
+            <version>2.6.2</version>
         </dependency>
     </dependencies>
 

diff --git a/__hatch/nanoxlsx4j-solon-plugin/pom.xml b/__hatch/nanoxlsx4j-solon-plugin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__hatch/pom.xml b/__hatch/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__hatch/solon.boot.reactor-netty/pom.xml b/__hatch/solon.boot.reactor-netty/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__hatch/solon.serialization.avro/pom.xml b/__hatch/solon.serialization.avro/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__hatch/solon.serialization.thrift/pom.xml b/__hatch/solon.serialization.thrift/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__release/nami-bundle/pom.xml b/__release/nami-bundle/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__release/solon-base-bundle1/pom.xml b/__release/solon-base-bundle1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__release/solon-base-bundle2/pom.xml b/__release/solon-base-bundle2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__release/solon-base-bundle3/pom.xml b/__release/solon-base-bundle3/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__release/solon-base-bundle4/pom.xml b/__release/solon-base-bundle4/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__release/solon-base-bundle5/pom.xml b/__release/solon-base-bundle5/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__release/solon-base-bundle6/pom.xml b/__release/solon-base-bundle6/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__release/solon-cloud-bundle1/pom.xml b/__release/solon-cloud-bundle1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__release/solon-cloud-bundle2/pom.xml b/__release/solon-cloud-bundle2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__release/solon-shortcuts-bundle/pom.xml b/__release/solon-shortcuts-bundle/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__test/pom.xml b/__test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../solon-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/__test/src/test/java/features/socketd/SocketAsyncTest.java b/__test/src/test/java/features/socketd/SocketAsyncTest.java
@@ -6,6 +6,7 @@
 import org.noear.java_websocket.client.SimpleWebSocketClient;
 import org.noear.snack.ONode;
 import org.noear.socketd.SocketD;
+import org.noear.socketd.transport.client.ClientSession;
 import org.noear.socketd.transport.core.Message;
 import org.noear.socketd.transport.core.Session;
 import org.noear.socketd.transport.core.entity.StringEntity;
@@ -33,7 +34,7 @@ public void test_async_message() throws Throwable {
 
         CompletableFuture<Boolean> check = new CompletableFuture<>();
 
-        Session session = SocketD.createClient("tcp://localhost:" + _port)
+        ClientSession session = SocketD.createClient("tcp://localhost:" + _port)
                 .listen(new SimpleListener(){
                     @Override
                     public void onMessage(Session session, Message message) throws IOException {

diff --git a/__test/src/test/java/features/socketd/SocketCallbackTest.java b/__test/src/test/java/features/socketd/SocketCallbackTest.java
@@ -5,6 +5,7 @@
 import org.noear.nami.channel.socketd.SocketdProxy;
 import org.noear.snack.ONode;
 import org.noear.socketd.SocketD;
+import org.noear.socketd.transport.client.ClientSession;
 import org.noear.socketd.transport.core.Entity;
 import org.noear.socketd.transport.core.Message;
 import org.noear.socketd.transport.core.Session;
@@ -27,7 +28,7 @@ public class SocketCallbackTest {
     public void test_callback_message() throws Throwable {
         int _port = 8080 + 20000;
 
-        Session session = SocketD.createClient("tcp://localhost:"+ _port)
+        ClientSession session = SocketD.createClient("tcp://localhost:"+ _port)
                 .listen(new PipelineListener().next(new SimpleListener(){
                     @Override
                     public void onMessage(Session session, Message message) {

diff --git a/__test/src/test/java/features/socketd/SocketResponseTest.java b/__test/src/test/java/features/socketd/SocketResponseTest.java
@@ -8,6 +8,7 @@
 import org.noear.nami.coder.snack3.SnackEncoder;
 import org.noear.snack.ONode;
 import org.noear.socketd.SocketD;
+import org.noear.socketd.transport.client.ClientSession;
 import org.noear.socketd.transport.core.Entity;
 import org.noear.socketd.transport.core.Session;
 import org.noear.socketd.transport.core.entity.StringEntity;
@@ -27,7 +28,7 @@ public class SocketResponseTest {
     public void test() throws Throwable{
         int _port = 8080 + 20000;
 
-        Session session = SocketD.createClient("tcp://localhost:"+_port)
+        ClientSession session = SocketD.createClient("tcp://localhost:"+_port)
                 .listen(SocketdProxy.socketdToHandler)
                 .open();
 
@@ -46,7 +47,7 @@ public void test() throws Throwable{
     public void test_rpc_message() throws Throwable {
         int _port = 8080 + 20000;
 
-        Session session = SocketD.createClient("tcp://localhost:"+ _port)
+        ClientSession session = SocketD.createClient("tcp://localhost:"+ _port)
                 .listen(SocketdProxy.socketdToHandler)
                 .open();
 

diff --git a/__test/src/test/java/features/socketd/SocketTest.java b/__test/src/test/java/features/socketd/SocketTest.java
@@ -5,6 +5,7 @@
 import org.noear.socketd.SocketD;
 import org.noear.socketd.exception.SocketdException;
 import org.noear.socketd.exception.SocketdTimeoutException;
+import org.noear.socketd.transport.client.ClientSession;
 import org.noear.socketd.transport.core.Entity;
 import org.noear.socketd.transport.core.Session;
 import org.noear.socketd.transport.core.entity.StringEntity;
@@ -26,7 +27,7 @@ public void test_compatible() throws Throwable {
         //这是短链接模式
         //
         String root = "tcp://localhost:" + (20000 + Solon.cfg().serverPort());
-        Session session = SocketD.createClient(root).open();
+        ClientSession session = SocketD.createClient(root).open();
 
         Entity msg = session.sendAndRequest(root + "/demog/中文/1", new StringEntity("Hello 世界!"));
         System.out.println(msg.dataAsString());
@@ -60,7 +61,7 @@ public void test_compatible() throws Throwable {
     public void test2() throws Throwable {
         //socket client
         String root = "tcp://localhost:" + (20000 + Solon.cfg().serverPort());
-        Session session = SocketD.createClient(root).open();
+        ClientSession session = SocketD.createClient(root).open();
 
         session.sendAndSubscribe(root + "/seb/test", new StringEntity("Hello 世界!+1"), (msg) -> {
             if (msg == null) {
@@ -78,7 +79,7 @@ public void test3() throws Throwable {
         //socket client
         String root = "tcp://localhost:" + (20000 + Solon.cfg().serverPort());
 
-        Session session = SocketD.createClient(root).open();
+        ClientSession session = SocketD.createClient(root).open();
 
         List<Integer> list = new ArrayList<>();
         for (int i = 0; i < 100; i++) {
@@ -106,7 +107,7 @@ public void test4() throws Throwable {
         //socket client
         String root = "tcp://localhost:" + (20000 + Solon.cfg().serverPort());
 
-        Session session = SocketD.createClient(root).open();
+        ClientSession session = SocketD.createClient(root).open();
 
 
         session.sendAndSubscribe(root + "/seb/test", new StringEntity("Hello 世界!"), (msg) -> {

diff --git a/solon-parent/pom.xml b/solon-parent/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.noear</groupId>
     <artifactId>solon-parent</artifactId>
-    <version>2.6.2-SNAPSHOT</version>
+    <version>2.6.2</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -23,18 +23,18 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
-        <solon.version>2.6.2-SNAPSHOT</solon.version>
-        <solon-admin.version>2.6.1</solon-admin.version>
-        <solon-integration.version>2.6.1</solon-integration.version>
+        <solon.version>2.6.2</solon.version>
+        <solon-admin.version>2.6.2</solon-admin.version>
+        <solon-integration.version>2.6.2</solon-integration.version>
 
         <snack3.version>3.2.84</snack3.version>
         <weed3.version>3.4.33</weed3.version>
         <wood.version>1.2.6</wood.version>
         <water.version>2.12.0</water.version>
         <luffy.version>1.7.0</luffy.version>
         <redisx.version>1.6.2</redisx.version>
-        <socketd.version>2.1.4</socketd.version>
-        <folkmq.version>1.0.15</folkmq.version>
+        <socketd.version>2.1.7</socketd.version>
+        <folkmq.version>1.0.18</folkmq.version>
         <redisson.version>3.23.3</redisson.version>
         <lettuce.version>6.2.5.RELEASE</lettuce.version>
 
@@ -144,7 +144,7 @@
 
         <activerecord.version>5.1.2</activerecord.version>
         <beetlsql.version>3.27.2-RELEASE</beetlsql.version>
-        <sqltoy.version>5.2.84</sqltoy.version>
+        <sqltoy.version>5.2.85</sqltoy.version>
         <mybatis-flex.version>1.7.5</mybatis-flex.version>
         <fastmybatis.version>2.9.7</fastmybatis.version>
         <dbvisitor.version>5.4.0</dbvisitor.version>

diff --git a/solon-projects-cloud/solon-cloud-breaker/guava-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-breaker/guava-solon-cloud-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.6.2</version>
         <relativePath>../../../solon-parent/pom.xml</relativePath>
     </parent>