From ee872873d050a4b7ebc17fdac752082a3f225584 Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Wed, 7 Apr 2021 18:31:58 +0800 Subject: [PATCH 01/19] commit for lc stability test --- core | 2 +- deploy/deploy-peer/src/main/resources/config/init/bftsmart.config | 2 +- libs/bft-smart | 2 +- samples/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core b/core index ceffde9a..d52cfc3e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ceffde9a029b1de69e3a8258c0ab1e957833c606 +Subproject commit d52cfc3e1f408c301ad9901305247b028a997a1d diff --git a/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config b/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config index cbf88f82..3bafbaee 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config +++ b/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config @@ -72,7 +72,7 @@ system.servers.num = 4 system.servers.f = 1 #Timeout to asking for a client request -system.totalordermulticast.timeout = 60000 +#system.totalordermulticast.timeout = 60000 #Allowable time tolerance range(millisecond) system.totalordermulticast.timeTolerance = 3000000 diff --git a/libs/bft-smart b/libs/bft-smart index 20638532..e0d84ac8 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 20638532de57b8804d24940ce2e8da63a2265e80 +Subproject commit e0d84ac8c2d7fc410dde2f25580cc51220962276 diff --git a/samples/pom.xml b/samples/pom.xml index afb9beb4..14f5ca56 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -8,7 +8,7 @@ pom - 1.4.2.RELEASE + 1.4.3-SNAPSHOT 1.5.0-SNAPSHOT From 2d5040e467ab4177e8dab1f1085babd07b32d32a Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Thu, 8 Apr 2021 14:48:16 +0800 Subject: [PATCH 02/19] commit main project for lc test more easy --- libs/bft-smart | 2 +- test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/bft-smart b/libs/bft-smart index e0d84ac8..7632552b 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit e0d84ac8c2d7fc410dde2f25580cc51220962276 +Subproject commit 7632552b3274cec7c393d7a93e42f69e0f910d39 diff --git a/test b/test index 104ed695..126cf63e 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 104ed695110ffc22fb2b2f8a1b6c83c79e4a1fb8 +Subproject commit 126cf63ee5588f83ba1acd90bfa75d78d951070e From ff3f3a6922790a666bf34ed0523575b3c963f98a Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Fri, 9 Apr 2021 14:11:00 +0800 Subject: [PATCH 03/19] modify submodule error utils version dependency! --- framework | 2 +- libs/bft-smart | 2 +- libs/httpservice | 2 +- libs/utils | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework b/framework index 68ff2864..25b72d0c 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 68ff2864dd5a9bfb8f3e1ac653483edeedae8799 +Subproject commit 25b72d0c7881c326af789a9b7ddad6fae43e1ed8 diff --git a/libs/bft-smart b/libs/bft-smart index 7632552b..7da40276 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 7632552b3274cec7c393d7a93e42f69e0f910d39 +Subproject commit 7da40276c7c88051a6f7bf40678e2e0ce022d6dc diff --git a/libs/httpservice b/libs/httpservice index ec00b84c..b1e2b473 160000 --- a/libs/httpservice +++ b/libs/httpservice @@ -1 +1 @@ -Subproject commit ec00b84c0609212cee06ede5bc64c661eb559cfe +Subproject commit b1e2b47357178d1bcbb90c50860c4d33f1941c8b diff --git a/libs/utils b/libs/utils index 9499aeb4..744d4e29 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 9499aeb488524398b6f9adcdea5e333bd1167c2a +Subproject commit 744d4e295c87f1fa152988f5e0d23978c3707912 From bc940ca48096949a770ed72b5c5f088c75798f18 Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Tue, 13 Apr 2021 16:45:29 +0800 Subject: [PATCH 04/19] fix jira 643,646 , jira 643: miss connect start process between old node and new active node; jira 646: tomlayer's last cid set problem --- libs/bft-smart | 2 +- test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/bft-smart b/libs/bft-smart index 7da40276..a880b569 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 7da40276c7c88051a6f7bf40678e2e0ce022d6dc +Subproject commit a880b569d95d83036f3e8e08f8e195bf99c75392 diff --git a/test b/test index 126cf63e..f1fbc76c 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 126cf63ee5588f83ba1acd90bfa75d78d951070e +Subproject commit f1fbc76cffa25d2d382806a796f7a5fa9332830b From a106a490b0028c9fe85eeb1e4c770f9097043c67 Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Thu, 22 Apr 2021 17:09:42 +0800 Subject: [PATCH 05/19] update submodule to fix jira 648, 649 --- libs/bft-smart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/bft-smart b/libs/bft-smart index a880b569..1f54435c 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit a880b569d95d83036f3e8e08f8e195bf99c75392 +Subproject commit 1f54435c5246f436db0a7d7ccae881e377dee53f From 273a4c0d6eb8b79f1faedeb52e904e8c45d9692f Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Thu, 22 Apr 2021 17:47:10 +0800 Subject: [PATCH 06/19] fix jira 645, shutdown fail --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index d52cfc3e..835c7454 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit d52cfc3e1f408c301ad9901305247b028a997a1d +Subproject commit 835c74544c6a959919d85e4f739d3a222863e4cf From 5e901b5c68db7d82c7b6f9cb5ef4c4363e1f831d Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Fri, 23 Apr 2021 10:11:00 +0800 Subject: [PATCH 07/19] update core sub module --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 835c7454..0ac57ded 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 835c74544c6a959919d85e4f739d3a222863e4cf +Subproject commit 0ac57dedb105b5db4f0020da54a66b667633b178 From 4b890d0ada46b9891e99ecbc8604534005ca0d56 Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Thu, 29 Apr 2021 00:09:10 +0800 Subject: [PATCH 08/19] fix jira 651, 652, update core and bft sub module --- core | 2 +- .../src/main/resources/scripts/peer-shutdown.sh | 36 +++++++++++++--------- libs/bft-smart | 2 +- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/core b/core index 0ac57ded..8abe1393 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 0ac57dedb105b5db4f0020da54a66b667633b178 +Subproject commit 8abe13934b3ff50e405dffdd168b0910c901fef9 diff --git a/deploy/deploy-peer/src/main/resources/scripts/peer-shutdown.sh b/deploy/deploy-peer/src/main/resources/scripts/peer-shutdown.sh index cd4c21dc..70ed2ce0 100644 --- a/deploy/deploy-peer/src/main/resources/scripts/peer-shutdown.sh +++ b/deploy/deploy-peer/src/main/resources/scripts/peer-shutdown.sh @@ -41,23 +41,29 @@ checkpid() { #注意: 在shell编程中，"$?" 表示上一句命令或者一个函数的返回值 ################################### stop() { - checkpid - - if [[ $psid -ne 0 ]]; then - echo "Stopping Peer ......(pid=$psid) " - JAVA_CMD="kill -9 $psid" - sleep 1 - $JAVA_CMD - if [[ $? -eq 0 ]]; then - echo "[OK]" + checkpid + if [[ $psid -ne 0 ]]; then + echo "Stopping Peer ......(pid=$psid) " + JAVA_CMD="kill $psid" + sleep 1 + $JAVA_CMD + if [[ $? -eq 0 ]]; then + echo "[Kill OK]" + else + JAVA_CMD="kill -9 $psid" + sleep 3 + $JAVA_CMD + if [[ $? -eq 0 ]]; then + echo "[Kill -9 OK]" + else + echo "[failed]" + fi + fi else - echo "[Failed]" + echo "================================" + echo "WARN: Peer is not running" + echo "================================" fi - else - echo "================================" - echo "WARN: Peer is not running" - echo "================================" - fi } diff --git a/libs/bft-smart b/libs/bft-smart index 1f54435c..33bf1ef1 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 1f54435c5246f436db0a7d7ccae881e377dee53f +Subproject commit 33bf1ef172d5487590534cfdd2a80d1110ecbd4f From 06242fb8288ee4e71e4b4d9c2c793c7f7e4301ce Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Fri, 30 Apr 2021 14:36:26 +0800 Subject: [PATCH 09/19] fix jira 654, update bft sub module --- libs/bft-smart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/bft-smart b/libs/bft-smart index 33bf1ef1..ca45a894 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 33bf1ef172d5487590534cfdd2a80d1110ecbd4f +Subproject commit ca45a894773577eaa249178a68c999ae9f0a8c8c From cc700c4a7af6d05f0fd44471e583547da1236dbc Mon Sep 17 00:00:00 2001 From: imuge Date: Wed, 12 May 2021 18:23:53 +0800 Subject: [PATCH 10/19] update gateway --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 8abe1393..be1d1d00 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8abe13934b3ff50e405dffdd168b0910c901fef9 +Subproject commit be1d1d00fd798e32ecbc0bbe25369cbfc7938c13 From 07720f29ca9366d98dc187623ac9d1efeccabae1 Mon Sep 17 00:00:00 2001 From: imuge Date: Wed, 12 May 2021 18:26:20 +0800 Subject: [PATCH 11/19] update shutdown shell, kill the process and wait for it to stop completely --- .../src/main/resources/scripts/shutdown.sh | 26 +++++++++------------- .../src/main/resources/scripts/manager-shutdown.sh | 13 +++++++---- .../src/main/resources/scripts/peer-shutdown.sh | 24 ++++++-------------- 3 files changed, 27 insertions(+), 36 deletions(-) diff --git a/deploy/deploy-gateway/src/main/resources/scripts/shutdown.sh b/deploy/deploy-gateway/src/main/resources/scripts/shutdown.sh index 068c5ed0..2a39f249 100644 --- a/deploy/deploy-gateway/src/main/resources/scripts/shutdown.sh +++ b/deploy/deploy-gateway/src/main/resources/scripts/shutdown.sh @@ -41,23 +41,19 @@ checkpid() { #注意: 在shell编程中，"$?" 表示上一句命令或者一个函数的返回值 ################################### stop() { - checkpid - - if [[ $psid -ne 0 ]]; then - echo "Stopping Gateway ......(pid=$psid) " - JAVA_CMD="kill -9 $psid" - sleep 1 - $JAVA_CMD - if [[ $? -eq 0 ]]; then - echo "[OK]" + checkpid + if [[ $psid -ne 0 ]]; then + echo "Stopping Gateway (PID = $psid) ......" + kill $psid + while kill -0 $psid 2>/dev/null; do sleep 1; done + echo "================================" + echo "Success" + echo "================================" else - echo "[Failed]" + echo "================================" + echo "WARN: Gateway is not running" + echo "================================" fi - else - echo "================================" - echo "WARN: Gateway is not running" - echo "================================" - fi } diff --git a/deploy/deploy-peer/src/main/resources/scripts/manager-shutdown.sh b/deploy/deploy-peer/src/main/resources/scripts/manager-shutdown.sh index e5f6b292..3974ce8f 100644 --- a/deploy/deploy-peer/src/main/resources/scripts/manager-shutdown.sh +++ b/deploy/deploy-peer/src/main/resources/scripts/manager-shutdown.sh @@ -8,9 +8,14 @@ PID=`ps -ef | grep $BOOT_HOME/manager/manager-booter | grep -v grep | awk '{prin #通过Kill命令将进程杀死 if [ -z "$PID" ]; then - echo "Unable to find JDChain Manager PID. stop aborted." + echo "================================" + echo "WARN: Unable to find JD Chain Manager PID($PID)." + echo "================================" else - echo "Start to kill PID = $PID ..." - kill -9 $PID - echo "JDChain Manager has been stopped ..." + echo "Stopping Manager (PID = $PID) ......" + kill $PID + while kill -0 $PID 2>/dev/null; do sleep 1; done + echo "================================" + echo "Success" + echo "================================" fi \ No newline at end of file diff --git a/deploy/deploy-peer/src/main/resources/scripts/peer-shutdown.sh b/deploy/deploy-peer/src/main/resources/scripts/peer-shutdown.sh index 70ed2ce0..968eb61b 100644 --- a/deploy/deploy-peer/src/main/resources/scripts/peer-shutdown.sh +++ b/deploy/deploy-peer/src/main/resources/scripts/peer-shutdown.sh @@ -41,24 +41,14 @@ checkpid() { #注意: 在shell编程中，"$?" 表示上一句命令或者一个函数的返回值 ################################### stop() { - checkpid + checkpid if [[ $psid -ne 0 ]]; then - echo "Stopping Peer ......(pid=$psid) " - JAVA_CMD="kill $psid" - sleep 1 - $JAVA_CMD - if [[ $? -eq 0 ]]; then - echo "[Kill OK]" - else - JAVA_CMD="kill -9 $psid" - sleep 3 - $JAVA_CMD - if [[ $? -eq 0 ]]; then - echo "[Kill -9 OK]" - else - echo "[failed]" - fi - fi + echo "Stopping Peer (PID = $psid) ......" + kill $psid + while kill -0 $psid 2>/dev/null; do sleep 1; done + echo "================================" + echo "Success" + echo "================================" else echo "================================" echo "WARN: Peer is not running" From 8e184b9effa248392a005315ce93e33efa994632 Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Fri, 14 May 2021 14:17:36 +0800 Subject: [PATCH 12/19] fix jira 655, update bftsmart sub module --- libs/bft-smart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/bft-smart b/libs/bft-smart index ca45a894..8a4b8b99 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit ca45a894773577eaa249178a68c999ae9f0a8c8c +Subproject commit 8a4b8b990f9bbb619e08aefdfa2b01101bd7723f From f0f77fa539f495b5ffffe17810dc859fc399987b Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Mon, 24 May 2021 14:29:17 +0800 Subject: [PATCH 13/19] update sub module bft, fix state transfer null pointer and mckey bug; --- libs/bft-smart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/bft-smart b/libs/bft-smart index 8a4b8b99..fae9af16 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 8a4b8b990f9bbb619e08aefdfa2b01101bd7723f +Subproject commit fae9af164ad47c24b5198b04e8bdd962a48d7896 From 5ffaf383f3deefdbb92f49976236aa99e34d1374 Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Mon, 24 May 2021 20:09:43 +0800 Subject: [PATCH 14/19] update sub module, upgrade version to 1.5.0 --- core | 2 +- framework | 2 +- libs/bft-smart | 2 +- libs/utils | 2 +- test | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core b/core index be1d1d00..0052e52f 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit be1d1d00fd798e32ecbc0bbe25369cbfc7938c13 +Subproject commit 0052e52f367cae7af519c206f5413d5af646903c diff --git a/framework b/framework index 25b72d0c..b1e758f5 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 25b72d0c7881c326af789a9b7ddad6fae43e1ed8 +Subproject commit b1e758f5518198722f7007a282cb26436e192797 diff --git a/libs/bft-smart b/libs/bft-smart index fae9af16..a964a9cc 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit fae9af164ad47c24b5198b04e8bdd962a48d7896 +Subproject commit a964a9cceb3de0659a7f637eb0ddda8b1a415e39 diff --git a/libs/utils b/libs/utils index 744d4e29..ee374d26 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 744d4e295c87f1fa152988f5e0d23978c3707912 +Subproject commit ee374d260d9f60751579dcb9cc36d5ed96b947a0 diff --git a/test b/test index f1fbc76c..bacad59a 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit f1fbc76cffa25d2d382806a796f7a5fa9332830b +Subproject commit bacad59aaed3447975d9bc02a60afd4e5a876853 From 3cafed9cd49843031ae9dbe224975a82abf430c0 Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Tue, 25 May 2021 10:36:51 +0800 Subject: [PATCH 15/19] merge submodule to main project --- core | 2 +- framework | 2 +- libs/bft-smart | 2 +- libs/binary-proto | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core b/core index 0052e52f..c4b6f114 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 0052e52f367cae7af519c206f5413d5af646903c +Subproject commit c4b6f114299f36f7eb031c802b35f53959b7596b diff --git a/framework b/framework index b1e758f5..4d9708fd 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit b1e758f5518198722f7007a282cb26436e192797 +Subproject commit 4d9708fd233662748e7bc57fc7c4e6085cf45c34 diff --git a/libs/bft-smart b/libs/bft-smart index a964a9cc..465b42bb 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit a964a9cceb3de0659a7f637eb0ddda8b1a415e39 +Subproject commit 465b42bb5793c2bcb61c2789317a85608d13d19e diff --git a/libs/binary-proto b/libs/binary-proto index d9f3b75a..7f09ae72 160000 --- a/libs/binary-proto +++ b/libs/binary-proto @@ -1 +1 @@ -Subproject commit d9f3b75a7c42d669c9b0b22775c5e4ca56c26de2 +Subproject commit 7f09ae72a9b05c96b53a617f814287eeb9f0aa05 From ccf3248f334a9df87d8f6e0e152d2e623a47e450 Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Tue, 25 May 2021 11:58:31 +0800 Subject: [PATCH 16/19] update version --- libs/httpservice | 2 +- libs/utils | 2 +- pom.xml | 2 +- samples/contract-samples/pom.xml | 2 +- samples/pom.xml | 4 ++-- samples/sdk-samples/pom.xml | 2 +- test | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/httpservice b/libs/httpservice index b1e2b473..d99eb102 160000 --- a/libs/httpservice +++ b/libs/httpservice @@ -1 +1 @@ -Subproject commit b1e2b47357178d1bcbb90c50860c4d33f1941c8b +Subproject commit d99eb102ab9a323bf81c459982f468b6618fb2a0 diff --git a/libs/utils b/libs/utils index ee374d26..fd27e310 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit ee374d260d9f60751579dcb9cc36d5ed96b947a0 +Subproject commit fd27e31039fbe34a6ea2c03896602f62ba54e597 diff --git a/pom.xml b/pom.xml index 05dacb93..d080517b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.5.0-SNAPSHOT + 1.5.0.RELEASE pom jdchain root project diff --git a/samples/contract-samples/pom.xml b/samples/contract-samples/pom.xml index 9b762555..67c844ee 100644 --- a/samples/contract-samples/pom.xml +++ b/samples/contract-samples/pom.xml @@ -6,7 +6,7 @@ com.jd.blockchain jdchain-samples - 1.4.3.RELEASE + 1.5.0.RELEASE diff --git a/samples/pom.xml b/samples/pom.xml index 90cf1cb6..65e26b59 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -4,11 +4,11 @@ 4.0.0 com.jd.blockchain jdchain-samples - 1.4.3.RELEASE + 1.5.0.RELEASE pom - 1.4.3.RELEASE + 1.5.0.RELEASE diff --git a/samples/sdk-samples/pom.xml b/samples/sdk-samples/pom.xml index d7836222..099cbb16 100644 --- a/samples/sdk-samples/pom.xml +++ b/samples/sdk-samples/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-samples - 1.4.3.RELEASE + 1.5.0.RELEASE sdk-samples diff --git a/test b/test index bacad59a..bc590c85 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit bacad59aaed3447975d9bc02a60afd4e5a876853 +Subproject commit bc590c8542ff6f1ee44b2bfd17543bcabb87fde0 From 1285b62f7f5636eb6f06668f4e77e3a23e837502 Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Tue, 25 May 2021 15:20:50 +0800 Subject: [PATCH 17/19] update sub module --- core | 2 +- libs/utils | 2 +- test | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core b/core index c4b6f114..74005eed 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit c4b6f114299f36f7eb031c802b35f53959b7596b +Subproject commit 74005eedf3917162742ef36d185a171f3553cf68 diff --git a/libs/utils b/libs/utils index fd27e310..dedda124 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit fd27e31039fbe34a6ea2c03896602f62ba54e597 +Subproject commit dedda124dfeb4488ece714d1e6af24b8d5f0a17a diff --git a/test b/test index bc590c85..36aef290 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit bc590c8542ff6f1ee44b2bfd17543bcabb87fde0 +Subproject commit 36aef2907ae1ae1307725514fab308fd8cc4918f From e7b261296700e13c2f5b437690b4629f14e882ef Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Tue, 25 May 2021 15:27:10 +0800 Subject: [PATCH 18/19] upgrade httpservice submodule --- libs/httpservice | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/httpservice b/libs/httpservice index d99eb102..df3e080e 160000 --- a/libs/httpservice +++ b/libs/httpservice @@ -1 +1 @@ -Subproject commit d99eb102ab9a323bf81c459982f468b6618fb2a0 +Subproject commit df3e080ee2a6636414e2292ec97d74b002d081cb From b5a953d72d89acfcd2b2cdd9ac01574ff8004a50 Mon Sep 17 00:00:00 2001 From: zhangshuang Date: Tue, 25 May 2021 16:24:36 +0800 Subject: [PATCH 19/19] upgrade sub modulle --- core | 2 +- libs/httpservice | 2 +- libs/kvdb | 2 +- test | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core b/core index 74005eed..86d3b678 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 74005eedf3917162742ef36d185a171f3553cf68 +Subproject commit 86d3b6786aedd814f9be5263f3c4012cb7a2ad63 diff --git a/libs/httpservice b/libs/httpservice index df3e080e..0aad08bc 160000 --- a/libs/httpservice +++ b/libs/httpservice @@ -1 +1 @@ -Subproject commit df3e080ee2a6636414e2292ec97d74b002d081cb +Subproject commit 0aad08bc7e8fe769178d6ca9a1184f4acc33e913 diff --git a/libs/kvdb b/libs/kvdb index a1d86d13..9a7235f1 160000 --- a/libs/kvdb +++ b/libs/kvdb @@ -1 +1 @@ -Subproject commit a1d86d133b544e5c765aa460d66188e0bb18e7ee +Subproject commit 9a7235f1eb63f7f22bc1f5995778633c9a086c89 diff --git a/test b/test index 36aef290..91e08505 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 36aef2907ae1ae1307725514fab308fd8cc4918f +Subproject commit 91e08505fbc0ccbd7cb3e5e04bea3d7c92c6a0e2