From beee0feaf466631ba01fdecaf8023c16c486b0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8D=AD=E7=90=AA=E6=9E=AB?= Date: Tue, 6 Jun 2023 15:11:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=8A=A5=E9=94=99h2=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8C=85?= =?UTF-8?q?=E6=B2=A1=E8=A6=81=E5=AF=BC=E5=85=A5=E5=AF=BC=E8=87=B4=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot-data-serviceImpl-rdb/pom.xml | 7 ++- .../dependency-reduced-pom.xml | 17 +++---- iot-components/iot-DLT645-component/pom.xml | 3 +- .../dependency-reduced-pom.xml | 1 + iot-components/iot-component-tcp/pom.xml | 3 +- .../dependency-reduced-pom.xml | 45 +++++------------- iot-components/iot-emqx-component/pom.xml | 3 +- .../dependency-reduced-pom.xml | 21 ++++---- iot-components/iot-http-biz-component/pom.xml | 3 +- .../dependency-reduced-pom.xml | 45 +++++------------- iot-components/iot-mqtt-component/pom.xml | 3 +- .../dependency-reduced-pom.xml | 23 ++++----- .../iot-websocket-component/pom.xml | 3 +- iot-module/iot-manager/pom.xml | 3 +- iot-module/iot-message-notify/pom.xml | 3 +- iot-module/iot-rule-engine/pom.xml | 5 +- iot-module/iot-system/pom.xml | 3 +- .../src/main/resources/application-dev.yml | 1 - .../src/main/resources/application-mysql.yml | 1 - .../src/main/resources/application.yml | 3 +- iot-test-tool/iot-test-mqtt/pom.xml | 3 +- iot-test-tool/iot-virtual-device/pom.xml | 3 +- log/error.2023-06-01.0.gz | Bin 0 -> 20 bytes log/error.2023-06-02.0.gz | Bin 0 -> 678 bytes log/info.2023-06-01.0.gz | Bin 0 -> 955 bytes log/info.2023-06-02.0.gz | Bin 0 -> 1394 bytes 26 files changed, 83 insertions(+), 119 deletions(-) create mode 100644 log/error.2023-06-01.0.gz create mode 100644 log/error.2023-06-02.0.gz create mode 100644 log/info.2023-06-01.0.gz create mode 100644 log/info.2023-06-02.0.gz diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/pom.xml b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/pom.xml index 95b86db1..3c815101 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/pom.xml +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/pom.xml @@ -32,6 +32,11 @@ querydsl-jpa + + com.h2database + h2 + + mysql mysql-connector-java @@ -140,4 +145,4 @@ - \ No newline at end of file + diff --git a/iot-components/iot-DLT645-component/dependency-reduced-pom.xml b/iot-components/iot-DLT645-component/dependency-reduced-pom.xml index 3c910860..7172d851 100644 --- a/iot-components/iot-DLT645-component/dependency-reduced-pom.xml +++ b/iot-components/iot-DLT645-component/dependency-reduced-pom.xml @@ -3,10 +3,12 @@ iot-components cc.iotkit - ${revision} + 0.4.5-SNAPSHOT 4.0.0 + cc.iotkit iot-DLT645-component + 0.4.5-SNAPSHOT @@ -38,6 +40,7 @@ 11 11 + utf8 @@ -46,25 +49,19 @@ org.projectlombok lombok - 1.18.24 + 1.18.26 compile - - io.vertx - vertx-web-proxy - 4.2.2 - provided - cc.iotkit iot-component-base - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile cc.iotkit iot-common-core - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile diff --git a/iot-components/iot-DLT645-component/pom.xml b/iot-components/iot-DLT645-component/pom.xml index 5d940944..591dc5cf 100644 --- a/iot-components/iot-DLT645-component/pom.xml +++ b/iot-components/iot-DLT645-component/pom.xml @@ -75,9 +75,10 @@ 11 11 + utf8 - \ No newline at end of file + diff --git a/iot-components/iot-component-tcp/dependency-reduced-pom.xml b/iot-components/iot-component-tcp/dependency-reduced-pom.xml index 8229622a..5bc831dc 100644 --- a/iot-components/iot-component-tcp/dependency-reduced-pom.xml +++ b/iot-components/iot-component-tcp/dependency-reduced-pom.xml @@ -37,6 +37,7 @@ ${java.version} true false + utf8 diff --git a/iot-components/iot-component-tcp/pom.xml b/iot-components/iot-component-tcp/pom.xml index 388e6ce3..f4c5a273 100644 --- a/iot-components/iot-component-tcp/pom.xml +++ b/iot-components/iot-component-tcp/pom.xml @@ -88,8 +88,9 @@ ${java.version} true false + utf8 - \ No newline at end of file + diff --git a/iot-components/iot-emqx-component/dependency-reduced-pom.xml b/iot-components/iot-emqx-component/dependency-reduced-pom.xml index 781e750e..ce15a1da 100644 --- a/iot-components/iot-emqx-component/dependency-reduced-pom.xml +++ b/iot-components/iot-emqx-component/dependency-reduced-pom.xml @@ -3,10 +3,12 @@ iot-components cc.iotkit - ${revision} + 0.4.5-SNAPSHOT 4.0.0 + cc.iotkit iot-emqx-component + 0.4.5-SNAPSHOT @@ -48,67 +50,44 @@ maven-compiler-plugin - 11 - 11 + ${java.version} + ${java.version} true false + utf8 - - io.vertx - vertx-core - 4.2.2 - provided - - - io.vertx - vertx-web-proxy - 4.2.2 - provided - - - io.vertx - vertx-mqtt - 4.2.2 - provided - - - org.luaj - luaj-jse - 3.0.1 - provided - cc.iotkit - iot-common-model - 0.4.3-SNAPSHOT + iot-common-model + 0.4.5-SNAPSHOT compile cc.iotkit iot-common-core - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile cc.iotkit iot-component-base - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile cc.iotkit iot-data-service - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile cc.iotkit iot-script-engine - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile diff --git a/iot-components/iot-emqx-component/pom.xml b/iot-components/iot-emqx-component/pom.xml index 7f92aca3..640a424f 100755 --- a/iot-components/iot-emqx-component/pom.xml +++ b/iot-components/iot-emqx-component/pom.xml @@ -114,9 +114,10 @@ ${java.version} true false + utf8 - \ No newline at end of file + diff --git a/iot-components/iot-http-biz-component/dependency-reduced-pom.xml b/iot-components/iot-http-biz-component/dependency-reduced-pom.xml index 4a7d557c..91363138 100644 --- a/iot-components/iot-http-biz-component/dependency-reduced-pom.xml +++ b/iot-components/iot-http-biz-component/dependency-reduced-pom.xml @@ -3,10 +3,12 @@ iot-components cc.iotkit - ${revision} + 0.4.5-SNAPSHOT 4.0.0 + cc.iotkit iot-http-biz-component + 0.4.5-SNAPSHOT @@ -36,8 +38,9 @@ maven-compiler-plugin - 11 - 11 + ${java.version} + ${java.version} + utf8 @@ -46,25 +49,19 @@ org.projectlombok lombok - 1.18.24 + 1.18.26 compile - - io.vertx - vertx-web-proxy - 4.2.2 - provided - cc.iotkit iot-component-base - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile cc.iotkit iot-script-engine - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile diff --git a/iot-components/iot-http-biz-component/pom.xml b/iot-components/iot-http-biz-component/pom.xml index 38e644df..5fed4022 100755 --- a/iot-components/iot-http-biz-component/pom.xml +++ b/iot-components/iot-http-biz-component/pom.xml @@ -68,9 +68,10 @@ ${java.version} ${java.version} + utf8 - \ No newline at end of file + diff --git a/iot-components/iot-mqtt-component/dependency-reduced-pom.xml b/iot-components/iot-mqtt-component/dependency-reduced-pom.xml index 2a282912..6a2a5b12 100644 --- a/iot-components/iot-mqtt-component/dependency-reduced-pom.xml +++ b/iot-components/iot-mqtt-component/dependency-reduced-pom.xml @@ -3,10 +3,12 @@ iot-components cc.iotkit - ${revision} + 0.4.5-SNAPSHOT 4.0.0 + cc.iotkit iot-mqtt-component + 0.4.5-SNAPSHOT @@ -34,73 +36,50 @@ maven-compiler-plugin - 11 - 11 + ${java.version} + ${java.version} true false + utf8 - - io.vertx - vertx-core - 4.2.2 - provided - - - io.vertx - vertx-mqtt - 4.2.2 - provided - - - io.netty - netty-codec-mqtt - 4.1.72.Final - provided - org.projectlombok lombok - 1.18.24 + 1.18.26 compile org.slf4j slf4j-api - 1.7.32 + 1.7.36 compile - - org.luaj - luaj-jse - 3.0.1 - provided - cc.iotkit iot-common-core - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile cc.iotkit iot-component-base - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile cc.iotkit iot-data-service - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile cc.iotkit iot-script-engine - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile diff --git a/iot-components/iot-mqtt-component/pom.xml b/iot-components/iot-mqtt-component/pom.xml index 9b0b6c18..85087550 100755 --- a/iot-components/iot-mqtt-component/pom.xml +++ b/iot-components/iot-mqtt-component/pom.xml @@ -98,9 +98,10 @@ ${java.version} true false + utf8 - \ No newline at end of file + diff --git a/iot-components/iot-websocket-component/dependency-reduced-pom.xml b/iot-components/iot-websocket-component/dependency-reduced-pom.xml index 6fde95e6..fde37299 100644 --- a/iot-components/iot-websocket-component/dependency-reduced-pom.xml +++ b/iot-components/iot-websocket-component/dependency-reduced-pom.xml @@ -3,10 +3,12 @@ iot-components cc.iotkit - ${revision} + 0.4.5-SNAPSHOT 4.0.0 + cc.iotkit iot-websocket-component + 0.4.5-SNAPSHOT @@ -32,43 +34,38 @@ maven-compiler-plugin - 11 - 11 + ${java.version} + ${java.version} true false + utf8 - - io.vertx - vertx-core - 4.2.2 - provided - org.projectlombok lombok - 1.18.24 + 1.18.26 compile cc.iotkit iot-common-core - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile org.slf4j slf4j-api - 1.7.32 + 1.7.36 compile cc.iotkit iot-component-base - 0.4.3-SNAPSHOT + 0.4.5-SNAPSHOT compile diff --git a/iot-components/iot-websocket-component/pom.xml b/iot-components/iot-websocket-component/pom.xml index a2545f9f..3440e361 100644 --- a/iot-components/iot-websocket-component/pom.xml +++ b/iot-components/iot-websocket-component/pom.xml @@ -71,9 +71,10 @@ ${java.version} true false + utf8 - \ No newline at end of file + diff --git a/iot-module/iot-manager/pom.xml b/iot-module/iot-manager/pom.xml index d75f71b1..58d16560 100644 --- a/iot-module/iot-manager/pom.xml +++ b/iot-module/iot-manager/pom.xml @@ -131,6 +131,7 @@ ${java.version} ${java.version} + utf8 org.projectlombok @@ -154,4 +155,4 @@ - \ No newline at end of file + diff --git a/iot-module/iot-message-notify/pom.xml b/iot-module/iot-message-notify/pom.xml index 408a46db..baf81663 100644 --- a/iot-module/iot-message-notify/pom.xml +++ b/iot-module/iot-message-notify/pom.xml @@ -46,9 +46,10 @@ ${java.version} ${java.version} + utf8 - \ No newline at end of file + diff --git a/iot-module/iot-rule-engine/pom.xml b/iot-module/iot-rule-engine/pom.xml index 29da01f4..2d671d0d 100644 --- a/iot-module/iot-rule-engine/pom.xml +++ b/iot-module/iot-rule-engine/pom.xml @@ -107,9 +107,10 @@ ${java.version} ${java.version} + utf8 - - \ No newline at end of file + + diff --git a/iot-module/iot-system/pom.xml b/iot-module/iot-system/pom.xml index 1d8b84cc..095e4251 100644 --- a/iot-module/iot-system/pom.xml +++ b/iot-module/iot-system/pom.xml @@ -75,6 +75,7 @@ ${java.version} ${java.version} + utf8 org.projectlombok @@ -98,4 +99,4 @@ - \ No newline at end of file + diff --git a/iot-starter/src/main/resources/application-dev.yml b/iot-starter/src/main/resources/application-dev.yml index 64daedaa..c268d301 100644 --- a/iot-starter/src/main/resources/application-dev.yml +++ b/iot-starter/src/main/resources/application-dev.yml @@ -80,7 +80,6 @@ spring: host: 127.0.0.1 port: 6379 database: 0 - password: mvc: pathmatch: diff --git a/iot-starter/src/main/resources/application-mysql.yml b/iot-starter/src/main/resources/application-mysql.yml index a8f5fb53..b21b8363 100644 --- a/iot-starter/src/main/resources/application-mysql.yml +++ b/iot-starter/src/main/resources/application-mysql.yml @@ -54,7 +54,6 @@ spring: host: 127.0.0.1 port: 6379 database: 0 - password: mvc: pathmatch: diff --git a/iot-starter/src/main/resources/application.yml b/iot-starter/src/main/resources/application.yml index 65de484a..01e99ef5 100644 --- a/iot-starter/src/main/resources/application.yml +++ b/iot-starter/src/main/resources/application.yml @@ -80,7 +80,6 @@ spring: host: 127.0.0.1 port: 6379 database: 0 - password: mvc: pathmatch: @@ -153,4 +152,4 @@ user: # 密码最大错误次数 maxRetryCount: 5 # 密码锁定时间（默认10分钟） - lockTime: 10 \ No newline at end of file + lockTime: 10 diff --git a/iot-test-tool/iot-test-mqtt/pom.xml b/iot-test-tool/iot-test-mqtt/pom.xml index 9d39066c..0b20fa2a 100755 --- a/iot-test-tool/iot-test-mqtt/pom.xml +++ b/iot-test-tool/iot-test-mqtt/pom.xml @@ -52,6 +52,7 @@ ${java.version} ${java.version} + utf8 @@ -79,4 +80,4 @@ - \ No newline at end of file + diff --git a/iot-test-tool/iot-virtual-device/pom.xml b/iot-test-tool/iot-virtual-device/pom.xml index b8f82dcc..24d94438 100644 --- a/iot-test-tool/iot-virtual-device/pom.xml +++ b/iot-test-tool/iot-virtual-device/pom.xml @@ -50,9 +50,10 @@ ${java.version} ${java.version} + utf8 - \ No newline at end of file + diff --git a/log/error.2023-06-01.0.gz b/log/error.2023-06-01.0.gz new file mode 100644 index 0000000000000000000000000000000000000000..0239669d57f6148035ad2dc4a6d54ae7db678e85 GIT binary patch literal 20 Scmb2|=3oGW|I82?NCE&DbOE&h literal 0 HcmV?d00001 diff --git a/log/error.2023-06-02.0.gz b/log/error.2023-06-02.0.gz new file mode 100644 index 0000000000000000000000000000000000000000..8d380cdefbd8c8d6aa7e1512e4eac62e0e75fbf8 GIT binary patch literal 678 zcmV;X0$KeZiwFP!00000|LvB$a^oNrhU?8tp1=)-3a1c@z>;Hcv6D%hDtj4kI?omu z;e;##k3iYv?N>(9tm4=vb}p4vi6i*VISl;zdo!G2gh_~!5MdBSW0Z{15ROpXo1rgc zl!4xiMA>9I{V{Dt;tbul(u3a7)V{u)KxR75q0MU7Cbi+4K?LD_L1){`BIMLdbMHYEL@+N@ zzZGk?XyiMzXLDn7%IunC7iy(+K@c#yv_;PQo99&rdFa)$U zdPNsIew~FnlXA65#wVnM;WL41?!77_--ULIu1bsG4$G53C2@)Ov}~;*7&xf!A3xf> z&q9?pLs1FqmGz=;bQxgBeHO2H{)2Z(jja}6X-4I=P>RkachGI$p30pwP;+YdXZI$l zx~a=-Ro48J$;rxd^*+jQ#+~8p3}4h MAM%W>_~H}*05@(;hX4Qo literal 0 HcmV?d00001 diff --git a/log/info.2023-06-01.0.gz b/log/info.2023-06-01.0.gz new file mode 100644 index 0000000000000000000000000000000000000000..3494b0839a2356c81511faf89e737a56489dc610 GIT binary patch literal 955 zcmV;s14R5EiwFP!00000|J9dEbK5o$$M2rWC-7wtnNfQnLXomwz0|dpi8HC4n#%N` z@pvEtl2DTb1AvOcEElygE9rRq|@3$8SFo6B*xzvSw@_U5*gEECbhkOb5oAoNO_S7 zBQP=#jx<;H#M3cnj5GL~k5BVF5$IFM>`Z2c-2otGbI8&Um!99-)^i)UL zB7Si4Qk12nED<9y%_yEPaPCib9X8o&Ae1BRm7IWC5 z*YemHiqg0eg*gdGNCJp4&)W*wa_zT0D_q)D^7ZMT@8vkcy5p6Bo4KmCVx8`-I4{B*XWA1*LyWIT>4gFom|G{b2fG@(#Fd7<{-X*W>&RFP#?Hr%S0EC~9!yc$9@JiQ(c&h714p%ltUvcR{4eLWj5 zAeD?e+X5Fn*L45Lu?Ft6g|j~R_-83d#;FeEsJ7qCsH}^~=~SsqR*>zS9BR{l9I465 z6~4pMt}K3ZR4E$gVV#~2bo6cFYAaZ=z@g++FB5LNbk z^?xj=Rq@o-QKg|^qGXCuz_cN|)z1awO3sD-fWZq4mJt}hWz}tKz;MqWYX53z=C%rC z)(6*e2SN3GS;1;wl570LHWHV-mnt5|B=TG%6PKiHKv6VmJY-L_{1&};5_lW{I|P7T7V<^HO{zJJu% z$lJEr?RC1l@?!Huv%)a>C3`33-G7(eoEEw+xd_|E7T$TEd@!&YXW_Qhb}Cz$cP{9I dVg88(@2ph^1FIirvD%9w_gAUxH7wB*005xj=ZpXV literal 0 HcmV?d00001 diff --git a/log/info.2023-06-02.0.gz b/log/info.2023-06-02.0.gz new file mode 100644 index 0000000000000000000000000000000000000000..c48b32f41f88135384f60faddb4ba40cd4ce990c GIT binary patch literal 1394 zcmV-&1&#V2iwFP!00000|LvPkZ{j!@#?M=+pP&~XICKuUj-CH|SXC|6j?|qQ(Q5aA zdN9E)nMrJvm`*#New~E0loAZhgn$G+0Ks{jUtartUa)&Iz%fRcbdlXf7#PSmJRchn zS?+cw`wa(?2xv4GY4-Z;t~hfk z)9&qY)c{|Jd++GKoT^847+OxMWYViW5V}GMnTKL=1n?rze)c zarlEKA^bakx>S+95z{0amzA7F({DmVT?2GqVhbUx;vvwm_lpN8#fciIY*YzlLrk2e zXI#QYVVVjK|7A(41`b&ASPIpjod^iT2pZK8mP_^~GUKTniJu&V`Ao}#Q$6MsnYTY< zt|VJ$*jb*p!@eaZlXZQIAm8+$=V(*9;ac_{_;AT%G|SVn5i3edWfaG5I%;h@aRzEY z%hKk@TA*9B;sVGswRPfd0cnzAMrA_JYc@VDKM|u z`Lr!RHhg6HmIn#aRkavfHfoD!Z9jhH(S6OY$Zl#HcKuj^+CDO%;pz&H zdZ1hL;}Xbrn~mId{kWiVpy@O}>zec9lEOptre(yve*bHKGm5;UE@x6ccX8KxOA$g2 zr)pMRDwgjoP`9-A#Db|@gjq^)MZ-wVA1OdO9mb&q6hvVv8D|OLLWcLVDFq}=e?ZWC zWL$zshzUrQzk$r){yIK7KKf1{DO7z%DsAy#nk1?n>@QwV?Zq=R8 z^+GJ;r;+@Yh&W6cOzA!A&BPZz zDim$Jp<+Itp08)qD_yE;A+({Y8ZD*dQbkoaE-D6N$~lWlrHkV23c-aI#YAdGmX!Q& zl5-G+MM6>UmAi8_(Nz|KG=1j5>Eh8`2Rpw@$TWVF5OFpT3L=rR@FN+XY ztCqj+;En;4DLCR<{H3@8O64LfmgJOksPWgEhWj86+B~sIQm!Qgd&()DHp~z3VRwY6{Sl%2cQk?C5 z_)0rwE~@i*Z~1)=)z^ZA(+JMaoSpO!opf-n`|fz5ryqD%G?m54*V*@({*-e%j94yO z_1W8Wmlse&nzFO}RYX??a;5!>#aDxpqb771ikeY#}_b5w*jct6}k;p9Es%< z7b0z-3=`ws---Lmql-^Xo|ab}3rba4G#$0JR~!|niJ)mT8_q4RI2J%2(e1d~F(6G= z%&4-xGrH}b^=Dm^D~<)lo1G%N9-DRjc!s9k+_Zye>x?{CyMo`Ue{JH&uBy19Worv3 zn;^3-o=yC?;L+|duF2E3ALo>g+j!Jk_hSX>Letf5P^$&HO+U_oJiKQ>x~%B=2t!l* zuUhqIU88=SQ+QZcuS!4uA9`rBKdCwZ0Cb9_ ABme*a literal 0 HcmV?d00001