From 547a250d31941f0c1085ed9a7c5d64cb2ab506c3 Mon Sep 17 00:00:00 2001
From: sdvdxl <sdvdxl@163.com>
Date: Wed, 12 May 2021 23:57:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E4=BE=9D=E8=B5=96?=
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 | 20 ++++++++------------
 .idea/jarRepositories.xml         |  5 +++++
 pom.xml                           | 20 ++++++++++++++++----
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/.idea/iotos-soft-gateway-demo.iml b/.idea/iotos-soft-gateway-demo.iml
index b71efcc..8f4e463 100644
--- a/.idea/iotos-soft-gateway-demo.iml
+++ b/.idea/iotos-soft-gateway-demo.iml
@@ -12,9 +12,6 @@
     <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-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: io.netty:netty-all:4.1.36.Final" 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" />
@@ -46,23 +43,22 @@
     <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" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.6.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" 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" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.12" 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.13" 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.12.0" 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.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" 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: 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>
 </module>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 14c1ed9..fe8c21e 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,6 +26,11 @@
       <option name="name" value="central" />
       <option name="url" value="https://maven.aliyun.com/repository/central" />
     </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.0-SNAPSHOT/maven/repository" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="apache-snapshots" />
       <option name="name" value="apache-snapshots" />
diff --git a/pom.xml b/pom.xml
index 93c9fdc..aa3ac4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,19 @@
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
     <iotos.softgateway.version>3.0.0-SNAPSHOT</iotos.softgateway.version>
-  </properties>
 
+  </properties>
   <parent>
-    <artifactId>iotos-soft-gateway</artifactId>
-    <groupId>me.hekr.iotos.softgateway</groupId>
-    <version>${iotos.softgateway.version}</version>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <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>
@@ -40,6 +46,12 @@
       <artifactId>framework-network-udp</artifactId>
       <version>${iotos.softgateway.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
-- 
Gitee


From 972575eee28789fb16256f68842239cc66889e0d Mon Sep 17 00:00:00 2001
From: sdvdxl <sdvdxl@163.com>
Date: Thu, 13 May 2021 09:37:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index aa3ac4c..863b961 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.0-SNAPSHOT</iotos.softgateway.version>
+    <iotos.softgateway.version>3.0.1-SNAPSHOT</iotos.softgateway.version>
 
   </properties>
   <parent>
@@ -29,7 +29,7 @@
       <url>
         <!--        sdvdxl 开发版本-->
         <!--        https://gitee.com/sdvdxl/iotos-soft-gateway/raw/master/maven/repository-->
-        https://gitee.com/geekhekr/iotos-soft-gateway/raw/3.0.0-SNAPSHOT/maven/repository
+        https://gitee.com/geekhekr/iotos-soft-gateway/raw/3.0.1-SNAPSHOT/maven/repository
       </url>
     </repository>
   </repositories>
-- 
Gitee