From 206128c55613231e9aa6002611ceb28fc9b21630 Mon Sep 17 00:00:00 2001
From: sdvdxl <sdvdxl@163.com>
Date: Thu, 13 May 2021 10:31:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7sdk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: sdvdxl <sdvdxl@163.com>
---
 .idea/iotos-soft-gateway-demo.iml             | 31 +++++--------------
 .idea/jarRepositories.xml                     |  5 +++
 pom.xml                                       |  2 +-
 .../config/SpringScheduleConfig.java          |  7 ++---
 .../subsystem/service/SubsystemService.java   |  2 +-
 .../subsystem/service/UdpServerService.java   |  4 +--
 6 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/.idea/iotos-soft-gateway-demo.iml b/.idea/iotos-soft-gateway-demo.iml
index 8f4e463..627139a 100644
--- a/.idea/iotos-soft-gateway-demo.iml
+++ b/.idea/iotos-soft-gateway-demo.iml
@@ -11,10 +11,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: me.hekr.iotos.softgateway:framework-core:3.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: me.hekr.iotos.softgateway:framework-core:3.0.2-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
@@ -28,36 +30,19 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.21" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.21" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.17.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.26" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: me.hekr.iotos.softgateway:framework-common-utils:3.0.2-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.13.1" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.21" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.21" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.8" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" name="Maven: me.hekr.iotos.softgateway:framework-network-udp:3.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: me.hekr.iotos.softgateway:framework-network-common:3.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: me.hekr.iotos.softgateway:framework-network-udp:3.0.2-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: me.hekr.iotos.softgateway:framework-network-common:3.0.2-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.36.Final" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
   </component>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index fe8c21e..6bb0383 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -66,6 +66,11 @@
       <option name="name" value="hekr-private-rdc-releases" />
       <option name="url" value="https://repo.rdc.aliyun.com/repository/30275-release-kUFPjh/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="hekr-iotos-soft-gateway" />
+      <option name="name" value="hekr-iotos-soft-gateway" />
+      <option name="url" value="https://gitee.com/geekhekr/iotos-soft-gateway/raw/3.0.1-SNAPSHOT/maven/repository" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="google" />
       <option name="name" value="google" />
diff --git a/pom.xml b/pom.xml
index 863b961..b0ba3a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <properties>
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
-    <iotos.softgateway.version>3.0.1-SNAPSHOT</iotos.softgateway.version>
+    <iotos.softgateway.version>3.0.2-SNAPSHOT</iotos.softgateway.version>
 
   </properties>
   <parent>
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 20c9f5a..470c6cf 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 58133ad..3368105 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 d2cb61c..d1f9790 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;
-- 
Gitee


From 0f7fb35098e7c45819cb07af330e4c63c07e277e Mon Sep 17 00:00:00 2001
From: sdvdxl <sdvdxl@163.com>
Date: Thu, 13 May 2021 11:22:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20sdk=20version=EF=BC=8C=203.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: sdvdxl <sdvdxl@163.com>
---
 pom.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index b0ba3a4..130a2b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <properties>
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
-    <iotos.softgateway.version>3.0.2-SNAPSHOT</iotos.softgateway.version>
+    <iotos.softgateway.version>3.0.2</iotos.softgateway.version>
 
   </properties>
   <parent>
@@ -14,11 +14,7 @@
     <version>2.1.6.RELEASE</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
-  <!--  <parent>-->
-  <!--    <artifactId>iotos-soft-gateway</artifactId>-->
-  <!--    <groupId>me.hekr.iotos.softgateway</groupId>-->
-  <!--    <version>3.0.0-SNAPSHOT</version>-->
-  <!--  </parent>-->
+
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
   <artifactId>iotos-soft-gateway-demo</artifactId>
@@ -29,7 +25,7 @@
       <url>
         <!--        sdvdxl 开发版本-->
         <!--        https://gitee.com/sdvdxl/iotos-soft-gateway/raw/master/maven/repository-->
-        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
       </url>
     </repository>
   </repositories>
-- 
Gitee