From eabc7e388cb2aacfcf37c60f6056973a79b03a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BF=97=E5=8B=87?= <zhangzhiyong1@xiaomi.com>
Date: Sat, 9 Nov 2024 14:33:28 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20mesh=20remote=20=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20(#899)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [fix] mesh remote 问题修复

* [fix] mesh remote 问题修复
---
 jcommon/pom.xml                               | 37 ++++++++++---------
 .../com/xiaomi/data/push/common/NetUtils.java |  8 ++--
 .../com/xiaomi/data/push/uds/UdsClient.java   |  2 +-
 .../com/xiaomi/data/push/uds/UdsServer.java   |  4 +-
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/jcommon/pom.xml b/jcommon/pom.xml
index 7b53cedbe..d4ecf9813 100644
--- a/jcommon/pom.xml
+++ b/jcommon/pom.xml
@@ -250,24 +250,25 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.6</version>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                        <configuration>
-                            <executable>gpg</executable>
-<!--                            <keyname>your-gpg-key</keyname>-->
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-gpg-plugin</artifactId>-->
+<!--                <version>1.6</version>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>sign-artifacts</id>-->
+<!--                        <phase>verify</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>sign</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            <executable>gpg</executable>-->
+<!--&lt;!&ndash;                            <keyname>your-gpg-key</keyname>&ndash;&gt;-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
+
         </plugins>
     </build>
 
diff --git a/jcommon/rcurve/src/main/java/com/xiaomi/data/push/common/NetUtils.java b/jcommon/rcurve/src/main/java/com/xiaomi/data/push/common/NetUtils.java
index d0a289181..f5111615e 100644
--- a/jcommon/rcurve/src/main/java/com/xiaomi/data/push/common/NetUtils.java
+++ b/jcommon/rcurve/src/main/java/com/xiaomi/data/push/common/NetUtils.java
@@ -13,10 +13,10 @@
  */
 public class NetUtils {
 
-    public static EventLoopGroup getEventLoopGroup() {
-//        if (CommonUtils.isMac() && CommonUtils.isArch64()) {
-//            return new NioEventLoopGroup();
-//        }
+    public static EventLoopGroup getEventLoopGroup(boolean remote) {
+        if (remote) {
+            return new NioEventLoopGroup();
+        }
         if (CommonUtils.isWindows()) {
             return new NioEventLoopGroup();
         }
diff --git a/jcommon/rcurve/src/main/java/com/xiaomi/data/push/uds/UdsClient.java b/jcommon/rcurve/src/main/java/com/xiaomi/data/push/uds/UdsClient.java
index 33f0d6780..eccf675c1 100644
--- a/jcommon/rcurve/src/main/java/com/xiaomi/data/push/uds/UdsClient.java
+++ b/jcommon/rcurve/src/main/java/com/xiaomi/data/push/uds/UdsClient.java
@@ -95,7 +95,7 @@ public UdsClient(String id) {
 
 
     private EventLoopGroup getEventLoopGroup() {
-        return NetUtils.getEventLoopGroup();
+        return NetUtils.getEventLoopGroup(this.remote);
     }
 
 
diff --git a/jcommon/rcurve/src/main/java/com/xiaomi/data/push/uds/UdsServer.java b/jcommon/rcurve/src/main/java/com/xiaomi/data/push/uds/UdsServer.java
index b41ab9031..07a63f225 100644
--- a/jcommon/rcurve/src/main/java/com/xiaomi/data/push/uds/UdsServer.java
+++ b/jcommon/rcurve/src/main/java/com/xiaomi/data/push/uds/UdsServer.java
@@ -109,8 +109,8 @@ public void start(String path) {
         this.path = path;
         delPath();
         boolean mac = CommonUtils.isMac();
-        EventLoopGroup bossGroup = NetUtils.getEventLoopGroup();
-        EventLoopGroup workerGroup = NetUtils.getEventLoopGroup();
+        EventLoopGroup bossGroup = NetUtils.getEventLoopGroup(this.remote);
+        EventLoopGroup workerGroup = NetUtils.getEventLoopGroup(this.remote);
         try {
             ServerBootstrap b = new ServerBootstrap();
             b.group(bossGroup, workerGroup)