From 103f782ddf6f4e8f7b2526d54679e40d2e9c2efc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E4=B8=99?= <sanbing-os@foxmail.com>
Date: Mon, 14 Oct 2024 17:46:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=B1=A0=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/util/config/ShardingThreadPool.java | 10 +++++-----
 .../v150/YunKuaiChongV15ProtocolMessageProcessor.java  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jcpp-infrastructure-util/src/main/java/sanbing/jcpp/infrastructure/util/config/ShardingThreadPool.java b/jcpp-infrastructure-util/src/main/java/sanbing/jcpp/infrastructure/util/config/ShardingThreadPool.java
index 29b6084..c334e7e 100644
--- a/jcpp-infrastructure-util/src/main/java/sanbing/jcpp/infrastructure/util/config/ShardingThreadPool.java
+++ b/jcpp-infrastructure-util/src/main/java/sanbing/jcpp/infrastructure/util/config/ShardingThreadPool.java
@@ -38,7 +38,7 @@ public class ShardingThreadPool {
 
     private HashFunction hashFunction;
 
-    private final Map<Integer, ExecutorService> EXECUTOR_SERVICE_MAP = new ConcurrentHashMap<>(8);
+    private final Map<Integer, ExecutorService> executorServiceMap = new ConcurrentHashMap<>(8);
 
     @PostConstruct
     public void init() {
@@ -47,7 +47,7 @@ public class ShardingThreadPool {
 
     @PreDestroy
     public void destroy() {
-        for (ExecutorService executorService : EXECUTOR_SERVICE_MAP.values()) {
+        for (ExecutorService executorService : executorServiceMap.values()) {
             executorService.shutdownNow();
             log.info("Sharding Thread [{}] Shutdown completed.", executorService);
         }
@@ -55,7 +55,7 @@ public class ShardingThreadPool {
 
     @Scheduled(fixedDelayString = "${thread-pool.sharding.stats-print-interval-ms:10000}")
     public void printStats() {
-        EXECUTOR_SERVICE_MAP.forEach((k, v) -> {
+        executorServiceMap.forEach((k, v) -> {
 
             ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) v;
 
@@ -78,8 +78,8 @@ public class ShardingThreadPool {
     public void execute(UUID hashKey, TracerRunnable runnable) {
         int partition = hash(hashFunction, hashKey);
 
-        EXECUTOR_SERVICE_MAP.computeIfAbsent(partition % parallelism,
-                        p -> Executors.newFixedThreadPool(1, JCPPThreadFactory.forName("sharding-threads-%d" + p)))
+        executorServiceMap.computeIfAbsent(Math.abs(partition % parallelism),
+                        p -> Executors.newFixedThreadPool(1, JCPPThreadFactory.forName("sharding-threads-" + p)))
                 .execute(runnable);
     }
 }
\ No newline at end of file
diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/YunKuaiChongV15ProtocolMessageProcessor.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/YunKuaiChongV15ProtocolMessageProcessor.java
index 66f4b8b..c73ad66 100644
--- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/YunKuaiChongV15ProtocolMessageProcessor.java
+++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/YunKuaiChongV15ProtocolMessageProcessor.java
@@ -102,7 +102,7 @@ public class YunKuaiChongV15ProtocolMessageProcessor extends ProtocolMessageProc
         int seqNo = in.readUnsignedShortLE();
 
         // 加密标志
-        int encrpyFlag = in.readUnsignedByte();
+        int encryptFlag = in.readUnsignedByte();
 
         // 帧类型标志
         int frameType = in.readUnsignedByte();
@@ -154,7 +154,7 @@ public class YunKuaiChongV15ProtocolMessageProcessor extends ProtocolMessageProc
         message.setHead(startFlag);
         message.setDataLength(dataLength);
         message.setSequenceNumber(seqNo);
-        message.setEncryptionFlag(encrpyFlag);
+        message.setEncryptionFlag(encryptFlag);
         message.setCmd(frameType);
         message.setMsgBody(msgBody);
         message.setCheckSum(checkSum);