🐳 21.16

iohao · Sep 9, 2024 · b977b61 · b977b61
1 parent 46c967e
commit b977b61
Show file tree

Hide file tree

Showing 21 changed files with 62 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -218,7 +218,7 @@ ioGame 是轻量级的网络编程框架，**不依赖任何第三方**中间件
 <dependency>
     <groupId>com.iohao.game</groupId>
     <artifactId>run-one-netty</artifactId>
-    <version>21.15</version>
+    <version>21.16</version>
 </dependency>
 ```
 

diff --git a/common/common-core/pom.xml b/common/common-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ioGame</artifactId>
         <groupId>com.iohao.game</groupId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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
@@ -26,7 +26,7 @@ public final class IoGameVersion {
     public static final String VERSION;
 
     static {
-        String internalVersion = "<version>21.15</version>";
+        String internalVersion = "<version>21.16</version>";
 
         VERSION = internalVersion
                 .replace("<version>", "")

diff --git a/common/common-kit/pom.xml b/common/common-kit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ioGame</artifactId>
         <groupId>com.iohao.game</groupId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/common/common-micro-kit/pom.xml b/common/common-micro-kit/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.iohao.game</groupId>
         <artifactId>ioGame</artifactId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...cro-kit/src/test/java/com/iohao/game/common/kit/concurrent/timer/delay/DelayTaskTest.java b/...cro-kit/src/test/java/com/iohao/game/common/kit/concurrent/timer/delay/DelayTaskTest.java
@@ -270,4 +270,45 @@ public void onUpdate() {
             log.info("向【{}】开炮，造成 {} 伤害", targetEntity, value);
         }
     }
+
+    @Test
+    public void example() {
+        long timeMillis = System.currentTimeMillis();
+
+        DelayTask delayTask = DelayTaskKit.of(() -> {
+                    long value = System.currentTimeMillis() - timeMillis;
+                    log.info("1 - 最终 {} ms 后，执行延时任务", value);
+                })
+                .plusTime(Duration.ofSeconds(1)) // 增加 1 秒的延时
+                // 启动任务
+                .task();
+
+        delayTask.plusTimeMillis(500); // 增加 0.5 秒的延时
+        delayTask.minusTimeMillis(500);// 减少 0.5 秒的延时时间
+
+        // 因为 taskId 相同，所以会覆盖之前的延时任务
+        String taskId = delayTask.getTaskId();
+        delayTask = DelayTaskKit.of(taskId, () -> {
+                    long value = System.currentTimeMillis() - timeMillis;
+                    log.info("2 - 最终 {} ms 后，执行延时任务", value);
+                })
+                .plusTime(Duration.ofSeconds(1)) // 增加 1 秒的延时
+                // 启动任务
+                .task();
+
+        // 取消延时任务，下面两个方法是等价的
+        delayTask.cancel();
+        DelayTaskKit.cancel(taskId);
+
+        // 可以通过 taskId 查找该延时任务
+        Optional<DelayTask> optionalDelayTask = DelayTaskKit.optional(taskId);
+        if (optionalDelayTask.isPresent()) {
+            var delayTaskObj = optionalDelayTask.get();
+        }
+
+        // 通过 taskId 查找延时任务，存在则执行给定逻辑
+        DelayTaskKit.ifPresent(taskId, task -> {
+            task.plusTimeMillis(500); // 增加 0.5 秒的延时时间
+        });
+    }
 }
diff --git a/common/common-validation/pom.xml b/common/common-validation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ioGame</artifactId>
         <groupId>com.iohao.game</groupId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/external/external-core/pom.xml b/external/external-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.iohao.game</groupId>
         <artifactId>ioGame</artifactId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/external/external-core/src/main/java/com/iohao/game/external/core/session/UserSessions.java b/external/external-core/src/main/java/com/iohao/game/external/core/session/UserSessions.java
@@ -18,7 +18,6 @@
  */
 package com.iohao.game.external.core.session;
 
-import com.iohao.game.common.kit.CollKit;
 import com.iohao.game.common.kit.attr.AttrOptionDynamic;
 import com.iohao.game.external.core.hook.UserHook;
 
@@ -101,7 +100,7 @@ default void ifPresent(Collection<Long> userIdList, Consumer<Session> consumer)
     boolean existUserSession(long userId);
 
     /**
-     * 设置 channel 的 userId
+     * 设置 channel 的 userId，表示已经身份验证了（即登录过了）。
      *
      * @param userChannelId userChannelId
      * @param userId        userId

diff --git a/external/external-netty/pom.xml b/external/external-netty/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.iohao.game</groupId>
         <artifactId>ioGame</artifactId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/net-bolt/bolt-broker-server/pom.xml b/net-bolt/bolt-broker-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ioGame</artifactId>
         <groupId>com.iohao.game</groupId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/net-bolt/bolt-client/pom.xml b/net-bolt/bolt-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ioGame</artifactId>
         <groupId>com.iohao.game</groupId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/net-bolt/bolt-core/pom.xml b/net-bolt/bolt-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ioGame</artifactId>
         <groupId>com.iohao.game</groupId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.iohao.game</groupId>
     <artifactId>ioGame</artifactId>
-    <version>21.15</version>
+    <version>21.16</version>
     <name>ioGame</name>
     <description>
         生产资料公有制。
@@ -53,7 +53,7 @@
         <encoding>UTF-8</encoding>
 
         <!-- 网络库 : https://mvnrepository.com/artifact/io.netty/netty-all -->
-        <netty.version>4.1.112.Final</netty.version>
+        <netty.version>4.1.113.Final</netty.version>
         <!--  bolt https://mvnrepository.com/artifact/com.alipay.sofa/bolt  -->
         <bolt.version>1.6.6</bolt.version>
         <!-- hessian 格式化 https://mvnrepository.com/artifact/com.caucho/hessian -->

diff --git a/run-one/run-one-netty/pom.xml b/run-one/run-one-netty/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.iohao.game</groupId>
         <artifactId>ioGame</artifactId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/widget/light-client/pom.xml b/widget/light-client/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.iohao.game</groupId>
         <artifactId>ioGame</artifactId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/widget/light-domain-event/pom.xml b/widget/light-domain-event/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ioGame</artifactId>
         <groupId>com.iohao.game</groupId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/widget/light-game-room/pom.xml b/widget/light-game-room/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ioGame</artifactId>
         <groupId>com.iohao.game</groupId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/widget/light-jprotobuf/pom.xml b/widget/light-jprotobuf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ioGame</artifactId>
         <groupId>com.iohao.game</groupId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/widget/light-profile/pom.xml b/widget/light-profile/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ioGame</artifactId>
         <groupId>com.iohao.game</groupId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/widget/other-tool/pom.xml b/widget/other-tool/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.iohao.game</groupId>
         <artifactId>ioGame</artifactId>
-        <version>21.15</version>
+        <version>21.16</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>