diff --git a/.idea/iotos-soft-gateway-demo.iml b/.idea/iotos-soft-gateway-demo.iml
index 8f4e4636df48e4bf7dc10a159493cb8688b85bfc..627139a363c1b7a1c00a0d15d4b84ab1e1265cb8 100644
--- a/.idea/iotos-soft-gateway-demo.iml
+++ b/.idea/iotos-soft-gateway-demo.iml
@@ -11,10 +11,12 @@
-
+
+
+
@@ -28,36 +30,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index fe8c21e5399970725d859ea755c485ebe589d247..6bb0383fced87029ae0398894cd0b0c9cde75797 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -66,6 +66,11 @@
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 863b9610ce5ab91431e0225e06156bd3873d1630..130a2b391a1cd81c46f802b25b14a3e043d77e34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
8
8
- 3.0.1-SNAPSHOT
+ 3.0.2
@@ -14,11 +14,7 @@
2.1.6.RELEASE
-
-
-
-
-
+
4.0.0
jar
iotos-soft-gateway-demo
@@ -29,7 +25,7 @@
- https://gitee.com/geekhekr/iotos-soft-gateway/raw/3.0.1-SNAPSHOT/maven/repository
+ https://gitee.com/geekhekr/iotos-soft-gateway/raw/3.0.2/maven/repository
diff --git a/src/main/java/me/hekr/iotos/softgateway/subsystem/config/SpringScheduleConfig.java b/src/main/java/me/hekr/iotos/softgateway/subsystem/config/SpringScheduleConfig.java
index 20c9f5afb2f5842a0b4dca45deac1b59c1a1f14e..470c6cf3a94b1b46aaa4bd356ba8c9285fcfc408 100644
--- a/src/main/java/me/hekr/iotos/softgateway/subsystem/config/SpringScheduleConfig.java
+++ b/src/main/java/me/hekr/iotos/softgateway/subsystem/config/SpringScheduleConfig.java
@@ -1,7 +1,7 @@
package me.hekr.iotos.softgateway.subsystem.config;
import java.util.concurrent.ScheduledExecutorService;
-import me.hekr.iotos.softgateway.core.utils.ThreadPoolUtil;
+import me.hekr.iotos.softgateway.common.utils.ThreadPoolUtil;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -27,9 +27,8 @@ public class SpringScheduleConfig implements SchedulingConfigurer {
return (ScheduledExecutorService)
new ThreadPoolUtil.Builder()
.setPrefix("spring-schedule")
- .setCore(12)
- .setMax(32)
- .setQueueSize(1000)
+ .setCore(2)
+ .setMax(8)
.setScheduled(true)
.build();
}
diff --git a/src/main/java/me/hekr/iotos/softgateway/subsystem/service/SubsystemService.java b/src/main/java/me/hekr/iotos/softgateway/subsystem/service/SubsystemService.java
index 58133ad37e8edb08b26ba345bab49fa19b3de5dc..336810585160374eeeb54d16666e88052eb70523 100644
--- a/src/main/java/me/hekr/iotos/softgateway/subsystem/service/SubsystemService.java
+++ b/src/main/java/me/hekr/iotos/softgateway/subsystem/service/SubsystemService.java
@@ -2,10 +2,10 @@ package me.hekr.iotos.softgateway.subsystem.service;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import me.hekr.iotos.softgateway.common.utils.ThreadPoolUtil;
import me.hekr.iotos.softgateway.core.klink.KlinkService;
import me.hekr.iotos.softgateway.core.klink.ModelData;
import me.hekr.iotos.softgateway.core.listener.DeviceRemoteConfigListenerAdapter;
-import me.hekr.iotos.softgateway.core.utils.ThreadPoolUtil;
import me.hekr.iotos.softgateway.subsystem.dto.RadioDevice;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/me/hekr/iotos/softgateway/subsystem/service/UdpServerService.java b/src/main/java/me/hekr/iotos/softgateway/subsystem/service/UdpServerService.java
index d2cb61cee689d7ac5a8e87f3bf3fa0135e175688..d1f97901c73986b1792b7264b2cea5ca20edbbaa 100644
--- a/src/main/java/me/hekr/iotos/softgateway/subsystem/service/UdpServerService.java
+++ b/src/main/java/me/hekr/iotos/softgateway/subsystem/service/UdpServerService.java
@@ -7,12 +7,12 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.stream.IntStream;
import lombok.extern.slf4j.Slf4j;
+import me.hekr.iotos.softgateway.common.utils.JsonUtil;
import me.hekr.iotos.softgateway.core.enums.ErrorCode;
import me.hekr.iotos.softgateway.core.klink.KlinkService;
import me.hekr.iotos.softgateway.core.klink.ModelData;
-import me.hekr.iotos.softgateway.core.utils.JsonUtil;
import me.hekr.iotos.softgateway.network.common.DecodePacket;
-import me.hekr.iotos.softgateway.network.common.PacketCoder;
+import me.hekr.iotos.softgateway.network.common.coder.PacketCoder;
import me.hekr.iotos.softgateway.network.udp.UdpClient;
import me.hekr.iotos.softgateway.network.udp.UdpServer;
import me.hekr.iotos.softgateway.subsystem.dto.RadioDevice;