diff --git a/README.md b/README.md index bd8eda2..3ce3d73 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,17 @@ Build all platforms under Windows: `build.bat` ## LICENSE -Copyright (c) 2022 KagurazakaYashi@Tongdy MqttClientTestTool is licensed under Mulan PSL v2. You can use this software according to the terms and conditions of the Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at: http://license.coscl.org.cn/MulanPSL2 THIS SOFTWARE IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. +Copyright (c) 2022 KagurazakaYashi@Tongdy MqttClientTestTool is licensed under Mulan PSL v2. You can use this software according to the terms and conditions of the Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at: THIS SOFTWARE IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. + +## Third-party + +- logrusorgru/aurora ([The Unlicense](https://github.com/logrusorgru/aurora/blob/master/LICENSE)) +- mochi-co/mqtt ([MIT License](https://github.com/mochi-co/mqtt/blob/master/LICENSE.md)) +- akavel/rsrc ([MIT License](https://github.com/akavel/rsrc/blob/master/LICENSE.txt)) +- gorilla/websocket ([BSD 2-Clause "Simplified" License](https://github.com/gorilla/websocket/blob/master/LICENSE)) +- josephspurrier/goversioninfo ([MIT License](https://github.com/josephspurrier/goversioninfo/blob/master/LICENSE)) +- rs/xid ([MIT License](https://github.com/rs/xid/blob/master/LICENSE)) + # MQTT 客户端测试工具 diff --git "a/\344\270\255\346\226\207\344\272\244\344\272\222\346\250\241\345\274\217.bat" "b/\344\270\255\346\226\207\344\272\244\344\272\222\346\250\241\345\274\217.bat" index 3ca4ca9..53845e0 100644 --- "a/\344\270\255\346\226\207\344\272\244\344\272\222\346\250\241\345\274\217.bat" +++ "b/\344\270\255\346\226\207\344\272\244\344\272\222\346\250\241\345\274\217.bat" @@ -1,4 +1,4 @@ -REM charset: GB2312, line break: CRLF, version: 1.1.0 +REM charset: GB2312, line break: CRLF, version: 1.2.0 SET vl=cn SET vip=0.0.0.0 SET vpo=1883 @@ -8,6 +8,10 @@ SET vw= SET vm= SET vs= SET vo= +SET ca= +SET ce= +SET ck= +SET cp= SET vn=YES :START @@ -22,16 +26,20 @@ ECHO ECHO ڴɺ󣬿ɽ豸мء ECHO ޸ MQTT ӦIJ ECHO -------------------------------------------------- -ECHO [0] Ϣʹõ: %vl% -ECHO [1] MQTT IP ַ: %vip% -ECHO [2] MQTT ˿ں: %vpo% -ECHO [3] ֻͻ ID ΪЩĿͻ: %vc% -ECHO [4] ֻЩϢ: %vt% -ECHO [5] ֻϢݰЩؼʲŻᴦ: %vw% -ECHO [6] ȡϢ浽 .csv ļ·: %vm% -ECHO [7] ͻ״̬仯浽 .csv ļ·: %vs% -ECHO [8] ־浽 .log ļ·: %vo% -ECHO [9] ɫģʽ(ͨ cmd ر): %vn% +ECHO [ 0] Ϣʹõ: %vl% +ECHO [ 1] MQTT IP ַ: %vip% +ECHO [ 2] MQTT ˿ں: %vpo% +ECHO [ 3] CA ֤ļ·: %ca% +ECHO [ 4] ǩ֤ļ·: %ce% +ECHO [ 5] ǩ˽Կļ·: %ck% +ECHO [ 6] ǩ˽Կļ: %cp% +ECHO [ 7] ֻͻ ID ΪЩĿͻ: %vc% +ECHO [ 8] ֻЩϢ: %vt% +ECHO [ 9] ֻϢݰЩؼʲŻᴦ: %vw% +ECHO [10] ȡϢ浽 .csv ļ·: %vm% +ECHO [11] ͻ״̬仯浽 .csv ļ·: %vs% +ECHO [12] ־浽 .log ļ·: %vo% +ECHO [13] ɫģʽ(ͨ cmd ر): %vn% ECHO -------------------------------------------------- ECHO [Y] MQTT ECHO [N] ˳ @@ -41,13 +49,17 @@ SET /P v= IF "%v%" EQU "0" GOTO SET_VL IF "%v%" EQU "1" GOTO SET_VIP IF "%v%" EQU "2" GOTO SET_VPO -IF "%v%" EQU "3" GOTO SET_VC -IF "%v%" EQU "4" GOTO SET_VT -IF "%v%" EQU "5" GOTO SET_VW -IF "%v%" EQU "6" GOTO SET_VM -IF "%v%" EQU "7" GOTO SET_VS -IF "%v%" EQU "8" GOTO SET_VO -IF "%v%" EQU "9" GOTO SET_VN +IF "%v%" EQU "3" GOTO SET_CA +IF "%v%" EQU "4" GOTO SET_CE +IF "%v%" EQU "5" GOTO SET_CK +IF "%v%" EQU "6" GOTO SET_CP +IF "%v%" EQU "7" GOTO SET_VC +IF "%v%" EQU "8" GOTO SET_VT +IF "%v%" EQU "9" GOTO SET_VW +IF "%v%" EQU "10" GOTO SET_VM +IF "%v%" EQU "11" GOTO SET_VS +IF "%v%" EQU "12" GOTO SET_VO +IF "%v%" EQU "13" GOTO SET_VN IF "%v%" EQU "Y" GOTO RUN IF "%v%" EQU "y" GOTO RUN IF "%v%" EQU "N" GOTO PEND @@ -95,6 +107,34 @@ SET /P vpo= IF "%vpo%" EQU "" SET vpo=1883 GOTO START +:SET_CA +CLS +ECHO ǰֵ: %ca% +ECHO CA ֤ļ·: +SET /P ca=ļ· (.pem/.crt): +GOTO START + +:SET_CE +CLS +ECHO ǰֵ: %ce% +ECHO ǩ֤ļ·: +SET /P ce=ļ· (.pem/.crt): +GOTO START + +:SET_CK +CLS +ECHO ǰֵ: %ck% +ECHO ǩ˽Կļ·: +SET /P ck=ļ· (.key): +GOTO START + +:SET_CP +CLS +ECHO ǰֵ: %cp% +ECHO ǩ˽Կļ: +SET /P cp=: +GOTO START + :SET_VC CLS ECHO ǰֵ: %vc% @@ -158,9 +198,13 @@ ECHO ECHO Ctrl+C ˳ SET el= -l "%vl%" SET ip= -p "%vip%:%vpo%" -IF "%vc%" NEQ "" SET ec= -c "%vc%". +IF "%vc%" NEQ "" SET ec= -c "%vc%" IF "%vt%" NEQ "" SET et= -t "%vt%" IF "%vw%" NEQ "" SET ew= -w "%vw%" +IF "%ca%" NEQ "" SET eca= -ca "%ca%" +IF "%ce%" NEQ "" SET ece= -ce "%ce%" +IF "%ck%" NEQ "" SET eck= -ck "%ck%" +IF "%cp%" NEQ "" SET ecp= -cp "%cp%" IF "%vm%" NEQ "" SET em= -m "%vm%" IF "%vs%" NEQ "" SET es= -s "%vs%" IF "%vo%" NEQ "" SET eo= -o "%vo%" @@ -169,8 +213,9 @@ IF "%vn%" EQU "YES" SET en= -n SET px=32 if "%PROCESSOR_ARCHITECTURE%"=="AMD64" SET px=64 TITLE MQTT ͻ˲Թ - %vip%:%vpo% +ECHO ´ͬʱֱӱ沢ʹ ECHO ON -MqttClientTestTool_v1.1.0_Windows%px%.exe%el%%ip%%ec%%et%%ew%%em%%es%%eo%%en% +MqttClientTestTool_v1.1.0_Windows%px%.exe%el%%ip%%eca%%ece%%eck%%ecp%%ec%%et%%ew%%em%%es%%eo%%en% GOTO START :PEND