Merge pull request #22 from sanshengshui/develop-0.7.3

=new merge
IoT-Technology · Jan 11, 2025 · 7e53c3e · 7e53c3e
2 parents 634334f + f6247b7
commit 7e53c3e
Show file tree

Hide file tree

Showing 244 changed files with 384 additions and 467 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macOS-latest, windows-latest ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 90
 

diff --git a/README_CN.md b/README_CN.md
@@ -170,7 +170,7 @@ Commands:
   publish, pub    向代理发布消息
   subscribe, sub  从MQTT Broker(代理)订阅更新
 
-Copyright (c) 2019-2023, 物联网技术指南
+Copyright (c) 2019-2025, 物联网技术指南
 Developed by mushuwei
 ```
 

diff --git a/bin/add-zsh-completion-osx.sh b/bin/add-zsh-completion-osx.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright © 2019-2023 The Toolkit Authors
+# Copyright © 2019-2025 The Toolkit Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright © 2019-2023 The Toolkit Authors
+    Copyright © 2019-2025 The Toolkit Authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/etc/license/license-header-template.txt b/etc/license/license-header-template.txt
@@ -1,4 +1,4 @@
-Copyright © ${project.inceptionYear}-2023 ${owner}
+Copyright © ${project.inceptionYear}-2025 ${owner}
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2019-2023 The Toolkit Authors
+    Copyright © 2019-2025 The Toolkit Authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <picocli.version>4.7.5</picocli.version>
+        <picocli.version>4.7.6</picocli.version>
         <netty.version>4.1.94.Final</netty.version>
         <slf4j.version>1.7.36</slf4j.version>
         <jackson.version>2.14.0-rc1</jackson.version>

diff --git a/toolkit-app/pom.xml b/toolkit-app/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2019-2023 The Toolkit Authors
+    Copyright © 2019-2025 The Toolkit Authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -224,26 +224,26 @@
                             </buildArgs>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>compress-binary</id>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <phase>package</phase>
-                                <configuration combine.self="override">
-                                    <executable>upx</executable>
-                                    <skip>${skipCompress}</skip>
-                                    <arguments>
-                                        <argument>${project.build.directory}/toolkit${executable-suffix}</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
+<!--                    <plugin>-->
+<!--                        <groupId>org.codehaus.mojo</groupId>-->
+<!--                        <artifactId>exec-maven-plugin</artifactId>-->
+<!--                        <executions>-->
+<!--                            <execution>-->
+<!--                                <id>compress-binary</id>-->
+<!--                                <goals>-->
+<!--                                    <goal>exec</goal>-->
+<!--                                </goals>-->
+<!--                                <phase>package</phase>-->
+<!--                                <configuration combine.self="override">-->
+<!--                                    <executable>upx</executable>-->
+<!--                                    <skip>${skipCompress}</skip>-->
+<!--                                    <arguments>-->
+<!--                                        <argument>${project.build.directory}/toolkit${executable-suffix}</argument>-->
+<!--                                    </arguments>-->
+<!--                                </configuration>-->
+<!--                            </execution>-->
+<!--                        </executions>-->
+<!--                    </plugin>-->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
@@ -278,7 +278,6 @@
             </activation>
             <properties>
                 <executable-suffix>.exe</executable-suffix>
-                <skipCompress>true</skipCompress>
             </properties>
         </profile>
 
@@ -291,6 +290,7 @@
             </activation>
             <properties>
                 <assembly-suffix>-osx</assembly-suffix>
+                <skipCompress>true</skipCompress>
             </properties>
             <build>
                 <plugins>

diff --git a/toolkit-app/src/main/assembly/assembly-java.xml b/toolkit-app/src/main/assembly/assembly-java.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2019-2023 The Toolkit Authors
+    Copyright © 2019-2025 The Toolkit Authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/toolkit-app/src/main/assembly/assembly-native-osx.xml b/toolkit-app/src/main/assembly/assembly-native-osx.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright © 2019-2023 The Toolkit Authors
+    Copyright © 2019-2025 The Toolkit Authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/toolkit-app/src/main/assembly/assembly-native.xml b/toolkit-app/src/main/assembly/assembly-native.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2019-2023 The Toolkit Authors
+    Copyright © 2019-2025 The Toolkit Authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/toolkit-app/src/main/java/iot/technology/client/toolkit/app/ToolKitCommand.java b/toolkit-app/src/main/java/iot/technology/client/toolkit/app/ToolKitCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@
 		synopsisSubcommandLabel = "{ config | mqtt | coap | nb }",
 		descriptionHeading = "%n",
 		requiredOptionMarker = '*',
-		footerHeading = "%nCopyright (c) 2019-2023, ${bundle:general.copyright}",
+		footerHeading = "%nCopyright (c) 2019-2025, ${bundle:general.copyright}",
 		footer = "%nDeveloped by mushuwei",
 		subcommands = {
 				AutoComplete.GenerateCompletion.class,

diff --git a/toolkit-app/src/main/java/iot/technology/client/toolkit/app/settings/ConfigCommand.java b/toolkit-app/src/main/java/iot/technology/client/toolkit/app/settings/ConfigCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
 		synopsisHeading = "%n@|bold ${bundle:general.usage}|@%n",
 		commandListHeading = "%n@|bold ${bundle:general.commands}|@%n",
 		descriptionHeading = "%n",
-		footerHeading = "%nCopyright (c) 2019-2023, ${bundle:general.copyright}",
+		footerHeading = "%nCopyright (c) 2019-2025, ${bundle:general.copyright}",
 		footer = "%nDeveloped by mushuwei",
 		versionProvider = iot.technology.client.toolkit.common.constants.VersionInfo.class
 )

diff --git a/toolkit-app/src/main/java/iot/technology/client/toolkit/app/settings/info/MainInfo.java b/toolkit-app/src/main/java/iot/technology/client/toolkit/app/settings/info/MainInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import iot.technology.client.toolkit.common.utils.ColorUtils;
 import iot.technology.client.toolkit.common.utils.StringUtils;
 
-import java.util.Locale;
 import java.util.ResourceBundle;
 
 /**

diff --git a/toolkit-app/src/main/java/iot/technology/client/toolkit/app/settings/lang/LangService.java b/toolkit-app/src/main/java/iot/technology/client/toolkit/app/settings/lang/LangService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/toolkit-coap/pom.xml b/toolkit-coap/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2019-2023 The Toolkit Authors
+    Copyright © 2019-2025 The Toolkit Authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/toolkit-coap/src/main/java/iot/technology/client/toolkit/coap/command/CoapCommand.java b/toolkit-coap/src/main/java/iot/technology/client/toolkit/coap/command/CoapCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@
 				CoapPutCommand.class,
 				CoapDeleteCommand.class,
 		},
-		footerHeading = "%nCopyright (c) 2019-2023, ${bundle:general.copyright}",
+		footerHeading = "%nCopyright (c) 2019-2025, ${bundle:general.copyright}",
 		footer = "%nDeveloped by mushuwei")
 public class CoapCommand implements Callable<Integer> {
 

diff --git a/...oap/src/main/java/iot/technology/client/toolkit/coap/command/sub/AbstractCoapContext.java b/...oap/src/main/java/iot/technology/client/toolkit/coap/command/sub/AbstractCoapContext.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright © 2019-2025 The Toolkit Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package iot.technology.client.toolkit.coap.command.sub;
 
 import iot.technology.client.toolkit.common.utils.Assert;

diff --git a/...-coap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapDeleteCommand.java b/...-coap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapDeleteCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
 		commandListHeading = "%n@|bold ${bundle:general.commands}|@%n",
 		optionListHeading = "%n@|bold ${bundle:general.option}|@%n",
 		descriptionHeading = "%n",
-		footerHeading = "%nCopyright (c) 2019-2023, ${bundle:general.copyright}",
+		footerHeading = "%nCopyright (c) 2019-2025, ${bundle:general.copyright}",
 		footer = "%nDeveloped by mushuwei"
 )
 public class CoapDeleteCommand extends AbstractCoapContext implements Callable<Integer> {

diff --git a/...oap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapDescribeCommand.java b/...oap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapDescribeCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
 		commandListHeading = "%n@|bold ${bundle:general.commands}|@%n",
 		optionListHeading = "%n@|bold ${bundle:general.option}|@%n",
 		descriptionHeading = "%n",
-		footerHeading = "%nCopyright (c) 2019-2023, ${bundle:general.copyright}",
+		footerHeading = "%nCopyright (c) 2019-2025, ${bundle:general.copyright}",
 		footer = "%nDeveloped by mushuwei"
 )
 public class CoapDescribeCommand implements Callable<Integer> {

diff --git a/...oap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapDiscoverCommand.java b/...oap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapDiscoverCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
 		commandListHeading = "%n@|bold ${bundle:general.commands}|@%n",
 		optionListHeading = "%n@|bold ${bundle:general.option}|@%n",
 		descriptionHeading = "%n",
-		footerHeading = "%nCopyright (c) 2019-2023, ${bundle:general.copyright}",
+		footerHeading = "%nCopyright (c) 2019-2025, ${bundle:general.copyright}",
 		footer = "%nDeveloped by mushuwei"
 )
 public class CoapDiscoverCommand extends AbstractCoapContext implements Callable<Integer> {
@@ -58,7 +58,6 @@ public class CoapDiscoverCommand extends AbstractCoapContext implements Callable
 			description = "${bundle:coap.uri.description}")
 	private URI uri;
 
-	/* ********************************** Identity Section ******************************** */
 	/* ********************************** Identity Section ******************************** */
 	@CommandLine.ArgGroup(exclusive = false,
 			heading = "%n@|bold,underline PSK Options|@ %n%n"//

diff --git a/...kit-coap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapGetCommand.java b/...kit-coap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapGetCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
 		commandListHeading = "%n@|bold ${bundle:general.commands}|@%n",
 		optionListHeading = "%n@|bold ${bundle:general.option}|@%n",
 		descriptionHeading = "%n",
-		footerHeading = "%nCopyright (c) 2019-2023, ${bundle:general.copyright}",
+		footerHeading = "%nCopyright (c) 2019-2025, ${bundle:general.copyright}",
 		footer = "%nDeveloped by mushuwei"
 )
 public class CoapGetCommand extends AbstractCoapContext implements Callable<Integer> {

diff --git a/...oap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapIdentitySection.java b/...oap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapIdentitySection.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright © 2019-2025 The Toolkit Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package iot.technology.client.toolkit.coap.command.sub;
 
 import picocli.CommandLine;

diff --git a/...p/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapMediaTypesCommand.java b/...p/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapMediaTypesCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
 		commandListHeading = "%n@|bold ${bundle:general.commands}|@%n",
 		optionListHeading = "%n@|bold ${bundle:general.option}|@%n",
 		descriptionHeading = "%n",
-		footerHeading = "%nCopyright (c) 2019-2023, ${bundle:general.copyright}",
+		footerHeading = "%nCopyright (c) 2019-2025, ${bundle:general.copyright}",
 		footer = "%nDeveloped by mushuwei"
 )
 public class CoapMediaTypesCommand implements Callable<Integer> {

diff --git a/...it-coap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapPostCommand.java b/...it-coap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapPostCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
 		commandListHeading = "%n@|bold ${bundle:general.commands}|@%n",
 		optionListHeading = "%n@|bold ${bundle:general.option}|@%n",
 		descriptionHeading = "%n",
-		footerHeading = "%nCopyright (c) 2019-2023, ${bundle:general.copyright}",
+		footerHeading = "%nCopyright (c) 2019-2025, ${bundle:general.copyright}",
 		footer = "%nDeveloped by mushuwei"
 )
 public class CoapPostCommand extends AbstractCoapContext implements Callable<Integer> {

diff --git a/...kit-coap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapPutCommand.java b/...kit-coap/src/main/java/iot/technology/client/toolkit/coap/command/sub/CoapPutCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
 		commandListHeading = "%n@|bold ${bundle:general.commands}|@%n",
 		optionListHeading = "%n@|bold ${bundle:general.option}|@%n",
 		descriptionHeading = "%n",
-		footerHeading = "%nCopyright (c) 2019-2023, ${bundle:general.copyright}",
+		footerHeading = "%nCopyright (c) 2019-2025, ${bundle:general.copyright}",
 		footer = "%nDeveloped by mushuwei"
 )
 public class CoapPutCommand extends AbstractCoapContext implements Callable<Integer> {

diff --git a/toolkit-coap/src/main/java/iot/technology/client/toolkit/coap/domain/AvailableResource.java b/toolkit-coap/src/main/java/iot/technology/client/toolkit/coap/domain/AvailableResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2023 The Toolkit Authors
+ * Copyright © 2019-2025 The Toolkit Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.