From 16d8c5c883a71d061ddb42e687961f4c75cfda05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=94=E6=B0=91=E5=B0=8F=E9=95=87?= <262610965@qq.com> Date: Sun, 19 May 2024 14:43:09 +0800 Subject: [PATCH] :whale: 21.8 --- README.md | 2 +- common/common-core/pom.xml | 2 +- .../game/action/skeleton/IoGameVersion.java | 2 +- .../game/action/skeleton/toy/BreakingNews.java | 4 ++++ .../game/action/skeleton/toy/IoGameBanner.java | 9 +++++++++ common/common-kit/pom.xml | 2 +- common/common-micro-kit/pom.xml | 2 +- .../iohao/game/common/kit/collect/MultiMap.java | 2 -- .../game/common/kit/concurrent/TaskKit.java | 1 - common/common-validation/pom.xml | 2 +- external/external-core/pom.xml | 2 +- external/external-netty/pom.xml | 2 +- net-bolt/bolt-broker-server/pom.xml | 2 +- net-bolt/bolt-client/pom.xml | 2 +- net-bolt/bolt-core/pom.xml | 2 +- pom.xml | 16 ++++++++-------- run-one/run-one-netty/pom.xml | 2 +- widget/light-client/pom.xml | 2 +- widget/light-domain-event/pom.xml | 2 +- widget/light-game-room/pom.xml | 2 +- widget/light-jprotobuf/pom.xml | 2 +- widget/light-profile/pom.xml | 2 +- .../light-redis-lock-spring-boot-starter/pom.xml | 2 +- widget/light-redis-lock/pom.xml | 2 +- widget/light-timer-task/pom.xml | 2 +- widget/other-tool/pom.xml | 2 +- 26 files changed, 42 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 1f159d83f..6d8a520dc 100644 --- a/README.md +++ b/README.md @@ -205,7 +205,7 @@ ioGame 是轻量级的网络编程框架,**不依赖任何第三方**中间件 com.iohao.game run-one-netty - 21.7 + 21.8 ``` diff --git a/common/common-core/pom.xml b/common/common-core/pom.xml index 31c71da12..f5f799466 100644 --- a/common/common-core/pom.xml +++ b/common/common-core/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.7 + 21.8 ../../pom.xml 4.0.0 diff --git a/common/common-core/src/main/java/com/iohao/game/action/skeleton/IoGameVersion.java b/common/common-core/src/main/java/com/iohao/game/action/skeleton/IoGameVersion.java index c5c3c1805..00adc6cbb 100644 --- a/common/common-core/src/main/java/com/iohao/game/action/skeleton/IoGameVersion.java +++ b/common/common-core/src/main/java/com/iohao/game/action/skeleton/IoGameVersion.java @@ -29,7 +29,7 @@ public final class IoGameVersion { public static String a; static { - String internalVersion = "21.7"; + String internalVersion = "21.8"; VERSION = internalVersion .replace("", "") diff --git a/common/common-core/src/main/java/com/iohao/game/action/skeleton/toy/BreakingNews.java b/common/common-core/src/main/java/com/iohao/game/action/skeleton/toy/BreakingNews.java index b1eed8c1d..5c730d18f 100644 --- a/common/common-core/src/main/java/com/iohao/game/action/skeleton/toy/BreakingNews.java +++ b/common/common-core/src/main/java/com/iohao/game/action/skeleton/toy/BreakingNews.java @@ -50,6 +50,10 @@ News randomAdv() { return RandomKit.randomEle(list); } + News ioGameJavadocApi() { + return new News("ioGame javadoc api", "https://www.yuque.com/iohao/game/nlbkmzn76mxnmhv6"); + } + private List listNews() { List list = new ArrayList<>(); diff --git a/common/common-core/src/main/java/com/iohao/game/action/skeleton/toy/IoGameBanner.java b/common/common-core/src/main/java/com/iohao/game/action/skeleton/toy/IoGameBanner.java index 6b5acffac..132410f83 100644 --- a/common/common-core/src/main/java/com/iohao/game/action/skeleton/toy/IoGameBanner.java +++ b/common/common-core/src/main/java/com/iohao/game/action/skeleton/toy/IoGameBanner.java @@ -98,6 +98,8 @@ private void renderBanner() { extractedPrint(table); + extractedIoGameJavadocApi(); + extractedAdv(); // breaking news extractedBreakingNews(); @@ -147,6 +149,13 @@ private void extractedAdv() { System.out.println("+----------+--------------------------------------------------------------------------------------"); } + private void extractedIoGameJavadocApi() { + String s = BreakingNews.ioGameJavadocApi().toString(); + String builder = "| javadoc | %s%n"; + System.out.printf(builder, s); + System.out.println("+----------+--------------------------------------------------------------------------------------"); + } + private void extractedMiss() { String desc = "大家可以来登记,有需要展示或记念的宠物、动漫人物等各种事物"; diff --git a/common/common-kit/pom.xml b/common/common-kit/pom.xml index 2124a9e75..1e5649879 100644 --- a/common/common-kit/pom.xml +++ b/common/common-kit/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.7 + 21.8 ../../pom.xml 4.0.0 diff --git a/common/common-micro-kit/pom.xml b/common/common-micro-kit/pom.xml index e322bfcc1..d0e84290f 100644 --- a/common/common-micro-kit/pom.xml +++ b/common/common-micro-kit/pom.xml @@ -6,7 +6,7 @@ com.iohao.game ioGame - 21.7 + 21.8 ../../pom.xml diff --git a/common/common-micro-kit/src/main/java/com/iohao/game/common/kit/collect/MultiMap.java b/common/common-micro-kit/src/main/java/com/iohao/game/common/kit/collect/MultiMap.java index 422a6f7a2..dff7ec1d7 100644 --- a/common/common-micro-kit/src/main/java/com/iohao/game/common/kit/collect/MultiMap.java +++ b/common/common-micro-kit/src/main/java/com/iohao/game/common/kit/collect/MultiMap.java @@ -50,8 +50,6 @@ interface MultiMap { */ Collection get(K key); -// Set> entrySet(); - /** * clear key 所对应的集合内的所有元素 * diff --git a/common/common-micro-kit/src/main/java/com/iohao/game/common/kit/concurrent/TaskKit.java b/common/common-micro-kit/src/main/java/com/iohao/game/common/kit/concurrent/TaskKit.java index 943c053f9..dcbd1d484 100644 --- a/common/common-micro-kit/src/main/java/com/iohao/game/common/kit/concurrent/TaskKit.java +++ b/common/common-micro-kit/src/main/java/com/iohao/game/common/kit/concurrent/TaskKit.java @@ -282,7 +282,6 @@ public void run(Timeout timeout) { } else { executeFlowTimerListener(intervalTaskListener, set); } - }); TaskKit.newTimeout(this, tick, timeUnit); diff --git a/common/common-validation/pom.xml b/common/common-validation/pom.xml index 838191255..e7f08f1ce 100644 --- a/common/common-validation/pom.xml +++ b/common/common-validation/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.7 + 21.8 ../../pom.xml 4.0.0 diff --git a/external/external-core/pom.xml b/external/external-core/pom.xml index 5533b5448..f696946ee 100644 --- a/external/external-core/pom.xml +++ b/external/external-core/pom.xml @@ -6,7 +6,7 @@ com.iohao.game ioGame - 21.7 + 21.8 ../../pom.xml diff --git a/external/external-netty/pom.xml b/external/external-netty/pom.xml index 2eb6543d6..058272aaa 100644 --- a/external/external-netty/pom.xml +++ b/external/external-netty/pom.xml @@ -6,7 +6,7 @@ com.iohao.game ioGame - 21.7 + 21.8 ../../pom.xml diff --git a/net-bolt/bolt-broker-server/pom.xml b/net-bolt/bolt-broker-server/pom.xml index 49b940208..64765297e 100644 --- a/net-bolt/bolt-broker-server/pom.xml +++ b/net-bolt/bolt-broker-server/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.7 + 21.8 ../../pom.xml 4.0.0 diff --git a/net-bolt/bolt-client/pom.xml b/net-bolt/bolt-client/pom.xml index 9238ea664..7f16a825b 100644 --- a/net-bolt/bolt-client/pom.xml +++ b/net-bolt/bolt-client/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.7 + 21.8 ../../pom.xml 4.0.0 diff --git a/net-bolt/bolt-core/pom.xml b/net-bolt/bolt-core/pom.xml index f2dc2e337..9dee5710b 100644 --- a/net-bolt/bolt-core/pom.xml +++ b/net-bolt/bolt-core/pom.xml @@ -5,7 +5,7 @@ ioGame com.iohao.game - 21.7 + 21.8 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 7b12c986f..f48d56f68 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.iohao.game ioGame - 21.7 + 21.8 ioGame 生产资料公有制。 @@ -46,11 +46,11 @@ widget/light-redis-lock-spring-boot-starter widget/light-client - widget/other-tool - - + widget/light-game-room + common/common-micro-kit + widget/other-tool @@ -73,8 +73,6 @@ 4.0.2 - - 1.18.30 3.17.7 @@ -107,13 +105,15 @@ 6.1.2 3.2.1 - - 4.13.2 2.0.11 1.4.14 + + 1.18.30 + + 4.13.2